diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 5e57d9efd8..96a742d0b9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -100,7 +100,7 @@ - type: StorageFill contents: - id: ClothingNeckMantleRD - - id: ClothingNeckCloakMystagogue # DeltaV - ClothingNeckCloakRd replaced in favour of Velta variant + - id: ClothingNeckCloakMystagogue # DeltaV - ClothingNeckCloakRd replaced in favour of Delta variant - id: ClothingHeadHatBeretRND - id: ClothingHandsGlovesColorPurple - id: ClothingEyesGlasses diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index e2f3831a38..9ff453c041 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -1,396 +1,379 @@ +- type: entityTable + id: LockerFillQuarterMaster + table: !type:AllSelector + children: + - !type:NestedSelector # DeltaV + tableId: LockerFillQuarterMasterDeltaV + - id: BoxEncryptionKeyCargo + - id: BoxFolderQmClipboard + - id: CargoBountyComputerCircuitboard + - id: CargoRequestComputerCircuitboard + - id: CargoSaleComputerCircuitboard + - id: CargoShuttleComputerCircuitboard + - id: CargoShuttleConsoleCircuitboard + - id: CigPackGreen + prob: 0.50 + - id: ClothingHeadsetAltCargo + - id: DoorRemoteCargo + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampQm + #- id: SalvageShuttleConsoleCircuitboard # DeltaV - no salv shuttle so this is useless + - type: entity id: LockerQuarterMasterFilled suffix: Filled parent: LockerQuarterMaster components: - - type: StorageFill - contents: - - id: BoxFolderQmClipboard - - id: CargoRequestComputerCircuitboard - - id: CargoSaleComputerCircuitboard - - id: CargoShuttleComputerCircuitboard - - id: CargoShuttleConsoleCircuitboard - - id: SalvageShuttleConsoleCircuitboard - - id: CargoBountyComputerCircuitboard - - id: CigPackGreen - prob: 0.50 - - id: DoorRemoteCargo - - id: RubberStampQm - - id: RubberStampDenied - - id: RubberStampApproved - - id: ClothingHeadsetAltCargo - - id: BoxEncryptionKeyCargo - - id: SpaceCashLuckyBill # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml - - id: BoxPDACargo # Delta-V - - id: QuartermasterIDCard # Delta-V - - id: ClothingShoesBootsWinterLogisticsOfficer #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillQuarterMaster -- type: entity - id: LockerCaptainFilledHardsuit - suffix: Filled, Hardsuit - parent: LockerCaptain - components: - - type: StorageFill - contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear -# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system - - id: ClothingOuterHardsuitCap - - id: ClothingMaskGasCaptain - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain -# - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box - - id: JetpackCaptainFilled - - id: MedalCase - - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 +# No laser table +- type: entityTable + id: LockerFillCaptainNoLaser + table: !type:AllSelector + children: + - !type:NestedSelector # DeltaV + tableId: LockerFillCaptainDeltaV + #- id: CaptainIDCard # DeltaV - Replaced by the spare ID system + - id: CigarGoldCase + prob: 0.25 + - id: ClothingBeltSheathFilled + - id: ClothingHeadsetAltCommand + - id: ClothingOuterArmorCaptainCarapace + - id: CommsComputerCircuitboard + - id: DoorRemoteCommand + - id: MedalCase + - id: NukeDisk + - id: PinpointerNuclear + - id: PlushieNuke + prob: 0.1 + - id: RubberStampCaptain + - id: SpaceCash1000 + - id: WeaponDisabler -- type: entity - id: LockerCaptainFilled - suffix: Filled, AntiqueLaser - parent: LockerCaptain - components: - - type: StorageFill - contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear -# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain - - id: WeaponAntiqueLaser - - id: JetpackCaptainFilled - - id: MedalCase - - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 +# No laser table + Laser table +- type: entityTable + id: LockerFillCaptainLaser + table: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillCaptainNoLaser + - id: WeaponAntiqueLaser +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillCaptainHardsuit + table: !type:AllSelector + children: + - id: ClothingOuterHardsuitCap + - id: ClothingMaskGasCaptain + - id: JetpackCaptainFilled + - id: OxygenTankFilled + +# No laser locker, used when the antique laser is placed in the special display crate - type: entity id: LockerCaptainFilledNoLaser suffix: Filled parent: LockerCaptain components: - - type: StorageFill - contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear -# - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat. - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain - - id: JetpackCaptainFilled - - id: MedalCase - - id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret - - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillCaptainNoLaser + +# No Laser + Laser locker +- type: entity + id: LockerCaptainFilled + suffix: DO NOT MAP, USE GLASS BOX # DeltaV + parent: LockerCaptain + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillCaptainLaser + +# No Laser + Laser + Hardsuit locker +- type: entity + id: LockerCaptainFilledHardsuit + suffix: DO NOT MAP, USE GLASS BOX # DeltaV + parent: LockerCaptain + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillCaptainLaser + - !type:NestedSelector + tableId: FillCaptainHardsuit + +- type: entityTable + id: LockerFillHeadOfPersonnel + table: !type:AllSelector + children: + - !type:NestedSelector # DeltaV + tableId: LockerFillHeadOfPersonnelDeltaV + - id: AccessConfigurator + - id: BoxEncryptionKeyPassenger + - id: BoxEncryptionKeyService + - id: BoxHeadset + - id: BoxID + - id: BoxPDA + - id: CigarGoldCase + prob: 0.25 + # Fuck the HoP they don't deserve fucking cigars. + # Yes they do fuck you. + - id: ClothingBackpackIan + prob: 0.5 + - id: ClothingHeadsetAltService # DeltaV - HoP is now a service role, replaces their all channels headset. + - id: ClothingNeckGoldmedal + - id: DoorRemoteService + - id: HoPIDCard + - id: IDComputerCircuitboard + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampHop + - id: WeaponDisabler - type: entity id: LockerHeadOfPersonnelFilled suffix: Filled parent: LockerHeadOfPersonnel components: - - type: StorageFill - contents: - - id: HoPIDCard - - id: ClothingHeadsetAltService # DeltaV - HoP is now a service role, replaces their all channels headset. - - id: BoxPDA - - id: BoxID - - id: BoxHeadset - - id: IDComputerCircuitboard - - id: WeaponDisabler - - id: ClothingOuterCoatHoPArmored # DeltaV - - id: ClothingOuterArmorDuraVest # DeltaV - replaced HoP's armoured coat with a standard stabproof, pending HoPcoat resprite - - id: ClothingOuterCoatHoPFormal # DeltaV - formal jacket - - id: CigarGoldCase - prob: 0.25 - # Fuck the HoP they don't deserve fucking cigars. - # Yes they do fuck you. - - id: DoorRemoteService - - id: ClothingNeckGoldmedal - - id: RubberStampHop - - id: RubberStampDenied - - id: RubberStampApproved - - id: BoxEncryptionKeyPassenger - - id: BoxEncryptionKeyService - - id: ClothingBackpackIan - prob: 0.5 - - id: AccessConfigurator - - id: BookIanDossier # DeltaV - HoP steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml - - id: ClothingHandsGlovesInspection # DeltaV - Add inspection gloves for HoP. - - id: ClothingUniformJumpsuitHoPMess # DeltaV - Add mess kit for HoP. - - id: ClothingUniformJumpskirtHoPMess # DeltaV - Add mess kit for HoP. - - id: ClothingUniformJumpsuitBoatswain # DeltaV - Add turtleneck for HoP. - - id: ClothingUniformJumpsuitHoPFormal # DeltaV - HOP Resprite - - id: ClothingShoesBootsLaceup # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap - - id: ClothingShoesBootsWinterHeadOfPersonel #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillHeadOfPersonnel -- type: entity - id: LockerChiefEngineerFilledHardsuit - suffix: Filled, Hardsuit - parent: LockerChiefEngineer - components: - - type: StorageFill - contents: - - id: ClothingOuterHardsuitEngineeringWhite - - id: ClothingMaskBreath - - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled - - id: ClothingShoesBootsMagAdv - - id: ClothingHandsGlovesColorYellow - - id: CigarCase - prob: 0.15 - - id: DoorRemoteEngineering - - id: RubberStampCE - - id: JetpackVoidFilled - - id: ClothingHeadsetAltEngineering - - id: BoxEncryptionKeyEngineering - - id: AccessConfigurator - - id: BoxPDAEngineering # Delta-V - - id: RCD - - id: RCDAmmo - - id: CEIDCard # Delta-V - - id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 +# No hardsuit table +- type: entityTable + id: LockerFillChiefEngineerNoHardsuit + table: !type:AllSelector + children: + - !type:NestedSelector # DeltaV + tableId: LockerFillChiefEngineerDeltaV + - id: AccessConfigurator + - id: BoxEncryptionKeyEngineering + - id: CigarCase + prob: 0.15 + - id: ClothingBeltChiefEngineerFilled + - id: ClothingEyesGlassesMeson + - id: ClothingHandsGlovesColorYellow + - id: ClothingHeadsetAltEngineering + - id: DoorRemoteEngineering + - id: RCD + - id: RCDAmmo + - id: RubberStampCE +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillChiefEngineerHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: ClothingOuterHardsuitEngineeringWhite + - id: ClothingShoesBootsMagAdv + - id: JetpackVoidFilled + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerChiefEngineerFilled suffix: Filled parent: LockerChiefEngineer components: - - type: StorageFill - contents: - - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled - - id: ClothingHandsGlovesColorYellow - - id: CigarCase - prob: 0.15 - - id: DoorRemoteEngineering - - id: RubberStampCE - - id: ClothingHeadsetAltEngineering - - id: BoxEncryptionKeyEngineering - - id: AccessConfigurator - - id: BoxPDAEngineering # Delta-V - - id: CEIDCard # Delta-V - - id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots - - id: RCD - - id: RCDAmmo - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillChiefEngineerNoHardsuit +# No hardsuit + hardsuit locker - type: entity - id: LockerChiefMedicalOfficerFilledHardsuit + id: LockerChiefEngineerFilledHardsuit suffix: Filled, Hardsuit - parent: LockerChiefMedicalOfficer + parent: LockerChiefEngineer components: - - type: StorageFill - contents: - - id: MedkitFilled - - id: ClothingHandsGlovesNitrile - - id: ClothingEyesHudMedical - - id: ClothingHeadsetAltMedical - - id: ClothingCloakCmo - - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingMaskSterile - - id: ClothingHeadHatBeretCmo - - id: ClothingOuterHardsuitMedical - - id: Hypospray - - id: HandheldCrewMonitor - - id: DoorRemoteMedical - - id: RubberStampCMO - - id: RubberStampPsychologist # DeltaV - - id: MedicalTechFabCircuitboard - - id: BoxEncryptionKeyMedical - - id: BoxPDAMedical # Delta-V - - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN! - - id: CMOIDCard # Delta-V - - id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillChiefEngineerNoHardsuit + - !type:NestedSelector + tableId: FillChiefEngineerHardsuit +# No hardsuit table +- type: entityTable + id: LockerFillChiefMedicalOfficerNoHardsuit + table: !type:AllSelector + children: + - !type:NestedSelector # DeltaV + tableId: LockerFillChiefMedicalOfficerDeltaV + - id: BoxEncryptionKeyMedical + - id: ClothingBackpackDuffelSurgeryFilled + - id: ClothingCloakCmo + - id: ClothingEyesHudMedical + - id: ClothingHandsGlovesNitrile + - id: ClothingHeadHatBeretCmo + - id: ClothingHeadsetAltMedical + - id: ClothingMaskSterile + - id: DoorRemoteMedical + - id: HandheldCrewMonitor + - id: Hypospray + - id: MedicalTechFabCircuitboard + - id: MedkitFilled + - id: RubberStampCMO + +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillChiefMedicalOfficerHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskBreathMedical + - id: ClothingOuterHardsuitMedical + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerChiefMedicalOfficerFilled suffix: Filled parent: LockerChiefMedicalOfficer components: - - type: StorageFill - contents: - - id: MedkitFilled - - id: ClothingHandsGlovesNitrile - - id: ClothingEyesHudMedical - - id: ClothingHeadsetAltMedical - - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingMaskSterile - - id: Hypospray - - id: HandheldCrewMonitor - - id: DoorRemoteMedical - - id: RubberStampCMO - - id: RubberStampPsychologist # DeltaV - - id: MedicalTechFabCircuitboard - - id: BoxEncryptionKeyMedical - - id: BoxPDAMedical # Delta-V - - id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN! - - id: CMOIDCard # Delta-V - - id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillChiefMedicalOfficerNoHardsuit +# No hardsuit + Hardsuit locker - type: entity - id: LockerResearchDirectorFilledHardsuit + id: LockerChiefMedicalOfficerFilledHardsuit suffix: Filled, Hardsuit - parent: LockerResearchDirector + parent: LockerChiefMedicalOfficer components: - - type: StorageFill - contents: - - id: ResearchComputerCircuitboard - - id: ProtolatheMachineCircuitboard - - id: CircuitImprinterMachineCircuitboard - - id: ClothingOuterHardsuitRd - - id: HandTeleporter - - id: DoorRemoteResearch - - id: ClothingBeltUtilityFilled - - id: RubberStampRd - - id: BoxEncryptionKeyScience - - id: BoxPDAScience # Delta-V - - id: RDIDCard # Delta-V - - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots - - id: ClothingHeadsetAltScience - - id: EncryptionKeyBinary - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillChiefMedicalOfficerNoHardsuit + - !type:NestedSelector + tableId: FillChiefMedicalOfficerHardsuit +# No hardsuit table +- type: entityTable + id: LockerFillResearchDirectorNoHardsuit + table: !type:AllSelector + children: + - !type:NestedSelector # DeltaV + tableId: LockerFillResearchDirectorDeltaV + - id: BoxEncryptionKeyScience + - id: CircuitImprinterMachineCircuitboard + - id: ClothingBeltUtilityFilled + - id: ClothingHeadsetAltScience + - id: DoorRemoteResearch + - id: EncryptionKeyBinary + - id: HandTeleporter + - id: ProtolatheMachineCircuitboard + - id: ResearchComputerCircuitboard + - id: RubberStampRd + +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillResearchDirectorHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: ClothingOuterHardsuitRd + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerResearchDirectorFilled suffix: Filled parent: LockerResearchDirector components: - - type: StorageFill - contents: - - id: ResearchComputerCircuitboard - - id: ProtolatheMachineCircuitboard - - id: CircuitImprinterMachineCircuitboard - - id: HandTeleporter - - id: DoorRemoteResearch - - id: ClothingBeltUtilityFilled - - id: RubberStampRd - - id: BoxEncryptionKeyScience - - id: BoxPDAScience # Delta-V - - id: RDIDCard # Delta-V - - id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots - - id: ClothingHeadsetAltScience - - id: EncryptionKeyBinary - - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! - prob: 0.3 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillResearchDirectorNoHardsuit +# No hardsuit + Hardsuit locker - type: entity - id: LockerHeadOfSecurityFilledHardsuit + id: LockerResearchDirectorFilledHardsuit suffix: Filled, Hardsuit - parent: LockerHeadOfSecurity + parent: LockerResearchDirector components: - - type: StorageFill - contents: - - id: WeaponDisabler - - id: ClothingOuterCoatHoSTrench - - id: ClothingMaskNeckGaiter - - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. - - id: ClothingMaskGasSwat - - id: ClothingBeltSecurityFilled - - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity - - id: ClothingShoesBootsJack - - id: CigarGoldCase - prob: 0.50 - - id: DoorRemoteSecurity - - id: RubberStampHos - - id: SecurityTechFabCircuitboard - - id: JetpackSecurityFilled - - id: BoxEncryptionKeySecurity - - id: HoloprojectorSecurity - - id: BookSecretDocuments - - id: BookSpaceLaw - # Begin DeltaV additions - - id: BoxPDASecurity - - id: WeaponEnergyGunMultiphase - - id: HoSIDCard - - id: ClothingShoesBootsWinterHeadOfSecurity - - id: LunchboxCommandFilledRandom - prob: 0.3 - # End DeltaV additions + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillResearchDirectorNoHardsuit + - !type:NestedSelector + tableId: FillResearchDirectorHardsuit +# No hardsuit table +- type: entityTable + id: LockerFillHeadOfSecurityNoHardsuit + table: !type:AllSelector + children: + - !type:NestedSelector # DeltaV + tableId: LockerFillHeadOfSecurityDeltaV + - id: BookSecretDocuments + - id: BookSpaceLaw + - id: BoxEncryptionKeySecurity + - id: CigarGoldCase + prob: 0.50 + - id: ClothingBeltSecurityFilled + - id: ClothingEyesGlassesSecurity + - id: ClothingHeadsetAltSecurity + - id: ClothingMaskNeckGaiter + - id: ClothingOuterCoatHoSTrench + - id: ClothingShoesBootsJack + - id: DoorRemoteSecurity + - id: HoloprojectorSecurity + - id: RubberStampHos + - id: SecurityTechFabCircuitboard + - id: WeaponDisabler + +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillHeadOfSecurityHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskGasSwat + - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. + - id: JetpackSecurityFilled + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerHeadOfSecurityFilled suffix: Filled parent: LockerHeadOfSecurity components: - - type: StorageFill - contents: - - id: WeaponDisabler - - id: ClothingOuterCoatHoSTrench - - id: ClothingMaskNeckGaiter - - id: ClothingBeltSecurityFilled - - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity - - id: ClothingShoesBootsJack - - id: CigarGoldCase - prob: 0.50 - - id: DoorRemoteSecurity - - id: RubberStampHos - - id: SecurityTechFabCircuitboard - - id: BoxEncryptionKeySecurity - - id: HoloprojectorSecurity - - id: BookSecretDocuments - - id: BookSpaceLaw - # Begin DeltaV additions - - id: BoxPDASecurity - - id: WeaponEnergyGunMultiphase - - id: HoSIDCard - - id: ClothingShoesBootsWinterHeadOfSecurity - - id: LunchboxCommandFilledRandom - prob: 0.3 - # End DeltaV additions + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillHeadOfSecurityNoHardsuit + +# No hardsuit + Hardsuit locker +- type: entity + id: LockerHeadOfSecurityFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerHeadOfSecurity + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillHeadOfSecurityNoHardsuit + - !type:NestedSelector + tableId: FillHeadOfSecurityHardsuit - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index ac5cb47cc9..bb1e1f5458 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -44,7 +44,7 @@ suffix: Prisoner EVA components: - type: StorageFill - contents: + contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitEVAPrisoner - id: ClothingHeadHelmetEVALarge @@ -150,13 +150,10 @@ parent: SuitStorageBase suffix: Chief Engineer components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: JetpackVoidFilled - - id: ClothingShoesBootsMagAdv - - id: ClothingOuterHardsuitEngineeringWhite - - id: ClothingMaskBreath + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillChiefEngineerHardsuit - type: AccessReader access: [["ChiefEngineer"]] @@ -166,11 +163,10 @@ parent: SuitStorageBase suffix: Chief Medical Officer components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: ClothingOuterHardsuitMedical - - id: ClothingMaskBreathMedical + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillChiefMedicalOfficerHardsuit - type: AccessReader access: [ [ "ChiefMedicalOfficer" ] ] @@ -180,11 +176,10 @@ parent: SuitStorageBase suffix: Mystagogue # DeltaV - Epistemics Department replacing Science components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: ClothingOuterHardsuitRd - - id: ClothingMaskBreath + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillResearchDirectorHardsuit - type: AccessReader access: [ [ "ResearchDirector" ] ] @@ -194,12 +189,10 @@ parent: SuitStorageBase suffix: Head of Security components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: JetpackSecurityFilled - - id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit. - - id: ClothingMaskGasSwat + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillHeadOfSecurityHardsuit - type: AccessReader access: [["HeadOfSecurity"]] @@ -223,11 +216,10 @@ parent: SuitStorageBase suffix: Captain components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: ClothingOuterHardsuitCap - - id: ClothingMaskGasCaptain + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillCaptainHardsuit - type: AccessReader access: [["Captain"]] diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml new file mode 100644 index 0000000000..fb11fbf91d --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml @@ -0,0 +1,86 @@ +# These get added to upstream files with NestedSelector to keep changes to them minimal +# TODO: move clothes to dressers when they get changed to entityTables + +- type: entityTable + id: LockerFillQuarterMasterDeltaV + table: !type:AllSelector + children: + - id: SpaceCashLuckyBill # LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml + - id: BoxPDACargo + - id: QuartermasterIDCard + - id: ClothingShoesBootsWinterLogisticsOfficer + - id: LunchboxCommandFilledRandom + prob: 0.3 + +- type: entityTable + 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 + +- type: entityTable + id: LockerFillHeadOfPersonnelDeltaV + 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/DeltaV/Entities/Objects/Misc/ian_dossier.yml + - id: ClothingHandsGlovesInspection + - id: ClothingUniformJumpsuitHoPMess + - id: ClothingUniformJumpskirtHoPMess + - id: ClothingUniformJumpsuitBoatswain + - id: ClothingUniformJumpsuitHoPFormal + - id: ClothingShoesBootsLaceup + - id: ClothingShoesMiscWhite + - id: ClothingShoesBootsWinterHeadOfPersonel + - id: LunchboxCommandFilledRandom + prob: 0.3 + +- type: entityTable + id: LockerChiefEngineerDeltaV + table: !type:AllSelector + children: + - id: BoxPDAEngineering + - id: CEIDCard + - id: ClothingShoesBootsWinterChiefEngineer + - id: LunchboxCommandFilledRandom + prob: 0.3 + +- type: entityTable + id: LockerChiefMedicalOfficerDeltaV + table: !type:AllSelector + children: + - id: RubberStampPsychologist # TODO: make a psych locker and move this to 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 + +- type: entityTable + id: LockerFillResearchDirectorDeltaV + table: !type:AllSelector + children: + - id: BoxPDAScience + - id: RDIDCard + - id: ClothingShoesBootsWinterMystagogue + - id: LunchboxCommandFilledRandom + prob: 0.3 + +- type: entityTable + id: LockerFillHeadOfSecurityDeltaV + table: !type:AllSelector + children: + - id: BoxPDASecurity + - id: WeaponEnergyGunMultiphase + - id: HoSIDCard + - id: ClothingShoesBootsWinterHeadOfSecurity + - id: LunchboxCommandFilledRandom + prob: 0.3