From c6bbd6e1db013a7f8c5c95d7e458002e01b6fc8e Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sat, 30 Dec 2023 16:42:19 -0600 Subject: [PATCH] Moves head's fluff items out of lockers into dressers (#23183) Co-authored-by: Jeff --- .../Catalog/Fills/Lockers/dressers.yml | 86 +++++++++++++++++++ .../Catalog/Fills/Lockers/heads.yml | 46 ---------- .../Catalog/Fills/Lockers/security.yml | 4 - 3 files changed, 86 insertions(+), 50 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml new file mode 100644 index 0000000000..d785f0ee67 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -0,0 +1,86 @@ +- type: entity + id: DresserCaptainFilled + parent: Dresser + suffix: Filled, Captain + components: + - type: StorageFill + contents: + - id: ClothingHeadHatCaptain + - id: ClothingHeadHatCapcap + - id: ClothingNeckCloakCap + - id: ClothingNeckCloakCapFormal + - id: ClothingUniformJumpsuitCapFormal + - id: ClothingUniformJumpskirtCapFormalDress + - id: ClothingHandsGlovesCaptain + +- type: entity + id: DresserChiefEngineerFilled + parent: Dresser + suffix: Filled, Chief Engineer + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitChiefEngineerTurtle + - id: ClothingUniformJumpskirtChiefEngineerTurtle + - id: ClothingNeckCloakCe + - id: ClothingHeadHatBeretEngineering + +- type: entity + id: DresserChiefMedicalOfficerFilled + parent: Dresser + suffix: Filled, Chief Medical Officer + components: + - type: StorageFill + contents: + - id: ClothingCloakCmo + - id: ClothingOuterCoatLabCmo + - id: ClothingHeadHatBeretCmo + +- type: entity + id: DresserHeadOfPersonnelFilled + parent: Dresser + suffix: Filled, Head Of Personnel + components: + - type: StorageFill + contents: + - id: ClothingNeckCloakHop + - id: ClothingHeadHatHopcap + - id: ClothingOuterWinterHoP + +- type: entity + id: DresserHeadOfSecurityFilled + parent: Dresser + suffix: Filled, Head Of Security + components: + - type: StorageFill + contents: + - id: ClothingHeadHatBeretHoS + - id: ClothingHeadHatHoshat + - id: ClothingNeckCloakHos + - id: ClothingUniformJumpskirtHoSAlt + - id: ClothingUniformJumpsuitHoSAlt + - id: ClothingUniformJumpskirtHosFormal + - id: ClothingUniformJumpsuitHosFormal + +- type: entity + id: DresserQuarterMasterFilled + parent: Dresser + suffix: Filled, Quarter Master + components: + - type: StorageFill + contents: + - id: ClothingNeckCloakQm + - id: ClothingHeadsetCargo + - id: ClothingUniformJumpsuitQMTurtleneck + - id: ClothingUniformJumpskirtQMTurtleneck + - id: ClothingHandsGlovesColorBrown + +- type: entity + id: DresserWardenFilled + parent: Dresser + suffix: Filled, Warden + components: + - type: StorageFill + contents: + - id: ClothingHeadHatWarden + - id: ClothingHeadHatBeretWarden diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index ba8f5c6dc0..d44d1a96d1 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -5,12 +5,7 @@ components: - type: StorageFill contents: - - id: ClothingNeckCloakQm - id: BoxFolderQmClipboard - - id: ClothingHeadsetCargo - - id: ClothingUniformJumpsuitQMTurtleneck - - id: ClothingUniformJumpskirtQMTurtleneck - - id: ClothingHandsGlovesColorBrown - id: CargoRequestComputerCircuitboard - id: CargoShuttleComputerCircuitboard - id: CargoShuttleConsoleCircuitboard @@ -34,8 +29,6 @@ - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard - - id: ClothingHeadHatCaptain - - id: ClothingNeckCloakCap - id: ClothingOuterHardsuitCap - id: ClothingMaskGasCaptain - id: WeaponDisabler @@ -48,14 +41,10 @@ prob: 0.25 - id: ClothingBeltSheathFilled - id: DoorRemoteCommand - - id: ClothingNeckCloakCapFormal - - id: ClothingUniformJumpsuitCapFormal - - id: ClothingUniformJumpskirtCapFormalDress - id: RubberStampCaptain - id: WeaponAntiqueLaser - id: JetpackCaptainFilled - id: MedalCase - - id: ClothingHeadHatCapcap - type: entity id: LockerCaptainFilled @@ -68,9 +57,6 @@ - id: NukeDisk - id: PinpointerNuclear - id: CaptainIDCard - - id: ClothingHeadHatCaptain - - id: ClothingNeckCloakCap - - id: ClothingHandsGlovesCaptain - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand @@ -81,14 +67,10 @@ prob: 0.25 - id: ClothingBeltSheathFilled - id: DoorRemoteCommand - - id: ClothingNeckCloakCapFormal - - id: ClothingUniformJumpsuitCapFormal - - id: ClothingUniformJumpskirtCapFormalDress - id: RubberStampCaptain - id: WeaponAntiqueLaser - id: JetpackCaptainFilled - id: MedalCase - - id: ClothingHeadHatCapcap - type: entity id: LockerHeadOfPersonnelFilled @@ -97,8 +79,6 @@ components: - type: StorageFill contents: - - id: ClothingNeckCloakHop - - id: ClothingHeadHatHopcap - id: HoPIDCard - id: ClothingHeadsetCommand - id: BoxPDA @@ -106,7 +86,6 @@ - id: BoxHeadset - id: IDComputerCircuitboard - id: WeaponDisabler - - id: ClothingOuterWinterHoP - id: CigarGoldCase prob: 0.25 # Fuck the HoP they don't deserve fucking cigars. @@ -129,14 +108,10 @@ contents: - id: ClothingOuterHardsuitEngineeringWhite - id: ClothingMaskBreath - - id: ClothingUniformJumpsuitChiefEngineerTurtle - - id: ClothingUniformJumpskirtChiefEngineerTurtle - id: OxygenTankFilled - id: NitrogenTankFilled - - id: ClothingNeckCloakCe - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - - id: ClothingHeadHatBeretEngineering - id: ClothingShoesBootsMagAdv - id: ClothingHandsGlovesColorYellow - id: CigarCase @@ -157,13 +132,9 @@ components: - type: StorageFill contents: - - id: ClothingNeckCloakCe - id: ClothingEyesGlassesMeson - id: ClothingBeltChiefEngineerFilled - - id: ClothingHeadHatBeretEngineering - id: ClothingHandsGlovesColorYellow - - id: ClothingUniformJumpsuitChiefEngineerTurtle - - id: ClothingUniformJumpskirtChiefEngineerTurtle - id: CigarCase prob: 0.15 - id: DoorRemoteEngineering @@ -209,11 +180,8 @@ - id: ClothingHandsGlovesNitrile #- name: ClothingEyesHudMedical #Removed until working properly - id: ClothingHeadsetAltMedical - - id: ClothingCloakCmo - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingOuterCoatLabCmo - id: ClothingMaskSterile - - id: ClothingHeadHatBeretCmo - id: Hypospray - id: HandheldCrewMonitor - id: DoorRemoteMedical @@ -273,12 +241,7 @@ contents: - id: ClothingEyesHudSecurity - id: WeaponDisabler - - id: ClothingHeadHatBeretHoS - - id: ClothingHeadHatHoshat - - id: ClothingNeckCloakHos - id: ClothingOuterCoatHoSTrench - - id: ClothingUniformJumpskirtHoSAlt - - id: ClothingUniformJumpsuitHoSAlt - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat - id: ClothingBeltSecurityFilled @@ -288,8 +251,6 @@ - id: CigarGoldCase prob: 0.50 - id: DoorRemoteSecurity - - id: ClothingUniformJumpskirtHosFormal - - id: ClothingUniformJumpsuitHosFormal - id: RubberStampHos - id: SecurityTechFabCircuitboard - id: JetpackSecurityFilled @@ -306,12 +267,7 @@ contents: - id: ClothingEyesHudSecurity - id: WeaponDisabler - - id: ClothingHeadHatBeretHoS - - id: ClothingHeadHatHoshat - - id: ClothingNeckCloakHos - id: ClothingOuterCoatHoSTrench - - id: ClothingUniformJumpskirtHoSAlt - - id: ClothingUniformJumpsuitHoSAlt - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - id: ClothingEyesGlassesSunglasses @@ -319,8 +275,6 @@ - id: CigarGoldCase prob: 0.50 - id: DoorRemoteSecurity - - id: ClothingUniformJumpskirtHosFormal - - id: ClothingUniformJumpsuitHosFormal - id: RubberStampHos - id: SecurityTechFabCircuitboard - id: BoxEncryptionKeySecurity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index a8272a873c..3ca83114aa 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -8,8 +8,6 @@ - id: FlashlightSeclite - id: WeaponDisabler prob: 0.3 - - id: ClothingHeadHatWarden - - id: ClothingHeadHatBeretWarden - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSunglasses @@ -34,8 +32,6 @@ - id: FlashlightSeclite - id: WeaponDisabler prob: 0.3 - - id: ClothingHeadHatWarden - - id: ClothingHeadHatBeretWarden - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSunglasses -- 2.51.2