diff --git a/Content.Server/ADT/Lizard/LizardBloodSystem.cs b/Content.Server/ADT/Lizard/LizardBloodSystem.cs index 913cee4923e..dc8b3e2e907 100644 --- a/Content.Server/ADT/Lizard/LizardBloodSystem.cs +++ b/Content.Server/ADT/Lizard/LizardBloodSystem.cs @@ -27,7 +27,6 @@ public sealed class LizardBloodSystem : EntitySystem [Dependency] private readonly SleepingSystem _sleepingSystem = default!; [Dependency] private readonly ChemistrySystem _chemistry = default!; [Dependency] private readonly BloodstreamSystem _bloodstream = default!; - [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly ReactiveSystem _reactiveSystem = default!; [Dependency] private readonly ReactiveSystem _reactive = default!; diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml index 0fef6be7371..59e47f059c4 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/buckwheat_kasha.yml @@ -15,7 +15,7 @@ - type: SolutionContainerManager solutions: food: - maxvol: 12 + maxVol: 12 reagents: - ReagentId: Nutriment Quantity: 8 @@ -40,7 +40,7 @@ - type: SolutionContainerManager solutions: food: - maxvol: 12 + maxVol: 12 reagents: - ReagentId: Nutriment Quantity: 8 @@ -67,7 +67,7 @@ - type: SolutionContainerManager solutions: food: - maxvol: 40 + maxVol: 40 reagents: - ReagentId: Nutriment Quantity: 18 diff --git a/Resources/Prototypes/ADT/Lixon/PilotSB.yml b/Resources/Prototypes/ADT/Lixon/PilotSB.yml index f2f24eeb770..4470603cc84 100644 --- a/Resources/Prototypes/ADT/Lixon/PilotSB.yml +++ b/Resources/Prototypes/ADT/Lixon/PilotSB.yml @@ -13,6 +13,6 @@ belt: ClothingBeltSecurityFilled Hands: ClothingHandsGlovesFingerless pocket2: ClothingOuterWinterSec - innerclothingskirt: ClothingUniformJumpskirtSec + innerClothingSkirt: ClothingUniformJumpskirtSec satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/ADT/Roles/Jobs/Civilian/bartender.yml index b5f8d14e570..32921c50195 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Civilian/bartender.yml @@ -11,6 +11,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ADTClothingUniformNewBarmanSkirt + innerClothingSkirt: ADTClothingUniformNewBarmanSkirt satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/ADT/Roles/Jobs/Civilian/service_worker.yml index 67501555b87..3c9abafe3b5 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Civilian/service_worker.yml @@ -9,6 +9,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ADTClothingUniformNewServiceSuit + innerClothingSkirt: ADTClothingUniformNewServiceSuit satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml b/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml index 7f1d8ad1c8f..17b4d80bd15 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Magistrate/Magistrate.yml @@ -43,7 +43,7 @@ neck: ClothingNeckLawyerbadge pocket1: RubberStampMagistrat pocket2: ADTtelescopicBaton - innerclothingskirt: ClothingUniformJumpsuitLawyerBlack + innerClothingSkirt: ClothingUniformJumpsuitLawyerBlack satchel: ClothingBackpackSatchel duffelbag: ClothingBackpackDuffel diff --git a/Resources/Prototypes/ADT/Roles/Jobs/Medical/virusolog.yml b/Resources/Prototypes/ADT/Roles/Jobs/Medical/virusolog.yml index 8ded212d4e7..7f7dd2b4de0 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/Medical/virusolog.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/Medical/virusolog.yml @@ -29,7 +29,7 @@ ears: ClothingHeadsetMedical belt: ClothingBeltMedical # the purple glasses? - innerclothingskirt: ClothingUniformJumpskirtColorWhite + innerClothingSkirt: ClothingUniformJumpskirtColorWhite satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/ADT/Roles/Jobs/SecInvestigator/investigator.yml b/Resources/Prototypes/ADT/Roles/Jobs/SecInvestigator/investigator.yml index 65b71bd439a..37ba7e23538 100644 --- a/Resources/Prototypes/ADT/Roles/Jobs/SecInvestigator/investigator.yml +++ b/Resources/Prototypes/ADT/Roles/Jobs/SecInvestigator/investigator.yml @@ -42,6 +42,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ADTClothingUniformInvestigatorSuit + innerClothingSkirt: ADTClothingUniformInvestigatorSuit satchel: ADTClothingBackpackSatchelInvestigatorFilled duffelbag: ADTClothingBackpackDuffelInvestigatorFilled diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml index 0136bbe4bca..71ce47dd2f3 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Consumable/Food/soup.yml @@ -15,7 +15,7 @@ - type: SolutionContainerManager solutions: food: - maxvol: 30 + maxVol: 30 reagents: - ReagentId: Nutriment Quantity: 10 diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml index f7494b0743c..0f646d41a21 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml @@ -31,6 +31,6 @@ eyes: ClothingEyesGlassesSunglasses ears: ClothingHeadsetIAA neck: ClothingNeckLawyerbadge - innerclothingskirt: ClothingUniformJumpskirtLawyerBlack + innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack satchel: ClothingBackpackSatchelIAAFilled duffelbag: ClothingBackpackDuffelIAAFilled diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index d85551316d0..f41d73a8365 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -26,6 +26,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtCargo + innerClothingSkirt: ClothingUniformJumpskirtCargo satchel: ClothingBackpackSatchelCargoFilled duffelbag: ClothingBackpackDuffelCargoFilled diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 76edb3076e5..a6005b75e02 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -48,6 +48,6 @@ underwearb: ClothingUnderwearBottomBoxersQM # Sirena-Underwear underweart: ClothingUnderwearTopBraQM # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesQM # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtQM + innerClothingSkirt: ClothingUniformJumpskirtQM satchel: ClothingBackpackSatchelQuartermasterFilled duffelbag: ClothingBackpackDuffelQuartermasterFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index 053405f5cc3..bcbc92922e9 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -20,6 +20,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtColorGrey + innerClothingSkirt: ClothingUniformJumpskirtColorGrey satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 6a20d52b5d1..521dbb97aa5 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -31,6 +31,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtBartender + innerClothingSkirt: ClothingUniformJumpskirtBartender satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index fe5c25e3267..35617d28da3 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -27,6 +27,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtHydroponics + innerClothingSkirt: ClothingUniformJumpskirtHydroponics satchel: ClothingBackpackSatchelHydroponicsFilled duffelbag: ClothingBackpackDuffelHydroponicsFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index d333efe19e0..a4288ca3600 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -25,6 +25,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtChaplain + innerClothingSkirt: ClothingUniformJumpskirtChaplain satchel: ClothingBackpackSatchelChaplainFilled duffelbag: ClothingBackpackDuffelChaplainFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index dd7a09e0c1d..db790af61c4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -32,6 +32,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtChef + innerClothingSkirt: ClothingUniformJumpskirtChef satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 090cba16e1d..0ae835622d6 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -27,7 +27,7 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtJanitor + innerClothingSkirt: ClothingUniformJumpskirtJanitor satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -43,6 +43,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtJanimaid + innerClothingSkirt: ClothingUniformJumpskirtJanimaid satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index f1b708f0525..781c563fcfd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -25,7 +25,7 @@ underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear inhand: - right hand: BriefcaseBrownFilled - innerclothingskirt: ClothingUniformJumpskirtLibrarian # Corvax-Resprite + - BriefcaseBrownFilled + innerClothingSkirt: ClothingUniformJumpskirtLibrarian # Corvax-Resprite satchel: ClothingBackpackSatchelLibrarianFilled duffelbag: ClothingBackpackDuffelLibrarianFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 9838a8a7668..2cfcbefdd70 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -34,7 +34,7 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtMime + innerClothingSkirt: ClothingUniformJumpskirtMime satchel: ClothingBackpackSatchelMimeFilled duffelbag: ClothingBackpackDuffelMimeFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 3be03452bb6..203fba02154 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -25,6 +25,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtBartender + innerClothingSkirt: ClothingUniformJumpskirtBartender satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index a66b12b6c24..1a529078e05 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -47,6 +47,6 @@ underwearb: ClothingUnderwearBottomBoxersCap # Sirena-Underwear underweart: ClothingUnderwearTopBraCap # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesCap # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtCaptain + innerClothingSkirt: ClothingUniformJumpskirtCaptain satchel: ClothingBackpackSatchelCaptainFilled duffelbag: ClothingBackpackDuffelCaptainFilled diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 5fc73c8b476..56c09d2284d 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -67,6 +67,6 @@ underwearb: ClothingUnderwearBottomBoxersHOP # Sirena-Underwear underweart: ClothingUnderwearTopBraHOP # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesHOP # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtHoP + innerClothingSkirt: ClothingUniformJumpskirtHoP satchel: ClothingBackpackSatchelHOPFilled duffelbag: ClothingBackpackDuffelHOPFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index f44b00ce03a..0b108ddf9f3 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -30,6 +30,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtAtmos + innerClothingSkirt: ClothingUniformJumpskirtAtmos satchel: ClothingBackpackSatchelAtmosphericsFilled duffelbag: ClothingBackpackDuffelAtmosphericsFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 9c691ccc7aa..93abe49c2b1 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -46,6 +46,6 @@ eyes: ClothingEyesGlassesMeson ears: ClothingHeadsetCE belt: ClothingBeltChiefEngineerFilled - innerclothingskirt: ClothingUniformJumpskirtChiefEngineer + innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer satchel: ClothingBackpackSatchelChiefEngineerFilled duffelbag: ClothingBackpackDuffelChiefEngineerFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 0aa48def3de..eb37585049e 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -32,6 +32,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtEngineering + innerClothingSkirt: ClothingUniformJumpskirtEngineering satchel: ClothingBackpackSatchelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 2c352ff56bd..a91570fd15c 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -27,6 +27,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtColorYellow + innerClothingSkirt: ClothingUniformJumpskirtColorYellow satchel: ClothingBackpackSatchelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled diff --git a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml index 8981a0d666d..4470005fc4f 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml @@ -13,7 +13,7 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtColorBlack + innerClothingSkirt: ClothingUniformJumpskirtColorBlack satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -30,6 +30,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtColorBlack + innerClothingSkirt: ClothingUniformJumpskirtColorBlack satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index a3840d25e1c..1ebc579408b 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -15,7 +15,7 @@ ears: ClothingHeadsetGrey pocket1: VehicleSkeletonMotorcycle pocket2: VehicleKeySkeletonMotorcycle - innerclothingskirt: ClothingUniformJumpskirtColorBlack + innerClothingSkirt: ClothingUniformJumpskirtColorBlack satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -39,7 +39,7 @@ belt: EnergyKatana suitstorage: YellowOxygenTankFilled inhand: - left hand: JetpackBlackFilled + - JetpackBlackFilled #Deathsquad Outfit - type: startingGear @@ -57,7 +57,7 @@ id: DeathsquadPDA pocket1: EnergySword belt: ClothingBeltChiefEngineerFilled - innerclothingskirt: ClothingUniformJumpskirtColorBlack + innerClothingSkirt: ClothingUniformJumpskirtColorBlack satchel: ClothingBackpackDuffelSyndicateAmmo duffelbag: ClothingBackpackDuffelSyndicateAmmo @@ -68,7 +68,7 @@ head: ClothingHeadHatOutlawHat jumpsuit: ClothingUniformJumpsuitOperative mask: CigaretteSyndicate - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative # Syndicate Operative Outfit - Barratry - type: startingGear @@ -78,7 +78,7 @@ back: ClothingBackpackDuffelSyndicateOperative shoes: ClothingShoesBootsCombatFilled gloves: ClothingHandsGlovesColorBlack - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -93,7 +93,7 @@ shoes: ClothingShoesBootsCombatFilled pocket1: BaseUplinkRadio40TC id: AgentIDCard - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -114,7 +114,7 @@ pocket1: DoubleEmergencyOxygenTankFilled pocket2: BaseUplinkRadio40TC belt: ClothingBeltMilitaryWebbing - innerclothingskirt: ClothingUniformJumpskirtOperative + innerClothingSkirt: ClothingUniformJumpskirtOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -136,8 +136,8 @@ pocket2: BaseUplinkRadio40TC belt: ClothingBeltMilitaryWebbing inhand: - right hand: NukeOpsDeclarationOfWar - innerclothingskirt: ClothingUniformJumpskirtOperative + - NukeOpsDeclarationOfWar + innerClothingSkirt: ClothingUniformJumpskirtOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -158,7 +158,7 @@ pocket2: BaseUplinkRadio40TC suitstorage: SyringeGun belt: ClothingBeltMilitaryWebbingMedFilled - innerclothingskirt: ClothingUniformJumpskirtOperative + innerClothingSkirt: ClothingUniformJumpskirtOperative satchel: ClothingBackpackDuffelSyndicateOperativeMedic duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic @@ -175,7 +175,7 @@ back: ClothingBackpackFilled shoes: ClothingShoesBootsCombat id: SyndiPDA #a subtype of this for footsoldiers would probably be good to have - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -193,7 +193,7 @@ shoes: ClothingShoesBootsCombat pocket1: CombatKnife id: SyndiPDA - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -212,7 +212,7 @@ pocket1: EnergySword pocket2: EnergyShield id: SyndiPDA - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -230,7 +230,7 @@ shoes: ClothingShoesBootsCombat pocket1: WeaponPistolViper id: SyndiPDA - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -247,7 +247,7 @@ outerClothing: ClothingOuterArmorBasicSlim ears: ClothingHeadsetSecurity gloves: ClothingHandsGlovesCombat - innerclothingskirt: ClothingUniformJumpskirtSec + innerClothingSkirt: ClothingUniformJumpskirtSec satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled @@ -271,7 +271,7 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpsuitColorBrown + innerClothingSkirt: ClothingUniformJumpsuitColorBrown satchel: ClothingBackpackDuffelCBURN duffelbag: ClothingBackpackDuffelCBURN @@ -295,7 +295,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitColorGrey shoes: ClothingShoesColorBlack - innerclothingskirt: ClothingUniformJumpskirtColorGrey + innerClothingSkirt: ClothingUniformJumpskirtColorGrey # DeathMatch Gear @@ -306,9 +306,9 @@ shoes: ClothingShoesBootsJack ears: ClothingHeadsetGrey gloves: ClothingHandsGlovesFingerless - innerclothingskirt: ClothingUniformJumpskirtColorWhite + innerClothingSkirt: ClothingUniformJumpskirtColorWhite inhand: - left hand: WeaponMeleeToolboxRobust + - WeaponMeleeToolboxRobust #Brigmedic diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index d1803c530f6..534b74e2695 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -30,6 +30,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtChemistry + innerClothingSkirt: ClothingUniformJumpskirtChemistry satchel: ClothingBackpackSatchelChemistryFilled duffelbag: ClothingBackpackDuffelChemistryFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 6f51a6e623e..c7c983289a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -49,6 +49,6 @@ underwearb: ClothingUnderwearBottomBoxersCMO # Sirena-Underwear underweart: ClothingUnderwearTopBraCMO # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesCMO # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtCMO + innerClothingSkirt: ClothingUniformJumpskirtCMO satchel: ClothingBackpackSatchelCMOFilled duffelbag: ClothingBackpackDuffelCMOFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index dc3b9bce87a..9c52e505617 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -29,6 +29,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor + innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 3faf77d6152..c5706594d14 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -27,6 +27,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtColorWhite + innerClothingSkirt: ClothingUniformJumpskirtColorWhite satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index 881d280010e..9f73b6dec1e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -31,6 +31,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtParamedic + innerClothingSkirt: ClothingUniformJumpskirtParamedic satchel: ADTClothingBackpackSatchelParamedicalFilled duffelbag: ADTClothingBackpackDuffelParamedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index 245418e1576..392f8954f74 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -26,6 +26,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtColorWhite + innerClothingSkirt: ClothingUniformJumpskirtColorWhite satchel: ClothingBackpackSatchelScienceFilled duffelbag: ClothingBackpackDuffelScienceFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 1e0208afcdf..e0cf03f2fdc 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -39,6 +39,6 @@ underwearb: ClothingUnderwearBottomBoxersRD # Sirena-Underwear underweart: ClothingUnderwearTopBraRD # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesRD # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtResearchDirector + innerClothingSkirt: ClothingUniformJumpskirtResearchDirector satchel: ClothingBackpackSatchelResearchDirectorFilled duffelbag: ClothingBackpackDuffelResearchDirectorFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 7287a949c1c..7c425f42ad3 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -26,6 +26,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraWhite # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtScientist + innerClothingSkirt: ClothingUniformJumpskirtScientist satchel: ClothingBackpackSatchelScienceFilled duffelbag: ClothingBackpackDuffelScienceFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index dcb7c64d1be..ab08464f0f5 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -35,6 +35,6 @@ ears: ClothingHeadsetBrigmedic mask: ClothingMaskBreathMedicalSecurity belt: ClothingBeltMedicalFilled - innerclothingskirt: ClothingUniformJumpskirtBrigmedic + innerClothingSkirt: ClothingUniformJumpskirtBrigmedic satchel: ClothingBackpackSatchelBrigmedicFilled duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 1c1fd0e58d5..082d345ee56 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -39,6 +39,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtDetective + innerClothingSkirt: ClothingUniformJumpskirtDetective satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index a2fbef12f39..a3ad11cedba 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -55,6 +55,6 @@ underwearb: ClothingUnderwearBottomBoxersHOS # Sirena-Underwear underweart: ClothingUnderwearTopBraHOS # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesHOS # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtHoS + innerClothingSkirt: ClothingUniformJumpskirtHoS satchel: ClothingBackpackSatchelHOSFilled duffelbag: ClothingBackpackDuffelHOSFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index e9fa559fc4d..02a0e9c3d47 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -35,6 +35,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtColorRed + innerClothingSkirt: ClothingUniformJumpskirtColorRed satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 4492708cf34..66f590ade0a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -37,6 +37,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtSec + innerClothingSkirt: ClothingUniformJumpskirtSec satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 169037e8ab4..2c0b427cf52 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -43,6 +43,6 @@ ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponRevolverDeckard - innerclothingskirt: ClothingUniformJumpskirtSeniorOfficer + innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer satchel: ADTClothingBackpackSatchelSeniorSecurityFilled duffelbag: ADTClothingBackpackDuffelSeniorSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index e62f3cbf2cb..49f8a991ee4 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -39,6 +39,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSportsAlternative # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtWarden + innerClothingSkirt: ClothingUniformJumpskirtWarden satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index ba50b8b35e5..5e71fcc410f 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -23,6 +23,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSports # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: UniformShortsRedWithTop + innerClothingSkirt: UniformShortsRedWithTop satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 8a102327763..25488fcf0b2 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -23,6 +23,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSports # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpskirtPsychologist # Corvax-Resprite + innerClothingSkirt: ClothingUniformJumpskirtPsychologist # Corvax-Resprite satchel: ClothingBackpackSatchelPsychologistFilled # Corvax-Stamp duffelbag: ClothingBackpackDuffelPsychologistFilled # Corvax-Stamp diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index aa6596495b5..218a6d77e5e 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -21,6 +21,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSports # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpsuitJournalist + innerClothingSkirt: ClothingUniformJumpsuitJournalist satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index 5f56ddec3a3..2c16b327014 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -23,6 +23,6 @@ underwearb: ClothingUnderwearBottomBoxersWhite # Sirena-Underwear underweart: ClothingUnderwearTopBraSports # Sirena-Underwear underwearb: ClothingUnderwearBottomPantiesWhite # Sirena-Underwear - innerclothingskirt: ClothingUniformJumpsuitSafari + innerClothingSkirt: ClothingUniformJumpsuitSafari satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png new file mode 100644 index 00000000000..699aeb7c484 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 0237c1489ee..725170a639b 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,15 +1,11 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", -<<<<<<< HEAD - "copyright": "Taken from TauCetiStation at commit https://github.com/TauCetiStation/TauCetiClassic/commit/401d381d53ceb9a045bca9c0ae60eb52b5fab2c5, some icons from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, modified by github:Morb0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy resprite by Morb0, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively", -======= - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, darts made by TheShuEd (github) for ss14", ->>>>>>> wizards/master - "size": { - "x": 32, - "y": 32 - }, + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, darts made by TheShuEd (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, "states": [ { "name": "beaker" @@ -39,14 +35,11 @@ "name": "sechud" }, { - "name": "bottle" + "name": "bottle" }, { "name": "box" }, - { - "name": "box_science" - }, { "name": "boxwide" }, @@ -57,7 +50,7 @@ "name": "box_hug" }, { - "name": "box_medical" + "name": "box_id" }, { "name": "box_of_doom" @@ -68,6 +61,9 @@ { "name": "box_security" }, + { + "name": "box_science" + }, { "name": "box_olive" }, @@ -153,15 +149,12 @@ "name": "writing_of_doom" }, { - "name": "headset" - }, - { - "name": "encryptokey" - }, + "name": "headset" + }, { - "name": "id" + "name": "encryptokey" }, - { + { "name": "inhand-left", "directions": 4 }, @@ -207,17 +200,12 @@ { "name": "darts" }, - { - "name": "box_science" - }, - { - "name": "box_medical" - }, { "name": "id" }, { - "name": "darts" + "name": "box_medical" } + ] }