From a04afc05c60bc23f4ecb00b22a4a39c36c7dfec3 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Sun, 21 Dec 2025 09:34:53 -0600 Subject: [PATCH] Additional heads locker cleanup. Added totes for CJ. --- Resources/Migrations/migration.yml | 12 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 4 + .../Prototypes/Catalog/Fills/Boxes/heads.yml | 20 +- .../Catalog/Fills/Lockers/dressers.yml | 8 + .../Catalog/Fills/Lockers/heads.yml | 50 ++- .../Catalog/Fills/Lockers/security.yml | 16 +- .../VendingMachines/Inventories/cart.yml | 21 +- .../Prototypes/Entities/Objects/Misc/box.yml | 1 + .../_DV/Catalog/Fills/Boxes/heads.yml | 37 +++ .../Catalog/Fills/Lockers/chiefjustice.yml | 14 +- .../_DV/Catalog/Fills/Lockers/dressers.yml | 288 ++++++++++++++++++ .../_DV/Catalog/Fills/Lockers/heads.yml | 29 +- .../Entities/Structures/Machines/lathe.yml | 1 + .../_DV/Recipes/Lathes/Packs/shared.yml | 15 + 14 files changed, 428 insertions(+), 88 deletions(-) create mode 100644 Resources/Prototypes/_DV/Catalog/Fills/Boxes/heads.yml create mode 100644 Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml index 4576cfc530c..89db82aa6da 100644 --- a/Resources/Migrations/migration.yml +++ b/Resources/Migrations/migration.yml @@ -682,4 +682,14 @@ SoapBorg: SoapNT CableApcStackLingering10: CableApcStack # 2025-11-28 - DeltaV -HoloprojectorEngineeringEmpty: HoloprojectorEngineering \ No newline at end of file +HoloprojectorEngineeringEmpty: HoloprojectorEngineering + +# 2025-12-21 - DeltaV +DresserCaptainFilled: DresserCaptainFilledDV +DresserChiefEngineerFilled: DresserChiefEngineerFilledDV +DresserChiefMedicalOfficerFilled: DresserChiefMedicalOfficerFilledDV +DresserHeadOfPersonnelFilled: DresserHeadOfPersonnelFilledDV +DresserHeadOfSecurityFilled: DresserHeadOfSecurityFilledDV +DresserQuarterMasterFilled: DresserQuarterMasterFilledDV +DresserResearchDirectorFilled: DresserResearchDirectorFilledDV +DresserWardenFilled: DresserWardenFilledDV diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c80acab2883..ec6fe59bafe 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -15,6 +15,9 @@ - id: BoneGel # Shitmed Change - id: NitrousOxideTankFilled # DeltaV - add anesthesia - id: SoapNT # DeltaV - add soap + - id: ClothingMaskSterile # DeltaV + - id: ClothingMaskBreathMedical # DeltaV + - id: ClothingHandsGlovesNitrile # DeltaV - type: entity parent: ClothingBackpackDuffelSyndicateMedicalBundle @@ -35,6 +38,7 @@ - id: BoneGel # Shitmed Change - id: NitrousOxideTankFilled # DeltaV - add anesthesia - id: SoapSyndie # DeltaV - add soap + - id: ClothingMaskSterile # DeltaV - type: entity parent: ClothingBackpackDuffelSyndicateBundle diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml index 0302f317c4b..b8bc46f38ce 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/heads.yml @@ -14,6 +14,7 @@ #- id: SalvageJobBoardComputerCircuitboard # DeltaV - Uneeded because mining points - id: MailTeleporterMachineCircuitboard # DeltaV Additions + - id: IDComputerCircuitboard - id: MiningShuttleConsoleCircuitboard - id: LogisticsTechFabCircuitboard - id: SalvageExpeditionsComputerCircuitboard @@ -55,8 +56,9 @@ - type: StorageFill contents: - id: IDComputerCircuitboard - - id: FundingAllocationComputerCircuitboard + #- id: FundingAllocationComputerCircuitboard # DeltaV - HoP doesn't have funding access - id: CargoRequestServiceComputerCircuitboard + - id: ServiceTechFabCircuitboard # DeltaV - type: entity name: stamp box [HoP] @@ -97,6 +99,9 @@ - id: AtmosMonitoringComputerCircuitboard - id: PowerComputerCircuitboard - id: SolarControlComputerCircuitboard + - id: IDComputerCircuitboard # DeltaV + - id: EngineeringTechFabCircuitboard # DeltaV + - id: CircuitImprinterMachineCircuitboard # DeltaV - type: entity name: circuit tote [Captain] @@ -108,6 +113,7 @@ contents: - id: CommsComputerCircuitboard - id: StationRecordsComputerCircuitboard + - id: IDComputerCircuitboard # DeltaV - type: entity name: circuit tote [CMO] @@ -119,23 +125,28 @@ contents: - id: MedicalTechFabCircuitboard - id: CargoRequestMedicalComputerCircuitboard + - id: IDComputerCircuitboard # DeltaV + - id: MedicalBiofabMachineBoard # DeltaV + - id: AutoclaveMachineCircuitboard # DeltaV - type: entity - name: circuit tote [RD] + name: circuit tote [MG] # DeltaV - Changed to MG parent: ToteBase id: BoxRDCircuitboards - description: A Tote filled with RD's Circuit boards. + description: A Tote filled with MG's Circuit boards. # DeltaV - Changed to MG components: - type: StorageFill contents: - id: CircuitImprinterMachineCircuitboard - - id: ProtolatheMachineCircuitboard + #- id: ProtolatheMachineCircuitboard # DeltaV - Replaced with Epi fab - id: ResearchComputerCircuitboard - id: CargoRequestScienceComputerCircuitboard - id: RoboticsConsoleCircuitboard - id: AnalysisComputerCircuitboard #Because sometimes round start artis just fucking explode on the pad. - id: ArtifactAnalyzerMachineCircuitboard - id: StationAiFixerCircuitboard + - id: IDComputerCircuitboard # DeltaV + - id: EpistemicsTechFabCircuitboard # DeltaV - type: entity name: circuit tote [HoS] @@ -147,3 +158,4 @@ contents: - id: SecurityTechFabCircuitboard - id: CargoRequestSecurityComputerCircuitboard + - id: IDComputerCircuitboard # DeltaV diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 38d8b3b0ca5..baf4ae3b76d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -2,6 +2,7 @@ id: DresserCaptainFilled parent: Dresser suffix: Filled, Captain + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: @@ -19,6 +20,7 @@ id: DresserChiefEngineerFilled parent: Dresser suffix: Filled, Chief Engineer + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: @@ -33,6 +35,7 @@ id: DresserChiefMedicalOfficerFilled parent: Dresser suffix: Filled, Chief Medical Officer + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: @@ -50,6 +53,7 @@ id: DresserHeadOfPersonnelFilled parent: Dresser suffix: Filled, Head Of Personnel + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: @@ -64,6 +68,7 @@ id: DresserHeadOfSecurityFilled parent: Dresser suffix: Filled, Head Of Security + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: @@ -83,6 +88,7 @@ id: DresserQuarterMasterFilled parent: Dresser suffix: Filled, Quarter Master + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: @@ -100,6 +106,7 @@ id: DresserResearchDirectorFilled parent: Dresser suffix: Filled, Research Director + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: @@ -115,6 +122,7 @@ id: DresserWardenFilled parent: Dresser suffix: Filled, Warden + categories: [ HideSpawnMenu ] # DeltaV - Replaced with bigger dresser in Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 91735d1348b..33376134201 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -33,18 +33,18 @@ - !type:NestedSelector # DeltaV tableId: LockerFillCaptainDeltaV #- id: CaptainIDCard # DeltaV - Replaced by the spare ID system - - id: CigarGoldCase - prob: 0.25 + #- id: CigarGoldCase # DeltaV - Moved to dresser + # prob: 0.25 - id: ClothingBeltSheathFilled - id: ClothingHeadsetAltCommand - id: ClothingOuterArmorCaptainCarapace - id: BoxCaptainCircuitboards - id: DoorRemoteCustom - - id: MedalCase + #- id: MedalCase # DeltaV - Moved to dresser - id: NukeDisk - id: PinpointerNuclear - - id: PlushieNuke - prob: 0.1 + #- id: PlushieNuke # DeltaV - Moved to dresser + # prob: 0.1 - id: RubberStampCaptain - id: SpaceCash1000 - id: WeaponDisabler @@ -116,16 +116,16 @@ children: - !type:NestedSelector # DeltaV tableId: LockerFillHeadOfPersonnelDeltaV - - id: AccessConfigurator - - id: BoxEncryptionKeyPassenger - - id: BoxEncryptionKeyService - - id: BoxHeadset + #- id: AccessConfigurator # DeltaV - Moved to PTech + #- id: BoxEncryptionKeyPassenger # DeltaV - PTech + #- id: BoxEncryptionKeyService # DeltaV - PTech + #- id: BoxHeadset # DeltaV - PTech - id: BoxHoPCircuitboards - id: BoxHoPStamps - - id: BoxID - - id: BoxPDA - - id: CigarGoldCase - prob: 0.25 + #- id: BoxID # DeltaV - PTech + #- id: BoxPDA # DeltaV - PTech + #- id: CigarGoldCase # DeltaV - moved to Dresser + # prob: 0.25 # Fuck the HoP they don't deserve fucking cigars. # Yes they do fuck you. - id: ClothingBackpackIan @@ -160,7 +160,7 @@ prob: 0.15 - id: ClothingBeltChiefEngineerFilled - id: ClothingEyesGlassesMeson - - id: ClothingHandsGlovesColorYellow + #- id: ClothingHandsGlovesColorYellow # DeltaV - Moved to dresser - id: ClothingHeadsetAltEngineering - id: DoorRemoteEngineering - id: BoxCECircuitboards @@ -216,12 +216,12 @@ tableId: LockerFillChiefMedicalOfficerDeltaV - id: BoxEncryptionKeyMedical - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingCloakCmo + #- id: ClothingCloakCmo # DeltaV - Moved to dresser - id: ClothingEyesHudMedical - - id: ClothingHandsGlovesNitrile - - id: ClothingHeadHatBeretCmo + #- id: ClothingHandsGlovesNitrile # DeltaV - Moved to dresser + #- id: ClothingHeadHatBeretCmo # DeltaV - Moved to dresser - id: ClothingHeadsetAltMedical - - id: ClothingMaskSterile + #- id: ClothingMaskSterile # DeltaV - Moved to ClothingBackpackDuffelSurgeryFilled - id: DoorRemoteMedical - id: HandheldCrewMonitor - id: Hypospray @@ -229,8 +229,6 @@ - id: MedkitFilled - id: RubberStampCMO - id: MedTekCartridge - # Shitmed - #- id: MedicalBiofabMachineBoard #DeltaV - Replaced with a flatpack at Prototypes/_DV/Catalog/Fills/Lockers/heads.yml # Hardsuit table, used for suit storage as well - type: entityTable @@ -328,16 +326,16 @@ tableId: LockerFillHeadOfSecurityDeltaV - id: BookSecretDocuments # - id: WeaponEnergyShotgun # DeltaV - Moved to warden locker - - id: BookSpaceLaw + #- id: BookSpaceLaw # DeltaV - Moved to dresser - id: BoxEncryptionKeySecurity - - id: CigarGoldCase - prob: 0.50 + #- id: CigarGoldCase # DeltaV - Moved to dresser + # prob: 0.50 - id: ClothingBeltSecurityFilled - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - - id: ClothingMaskNeckGaiter - - id: ClothingOuterCoatHoSTrench - - id: ClothingShoesBootsJack + #- id: ClothingMaskNeckGaiter # DeltaV - Moved to dresser + #- id: ClothingOuterCoatHoSTrench # DeltaV - Moved to dresser + #- id: ClothingShoesBootsJack # DeltaV - Moved to dresser - id: DoorRemoteSecurity - id: HoloprojectorSecurity - id: RubberStampHos diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index e37b843f39d..83c662f5a3d 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -33,19 +33,19 @@ - id: Flash - id: ClothingEyesGlassesSecurity - id: ClothingHandsGlovesCombat - - id: ClothingShoesBootsJack + #- id: ClothingShoesBootsJack # DeltaV - Moved to dresser #- id: ClothingOuterCoatWarden # DeltaV - removed for incongruence #- id: ClothingOuterWinterWarden # DeltaV - removed for incongruence - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - - id: BookSpaceLaw + #- id: BookSpaceLaw # DeltaV - Moved to dresser - id: ClothingBackpackElectropack amount: 2 - - id: RemoteSignaller - amount: 2 - - id: NetworkConfigurator - - id: Binoculars + #- id: RemoteSignaller # DeltaV - Moved to dresser + # amount: 2 + #- id: NetworkConfigurator # DeltaV - Moved to dresser + #- id: Binoculars # DeltaV - Moved to Dresser # Begin DeltaV additions - id: WeaponEnergyShotgun - id: BoxPDAPrisoner @@ -54,8 +54,8 @@ prob: 0.3 - id: ClothingOuterVestPlateCarrierAdv - id: ClothingHeadsetAltSecurity # Restored from upstream merge. - - id: ClothingNeckShockCollar - amount: 2 + #- id: ClothingNeckShockCollar # DeltaV - Moved to dresser I guess? + # amount: 2 # End DeltaV additions - type: entityTable diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index 7fff28d74cd..1dae881dae9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -3,7 +3,18 @@ startingInventory: PassengerPDA: 5 ClearPDA: 5 + PassengerIDCard: 5 + ClothingHeadsetGrey: 5 + ClothingHeadsetService: 5 # Delta-V + RubberStampApproved: 1 + RubberStampDenied: 1 + BoxFolderPlasticClipboardEmpty: 2 + Paper: 10 + Envelope: 10 + HandLabeler: 2 + EncryptionKeyService: 3 # Begin Delta-V additions + AccessConfigurator: 2 ServiceWorkerPDA: 2 ChefPDA: 2 BotanistPDA: 2 @@ -18,15 +29,6 @@ MimePDA: 1 MusicianPDA: 1 # End Delta-V additions - PassengerIDCard: 5 - ClothingHeadsetGrey: 5 - ClothingHeadsetService: 5 # Delta-V - RubberStampApproved: 1 - RubberStampDenied: 1 - BoxFolderPlasticClipboardEmpty: 2 - Paper: 10 - Envelope: 10 - HandLabeler: 2 # Begin Delta-V subtractions # EncryptionKeyCargo: 2 # EncryptionKeyEngineering: 2 @@ -34,7 +36,6 @@ # EncryptionKeyScience: 2 # EncryptionKeySecurity: 1 # End Delta-V subtractions - EncryptionKeyService: 3 contrabandInventory: BalloonNT: 2 LuxuryPen: 1 diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml index ae8e471f762..77a93026d25 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/box.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml @@ -51,6 +51,7 @@ components: - MachineBoard - Circuitboard + - ComputerBoard - type: Construction graph: ToteBase node: totebase diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Boxes/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/heads.yml new file mode 100644 index 00000000000..a4cd2091ad8 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Fills/Boxes/heads.yml @@ -0,0 +1,37 @@ +- type: entity + name: stamp box [CJ] + parent: BoxCardboard + id: BoxCJStamps + description: A box filled with CJ's Stamps. Ready to dispense justice! + components: + - type: Item + size: Small + shape: + - 0,0,1,1 + - type: StorageFill + contents: + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampChiefJustice + - type: Storage + grid: + - 0,0,1,1 + whitelist: + components: + - Stamp + - type: Sprite + layers: + - state: box + - state: stamp + +- type: entity + name: circuit tote [CJ] + parent: ToteBase + id: BoxCJCircuitboards + description: A Tote filled with CJ's Circuit boards. + components: + - type: StorageFill + contents: + - id: IDComputerCircuitboard + - id: CargoRequestJusticeComputerCircuitboard + \ No newline at end of file diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml index d5942f19a09..ce31f7d8771 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/chiefjustice.yml @@ -6,22 +6,14 @@ - type: StorageFill contents: - id: ClothingHeadsetAltJustice - - id: ClothingNeckCloakCJ - - id: ClothingNeckMantleCJ - - id: ClothingOuterChiefJustice - - id: ClothingUniformJumpsuitChiefJusticeFormal - - id: ClothingUniformJumpskirtCJFormal - - id: ClothingUniformJumpsuitChiefJusticeWhite - - id: PaperStationWarrant + - id: PaperStationWarrant # TODO: Put these in a folder or something amount: 10 - id: BoxPDAJustice - id: BoxEncryptionKeyJustice - id: ChiefJusticeIDCard - id: DoorRemoteJustice - id: Gavel - - id: RubberStampChiefJustice - - id: CargoRequestJusticeComputerCircuitboard + - id: BoxCJStamps + - id: BoxCJCircuitboards - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 - - id: RubberStampApproved - - id: RubberStampDenied diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml new file mode 100644 index 00000000000..48320221725 --- /dev/null +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml @@ -0,0 +1,288 @@ +# Bigger dresser to fit all the drip +- type: entity + parent: Dresser + id: DresserLargeCommand + suffix: Empty, Command, Large + components: + - type: Storage + maxItemSize: Huge + grid: + - 0,0,8,12 # What kind of dresser is smaller than a duffle bag. Let's fix this. + +- type: entity + id: DresserCaptainFilledDV + suffix: Filled, Captain + parent: DresserLargeCommand + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitCaptain + - id: ClothingUniformJumpskirtCaptain + - id: ClothingUniformJumpsuitCapFormal + - id: ClothingUniformJumpskirtCapFormalDress + # Eyes + - id: ClothingEyesGlassesSunglasses + # Hats + - id: ClothingHeadHatCaptain + - id: ClothingHeadHatCapcap + - id: ClothingHeadHatBeretCap + # Cloaks + - id: ClothingNeckCloakCap + - id: ClothingNeckCloakCapFormal + - id: ClothingNeckMantleCap + # Outerwear + - id: ClothingOuterWinterCap + # Gloves + - id: ClothingHandsGlovesInspection + - id: ClothingHandsGlovesCaptain + # Shoes + - id: ClothingShoesLeather + - id: ClothingShoesMiscWhite + - id: ClothingShoesBootsWinterCap + # Extras + - id: MedalCase + - id: CigarGoldCase + - id: PlushieNuke + prob: 0.1 + orGroup: captainfunloot + - id: BookGorlexGirlfriends + prob: 0.1 + orGroup: captainfunloot + - id: BookCentcommChads + prob: 0.1 + orGroup: captainfunloot + +- type: entity + id: DresserChiefEngineerFilledDV + parent: DresserLargeCommand + suffix: Filled, Chief Engineer + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpsuitChiefEngineer + - id: ClothingUniformJumpskirtChiefEngineer + - id: ClothingUniformJumpsuitChiefEngineerTurtle + - id: ClothingUniformJumpskirtChiefEngineerTurtle + # Hats + - id: ClothingHeadHatHardhatWhite + - id: ClothingHeadHatBeretEngineering + # Cloaks + - id: ClothingNeckCloakCe + - id: ClothingNeckMantleCE + # Outerwear + - id: ClothingOuterWinterCE + # Gloves + - id: ClothingHandsGlovesColorYellow # I know its a bit weird for CEs to put work gloves in their dresser but they already start with them in the loadout so lets just move them + # Shoes + - id: ClothingShoesColorBrown + - id: ClothingShoesBootsWinterChiefEngineer + +- type: entity + id: DresserChiefMedicalOfficerFilledDV + parent: DresserLargeCommand + suffix: Filled, Chief Medical Officer + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpsuitCMO + - id: ClothingUniformJumpskirtCMO + - id: ClothingUniformJumpsuitCMOTurtle + - id: ClothingUniformJumpskirtCMOTurtle + # Hats + - id: ClothingHeadHatBeretCmo + - id: ClothingHeadMirror + # Eyes + - id: ClothingEyesGlasses + # Cloak + - id: ClothingNeckMantleCMO + - id: ClothingCloakCmo + # Outerwear + - id: ClothingOuterCoatLabCmo + - id: ClothingOuterWinterCMO + # Gloves + - id: ClothingHandsGlovesNitrile + - id: ClothingHandsGlovesLatex + # Shoes + - id: ClothingShoesBootsWinterChiefMedicalOfficer + - id: ClothingShoesColorWhite + +- type: entity + id: DresserHeadOfPersonnelFilledDV + parent: DresserLargeCommand + suffix: Filled, Head Of Personnel + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpsuitHoP + - id: ClothingUniformJumpskirtHoP + - id: ClothingUniformJumpsuitHoPMess + - id: ClothingUniformJumpskirtHoPMess + - id: ClothingUniformJumpsuitBoatswain + - id: ClothingUniformJumpsuitHoPFormal + - id: ClothingUniformJumpskirtHoPFormal + # Hats + - id: ClothingHeadHatBeretHop + - id: ClothingHeadHatHopcap + # Eyes + - id: ClothingEyesGlasses + # Cloak + - id: ClothingNeckCloakHop + - id: ClothingNeckMantleHOP + - id: ClothingNeckGoldmedal + # Outerwear + - id: ClothingOuterWinterHoP + - id: ClothingOuterCoatHoPFormal + # Gloves + - id: ClothingHandsGlovesInspection + - id: ClothingHandsGlovesHop + # Shoes + - id: ClothingShoesBootsLaceup + - id: ClothingShoesMiscWhite + - id: ClothingShoesBootsWinterHeadOfPersonel + # Other + - id: CigarGoldCase + +- type: entity + id: DresserHeadOfSecurityFilledDV + parent: DresserLargeCommand + suffix: Filled, Head Of Security + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpskirtHosFormal + - id: ClothingUniformJumpsuitHosFormal + - id: ClothingUniformJumpskirtHoSAlt + - id: ClothingUniformJumpsuitHoSAlt + # Hats + - id: ClothingHeadHatBeretHoS + - id: ClothingHeadHatHoshat + # Mask + - id: ClothingMaskNeckGaiter + # Eyes + - id: ClothingEyesGlassesSunglasses + # Cloak + - id: ClothingNeckCloakHos + - id: ClothingNeckMantleHOS + # Outerwear + - id: ClothingOuterCoatStasecHoS + - id: ClothingOuterCoatHoSTrench + #- id: ClothingOuterWinterHoS # DeltaV - removed for incongruence + # Gloves + - id: ClothingHandsGlovesCombat + - id: ClothingHandsGlovesForensic + # Shoes + - id: ClothingShoesBootsWinterHeadOfSecurity + - id: ClothingShoesBootsJack + # Extras + - id: BookSpaceLaw + - id: CigarGoldCase + +- type: entity + id: DresserQuarterMasterFilledDV + parent: DresserLargeCommand + suffix: Filled, Logistics Officer + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpsuitQMFormal + - id: ClothingUniformJumpskirtQMFormal + - id: ClothingUniformJumpsuitQMTurtleneck + - id: ClothingUniformJumpskirtQMTurtleneck + # Hats + - id: ClothingHeadHatBeretQM + # Cloak + - id: ClothingNeckCloakQm + - id: ClothingNeckMantleQM + # Gloves + - id: ClothingHandsGlovesColorBrown + # Outerwear + - id: ClothingOuterWinterQM + # Shoes + - id: ClothingShoesBootsLaceup + - id: ClothingShoesBootsWinterLogisticsOfficer + +- type: entity + id: DresserResearchDirectorFilledDV + parent: DresserLargeCommand + suffix: Filled, Mystagogue + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpsuitResearchDirector + - id: ClothingUniformJumpskirtResearchDirector + # Hats + - id: ClothingHeadHatBeretRND + # Eyes + - id: ClothingEyesGlasses + # Cloaks + - id: ClothingNeckCloakMystagogue + - id: ClothingNeckCloakRd + - id: ClothingNeckMantleRD + # Gloves + - id: ClothingHandsGlovesColorPurple + - id: ClothingHandsGlovesLatex + # Outerwear + - id: ClothingOuterWinterRD + - id: ClothingOuterCoatRD + # Shoes + - id: ClothingShoesBootsLaceup + - id: ClothingShoesBootsWinterMystagogue + +- type: entity + id: DresserChiefJusticeFilled + parent: DresserLargeCommand + suffix: Filled, Chief Justice + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpsuitChiefJustice + - id: ClothingUniformJumpskirtChiefJustice + - id: ClothingUniformJumpsuitChiefJusticeFormal + - id: ClothingUniformJumpskirtCJFormal + - id: ClothingUniformJumpsuitChiefJusticeWhite + # Cloaks + - id: ClothingNeckCloakCJ + - id: ClothingNeckMantleCJ + # Outerwear + - id: ClothingOuterChiefJustice + # Shoes + - id: ClothingShoesBootsLaceup + # Other + - id: BookSpaceLaw + +- type: entity + id: DresserWardenFilledDV + parent: DresserLargeCommand + suffix: Filled, Warden + components: + - type: StorageFill + contents: + # Jumpsuits + - id: ClothingUniformJumpskirtWarden + - id: ClothingUniformJumpsuitWarden + # Hats + - id: ClothingHeadHatWarden + - id: ClothingHeadHatBeretWarden + # Eyes + - id: ClothingEyesGlassesSunglasses + # Outerwear + - id: ClothingOuterCoatStasecWarden + #- id: ClothingOuterWinterHoS # DeltaV - removed for incongruence + #- id: ClothingOuterCoatWarden # DeltaV - removed for incongruence + #- id: ClothingOuterWinterWarden # DeltaV - removed for incongruence + # Shoes + - id: ClothingShoesBootsWinterSec + - id: ClothingShoesBootsJack + # Extras + - id: BookSpaceLaw + - id: ClothingNeckShockCollar + - id: RemoteSignaller + - id: Binoculars + - id: NetworkConfigurator diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml index f55113bd849..4a6a90a4bfc 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/heads.yml @@ -7,7 +7,6 @@ children: - id: BoxPDACargo - id: QuartermasterIDCard - - id: ClothingShoesBootsWinterLogisticsOfficer - id: StockTradingCartridge - id: LunchboxCommandFilledRandom prob: 0.3 @@ -16,10 +15,6 @@ id: LockerFillCaptainDeltaV table: !type:AllSelector children: - - id: ClothingHeadHatBeretCap - - id: ClothingShoesLeather # fancy shoes for HoP and cap TODO: move to dresser - - id: ClothingShoesMiscWhite - - id: ClothingShoesBootsWinterCap - id: LunchboxCommandFilledRandom prob: 0.3 @@ -28,21 +23,9 @@ table: !type:AllSelector children: - id: ClothingOuterCoatHoPArmored - - id: ClothingOuterArmorDuraVest # replaced(???) HoP's armoured coat with a standard stabproof, pending HoPcoat resprite - - id: ClothingOuterCoatHoPFormal - id: BookIanDossier # HoP steal objective, see Resources/Prototypes/_DV/Entities/Objects/Misc/ian_dossier.yml - - id: ClothingHandsGlovesInspection - - id: ClothingUniformJumpsuitHoPMess - - id: ClothingUniformJumpskirtHoPMess - - id: ClothingUniformJumpsuitBoatswain - - id: ClothingUniformJumpsuitHoPFormal - - id: ClothingUniformJumpskirtHoPFormal - - id: ClothingShoesBootsLaceup - - id: ClothingShoesMiscWhite - - id: ClothingShoesBootsWinterHeadOfPersonel - - id: ServiceTechFabCircuitboard - id: LunchboxCommandFilledRandom - prob: 0.3 + prob: 0.8 - type: entityTable id: LockerFillChiefEngineerDeltaV @@ -50,8 +33,6 @@ children: - id: BoxPDAEngineering - id: CEIDCard - - id: ClothingShoesBootsWinterChiefEngineer - - id: EngineeringTechFabCircuitboard - id: LunchboxCommandFilledRandom prob: 0.3 @@ -59,17 +40,11 @@ id: LockerFillChiefMedicalOfficerDeltaV table: !type:AllSelector children: - - id: RubberStampPsychologist # TODO: make a psych locker and move this to it, or just remove this since psych spawns with it. - id: BoxPDAMedical - id: ClothingBeltMilitaryWebbingCMO # add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN! - id: CMOIDCard - - id: ClothingShoesBootsWinterChiefMedicalOfficer - id: LunchboxCommandFilledRandom prob: 0.3 - - id: MedBioFabricatorFlatpack # Replaced the shitmed board - - id: AutoclaveFlatpack # Make sure surgeons have access to an autoclave - - id: Multitool # Ensure the flatpacks can be used without having to beg a tool - - id: Screwdriver # Quality of life for chemvend / nanomed restocks - type: entityTable id: LockerFillResearchDirectorDeltaV @@ -78,8 +53,6 @@ - id: BoxPDAScience - id: RDIDCard - id: BoxFolderRdClipboard - - id: ClothingShoesBootsWinterMystagogue - - id: EpistemicsTechFabCircuitboard - id: LunchboxCommandFilledRandom prob: 0.3 - id: CosmicCenser diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml index d05989d5363..fa248efa4c0 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml @@ -166,6 +166,7 @@ - LightsStatic - ServiceStatic - PartsStaticDeltaV # Add Beaker and Hand Labeler to the service techfab + - SimpleToolsStaticDeltaV - SimpleElectronicsStatic - EVASuit dynamicPacks: diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml index 776e084e176..61706bd2095 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/shared.yml @@ -42,3 +42,18 @@ - CellRechargerCircuitboard - WeaponCapacitorRechargerCircuitboard - FreezerElectronics + + +- type: latheRecipePack + id: SimpleToolsStaticDeltaV # Since we removed the autolathe, let medical, service, and sec print some basic tools too + recipes: + - Screwdriver + - Wrench + - Wirecutter + - CrowbarGreen + - Multitool + - Welder + - WeldingMask + - HandheldGPSBasic + - HandheldStationMap + - MicroManipulatorStockPart # Heads start with machine boards \ No newline at end of file