Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ERT equipment change and other assorted loadout changes (#18024)

Browse Source 
* Add files via upload

* ERT+CBURN+DS loadout change

* ert more stuf

* real?

* ERT and others loadout change

* Update misc_startinggear.yml

* gave the footsoldiers their regular gas masks back

* got sec their mags back

* centcom ID change no longer needed

* oxgen tanks for ERT, form emisse request

* oxygen tanks for CBURN and DS, from emisse request

* removed extended survival box from salvage backpack
This commit is contained in:
JoeHammad1844
2023-07-24 13:01:28 +10:00
committed by GitHub
parent f2bfdd8e17
commit d52125288e
4 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
View File

@@ -216,10 +216,11 @@
- type: StorageFill
contents:
- id: BoxSurvival
- id: WeaponPulseCarbine
- id: WeaponPulsePistol
- id: WeaponPistolMk58
- id: MagazinePistolHighCapacityRubber
- id: MagazinePistol
- id: WeaponDisabler
- id: MedicatedSuture
- id: RegenerativeMesh
- id: Handcuffs
- id: CrowbarRed
@@ -234,8 +235,9 @@
- id: WeaponDisabler
- id: WeaponPulsePistol
- id: WeaponPulseCarbine
- id: MedicatedSuture
- id: RegenerativeMesh
- id: BoxHandcuff
- id: Handcuffs
- id: CrowbarRed
- type: entity
@@ -245,11 +247,14 @@
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: BoxSurvivalMedical
- id: WeaponPulseCarbine
- id: Hypospray
- id: MedkitAdvancedFilled
- id: CrowbarRed
- id: OmnizineChemistryBottle
- id: EpinephrineChemistryBottle
- id: EpinephrineChemistryBottle
- type: entity
noSpawn: true
@@ -261,10 +266,14 @@
- id: BoxSurvival
- id: trayScanner
- id: WeaponPulseCarbine
- id: MedicatedSuture
- id: RegenerativeMesh
- id: RCD
- id: RCDAmmo
- id: RCDAmmo
- id: RCDAmmo
- id: CableMVStack
- id: CableHVStack
- type: entity
noSpawn: true

6
Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
View File

@@ -15,12 +15,12 @@
id: CentcomGear
equipment:
jumpsuit: ClothingUniformJumpsuitCentcomOfficial
shoes: ClothingShoesBootsJack
shoes: ClothingShoesBootsCombatFilled
head: ClothingHeadHatCentcom
eyes: ClothingEyesGlassesSunglasses
gloves: ClothingHandsGlovesColorBlack
outerClothing: ClothingOuterArmorBasic
id: CentcomPDA
ears: ClothingHeadsetAltCommand
pocket1: PaperOffice
ears: ClothingHeadsetAltCentCom
pocket1: BoxFolderBlack
pocket2: PenCentcom

52
Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
View File

@@ -17,14 +17,14 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTLeader
back: ClothingBackpackERTLeaderFilled
shoes: ClothingShoesBootsJack
shoes: ClothingShoesBootsCombatFilled
head: ClothingHeadHelmetERTLeader
eyes: ClothingEyesGlassesSecurity
gloves: ClothingHandsGlovesColorBlack
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterArmorBulletproof
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
belt: ClothingBeltSecurityWebbing
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltSecurityFilled
pocket1: Flare
- type: startingGear
@@ -32,14 +32,14 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTLeader
back: ClothingBackpackERTLeaderFilled
shoes: ClothingShoesBootsMag
shoes: ClothingShoesBootsMagAdv
mask: ClothingMaskGasERT
eyes: ClothingEyesGlassesSecurity
gloves: ClothingHandsGlovesColorBlack
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterHardsuitERTLeader
suitstorage: OxygenTankFilled
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltSecurityFilled
pocket1: Flare
@@ -65,10 +65,10 @@
shoes: ClothingShoesBootsWork
head: ClothingHeadHelmetERTEngineer
eyes: ClothingEyesGlassesMeson
gloves: ClothingHandsGlovesColorYellow
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterArmorBulletproof
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltChiefEngineerFilled
pocket1: Flare
@@ -80,11 +80,11 @@
shoes: ClothingShoesBootsMagAdv
mask: ClothingMaskGasERT
eyes: ClothingEyesGlassesMeson
gloves: ClothingHandsGlovesColorYellow
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterHardsuitERTEngineer
suitstorage: OxygenTankFilled
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltChiefEngineerFilled
pocket1: Flare
@@ -107,15 +107,16 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTSecurity
back: ClothingBackpackERTSecurityFilled
shoes: ClothingShoesBootsJack
shoes: ClothingShoesBootsCombatFilled
head: ClothingHeadHelmetERTSecurity
eyes: ClothingEyesGlassesSecurity
gloves: ClothingHandsGlovesColorBlack
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterArmorBulletproof
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
belt: ClothingBeltSecurityWebbing
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltSecurityFilled
pocket1: Flare
pocket2: FlashlightSeclite
- type: startingGear
id: ERTSecurityGearEVA
@@ -125,13 +126,14 @@
shoes: ClothingShoesBootsMag
mask: ClothingMaskGasERT
eyes: ClothingEyesGlassesSecurity
gloves: ClothingHandsGlovesColorBlack
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterHardsuitERTSecurity
suitstorage: OxygenTankFilled
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
belt: ClothingBeltSecurityWebbing
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltSecurityFilled
pocket1: Flare
pocket2: FlashlightSeclite
# Medical
- type: job
@@ -152,13 +154,13 @@
equipment:
jumpsuit: ClothingUniformJumpsuitERTMedic
back: ClothingBackpackERTMedicalFilled
shoes: ClothingShoesBootsJack
shoes: ClothingShoesBootsCombatFilled
head: ClothingHeadHelmetERTMedic
eyes: ClothingEyesHudMedical
gloves: ClothingHandsGlovesColorBlack
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterArmorBulletproof
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltMedicalFilled
pocket1: HandheldHealthAnalyzer
pocket2: Flare
@@ -171,11 +173,11 @@
shoes: ClothingShoesBootsMag
mask: ClothingMaskGasERT
eyes: ClothingEyesHudMedical
gloves: ClothingHandsGlovesColorBlack
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterHardsuitERTMedical
suitstorage: OxygenTankFilled
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltMedicalFilled
pocket1: HandheldHealthAnalyzer
pocket2: Flare
@@ -204,7 +206,7 @@
gloves: ClothingHandsGlovesColorBlack
outerClothing: ClothingOuterArmorBulletproof
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltJanitorFilled
pocket1: Flare
@@ -219,6 +221,6 @@
outerClothing: ClothingOuterHardsuitERTJanitor
suitstorage: OxygenTankFilled
id: ERTLeaderPDA
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
belt: ClothingBeltJanitorFilled
pocket1: Flare

44
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
View File

@@ -42,10 +42,10 @@
back: ClothingBackpackDuffelSyndicateAmmo
mask: ClothingMaskGasDeathSquad
eyes: ClothingEyesGlassesSecurity
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterHardsuitDeathsquad
suitstorage: YellowOxygenTankFilled
suitstorage: OxygenTankFilled
shoes: ClothingShoesBootsMagAdv
id: DeathsquadPDA
pocket1: EnergySword
@@ -63,13 +63,14 @@
mask: CigaretteSyndicate
innerclothingskirt: ClothingUniformJumpsuitOperative
# Syndicate Operative Outfit - Poverty
# Syndicate Operative Outfit - Barratry
- type: startingGear
id: SyndicateOperativeGearExtremelyBasic
equipment:
jumpsuit: ClothingUniformJumpsuitOperative
back: ClothingBackpackDuffelSyndicateOperative
shoes: ClothingShoesBootsCombatFilled
gloves: ClothingHandsGlovesColorBlack
innerclothingskirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
@@ -103,7 +104,7 @@
outerClothing: ClothingOuterHardsuitSyndie
shoes: ClothingShoesBootsCombatFilled
id: AgentIDCard
pocket1: ExtendedEmergencyOxygenTankFilled
pocket1: DoubleEmergencyOxygenTankFilled
pocket2: BaseUplinkRadio40TC
belt: ClothingBeltMilitaryWebbing
innerclothingskirt: ClothingUniformJumpskirtOperative
@@ -124,7 +125,7 @@
outerClothing: ClothingOuterHardsuitSyndieCommander
shoes: ClothingShoesBootsCombatFilled
id: SyndiPDA
pocket1: ExtendedEmergencyOxygenTankFilled
pocket1: DoubleEmergencyOxygenTankFilled
pocket2: BaseUplinkRadio40TC
belt: ClothingBeltMilitaryWebbing
innerclothingskirt: ClothingUniformJumpskirtOperative
@@ -137,7 +138,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitOperative
back: ClothingBackpackDuffelSyndicateOperativeMedic
mask: ClothingMaskBreathMedical
mask: ClothingMaskBreathMedicalSecurity
eyes: ClothingEyesHudMedical
ears: ClothingHeadsetAltSyndicate
gloves: ClothingHandsGlovesCombat
@@ -158,15 +159,15 @@
jumpsuit: ClothingUniformJumpsuitOperative
head: ClothingHeadHelmetSwatSyndicate
mask: ClothingMaskGas
outerClothing: ClothingOuterArmorBasic
outerClothing: ClothingOuterArmorBasicSlim
ears: ClothingHeadsetAltSyndicate
gloves: ClothingHandsGlovesCombat
back: ClothingBackpackFilled
shoes: ClothingShoesBootsCombat
id: SyndiPDA #a subtype of this for footsoldiers would probably be good to have
innerclothingskirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
# Syndicate Footsoldier Gear - Knife
- type: startingGear
@@ -175,7 +176,7 @@
jumpsuit: ClothingUniformJumpsuitOperative
head: ClothingHeadHelmetSwatSyndicate
mask: ClothingMaskGas
outerClothing: ClothingOuterArmorBasic
outerClothing: ClothingOuterArmorBasicSlim
ears: ClothingHeadsetAltSyndicate
gloves: ClothingHandsGlovesCombat
back: ClothingBackpackFilled
@@ -183,27 +184,27 @@
pocket1: CombatKnife
id: SyndiPDA
innerclothingskirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
# Syndicate Footsoldier Gear - Energy Sword
#Add energy shield to this when that gets added.
- type: startingGear
id: SyndicateFootsoldierGearESword
equipment:
jumpsuit: ClothingUniformJumpsuitOperative
head: ClothingHeadHelmetSwatSyndicate
mask: ClothingMaskGas
outerClothing: ClothingOuterArmorBasic
outerClothing: ClothingOuterArmorBasicSlim
ears: ClothingHeadsetAltSyndicate
gloves: ClothingHandsGlovesCombat
back: ClothingBackpackFilled
shoes: ClothingShoesBootsCombatFilled
pocket1: EnergySword
pocket2: EnergyShield
id: SyndiPDA
innerclothingskirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
# Syndicate Footsoldier Gear - Viper
- type: startingGear
@@ -212,7 +213,7 @@
jumpsuit: ClothingUniformJumpsuitOperative
head: ClothingHeadHelmetSwatSyndicate
mask: ClothingMaskGas
outerClothing: ClothingOuterArmorBasic
outerClothing: ClothingOuterArmorBasicSlim
ears: ClothingHeadsetAltSyndicate
gloves: ClothingHandsGlovesCombat
back: ClothingBackpackFilled
@@ -220,11 +221,10 @@
pocket1: WeaponPistolViper
id: SyndiPDA
innerclothingskirt: ClothingUniformJumpsuitOperative
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
# Nanotrasen Paramilitary Unit Gear - Unarmed
#I do not feel like doing more of these right now because this probably needs more stuff (like a different ID.)
# Nanotrasen Paramilitary Unit Gear - pistol
- type: startingGear
id: NanotrasenParamilitaryGear
equipment:
@@ -249,7 +249,7 @@
back: ClothingBackpackDuffelCBURN
mask: ClothingMaskGasExplorer
eyes: ClothingEyesGlassesSecurity
ears: ClothingHeadsetAltCommand
ears: ClothingHeadsetAltCentCom
gloves: ClothingHandsGlovesCombat
outerClothing: ClothingOuterHardsuitCBURN
shoes: ClothingShoesBootsCombatFilled