From 5f47e9260b83e00c226cdd4e141c494e828db407 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Sat, 14 Oct 2023 10:28:52 -0700 Subject: [PATCH] Make starting gear automatically find hands for inhand items (#20861) --- .../Commands/SetOutfitCommand.cs | 4 +- Content.Shared/Roles/StartingGearPrototype.cs | 40 ++++++++---------- .../Station/SharedStationSpawningSystem.cs | 8 +++- Resources/Prototypes/Roles/Antags/pirate.yml | 6 +-- .../Roles/Jobs/Cargo/cargo_technician.yml | 2 +- .../Roles/Jobs/Cargo/quartermaster.yml | 2 +- .../Roles/Jobs/Civilian/assistant.yml | 2 +- .../Roles/Jobs/Civilian/bartender.yml | 2 +- .../Roles/Jobs/Civilian/botanist.yml | 2 +- .../Roles/Jobs/Civilian/chaplain.yml | 4 +- .../Prototypes/Roles/Jobs/Civilian/chef.yml | 2 +- .../Roles/Jobs/Civilian/janitor.yml | 4 +- .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 4 +- .../Roles/Jobs/Civilian/librarian.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/mime.yml | 2 +- .../Roles/Jobs/Civilian/service_worker.yml | 2 +- .../Prototypes/Roles/Jobs/Command/captain.yml | 2 +- .../Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 2 +- .../Jobs/Engineering/senior_engineer.yml | 2 +- .../Jobs/Engineering/station_engineer.yml | 2 +- .../Jobs/Engineering/technical_assistant.yml | 2 +- .../Roles/Jobs/Fun/cult_startinggear.yml | 4 +- .../Roles/Jobs/Fun/misc_startinggear.yml | 42 +++++++++---------- .../Roles/Jobs/Fun/wizard_startinggear.yml | 8 ++-- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- .../Jobs/Medical/chief_medical_officer.yml | 2 +- .../Roles/Jobs/Medical/medical_doctor.yml | 2 +- .../Roles/Jobs/Medical/medical_intern.yml | 2 +- .../Roles/Jobs/Medical/paramedic.yml | 2 +- .../Roles/Jobs/Medical/senior_physician.yml | 2 +- .../Roles/Jobs/Science/research_assistant.yml | 2 +- .../Roles/Jobs/Science/research_director.yml | 2 +- .../Roles/Jobs/Science/scientist.yml | 2 +- .../Roles/Jobs/Science/senior_researcher.yml | 2 +- .../Roles/Jobs/Security/detective.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 2 +- .../Roles/Jobs/Security/security_cadet.yml | 2 +- .../Roles/Jobs/Security/security_officer.yml | 2 +- .../Roles/Jobs/Security/senior_officer.yml | 2 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 2 +- .../Roles/Jobs/Ship_VS_Ship/nanotrasen.yml | 10 ++--- .../Roles/Jobs/Ship_VS_Ship/syndicate.yml | 10 ++--- .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 2 +- .../Roles/Jobs/Wildcards/psychologist.yml | 2 +- .../Roles/Jobs/Wildcards/reporter.yml | 2 +- .../Roles/Jobs/Wildcards/zookeeper.yml | 2 +- 48 files changed, 107 insertions(+), 109 deletions(-) diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs index 96fa465253..28172ee6c5 100644 --- a/Content.Server/Administration/Commands/SetOutfitCommand.cs +++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs @@ -121,10 +121,10 @@ namespace Content.Server.Administration.Commands { var handsSystem = entityManager.System(); var coords = entityManager.GetComponent(target).Coordinates; - foreach (var (hand, prototype) in startingGear.Inhand) + foreach (var prototype in startingGear.Inhand) { var inhandEntity = entityManager.SpawnEntity(prototype, coords); - handsSystem.TryPickup(target, inhandEntity, hand, checkActionBlocker: false, handsComp: handsComponent); + handsSystem.TryPickup(target, inhandEntity, checkActionBlocker: false, handsComp: handsComponent); } } diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index 533cfc0675..98e20fe534 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -1,34 +1,28 @@ using Content.Shared.Preferences; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; namespace Content.Shared.Roles { [Prototype("startingGear")] public sealed class StartingGearPrototype : IPrototype { - [DataField("equipment", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer))] - private Dictionary _equipment = new(); + [DataField] + public Dictionary Equipment = new(); /// /// if empty, there is no skirt override - instead the uniform provided in equipment is added. /// - [DataField("innerclothingskirt", customTypeSerializer:typeof(PrototypeIdSerializer))] - private string? _innerClothingSkirt; + [DataField] + public EntProtoId? InnerClothingSkirt; - [DataField("satchel", customTypeSerializer:typeof(PrototypeIdSerializer))] - private string? _satchel; + [DataField] + public EntProtoId? Satchel; - [DataField("duffelbag", customTypeSerializer:typeof(PrototypeIdSerializer))] - private string? _duffelbag; + [DataField] + public EntProtoId? Duffelbag; - public IReadOnlyDictionary Inhand => _inHand; - /// - /// hand index, item prototype - /// - [DataField("inhand")] - private Dictionary _inHand = new(0); + [DataField] + public List Inhand = new(0); [ViewVariables] [IdDataField] @@ -38,15 +32,15 @@ namespace Content.Shared.Roles { if (profile != null) { - if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(_innerClothingSkirt)) - return _innerClothingSkirt; - if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(_satchel)) - return _satchel; - if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(_duffelbag)) - return _duffelbag; + if (slot == "jumpsuit" && profile.Clothing == ClothingPreference.Jumpskirt && !string.IsNullOrEmpty(InnerClothingSkirt)) + return InnerClothingSkirt; + if (slot == "back" && profile.Backpack == BackpackPreference.Satchel && !string.IsNullOrEmpty(Satchel)) + return Satchel; + if (slot == "back" && profile.Backpack == BackpackPreference.Duffelbag && !string.IsNullOrEmpty(Duffelbag)) + return Duffelbag; } - return _equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty; + return Equipment.TryGetValue(slot, out var equipment) ? equipment : string.Empty; } } } diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index cf575fb4f2..d392cf7bed 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -37,10 +37,14 @@ public abstract class SharedStationSpawningSystem : EntitySystem var inhand = startingGear.Inhand; var coords = EntityManager.GetComponent(entity).Coordinates; - foreach (var (hand, prototype) in inhand) + foreach (var prototype in inhand) { var inhandEntity = EntityManager.SpawnEntity(prototype, coords); - _handsSystem.TryPickup(entity, inhandEntity, hand, checkActionBlocker: false, handsComp: handsComponent); + + if (_handsSystem.TryGetEmptyHand(entity, out var emptyHand, handsComponent)) + { + _handsSystem.TryPickup(entity, inhandEntity, emptyHand, checkActionBlocker: false, handsComp: handsComponent); + } } } } diff --git a/Resources/Prototypes/Roles/Antags/pirate.yml b/Resources/Prototypes/Roles/Antags/pirate.yml index e325643d3a..59290acd04 100644 --- a/Resources/Prototypes/Roles/Antags/pirate.yml +++ b/Resources/Prototypes/Roles/Antags/pirate.yml @@ -8,7 +8,7 @@ id: PassengerPDA belt: ClothingBeltUtility pocket1: AppraisalTool - innerclothingskirt: ClothingUniformJumpsuitPirate + innerClothingSkirt: ClothingUniformJumpsuitPirate satchel: ClothingBackpackPirateFilled duffelbag: ClothingBackpackPirateFilled @@ -24,7 +24,7 @@ pocket1: AppraisalTool pocket2: EnergyCutlass outerClothing: ClothingOuterCoatPirate - innerclothingskirt: ClothingUniformJumpskirtColorLightBrown + innerClothingSkirt: ClothingUniformJumpskirtColorLightBrown satchel: ClothingBackpackPirateFilled duffelbag: ClothingBackpackPirateFilled @@ -39,6 +39,6 @@ belt: ClothingBeltUtility pocket1: AppraisalTool outerClothing: ClothingOuterCoatGentle - innerclothingskirt: ClothingUniformJumpsuitPirate + innerClothingSkirt: ClothingUniformJumpsuitPirate satchel: ClothingBackpackPirateFilled duffelbag: ClothingBackpackPirateFilled diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index e6013d9ef8..a0d3c60566 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -25,6 +25,6 @@ id: CargoPDA ears: ClothingHeadsetCargo pocket1: AppraisalTool - 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 ea0a8d186b..3960c40c5f 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -51,6 +51,6 @@ ears: ClothingHeadsetQM belt: BoxFolderClipboard pocket1: AppraisalTool - 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 0f7866f1a6..5cf4fd9449 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -17,6 +17,6 @@ shoes: ClothingShoesColorBlack id: PassengerPDA ears: ClothingHeadsetGrey - 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 0230fcbc17..8f6f9fc7de 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -28,6 +28,6 @@ shoes: ClothingShoesColorBlack id: BartenderPDA ears: ClothingHeadsetService - 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 2647a93eec..35b858fb38 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -24,6 +24,6 @@ ears: ClothingHeadsetService outerClothing: ClothingOuterApronBotanist belt: ClothingBeltPlantFilled - 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 62d7e4d51c..aa01b9a98b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -22,7 +22,7 @@ components: - type: PsionicBonusChance #Nyano - Summary: makes it more likely to become psionic. multiplier: 3 - + - type: startingGear id: ChaplainGear equipment: @@ -31,6 +31,6 @@ shoes: ClothingShoesColorBlack id: ChaplainPDA ears: ClothingHeadsetScience # DeltaV - Move Chaplain into Epistemics - 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 2bcec8ad8a..34c4abf30f 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -29,6 +29,6 @@ id: ChefPDA ears: ClothingHeadsetService outerClothing: ClothingOuterApronChef - 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 c701ed67ee..ed48ea2711 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -24,7 +24,7 @@ id: JanitorPDA ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled - innerclothingskirt: ClothingUniformJumpskirtJanitor + innerClothingSkirt: ClothingUniformJumpskirtJanitor satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -37,6 +37,6 @@ head: ClothingHeadHatCatEars ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled - innerclothingskirt: ClothingUniformJumpskirtJanimaid + innerClothingSkirt: ClothingUniformJumpskirtJanimaid satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index a45d602598..4c49e6d3a7 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -28,7 +28,7 @@ ears: ClothingHeadsetSecurity # TODO add copy of space law inhand: - right hand: BriefcaseBrownFilled - innerclothingskirt: ClothingUniformJumpskirtLawyerBlack + - BriefcaseBrownFilled + innerClothingSkirt: ClothingUniformJumpskirtLawyerBlack satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index ea448c0f3d..4f425f4527 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -23,6 +23,6 @@ ears: ClothingHeadsetService pocket1: d10Dice pocket2: HandLabeler # for making named bestsellers - innerclothingskirt: ClothingUniformJumpskirtLibrarian + innerClothingSkirt: ClothingUniformJumpskirtLibrarian satchel: ClothingBackpackSatchelLibrarianFilled duffelbag: ClothingBackpackDuffelLibrarianFilled diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 4c288b6519..6edef06c7e 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -31,7 +31,7 @@ mask: ClothingMaskMime id: MimePDA ears: ClothingHeadsetService - 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 f7068389c1..d832a9fcb6 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -26,6 +26,6 @@ shoes: ClothingShoesColorBlack id: ServiceWorkerPDA ears: ClothingHeadsetService - 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 ac036c513d..620c6e99bf 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -56,6 +56,6 @@ outerClothing: ClothingOuterArmorCaptainCarapace id: CaptainPDA ears: ClothingHeadsetAltCommand - 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 3b5002a3d1..985cfc9e17 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -72,6 +72,6 @@ id: HoPPDA ears: ClothingHeadsetHoP # DeltaV - HoP is now a service role, replaces their all channels headset. belt: BoxFolderClipboard - 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 5348fa8f6f..a188e93388 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -27,6 +27,6 @@ id: AtmosPDA belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering - 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 2e3397f5eb..3b9b9dfece 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -50,6 +50,6 @@ eyes: ClothingEyesGlassesMeson ears: ClothingHeadsetCE belt: ClothingBeltUtilityEngineering - innerclothingskirt: ClothingUniformJumpskirtChiefEngineer + innerClothingSkirt: ClothingUniformJumpskirtChiefEngineer satchel: ClothingBackpackSatchelChiefEngineerFilled duffelbag: ClothingBackpackDuffelChiefEngineerFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml index c2cd832c58..ba8a8f6acc 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml @@ -34,6 +34,6 @@ eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering - innerclothingskirt: ClothingUniformJumpskirtSeniorEngineer + innerClothingSkirt: ClothingUniformJumpskirtSeniorEngineer satchel: ClothingBackpackSatchelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index 40f0b4c0ca..40f991dac3 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -30,6 +30,6 @@ eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering - 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 c6fbc4c8b0..4eab9a433d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -28,6 +28,6 @@ id: TechnicalAssistantPDA belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetEngineering - 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 e0b008b4fd..6c97d37799 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/cult_startinggear.yml @@ -10,7 +10,7 @@ shoes: ClothingShoesCult id: PassengerPDA ears: ClothingHeadsetService - innerclothingskirt: ClothingUniformJumpskirtColorBlack + innerClothingSkirt: ClothingUniformJumpskirtColorBlack satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -24,6 +24,6 @@ shoes: ClothingShoesColorRed id: PassengerPDA ears: ClothingHeadsetService - 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 147ae62fd9..19d24bb9e8 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 @@ -135,9 +135,9 @@ pocket1: DoubleEmergencyOxygenTankFilled pocket2: BaseUplinkRadio40TC belt: ClothingBeltMilitaryWebbing -# inhand: # DeltaV - Prevent commander spawning with the declaration of war -# right hand: NukeOpsDeclarationOfWar - innerclothingskirt: ClothingUniformJumpskirtOperative + #inhand: # DeltaV - Prevent commander spawning with the declaration of war + # - NukeOpsDeclarationOfWar + innerClothingSkirt: ClothingUniformJumpskirtOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -157,7 +157,7 @@ pocket1: DoubleEmergencyOxygenTankFilled pocket2: BaseUplinkRadio40TC belt: ClothingBeltMilitaryWebbingMedFilled - innerclothingskirt: ClothingUniformJumpskirtOperative + innerClothingSkirt: ClothingUniformJumpskirtOperative satchel: ClothingBackpackDuffelSyndicateOperativeMedic duffelbag: ClothingBackpackDuffelSyndicateOperativeMedic @@ -174,7 +174,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 @@ -192,7 +192,7 @@ shoes: ClothingShoesBootsCombat pocket1: CombatKnife id: SyndiPDA - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -211,7 +211,7 @@ pocket1: EnergySword pocket2: EnergyShield id: SyndiPDA - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -229,7 +229,7 @@ shoes: ClothingShoesBootsCombat pocket1: WeaponPistolViper id: SyndiPDA - innerclothingskirt: ClothingUniformJumpsuitOperative + innerClothingSkirt: ClothingUniformJumpsuitOperative satchel: ClothingBackpackDuffelSyndicateOperative duffelbag: ClothingBackpackDuffelSyndicateOperative @@ -246,7 +246,7 @@ outerClothing: ClothingOuterArmorBasicSlim ears: ClothingHeadsetSecurity gloves: ClothingHandsGlovesCombat - innerclothingskirt: ClothingUniformJumpskirtSec + innerClothingSkirt: ClothingUniformJumpskirtSec satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled @@ -267,7 +267,7 @@ pocket2: WeaponLaserGun suitstorage: YellowOxygenTankFilled belt: ClothingBeltBandolier - innerclothingskirt: ClothingUniformJumpsuitColorBrown + innerClothingSkirt: ClothingUniformJumpsuitColorBrown satchel: ClothingBackpackDuffelCBURN duffelbag: ClothingBackpackDuffelCBURN @@ -291,7 +291,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitColorGrey shoes: ClothingShoesColorBlack - innerclothingskirt: ClothingUniformJumpskirtColorGrey + innerClothingSkirt: ClothingUniformJumpskirtColorGrey # DeathMatch Gear @@ -302,9 +302,9 @@ shoes: ClothingShoesBootsJack ears: ClothingHeadsetGrey gloves: ClothingHandsGlovesFingerless - innerclothingskirt: ClothingUniformJumpskirtColorWhite + innerClothingSkirt: ClothingUniformJumpskirtColorWhite inhand: - left hand: WeaponMeleeToolboxRobust + - WeaponMeleeToolboxRobust #Brigmedic @@ -322,7 +322,7 @@ ears: ClothingHeadsetBrigmedic mask: ClothingMaskBreathMedicalSecurity belt: ClothingBeltMedicalFilled - innerclothingskirt: ClothingUniformJumpskirtBrigmedic + innerClothingSkirt: ClothingUniformJumpskirtBrigmedic satchel: ClothingBackpackSatchelBrigmedicFilled duffelbag: ClothingBackpackDuffelBrigmedicFilled diff --git a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml index a72ea59547..9f32796073 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/wizard_startinggear.yml @@ -9,7 +9,7 @@ shoes: ClothingShoesWizard id: PassengerPDA ears: ClothingHeadsetService - innerclothingskirt: ClothingUniformJumpskirtColorDarkBlue + innerClothingSkirt: ClothingUniformJumpskirtColorDarkBlue satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -23,7 +23,7 @@ shoes: ClothingShoesWizard id: PassengerPDA ears: ClothingHeadsetService - innerclothingskirt: ClothingUniformJumpskirtColorRed + innerClothingSkirt: ClothingUniformJumpskirtColorRed satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -37,7 +37,7 @@ shoes: ClothingShoesWizard id: PassengerPDA ears: ClothingHeadsetService - innerclothingskirt: ClothingUniformJumpskirtColorPurple + innerClothingSkirt: ClothingUniformJumpskirtColorPurple satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -50,6 +50,6 @@ shoes: ClothingShoesWizard id: PassengerPDA ears: ClothingHeadsetService - innerclothingskirt: ClothingUniformJumpskirtColorPurple + innerClothingSkirt: ClothingUniformJumpskirtColorPurple satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 478fc27222..f151921b7a 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -27,6 +27,6 @@ belt: ChemBag pocket1: HandLabeler # the purple glasses? - 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 a2858affb2..fe5451b78c 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -52,6 +52,6 @@ id: CMOPDA ears: ClothingHeadsetCMO belt: ClothingBeltMedicalFilled - 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 0bedaa5bc0..1242324c0a 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -27,6 +27,6 @@ id: MedicalPDA ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled - 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 0cabaa996c..468d9632a0 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -25,6 +25,6 @@ id: MedicalInternPDA ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled - # innerclothingskirt: ClothingUniformJumpskirtColorWhite #Delta V + # innerClothingSkirt: ClothingUniformJumpskirtColorWhite # DeltaV satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index db7ae7d334..b7d18ba1aa 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -35,6 +35,6 @@ belt: ClothingBeltParamedicFilled pocket1: HandheldGPSBasic # DeltaV - Give Paramedics useful tools on spawn pocket2: HandheldCrewMonitor # DeltaV - Give Paramedics useful tools on spawn - innerclothingskirt: ClothingUniformJumpskirtParamedic + innerClothingSkirt: ClothingUniformJumpskirtParamedic satchel: ClothingBackpackSatchelParamedicFilled # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/satchel.yml duffelbag: ClothingBackpackDuffelParamedicFilled # DeltaV - Give Paramedics useful tools on spawn, see Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StargerGear/duffelbag.yml diff --git a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml index db4c7ef835..1b11d4cc7e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml @@ -32,6 +32,6 @@ id: SeniorPhysicianPDA ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled - innerclothingskirt: ClothingUniformJumpskirtSeniorPhysician + innerClothingSkirt: ClothingUniformJumpskirtSeniorPhysician satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index d569fe3b45..bff76fd7bd 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -24,6 +24,6 @@ shoes: ClothingShoesColorWhite id: ResearchAssistantPDA ears: ClothingHeadsetScience - 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 c109747b83..0176d52746 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -43,6 +43,6 @@ id: RnDPDA ears: ClothingHeadsetRD belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit - 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 676514b121..bda5e84d22 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -23,6 +23,6 @@ outerClothing: ClothingOuterCoatRnd id: SciencePDA ears: ClothingHeadsetScience - innerclothingskirt: ClothingUniformJumpskirtScientist + innerClothingSkirt: ClothingUniformJumpskirtScientist satchel: ClothingBackpackSatchelScienceFilled duffelbag: ClothingBackpackDuffelScienceFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml index da90ca0b59..e06861fe2e 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml @@ -25,6 +25,6 @@ outerClothing: ClothingOuterCoatLabSeniorResearcher id: SeniorResearcherPDA ears: ClothingHeadsetScience - innerclothingskirt: ClothingUniformJumpskirtSeniorResearcher + innerClothingSkirt: ClothingUniformJumpskirtSeniorResearcher satchel: ClothingBackpackSatchelScienceFilled duffelbag: ClothingBackpackDuffelScienceFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index da485401a1..b6fb2bad02 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -33,6 +33,6 @@ id: DetectivePDA ears: ClothingHeadsetSecurity belt: ClothingBeltHolsterFilled - innerclothingskirt: ClothingUniformJumpskirtDetective + innerClothingSkirt: ClothingUniformJumpskirtDetective satchel: ClothingBackpackSatchelSecurityFilledDetective duffelbag: ClothingBackpackDuffelSecurityFilledDetective diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 0e143c0d2b..6dc86e34f6 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -56,6 +56,6 @@ ears: ClothingHeadsetAltSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal - 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 033adf5c5d..a99245f027 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -32,6 +32,6 @@ id: SecurityCadetPDA ears: ClothingHeadsetSecurity # pocket1: WeaponPistolMk58Nonlethal # DeltaV - Security Cadet doesn't spawn with a gun - 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 8c90788e8a..c2b2d519b3 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -34,6 +34,6 @@ ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal - 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 dc92981f20..6425458b6a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -44,6 +44,6 @@ ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal - innerclothingskirt: ClothingUniformJumpskirtSeniorOfficer + innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 3514f62025..c9df3453c7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -42,6 +42,6 @@ ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal - innerclothingskirt: ClothingUniformJumpskirtWarden + innerClothingSkirt: ClothingUniformJumpskirtWarden satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/nanotrasen.yml b/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/nanotrasen.yml index 637abd43c3..765c9a745e 100644 --- a/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/nanotrasen.yml +++ b/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/nanotrasen.yml @@ -13,7 +13,7 @@ gloves: ClothingHandsGlovesColorBlack id: PassengerPDA ears: ClothingHeadsetGrey - innerclothingskirt: ClothingUniformJumpsuitRecruitNT #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits. + innerClothingSkirt: ClothingUniformJumpsuitRecruitNT #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits. satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -30,7 +30,7 @@ eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite. - innerclothingskirt: ClothingUniformJumpsuitRepairmanNT + innerClothingSkirt: ClothingUniformJumpsuitRepairmanNT satchel: ClothingBackpackSatchelEngineeringFilled duffelbag: ClothingBackpackDuffelEngineeringFilled @@ -46,7 +46,7 @@ eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesLatex belt: ClothingBeltMedicalFilled - innerclothingskirt: ClothingUniformJumpskirtMedicalDoctor + innerClothingSkirt: ClothingUniformJumpskirtMedicalDoctor satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -58,12 +58,12 @@ head: ClothingHeadHatHardhatArmored jumpsuit: ClothingUniformJumpsuitChiefEngineerNT back: ClothingBackpackFilled #Again, the regular sprite here looks way worse than the regular backpack. - shoes: ClothingShoesBootsJack + shoes: ClothingShoesBootsJack gloves: ClothingHandsGlovesCombat id: CEPDA eyes: ClothingEyesGlassesMeson ears: ClothingHeadsetAltCommand #Same as repairman - make this use the alt headset sprite. belt: ClothingBeltUtilityEngineering - innerclothingskirt: ClothingUniformJumpsuitChiefEngineerNT + innerClothingSkirt: ClothingUniformJumpsuitChiefEngineerNT satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/syndicate.yml b/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/syndicate.yml index 353b69730e..b7a4daf8f2 100644 --- a/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/syndicate.yml +++ b/Resources/Prototypes/Roles/Jobs/Ship_VS_Ship/syndicate.yml @@ -12,7 +12,7 @@ gloves: ClothingHandsGlovesColorBlack id: PassengerPDA ears: ClothingHeadsetGrey - innerclothingskirt: ClothingUniformJumpsuitRecruitSyndie #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits. + innerClothingSkirt: ClothingUniformJumpsuitRecruitSyndie #Wearing a jumpskirt into combat is a little unfitting and silly, so there is no jumpskirt counterpart for any of the Ship VS. Ship suits. satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -29,7 +29,7 @@ eyes: ClothingEyesGlassesMeson belt: ClothingBeltUtilityEngineering ears: ClothingHeadsetAltCommand #Should use the "alt" engineering headset sprite. - innerclothingskirt: ClothingUniformJumpsuitRepairmanSyndie + innerClothingSkirt: ClothingUniformJumpsuitRepairmanSyndie satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -45,7 +45,7 @@ eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesLatex belt: ClothingBeltMedicalFilled - innerclothingskirt: ClothingUniformJumpsuitParamedicSyndie + innerClothingSkirt: ClothingUniformJumpsuitParamedicSyndie satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled @@ -57,12 +57,12 @@ head: ClothingHeadHatHardhatArmored jumpsuit: ClothingUniformJumpsuitChiefEngineerSyndie back: ClothingBackpackFilled #In a running theme, the default station job backpack still continues to look strange in comparison to the regular one. It's not as bad as on the syndicate engineer here, though. - shoes: ClothingShoesBootsJack + shoes: ClothingShoesBootsJack gloves: ClothingHandsGlovesCombat id: CEPDA eyes: ClothingEyesGlassesMeson ears: ClothingHeadsetAltCommand belt: ClothingBeltUtilityEngineering - innerclothingskirt: ClothingUniformJumpsuitChiefEngineerSyndie + innerClothingSkirt: ClothingUniformJumpsuitChiefEngineerSyndie satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index f328ce3e0a..65f47017bf 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -32,6 +32,6 @@ gloves: ClothingHandsGlovesBoxingRed shoes: ClothingShoesColorRed belt: ClothingBeltChampion - 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 649f0528cb..a53188dfe5 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -26,6 +26,6 @@ shoes: ClothingShoesLeather id: PsychologistPDA ears: ClothingHeadsetMedical - innerclothingskirt: ClothingUniformJumpsuitPsychologist + innerClothingSkirt: ClothingUniformJumpsuitPsychologist satchel: ClothingBackpackSatchelMedicalFilled duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index a3d53851e1..1b95145c6b 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -21,6 +21,6 @@ shoes: ClothingShoesColorWhite id: ReporterPDA ears: ClothingHeadsetService - 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 5b76d08286..f76c602385 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -22,6 +22,6 @@ shoes: ClothingShoesColorWhite id: ZookeeperPDA ears: ClothingHeadsetService - innerclothingskirt: ClothingUniformJumpsuitSafari + innerClothingSkirt: ClothingUniformJumpsuitSafari satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled