Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
{
Text = hardElectrocuteName,
Category = VerbCategory.Smite,
Icon = new SpriteSpecifier.Rsi(new ("/Textures/Clothing/Hands/Gloves/Color/yellow.rsi"), "icon"),
Icon = new SpriteSpecifier.Rsi(new ("/Textures/_Maid/Clothing/Hands/Gloves/Color/yellow.rsi"), "icon"),
Act = () =>
{
int damageToDeal;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Actions/ninja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
components:
- type: Action
icon:
sprite: Objects/Weapons/Grenades/empgrenade.rsi
sprite: _Maid/Objects/Weapons/Grenades/empgrenade.rsi #Maid
state: icon
itemIconStyle: BigAction
priority: -13
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Actions/types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
itemIconStyle: BigAction
priority: -20
icon:
sprite: Objects/Weapons/Grenades/empgrenade.rsi
sprite: _Maid/Objects/Weapons/Grenades/empgrenade.rsi #Maid
state: icon

- type: entity
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
- type: cargoProduct
id: SecurityNonlethalThrowables
icon:
sprite: Objects/Weapons/Grenades/stingergrenade.rsi
sprite: _Maid/Objects/Weapons/Grenades/stingergrenade.rsi #Maid
state: icon
product: CrateSecNonlethalThrowables
cost: 2500
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Cargo/cargo_service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
- type: cargoProduct
id: ServiceCleanerGrenades
icon:
sprite: Objects/Weapons/Grenades/janitor.rsi
sprite: _Maid/Objects/Weapons/Grenades/janitor.rsi #Maid
state: icon
product: CrateServiceCleanerGrenades
cost: 400
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@
id: UplinkHeadsetEncryptionKey
name: uplink-encryption-key-name
description: uplink-encryption-key-desc
icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: synd_label }
icon: { sprite: /Textures/_Maid/Objects/Devices/encryption_keys.rsi, state: synd_label } #Maid
productEntity: EncryptionKeySyndie # One for the price of one, but cheaper
cost:
Telecrystal: 3 # goob
Expand All @@ -958,7 +958,7 @@
# id: UplinkBinaryTranslatorKey
# name: uplink-binary-translator-key-name
# description: uplink-binary-translator-key-desc
# icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: ai_label }
# icon: { sprite: /Textures/_Maid/Objects/Devices/encryption_keys.rsi, state: ai_label } #Maid
# productEntity: EncryptionKeyBinarySyndicate
# cost:
# Telecrystal: 5 # goob
Expand Down Expand Up @@ -1528,7 +1528,7 @@
id: UplinkRadioImplanter
name: uplink-radio-implanter-name
description: uplink-radio-implanter-desc
icon: { sprite: /Textures/Objects/Devices/encryption_keys.rsi, state: synd_label }
icon: { sprite: /Textures/_Maid/Objects/Devices/encryption_keys.rsi, state: synd_label } #Maid
productEntity: RadioImplanter
cost:
Telecrystal: 7 # goob - Syndicate Radio Price Adjust
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Hands/colored.yml
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,9 @@
components:
- type: FingerprintMask
- type: Sprite
sprite: Clothing/Hands/Gloves/Color/yellow.rsi
sprite: _Maid/Clothing/Hands/Gloves/Color/yellow.rsi #Maid
- type: Clothing
sprite: Clothing/Hands/Gloves/Color/yellow.rsi
sprite: _Maid/Clothing/Hands/Gloves/Color/yellow.rsi #Maid
- type: Butcherable
butcheringType: Knife
spawned:
Expand Down
20 changes: 10 additions & 10 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1011,9 +1011,9 @@
description: A special hardsuit helmet worn by members of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi #Maid
- type: Clothing
sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi #Maid
- type: PointLight
color: "#addbff"

Expand All @@ -1039,9 +1039,9 @@
description: A special hardsuit helmet worn by members of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi #Maid
- type: Clothing
sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi #Maid
- type: PointLight
color: "#f4ffad"
- type: EyeProtection # goob
Expand All @@ -1054,9 +1054,9 @@
description: A special hardsuit helmet worn by members of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi #Maid
- type: Clothing
sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi #Maid
- type: PointLight
color: "#adffec"

Expand All @@ -1068,9 +1068,9 @@
description: A special hardsuit helmet worn by members of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi #Maid
- type: Clothing
sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi #Maid
- type: PointLight
color: "#ffadc6"

Expand All @@ -1082,9 +1082,9 @@
description: A special hardsuit helmet worn by members of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi #Maid
- type: Clothing
sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
sprite: _Maid/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi #Maid
- type: PointLight
color: "#cbadff"

Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1063,9 +1063,9 @@
description: This hat emphasizes that you are THE LAW.
components:
- type: Sprite
sprite: Clothing/Head/Hats/warden.rsi
sprite: _Maid/Clothing/Head/Hats/warden.rsi #Maid
- type: Clothing
sprite: Clothing/Head/Hats/warden.rsi
sprite: _Maid/Clothing/Head/Hats/warden.rsi #Maid
- type: StealTarget
stealGroup: ClothingHeadHatWarden
- type: Armor # Goob
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,9 @@
description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
sprite: _Maid/Clothing/OuterClothing/Coats/labcoat_chem.rsi #Maid
- type: Clothing
sprite: Clothing/OuterClothing/Coats/labcoat_chem.rsi
sprite: _Maid/Clothing/OuterClothing/Coats/labcoat_chem.rsi #Maid
- type: Armor
coverage:
- Chest
Expand Down
32 changes: 16 additions & 16 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2020 FrostMando <68990565+FrostMando@users.noreply.github.com>
# SPDX-FileCopyrightText: 2020 Swept <sweptwastaken@protonmail.com>
# SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto <zddm@outlook.es>
# SPDX-FileCopyrightText: 2020 VГ­ctor Aguilera Puerto <zddm@outlook.es>
# SPDX-FileCopyrightText: 2020 Ygg01 <daniel.fath7@gmail.com>
# SPDX-FileCopyrightText: 2021 Elijahrane <60792108+Elijahrane@users.noreply.github.com>
# SPDX-FileCopyrightText: 2021 Mith-randalf <84274729+Mith-randalf@users.noreply.github.com>
Expand Down Expand Up @@ -86,8 +86,8 @@

# SPDX-FileCopyrightText: 2020 FrostMando <68990565+FrostMando@users.noreply.github.com>
# SPDX-FileCopyrightText: 2020 Swept <sweptwastaken@protonmail.com>
# SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
# SPDX-FileCopyrightText: 2020 Víctor Aguilera Puerto <zddm@outlook.es>
# SPDX-FileCopyrightText: 2020 VГ­ctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
# SPDX-FileCopyrightText: 2020 VГ­ctor Aguilera Puerto <zddm@outlook.es>
# SPDX-FileCopyrightText: 2020 Ygg01 <daniel.fath7@gmail.com>
# SPDX-FileCopyrightText: 2021 DrSmugleaf <DrSmugleaf@users.noreply.github.com>
# SPDX-FileCopyrightText: 2021 Elijahrane <60792108+Elijahrane@users.noreply.github.com>
Expand Down Expand Up @@ -196,7 +196,7 @@
# SPDX-FileCopyrightText: 2024 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
# SPDX-FileCopyrightText: 2024 username <113782077+whateverusername0@users.noreply.github.com>
# SPDX-FileCopyrightText: 2024 whateverusername0 <whateveremail>
# SPDX-FileCopyrightText: 2024 Арт <123451459+JustArt1m@users.noreply.github.com>
# SPDX-FileCopyrightText: 2024 РђСЂС‚ <123451459+JustArt1m@users.noreply.github.com>
# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
# SPDX-FileCopyrightText: 2025 Aiden <aiden@djkraz.com>
# SPDX-FileCopyrightText: 2025 Aidenkrz <aiden@djkraz.com>
Expand Down Expand Up @@ -1069,9 +1069,9 @@
description: A suit made by the cutting edge R&D department at Cybersun to be hyper resilient.
components:
- type: Sprite
sprite: _Maid/Clothing/OuterClothing/Hardsuits/cybersun.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/cybersun.rsi #Maid
- type: Clothing
sprite: _Maid/Clothing/OuterClothing/Hardsuits/cybersun.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/cybersun.rsi #Maid
- type: PressureProtection
highPressureMultiplier: 0.2
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -1284,9 +1284,9 @@
description: A protective hardsuit worn by the leader of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi #Maid
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertleader.rsi #Maid
- type: ToggleableClothing # Goobstation - Modsuits change
clothingPrototypes:
head: ClothingHeadHelmetHardsuitERTLeader
Expand Down Expand Up @@ -1314,9 +1314,9 @@
description: A protective hardsuit worn by the engineers of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi #Maid
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi #Maid
- type: ToggleableClothing # Goobstation - Modsuits change
clothingPrototypes:
head: ClothingHeadHelmetHardsuitERTEngineer
Expand All @@ -1331,9 +1331,9 @@
description: A protective hardsuit worn by the medics of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi #Maid
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertmedical.rsi #Maid
- type: ToggleableClothing # Goobstation - Modsuits change
clothingPrototypes:
head: ClothingHeadHelmetHardsuitERTMedical
Expand All @@ -1346,9 +1346,9 @@
description: A protective hardsuit worn by the security officers of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi #Maid
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi #Maid
- type: ToggleableClothing # Goobstation - Modsuits change
clothingPrototypes:
head: ClothingHeadHelmetHardsuitERTSecurity
Expand All @@ -1365,9 +1365,9 @@
description: A protective hardsuit worn by the janitors of an emergency response team. # Goob edit
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi #Maid
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi
sprite: _Maid/Clothing/OuterClothing/Hardsuits/ERTSuits/ertjanitor.rsi #Maid
- type: ToggleableClothing # Goobstation - Modsuits change
clothingPrototypes:
head: ClothingHeadHelmetHardsuitERTJanitor
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@
description: Rubber boots.
components:
- type: Sprite
sprite: Clothing/Shoes/Specific/galoshes.rsi
sprite: _Maid/Clothing/Shoes/Specific/galoshes.rsi # Maid
- type: Clothing
sprite: Clothing/Shoes/Specific/galoshes.rsi
sprite: _Maid/Clothing/Shoes/Specific/galoshes.rsi # Maid
- type: NoSlip
- type: SlowedOverSlippery
slowdownModifier: 0.7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
- type: Sprite
layers:
- state: red
- sprite: Objects/Devices/encryption_keys.rsi
- sprite: _Maid/Objects/Devices/encryption_keys.rsi #Maid
state: crypt_rusted
- sprite: Objects/Devices/encryption_keys.rsi
- sprite: _Maid/Objects/Devices/encryption_keys.rsi #Maid
state: nano_label
- type: RandomSpawner
rarePrototypes:
Expand All @@ -28,4 +28,4 @@
- EncryptionKeyMedical
- EncryptionKeyCargo
chance: 0.9
offset: 0.0
offset: 0.0
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@
- type: Sprite
layers:
- state: red
- sprite: Clothing/Hands/Gloves/Color/yellow.rsi
- sprite: _Maid/Clothing/Hands/Gloves/Color/yellow.rsi #Maid
state: icon
- type: EntityTableSpawner
table: !type:NestedSelector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@
components:
- type: EncryptionKey
- type: Item
sprite: Objects/Devices/encryption_keys.rsi
sprite: _Maid/Objects/Devices/encryption_keys.rsi #Maid
- type: Sprite
sprite: Objects/Devices/encryption_keys.rsi
sprite: _Maid/Objects/Devices/encryption_keys.rsi #Maid

- type: entity
parent: EncryptionKey
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
path: /Audio/_Goobstation/Items/handling/component_drop.ogg
# Goobstation edit end
- type: Sprite
sprite: Objects/Misc/stock_parts.rsi
sprite: _Maid/Objects/Misc/stock_parts.rsi #Maid
- type: Item
size: Tiny
- type: Stack
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Shields/shields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@
abstract: true
components:
- type: Sprite
sprite: Objects/Weapons/Melee/shields.rsi
sprite: _Maid/Objects/Weapons/Melee/shields.rsi #Maid
state: riot-icon
- type: Item
sprite: Objects/Weapons/Melee/shields.rsi
sprite: _Maid/Objects/Weapons/Melee/shields.rsi #Maid
size: Ginormous
heldPrefix: riot
- type: Blocking
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@
tags:
- JawsOfLife
- type: Sprite
sprite: Objects/Tools/jaws_of_life.rsi
sprite: _Maid/Objects/Tools/jaws_of_life.rsi #Maid
state: jaws_pry
- type: Item
size: Normal
- type: Clothing
sprite: Objects/Tools/jaws_of_life.rsi
sprite: _Maid/Objects/Tools/jaws_of_life.rsi #Maid
quickEquip: false
slots:
- Belt
Expand All @@ -99,13 +99,13 @@
entries:
- behavior: Prying
sprite:
sprite: Objects/Tools/jaws_of_life.rsi
sprite: _Maid/Objects/Tools/jaws_of_life.rsi #Maid
state: jaws_pry
useSound: /Audio/Items/jaws_pry.ogg
changeSound: /Audio/Items/change_jaws.ogg
- behavior: Cutting
sprite:
sprite: Objects/Tools/jaws_of_life.rsi
sprite: _Maid/Objects/Tools/jaws_of_life.rsi #Maid
state: jaws_cutter
useSound: /Audio/Items/jaws_cut.ogg
changeSound: /Audio/Items/change_jaws.ogg
Expand Down Expand Up @@ -144,7 +144,7 @@
description: Useful for entering the station or its departments.
components:
- type: Sprite
sprite: Objects/Tools/jaws_of_life.rsi
sprite: _Maid/Objects/Tools/jaws_of_life.rsi #Maid
state: syn_jaws_pry
- type: Item
inhandVisuals:
Expand All @@ -159,13 +159,13 @@
entries:
- behavior: Prying
sprite:
sprite: Objects/Tools/jaws_of_life.rsi
sprite: _Maid/Objects/Tools/jaws_of_life.rsi #Maid
state: syn_jaws_pry
useSound: /Audio/Items/jaws_pry.ogg
changeSound: /Audio/Items/change_jaws.ogg
- behavior: Cutting
sprite:
sprite: Objects/Tools/jaws_of_life.rsi
sprite: _Maid/Objects/Tools/jaws_of_life.rsi #Maid
state: syn_jaws_cutter
useSound: /Audio/Items/jaws_cut.ogg
changeSound: /Audio/Items/change_jaws.ogg
Expand Down
Loading
Loading