From 0f4ec57282bac7d78d506fd7cc40a38d93e9fb24 Mon Sep 17 00:00:00 2001 From: Tryded <139474617+Tryded@users.noreply.github.com> Date: Thu, 21 Sep 2023 20:59:29 -0500 Subject: [PATCH] ERT Overhaul (#170) * Everything Related to the ERT The Errors.. make them stop. * Fix 1.0 Accidental Capitalization and copying mistakes. * Fix 1.5 * Fix 2.0 * Adding Automatic Weapons for Gamma Security ERT --- .../Fills/Backpacks/StarterGear/backpack.yml | 274 ++++++++++++++++-- .../Prototypes/Catalog/Fills/Items/belt.yml | 29 ++ .../Entities/Mobs/Player/humanoid.yml | 271 ++++++++++++----- .../Weapons/Guns/Battery/battery_guns.yml | 2 +- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 163 ++++++++--- 5 files changed, 601 insertions(+), 138 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 1b649743cbd8..be2a96b4687a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -160,90 +160,316 @@ - id: BoxForensicPad # ERT +# Amber ERT: - type: entity noSpawn: true parent: ClothingBackpackERTLeader - id: ClothingBackpackERTLeaderFilled + id: ClothingBackpackERTLeaderAmber components: - type: StorageFill contents: - id: BoxSurvival - - id: WeaponPulseCarbine - - id: WeaponPulsePistol + - id: WeaponLaserCarbine - id: WeaponDisabler - - id: MedicatedSuture - - id: RegenerativeMesh + - id: Stunbaton - id: Handcuffs + - id: MedicatedSuture + - id: PinpointerNuclear - id: CrowbarRed - type: entity noSpawn: true parent: ClothingBackpackERTSecurity - id: ClothingBackpackERTSecurityFilled + id: ClothingBackpackERTSecurityAmber components: - type: StorageFill contents: - id: BoxSurvival - id: WeaponDisabler - - id: WeaponPulsePistol - - id: WeaponPulseCarbine + - id: WeaponLaserCarbine + - id: FlashlightSeclite + - id: BoxFlashbang - id: MedicatedSuture - - id: RegenerativeMesh - id: BoxHandcuff - id: CrowbarRed - type: entity noSpawn: true parent: ClothingBackpackERTMedical - id: ClothingBackpackERTMedicalFilled + id: ClothingBackpackERTMedicalAmber components: - type: StorageFill contents: - id: BoxSurvivalMedical - - id: WeaponPulseCarbine + - id: WeaponDisabler - id: Hypospray + - id: MedkitFilled - id: MedkitAdvancedFilled - id: CrowbarRed - - id: OmnizineChemistryBottle - - id: EpinephrineChemistryBottle - - id: EpinephrineChemistryBottle + - id: Stunbaton + - id: Defibrillator + - id: CombatMedipen - type: entity noSpawn: true parent: ClothingBackpackERTEngineer - id: ClothingBackpackERTEngineerFilled + id: ClothingBackpackERTEngineerAmber components: - type: StorageFill contents: - id: BoxSurvival - id: trayScanner - - id: WeaponPulseCarbine + - id: WeaponDisabler - id: MedicatedSuture - - id: RegenerativeMesh + - id: SheetSteel + - id: SheetGlass + - id: FlashlightLantern + - id: GasAnalyzer + - id: Stunbaton + - id: CableMVStack + - id: CableHVStack + +- type: entity + noSpawn: true + parent: ClothingBackpackERTJanitor + id: ClothingBackpackERTJanitorAmber + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: WeaponDisabler + + - id: BoxLightMixed + - id: LightReplacer + - id: Soap + - id: CrowbarRed + - id: AdvMopItem + - id: Stunbaton + +# End of Amber +# Red ERT + +- type: entity + noSpawn: true + parent: ClothingBackpackERTLeader + id: ClothingBackpackERTLeaderRed + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponPulsePistol + - id: Handcuffs + - id: PinpointerNuclear + - id: DoorRemoteAll + - id: MedicatedSuture + - id: BoxSurvival + - id: CrowbarRed + +- type: entity + noSpawn: true + parent: ClothingBackpackERTSecurity + id: ClothingBackpackERTSecurityRed + components: + - type: StorageFill + contents: + - id: WeaponDisabler + - id: WeaponLaserGun + - id: WeaponSubMachineGunVector + - id: MagazineMagnumSubMachineGun + - id: MagazineMagnumSubMachineGun + - id: Flash + - id: CombatKnife + - id: BoxHandcuff + - id: BoxSurvivalSecurity + - id: MedicatedSuture + - id: FlashlightSeclite + +- type: entity + noSpawn: true + parent: ClothingBackpackERTMedical + id: ClothingBackpackERTMedicalRed + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponLaserGun + - id: WeaponDisabler + - id: Hypospray + - id: Defibrillator + - id: PowerCellBluespace + - id: CombatMedipen + - id: CombatMedipen + - id: CombatMedipen + - id: CrowbarRed + - id: BoxSurvivalMedical + +- type: entity + noSpawn: true + parent: ClothingBackpackERTEngineer + id: ClothingBackpackERTEngineerRed + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: BoxSurvivalEngineering + - id: trayScanner - id: RCD - id: RCDAmmo - id: RCDAmmo - id: RCDAmmo - - id: CableMVStack + - id: WeaponLaserGun + - id: WeaponDisabler - id: CableHVStack - + - id: CableMVStack + - id: MedicatedSuture + - id: FlashlightLantern + - type: entity noSpawn: true parent: ClothingBackpackERTJanitor - id: ClothingBackpackERTJanitorFilled + id: ClothingBackpackERTJanitorRed components: - type: StorageFill contents: + - id: Stunbaton + - id: WeaponLaserGun + - id: HydroponicsToolScythe + - id: AdvMopItem + - id: LightReplacer + - id: BoxLightMixed - id: BoxSurvival + - id: WeaponDisabler + - id: CrowbarRed + - id: SoapOmega + - id: CombatKnife + - id: MedicatedSuture + - id: FlashlightLantern + +# End of Red +# Gamma ERT + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTLeaderGamma + components: + - type: StorageFill + contents: + - id: Stunbaton - id: WeaponPulsePistol + - id: WeaponPistolUniversal + - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalCaselessRifle + - id: Flash + - id: Handcuffs + - id: PinpointerNuclear + - id: DoorRemoteAll + - id: BoxSurvival + - id: CrowbarRed + - id: MedicatedSuture + - id: WeaponDisabler + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTSecurityGamma + components: + - type: StorageFill + contents: + - id: WeaponAdvancedLaser + - id: WeaponSniperHristov + - id: MagazineBoxAntiMaterielBig + - id: WeaponXrayCannon + - id: Stunbaton + - id: MedicatedSuture + - id: Bola + - id: BoxHandcuff + - id: BoxFlashbang + - id: WeaponSubMachineGunVector + - id: MagazineMagnumSubMachineGun + - id: MagazineMagnumSubMachineGun + - id: C4 + - id: C4 + - id: C4 + - id: BoxSurvivalSecurity + - id: SecBreachingHammer + - id: FlashlightSeclite + - id: PowerCellBluespace + - id: CrowbarRed + - id: WeaponDisabler + - id: MedicatedSuture + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTMedicalGamma + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponPistolUniversal + - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalCaselessRifle + - id: Stimpack + - id: Stimpack + - id: Stimpack + - id: Hypospray + - id: OmnizineChemistryBottle + - id: OmnizineChemistryBottle + - id: OmnizineChemistryBottle + - id: Defibrillator + - id: PowerCellBluespace - id: MedkitFilled - - id: BoxLightMixed - - id: BoxLightMixed - - id: Soap + - id: MedkitAdvancedFilled + - id: CheapRollerBedSpawnFolded - id: CrowbarRed + - id: BoxSurvivalMedical + - id: WeaponDisabler + +- type: entity + noSpawn: true + parent: ClothingBackpackHolding + id: ClothingBackpackERTEngineerGamma + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponPistolUniversal + - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalCaselessRifle + - id: trayScanner + - id: WeaponDisabler + - id: MedicatedSuture + - id: RCDExperimental + - id: BoxSurvivalEngineering + - id: CableHVStack + - id: CableMVStack + +- type: entity + noSpawn: true + parent: ClothingBackpackERTJanitor + id: ClothingBackpackERTJanitorGamma + components: + - type: StorageFill + contents: + - id: Stunbaton + - id: WeaponPistolUniversal + - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalCaselessRifle + - id: WeaponDisabler + - id: HydroponicsToolScythe + - id: LightReplacer - id: AdvMopItem - + - id: BoxLightMixed + - id: BoxSurvival + - id: CrowbarRed + - id: PowerCellBluespace + - id: FlashlightLantern + + #End of Gamma + + - type: entity noSpawn: true parent: ClothingBackpackSalvage diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 456535af3188..fdc5dc573a21 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -63,6 +63,19 @@ #- name: GrenadeChem #- name: GrenadeChem - id: FlashlightLantern + +- type: entity + id: ClothingBeltJanitorAdvanced + parent: ClothingBeltJanitor + suffix: Filled + components: + - type: StorageFill + contents: + - id: Soap #Make a soap group and pick between when i'm not lazy + - id: SprayBottleSpaceCleaner + - id: WetFloorSign + - id: Holoprojector + - id: FlashlightLantern - type: entity id: ClothingBeltMedicalFilled @@ -80,6 +93,7 @@ - id: Gauze - id: EmergencyMedipen #You never know what people are going to latejoin into + - type: entity id: ClothingBeltParamedicFilled parent: ClothingBeltMedical @@ -158,3 +172,18 @@ - id: WeaponWandFireball - id: WeaponWandDeath - id: WeaponWandPolymorphDoor + +- type: entity + id: ClothingBeltMilitaryWebbingMedAdvanced + parent: ClothingBeltMilitaryWebbingMed + suffix: Filled + components: + - type: StorageFill + contents: + - id: MedicatedSuture + amount: 3 + - id: RegenerativeMesh + amount: 1 + - id: Bloodpack + amount: 1 + - id: CombatMedipen \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 922f7884c226..14b721187b33 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -3,8 +3,9 @@ ## ERT Leader - type: entity - id: RandomHumanoidSpawnerERTLeader - name: ERT leader + id: RandomHumanoidSpawnerERTLeaderAmber + name: Amber ERT leader + suffix: Amber components: - type: Sprite netsync: false @@ -15,10 +16,10 @@ - NamesFirstMilitaryLeader - names_last - type: RandomHumanoidSpawner - settings: ERTLeader + settings: ERTLeaderAmber - type: randomHumanoidSettings - id: ERTLeader + id: ERTLeaderAmber randomizeName: false speciesBlacklist: - Arachne @@ -28,42 +29,67 @@ description: ghost-role-information-ert-leader-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTLeaderGear ] + prototypes: [ERTLeaderGearAmber] - type: RandomMetadata nameSegments: - NamesFirstMilitaryLeader - names_last - type: entity - id: RandomHumanoidSpawnerERTLeaderEVA - parent: RandomHumanoidSpawnerERTLeader - name: ERT leader - suffix: EVA + id: RandomHumanoidSpawnerERTLeaderRed + parent: RandomHumanoidSpawnerERTLeaderAmber + name: Red ERT leader + suffix: Red components: - type: Sprite netsync: false sprite: Markers/jobs.rsi state: ertleadereva - type: RandomHumanoidSpawner - settings: ERTLeaderEVA + settings: ERTLeaderRed - type: randomHumanoidSettings - id: ERTLeaderEVA - parent: ERTLeader + id: ERTLeaderRed + parent: ERTLeaderAmber components: - type: GhostRole name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTLeaderGearEVA ] + prototypes: [ERTLeaderGearRed] + +- type: entity + id: RandomHumanoidSpawnerERTLeaderGamma + parent: RandomHumanoidSpawnerERTLeaderAmber + name: Gamma ERT leader + suffix: Gamma + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertleadereva + - type: RandomHumanoidSpawner + settings: ERTLeaderGamma + +- type: randomHumanoidSettings + id: ERTLeaderGamma + parent: ERTLeaderAmber + components: + - type: GhostRole + name: ghost-role-information-ert-leader-name + description: ghost-role-information-ert-leader-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTLeaderGearGamma] ## ERT Janitor - type: entity - id: RandomHumanoidSpawnerERTJanitor - parent: RandomHumanoidSpawnerERTLeader - name: ERT janitor + id: RandomHumanoidSpawnerERTJanitorAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT janitor Amber + suffix: Amber components: - type: Sprite netsync: false @@ -74,11 +100,11 @@ - NamesFirstMilitary - names_last - type: RandomHumanoidSpawner - settings: ERTJanitor + settings: ERTJanitorAmber - type: randomHumanoidSettings - id: ERTJanitor - parent: ERTLeader + id: ERTJanitorAmber + parent: ERTLeaderAmber components: - type: GhostRole name: ghost-role-information-ert-janitor-name @@ -89,38 +115,63 @@ - NamesFirstMilitary - names_last - type: Loadout - prototypes: [ ERTJanitorGear ] + prototypes: [ERTJanitorGearAmber] + +- type: entity + id: RandomHumanoidSpawnerERTJanitorRed + parent: RandomHumanoidSpawnerERTJanitorAmber + name: ERT janitor Red + suffix: Red + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertjanitoreva + - type: RandomHumanoidSpawner + settings: ERTJanitorRed + +- type: randomHumanoidSettings + id: ERTJanitorRed + parent: ERTJanitorAmber + components: + - type: GhostRole + name: ghost-role-information-ert-janitor-name + description: ghost-role-information-ert-janitor-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTJanitorGearRed] - type: entity - id: RandomHumanoidSpawnerERTJanitorEVA - parent: RandomHumanoidSpawnerERTJanitor - name: ERT janitor - suffix: EVA + id: RandomHumanoidSpawnerERTJanitorGamma + parent: RandomHumanoidSpawnerERTJanitorAmber + name: ERT janitor Gamma + suffix: Gamma components: - type: Sprite netsync: false sprite: Markers/jobs.rsi state: ertjanitoreva - type: RandomHumanoidSpawner - settings: ERTJanitorEVA + settings: ERTJanitorGamma - type: randomHumanoidSettings - id: ERTJanitorEVA - parent: ERTJanitor + id: ERTJanitorGamma + parent: ERTJanitorAmber components: - type: GhostRole name: ghost-role-information-ert-janitor-name description: ghost-role-information-ert-janitor-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTJanitorGearEVA ] + prototypes: [ERTJanitorGearGamma] ## ERT Engineer - type: entity - id: RandomHumanoidSpawnerERTEngineer - parent: RandomHumanoidSpawnerERTLeader - name: ERT engineer + id: RandomHumanoidSpawnerERTEngineerAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT engineer Amber + suffix: Amber components: - type: Sprite netsync: false @@ -131,11 +182,11 @@ - NamesFirstMilitary - names_last - type: RandomHumanoidSpawner - settings: ERTEngineer + settings: ERTEngineerAmber - type: randomHumanoidSettings - id: ERTEngineer - parent: ERTLeader + id: ERTEngineerAmber + parent: ERTLeaderAmber components: - type: GhostRole name: ghost-role-information-ert-engineer-name @@ -146,38 +197,63 @@ - NamesFirstMilitary - names_last - type: Loadout - prototypes: [ ERTEngineerGear ] + prototypes: [ERTEngineerGearAmber] + +- type: entity + id: RandomHumanoidSpawnerERTEngineerRed + parent: RandomHumanoidSpawnerERTEngineerAmber + name: ERT engineer Red + suffix: Red + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertengineereva + - type: RandomHumanoidSpawner + settings: ERTEngineerRed + +- type: randomHumanoidSettings + id: ERTEngineerRed + parent: ERTEngineerAmber + components: + - type: GhostRole + name: ghost-role-information-ert-engineer-name + description: ghost-role-information-ert-engineer-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTEngineerGearRed] - type: entity - id: RandomHumanoidSpawnerERTEngineerEVA - parent: RandomHumanoidSpawnerERTEngineer - name: ERT engineer - suffix: EVA + id: RandomHumanoidSpawnerERTEngineerGamma + parent: RandomHumanoidSpawnerERTEngineerAmber + name: ERT engineer Gamma + suffix: Gamma components: - type: Sprite netsync: false sprite: Markers/jobs.rsi state: ertengineereva - type: RandomHumanoidSpawner - settings: ERTEngineerEVA + settings: ERTEngineerGamma - type: randomHumanoidSettings - id: ERTEngineerEVA - parent: ERTEngineer + id: ERTEngineerGamma + parent: ERTEngineerAmber components: - type: GhostRole name: ghost-role-information-ert-engineer-name description: ghost-role-information-ert-engineer-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTEngineerGearEVA ] + prototypes: [ERTEngineerGearGamma] ## ERT Security - type: entity - id: RandomHumanoidSpawnerERTSecurity - parent: RandomHumanoidSpawnerERTLeader - name: ERT security + id: RandomHumanoidSpawnerERTSecurityAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT security Amber + suffix: Amber components: - type: Sprite netsync: false @@ -188,11 +264,11 @@ - NamesFirstMilitary - names_last - type: RandomHumanoidSpawner - settings: ERTSecurity + settings: ERTSecurityAmber - type: randomHumanoidSettings - id: ERTSecurity - parent: ERTLeader + id: ERTSecurityAmber + parent: ERTLeaderAmber components: - type: GhostRole name: ghost-role-information-ert-security-name @@ -203,38 +279,63 @@ - NamesFirstMilitary - names_last - type: Loadout - prototypes: [ ERTSecurityGear ] + prototypes: [ERTSecurityGearAmber] - type: entity - id: RandomHumanoidSpawnerERTSecurityEVA - parent: RandomHumanoidSpawnerERTSecurity - name: ERT security - suffix: EVA + id: RandomHumanoidSpawnerERTSecurityRed + parent: RandomHumanoidSpawnerERTSecurityAmber + name: ERT security Red + suffix: Red + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertsecurityeva + - type: RandomHumanoidSpawner + settings: ERTSecurityRed + +- type: randomHumanoidSettings + id: ERTSecurityRed + parent: ERTSecurityAmber + components: + - type: GhostRole + name: ghost-role-information-ert-security-name + description: ghost-role-information-ert-security-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTSecurityGearRed] + +- type: entity + id: RandomHumanoidSpawnerERTSecurityGamma + parent: RandomHumanoidSpawnerERTSecurityAmber + name: ERT security Gamma + suffix: Gamma components: - type: Sprite netsync: false sprite: Markers/jobs.rsi state: ertsecurityeva - type: RandomHumanoidSpawner - settings: ERTSecurityEVA + settings: ERTSecurityGamma - type: randomHumanoidSettings - id: ERTSecurityEVA - parent: ERTSecurity + id: ERTSecurityGamma + parent: ERTSecurityAmber components: - type: GhostRole name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTSecurityGearEVA ] + prototypes: [ERTSecurityGearGamma] ## ERT Medic - type: entity - id: RandomHumanoidSpawnerERTMedical - parent: RandomHumanoidSpawnerERTLeader - name: ERT medic + id: RandomHumanoidSpawnerERTMedicalAmber + parent: RandomHumanoidSpawnerERTLeaderAmber + name: ERT medic Amber + suffix: Amber components: - type: Sprite netsync: false @@ -245,11 +346,11 @@ - NamesFirstMilitary - names_last - type: RandomHumanoidSpawner - settings: ERTMedical + settings: ERTMedicalAmber - type: randomHumanoidSettings - id: ERTMedical - parent: ERTLeader + id: ERTMedicalAmber + parent: ERTLeaderAmber components: - type: GhostRole name: ghost-role-information-ert-medical-name @@ -260,31 +361,55 @@ - NamesFirstMilitary - names_last - type: Loadout - prototypes: [ ERTMedicalGear ] + prototypes: [ERTMedicalGearAmber] - type: entity - id: RandomHumanoidSpawnerERTMedicalEVA - parent: RandomHumanoidSpawnerERTMedical - name: ERT medic - suffix: EVA + id: RandomHumanoidSpawnerERTMedicalRed + parent: RandomHumanoidSpawnerERTMedicalAmber + name: ERT medic Red + suffix: Red + components: + - type: Sprite + netsync: false + sprite: Markers/jobs.rsi + state: ertmedicaleva + - type: RandomHumanoidSpawner + settings: ERTMedicalRed + +- type: randomHumanoidSettings + id: ERTMedicalRed + parent: ERTMedicalAmber + components: + - type: GhostRole + name: ghost-role-information-ert-medical-name + description: ghost-role-information-ert-medical-description + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ERTMedicalGearRed] + +- type: entity + id: RandomHumanoidSpawnerERTMedicalGamma + parent: RandomHumanoidSpawnerERTMedicalAmber + name: ERT medic Gamma + suffix: Gamma components: - type: Sprite netsync: false sprite: Markers/jobs.rsi state: ertmedicaleva - type: RandomHumanoidSpawner - settings: ERTMedicalEVA + settings: ERTMedicalGamma - type: randomHumanoidSettings - id: ERTMedicalEVA - parent: ERTMedical + id: ERTMedicalGamma + parent: ERTMedicalAmber components: - type: GhostRole name: ghost-role-information-ert-medical-name description: ghost-role-information-ert-medical-description - type: GhostTakeoverAvailable - type: Loadout - prototypes: [ ERTMedicalGearEVA ] + prototypes: [ERTMedicalGearGamma] ## CBURN diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 279a57b0eb9d..226e5f39d949 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -60,7 +60,7 @@ shader: unshaded - type: HitscanBatteryAmmoProvider proto: RedLaser - fireCost: 62.5 + fireCost: 100 - type: MagazineVisuals magState: mag steps: 5 diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 6ddea0f1087b..e2816c35e81b 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -5,7 +5,7 @@ description: job-description-ertleader playTimeTracker: JobERTLeader setPreference: false - startingGear: ERTLeaderGearEVA + startingGear: ERTLeaderGearAmber icon: "Nanotrasen" supervisors: job-supervisors-centcom canBeAntag: false @@ -13,10 +13,10 @@ - AllAccess - type: startingGear - id: ERTLeaderGear + id: ERTLeaderGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTLeader - back: ClothingBackpackERTLeaderFilled + back: ClothingBackpackERTLeaderAmber shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHelmetERTLeader eyes: ClothingEyesGlassesSecurity @@ -24,14 +24,30 @@ outerClothing: ClothingOuterArmorBulletproof id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled + belt: ClothingBeltSheathFilled pocket1: Flare - type: startingGear - id: ERTLeaderGearEVA + id: ERTLeaderGearRed + equipment: + jumpsuit: ClothingUniformJumpsuitERTLeader + back: ClothingBackpackERTLeaderRed + shoes: ClothingShoesBootsMag + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTLeader + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltSheathFilled + pocket1: Flare + +- type: startingGear + id: ERTLeaderGearGamma equipment: jumpsuit: ClothingUniformJumpsuitERTLeader - back: ClothingBackpackERTLeaderFilled + back: ClothingBackpackERTLeaderGamma shoes: ClothingShoesBootsMagAdv mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity @@ -40,7 +56,7 @@ suitstorage: OxygenTankFilled id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltSecurityFilled + belt: ClothingBeltSheathFilled pocket1: Flare # Engineer @@ -50,7 +66,7 @@ description: job-description-ertengineer playTimeTracker: JobERTEngineer setPreference: false - startingGear: ERTEngineerGearEVA + startingGear: ERTEngineerGearAmber icon: "Nanotrasen" supervisors: job-supervisors-centcom canBeAntag: false @@ -58,25 +74,24 @@ - AllAccess - type: startingGear - id: ERTEngineerGear + id: ERTEngineerGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTEngineer - back: ClothingBackpackERTEngineerFilled - shoes: ClothingShoesBootsWork - head: ClothingHeadHelmetERTEngineer + back: ClothingBackpackERTEngineerAmber + shoes: ClothingShoesBootsMag eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBulletproof + outerClothing: ClothingOuterHardsuitERTEngineer id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltChiefEngineerFilled + belt: ClothingBeltUtilityEngineering pocket1: Flare - type: startingGear - id: ERTEngineerGearEVA + id: ERTEngineerGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTEngineer - back: ClothingBackpackERTEngineerFilled + back: ClothingBackpackERTEngineerRed shoes: ClothingShoesBootsMagAdv mask: ClothingMaskGasERT eyes: ClothingEyesGlassesMeson @@ -87,6 +102,24 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled pocket1: Flare + +- type: startingGear + id: ERTEngineerGearGamma + equipment: + jumpsuit: ClothingUniformJumpsuitERTEngineer + back: ClothingBackpackERTEngineerGamma + shoes: ClothingShoesBootsMagAdv + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesMeson + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTEngineer + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltChiefEngineerFilled + pocket1: Flare + + # Security - type: job @@ -95,7 +128,7 @@ description: job-description-ertsecurity playTimeTracker: JobERTSecurity setPreference: false - startingGear: ERTEngineerGearEVA + startingGear: ERTSecurityGearAmber icon: "Nanotrasen" supervisors: job-supervisors-centcom canBeAntag: false @@ -103,10 +136,10 @@ - AllAccess - type: startingGear - id: ERTSecurityGear + id: ERTSecurityGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity - back: ClothingBackpackERTSecurityFilled + back: ClothingBackpackERTSecurityAmber shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHelmetERTSecurity eyes: ClothingEyesGlassesSecurity @@ -116,13 +149,13 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: Flare - pocket2: FlashlightSeclite + - type: startingGear - id: ERTSecurityGearEVA + id: ERTSecurityGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTSecurity - back: ClothingBackpackERTSecurityFilled + back: ClothingBackpackERTSecurityRed shoes: ClothingShoesBootsMag mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity @@ -133,7 +166,22 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: Flare - pocket2: FlashlightSeclite + +- type: startingGear + id: ERTSecurityGearGamma + equipment: + jumpsuit: ClothingUniformJumpsuitERTSecurity + back: ClothingBackpackERTSecurityGamma + shoes: ClothingShoesBootsMagAdv + mask: ClothingMaskGasERT + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTSecurity + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltSecurityFilled + pocket1: Flare # Medical - type: job @@ -142,7 +190,7 @@ description: job-description-ertmedic playTimeTracker: JobERTMedical setPreference: false - startingGear: ERTMedicalGearEVA + startingGear: ERTMedicalGearAmber icon: "Nanotrasen" supervisors: job-supervisors-centcom canBeAntag: false @@ -154,10 +202,10 @@ - type: MedicalTraining - type: startingGear - id: ERTMedicalGear + id: ERTMedicalGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTMedic - back: ClothingBackpackERTMedicalFilled + back: ClothingBackpackERTMedicalAmber shoes: ClothingShoesBootsCombatFilled head: ClothingHeadHelmetERTMedic eyes: ClothingEyesHudMedical @@ -170,10 +218,10 @@ pocket2: Flare - type: startingGear - id: ERTMedicalGearEVA + id: ERTMedicalGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTMedic - back: ClothingBackpackERTMedicalFilled + back: ClothingBackpackERTMedicalRed shoes: ClothingShoesBootsMag mask: ClothingMaskGasERT eyes: ClothingEyesHudMedical @@ -182,10 +230,27 @@ suitstorage: OxygenTankFilled id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltMedicalFilled + belt: ClothingBeltMilitaryWebbingMedAdvanced pocket1: HandheldHealthAnalyzer pocket2: Flare - + +- type: startingGear + id: ERTMedicalGearGamma + equipment: + jumpsuit: ClothingUniformJumpsuitERTMedic + back: ClothingBackpackERTMedicalGamma + shoes: ClothingShoesBootsMagAdv + mask: ClothingMaskGasERT + eyes: ClothingEyesHudMedical + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTMedical + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltMilitaryWebbingMedAdvanced + pocket1: HandheldHealthAnalyzer + pocket2: Flare + # Janitor - type: job id: ERTJanitor @@ -193,7 +258,7 @@ description: job-description-ertjanitor playTimeTracker: JobERTJanitor setPreference: false - startingGear: ERTJanitorGearEVA + startingGear: ERTJanitorGearAmber icon: "Nanotrasen" supervisors: job-supervisors-centcom canBeAntag: false @@ -201,30 +266,48 @@ - AllAccess - type: startingGear - id: ERTJanitorGear + id: ERTJanitorGearAmber equipment: jumpsuit: ClothingUniformJumpsuitERTJanitor - back: ClothingBackpackERTJanitorFilled + back: ClothingBackpackERTJanitorAmber shoes: ClothingShoesGaloshes + eyes: ClothingEyesGlassesSecurity head: ClothingHeadHelmetERTJanitor - gloves: ClothingHandsGlovesColorBlack + gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBulletproof id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltJanitorFilled + belt: ClothingBeltJanitorAdvanced pocket1: Flare - type: startingGear - id: ERTJanitorGearEVA + id: ERTJanitorGearRed equipment: jumpsuit: ClothingUniformJumpsuitERTJanitor - back: ClothingBackpackERTJanitorFilled - shoes: ClothingShoesBootsMag + back: ClothingBackpackERTJanitorRed + shoes: ClothingShoesGaloshes mask: ClothingMaskBreath - gloves: ClothingHandsGlovesColorBlack + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterHardsuitERTJanitor + suitstorage: OxygenTankFilled + id: ERTLeaderPDA + ears: ClothingHeadsetAltCentCom + belt: ClothingBeltJanitorAdvanced + pocket1: Flare + +- type: startingGear + id: ERTJanitorGearGamma + equipment: + jumpsuit: ClothingUniformJumpsuitERTJanitor + back: ClothingBackpackERTJanitorGamma + shoes: ClothingShoesBootsMagAdv + mask: ClothingMaskBreath + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTJanitor suitstorage: OxygenTankFilled id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom - belt: ClothingBeltJanitorFilled + belt: ClothingBeltJanitorAdvanced pocket1: Flare