diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml index 184a271999..a0488a4586 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml @@ -10,6 +10,7 @@ ClothingUniformJumpskirtAtmosCasual: 3 # DeltaV ClothingShoesColorWhite: 3 ClothingHeadsetEngineering: 2 + ClothingHeadHatBeretAtmospherics: 3 # DeltaV - Remove Specific Role Timers ClothingHeadHelmetFire: 2 ClothingOuterSuitFire: 2 ClothingOuterWinterAtmos: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 535d81f95d..33db44aa22 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -10,6 +10,7 @@ ClothingShoesColorBlack: 3 ClothingOuterVestHazard: 3 ClothingShoesBootsWork: 3 + ClothingHeadHatBeretEngineering: 3 # DeltaV - Remove Specific Role Timers ClothingHeadHatHardhatYellow: 3 ClothingHeadHatHardhatOrange: 3 ClothingHeadsetEngineering: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml index 032bf08a63..c790f8105b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml @@ -15,6 +15,7 @@ ClothingMaskGas: 3 ClothingOuterWinterSci: 2 ClothingNeckScarfStripedPurple: 3 + ClothingHeadHatBeretRND: 3 # DeltaV - Remove Specific Role Timers ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics ClothingShoesBootsWinterSci: 2 ClothingOuterExplorerCoat: 3 # DeltaV diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index cba1288d11..0f6be7d49a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -41,11 +41,11 @@ head: ClothingHeadHatHardhatRed - type: loadout - id: SeniorEngineerBeret + id: EngineerBeret # DeltaV - Was SeniorEngineerBeret startingGear: EngineeringBeret - effects: - - !type:GroupLoadoutEffect - proto: SeniorEngineering +# effects: # DeltaV - Remove Specific Role Timers +# - !type:GroupLoadoutEffect +# proto: SeniorEngineering # Jumpsuit - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index 93cfcc3be8..49b0ba0c99 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -18,9 +18,9 @@ - type: loadout id: ScientificBeret startingGear: ScientificBeret - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher +# effects: # DeltaV - Remove Specific Role Timers +# - !type:GroupLoadoutEffect +# proto: SeniorResearcher - type: loadout id: RoboticistCap diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 4877a60d4f..873cbd6d0b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1122,7 +1122,7 @@ - StationEngineerHardhatYellow - StationEngineerHardhatOrange - StationEngineerHardhatRed - - SeniorEngineerBeret + - EngineerBeret # DeltaV - Was SeniorEngineerBeret - type: loadoutGroup id: StationEngineerJumpsuit diff --git a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml index be36babc78..3d740290ea 100644 --- a/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml @@ -187,6 +187,7 @@ # Cloak - id: ClothingNeckCloakHos - id: ClothingNeckMantleHOS + - id: ClothingNeckHosRobe # Outerwear - id: ClothingOuterCoatStasecHoS - id: ClothingOuterCoatHoSTrench diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml index aa6415f4d9..8f35c3e25c 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -44,6 +44,6 @@ requirement: !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 432000 # 120hr + time: 216000 # 60hr equipment: neck: ClothingNeckMantleSalvage diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml index 29e08c5e8e..51852aa313 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -22,12 +22,6 @@ - type: loadout id: AtmosBeret - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobAtmosphericTechnician - time: 216000 # 60hr equipment: head: ClothingHeadHatBeretAtmospherics diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml index 81f399b5f5..2b4b8ff6c9 100644 --- a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml @@ -54,11 +54,5 @@ # Neck - type: loadout id: HeadOfSecurityRobe - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobHeadOfSecurity - time: 180000 equipment: neck: ClothingNeckHosRobe