cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 37d88d8cda into c3c6a6abd9

This commit is contained in:
Stxcking 2026-05-10 11:43:47 +00:00 committed by GitHub
parent c3c6a6abd9 37d88d8cda
commit 63f7cbba1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View File

@ -10,6 +10,7 @@
ClothingUniformJumpskirtAtmosCasual: 3 # DeltaV
ClothingShoesColorWhite: 3
ClothingHeadsetEngineering: 2
ClothingHeadHatBeretAtmospherics: 3 # DeltaV - Remove Specific Role Timers
ClothingHeadHelmetFire: 2
ClothingOuterSuitFire: 2
ClothingOuterWinterAtmos: 2

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
View File

@ -10,6 +10,7 @@
ClothingShoesColorBlack: 3
ClothingOuterVestHazard: 3
ClothingShoesBootsWork: 3
ClothingHeadHatBeretEngineering: 3 # DeltaV - Remove Specific Role Timers
ClothingHeadHatHardhatYellow: 3
ClothingHeadHatHardhatOrange: 3
ClothingHeadsetEngineering: 3

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
View File

@ -16,6 +16,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

6
Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
View File

@ -43,9 +43,9 @@
- type: loadout
id: SeniorEngineerBeret
startingGear: EngineeringBeret
effects:
- !type:GroupLoadoutEffect
proto: SeniorEngineering
# effects: # DeltaV - Remove Specific Role Timers
# - !type:GroupLoadoutEffect
# proto: SeniorEngineering
# Jumpsuit
- type: loadout

6
Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
View File

@ -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

1
Resources/Prototypes/_DV/Catalog/Fills/Lockers/dressers.yml
View File

@ -187,6 +187,7 @@
# Cloak
- id: ClothingNeckCloakHos
- id: ClothingNeckMantleHOS
- id: ClothingNeckHosRobe
# Outerwear
- id: ClothingOuterCoatStasecHoS
- id: ClothingOuterCoatHoSTrench

2
Resources/Prototypes/_DV/Loadouts/Jobs/Cargo/salvage_specialist.yml
View File

@ -44,6 +44,6 @@
requirement:
!type:RoleTimeRequirement
role: JobSalvageSpecialist
time: 432000 # 120hr
time: 216000 # 60hr
equipment:
neck: ClothingNeckMantleSalvage

6
Resources/Prototypes/_DV/Loadouts/Jobs/Engineering/atmospheric_technician.yml
View File

@ -22,12 +22,6 @@
- type: loadout
id: AtmosBeret
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobAtmosphericTechnician
time: 216000 # 60hr
equipment:
head: ClothingHeadHatBeretAtmospherics

6
Resources/Prototypes/_DV/Loadouts/Jobs/Security/head_of_security.yml
View File

@ -60,12 +60,6 @@
# Neck
- type: loadout
id: HeadOfSecurityRobe
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobHeadOfSecurity
time: 180000
equipment:
neck: ClothingNeckHosRobe