rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ERT Overhaul 2/3: Equipment (#38105)

Browse source 
* fixed naming

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added equipment to be used by ERT.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added flamethrower suffix

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added hydra filled with frag grenades

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made basic grenades centcomm restricted

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made energy swords central command contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Revert "Parented ERT backpacks to syndicate ones"

This reverts commit 615526512d90ea17c0e452ed24fdb351f54740bc.

:wq#

* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* removed flamethrower

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Made C4 CC contra, reverted Incen to syni contra

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* reverted contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* revert the rest of the contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Heisentest

* Added label component to spray bottles.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

* Added suffixes to the space cleaner bottles

Signed-off-by: Nox38 <nebulousnox38@gmail.com>

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
This commit is contained in:
Nox 2025-12-14 19:47:28 -08:00 • committed by GitHub
parent 2b08ae480d
commit bfb0c1791e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 289 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Resources/Locale/en-US/preferences/loadout-groups.ftl
View file

@ -13,6 +13,7 @@ loadout-group-survival-clown = Clown Survival Box
loadout-group-survival-medical = Medical Survival Box
loadout-group-survival-security = Security Survival Box
loadout-group-survival-syndicate = Github is forcing me to write text that is literally twice-impossible for the player to ever see, send help
loadout-group-survival-military = See line 14, no one will ever see this so :3
loadout-group-breath-tool = Species-dependent breath tools
loadout-group-tank-harness = Species-specific survival equipment
loadout-group-EVA-tank = Species-specific gas tank

3
Resources/Locale/en-US/reagents/meta/medicine.ftl
View file

@ -26,6 +26,7 @@ reagent-name-dexalin = dexalin
reagent-desc-dexalin = Used for treating minor oxygen deprivation and bloodloss. A required reagent for dexalin plus.
reagent-name-dexalin-plus = dexalin plus
reagent-name-dexalin-plus-saline = dexalin plus & saline
reagent-desc-dexalin-plus = Used in treatment of extreme cases of oxygen deprivation and bloodloss. Flushes heartbreaker toxin out of the blood stream.
reagent-name-epinephrine = epinephrine
@ -113,6 +114,7 @@ reagent-name-lacerinol = lacerinol
reagent-desc-lacerinol = A fairly unreactive chemical that boosts collagen sythesis to incredible levels, healing slash trauma.
reagent-name-puncturase = puncturase
reagent-name-puncturase-tranexamic = puncturase & tranexamic
reagent-desc-puncturase = A fizzy chemical that helps rebuild trauma caused by piercing damage, leaving a slight amount of tissue damage behind.
reagent-name-bruizine = bruizine
@ -122,6 +124,7 @@ reagent-name-holywater = holy water
reagent-desc-holywater = The cleanest and purest of waters straight from the hands of god, is known to magically heal wounds.
reagent-name-pyrazine = pyrazine
reagent-name-pyrazine-dermaline = pyrazine & dermaline
reagent-desc-pyrazine = Efficiently heals burns from the hottest of fires. Causes massive internal bleeding when overdosed.
reagent-name-insuzine = insuzine

40
Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
View file

@ -317,3 +317,43 @@
- state: nitrogentank
- type: Label
currentLabel: reagent-name-nitrogen
- type: entity
parent: BoxCardboard
id: BoxSurvivalMilitaryDouble
suffix: Military O2
description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank.
components:
- type: StorageFill
contents:
- id: ClothingMaskBreath
- id: DoubleEmergencyOxygenTankFilled
- id: EmergencyMedipen
- id: Flare
- id: FoodSnackNutribrick
- id: DrinkWaterBottleFull
- type: Sprite
layers:
- state: internals
- state: extendedtank
- type: entity
parent: BoxSurvivalMilitaryDouble
id: BoxSurvivalMilitaryDoubleNitrogen
suffix: Military N2
components:
- type: StorageFill
contents:
- id: ClothingMaskBreath
- id: DoubleEmergencyNitrogenTankFilled
- id: EmergencyMedipen
- id: Flare
- id: FoodSnackNutribrick
- id: DrinkWaterBottleFull
- type: Sprite
layers:
- state: internals
- state: nitrogentank
- type: Label
currentLabel: reagent-name-nitrogen

21
Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
View file

@ -88,11 +88,10 @@
Quantity: 100
- type: entity
name: space cleaner
description: BLAM!-brand non-foaming space cleaner!
id: SprayBottleSpaceCleaner
parent: SprayBottle
suffix: ""
suffix: Space Cleaner
components:
- type: SolutionContainerManager
solutions:
@ -101,10 +100,28 @@
reagents:
- ReagentId: SpaceCleaner
Quantity: 100
- type: Label
currentLabel: space cleaner
- type: Tag
tags:
- Spray
- type: entity
parent: MegaSprayBottle
id: MegaSprayBottleSpaceCleaner
description: BLAM!-brand non-foaming space cleaner, now in a bigger package for those huge blood puddles!
suffix: Space Cleaner
components:
- type: SolutionContainerManager
solutions:
spray:
maxVol: 250
reagents:
- ReagentId: SpaceCleaner
Quantity: 250
- type: Label
currentLabel: space cleaner
- type: entity
parent: SprayBottle
id: BorgSprayBottle

91
Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
View file

@ -88,6 +88,97 @@
- ChemDispensable
- type: DnaSubstanceTrace
- type: entity
parent: Jug
id: JugPunctTranex
categories: [ HideSpawnMenu ]
suffix: punct & tranex
components:
- type: Label
currentLabel: reagent-name-puncturase-tranexamic
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Puncturase
Quantity: 160
- ReagentId: TranexamicAcid
Quantity: 40
- type: entity
parent: Jug
id: JugPyraDerma
suffix: pyra & derma
components:
- type: Label
currentLabel: reagent-name-pyrazine-dermaline
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Pyrazine
Quantity: 50
- ReagentId: Dermaline
Quantity: 150
- type: entity
parent: Jug
id: JugDexPlusSaline
suffix: dex+ & saline
components:
- type: Label
currentLabel: reagent-name-dexalin-plus-saline
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: DexalinPlus
Quantity: 100
- ReagentId: Saline
Quantity: 100
- type: entity
parent: Jug
id: JugTrico
suffix: tricordrazine
components:
- type: Label
currentLabel: reagent-name-tricordrazine
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Tricordrazine
Quantity: 200
- type: entity
parent: Jug
id: JugBlood
suffix: blood
components:
- type: Label
currentLabel: reagent-name-blood
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Blood
Quantity: 200
- type: entity
parent: Jug
id: JugWater
suffix: water
components:
- type: Label
currentLabel: reagent-name-water
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Water
Quantity: 200
- type: entity
parent: Jug
suffix: carbon

90
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
View file

@ -198,6 +198,96 @@
- ReagentId: Cryoxadone
Quantity: 50
- type: entity
parent: Beaker
id: BeakerSmallArith
suffix: arithrazine
components:
- type: Label
currentLabel: reagent-name-arithrazine
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 50
reagents:
- ReagentId: Arithrazine
Quantity: 50
- type: entity
parent: Beaker
id: BeakerSmallSigy
suffix: sigynate
components:
- type: Label
currentLabel: reagent-name-sigynate
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 50
reagents:
- ReagentId: Sigynate
Quantity: 50
- type: entity
parent: Beaker
id: BeakerSmallPhal
suffix: phalanximine
components:
- type: Label
currentLabel: reagent-name-phalanximine
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 50
reagents:
- ReagentId: Phalanximine
Quantity: 50
- type: entity
parent: Beaker
id: BeakerSmallDiph
suffix: diphenhydramine
components:
- type: Label
currentLabel: reagent-name-diphenhydramine
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 50
reagents:
- ReagentId: Diphenhydramine
Quantity: 50
- type: entity
parent: Beaker
id: BeakerSmallBruiz
suffix: bruizine
components:
- type: Label
currentLabel: reagent-name-bruizine
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 50
reagents:
- ReagentId: Bruizine
Quantity: 50
- type: entity
parent: Beaker
id: BeakerSmallLace
suffix: lacerinol
components:
- type: Label
currentLabel: reagent-name-lacerinol
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 50
reagents:
- ReagentId: Lacerinol
Quantity: 50
- type: entity
name: large beaker
parent: BaseBeaker

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
View file

@ -103,6 +103,14 @@
soundInsert:
path: /Audio/Weapons/Guns/MagIn/sfrifle_magin.ogg
- type: entity
parent: [WeaponLauncherHydra]
id: WeaponLauncherHydraLethal
suffix: frag
components:
- type: RevolverAmmoProvider
proto: GrenadeFrag
- type: entity
name: RPG-7
parent: [ BaseWeaponLauncher, BaseMajorContraband ]

23
Resources/Prototypes/Loadouts/Miscellaneous/survival.yml
View file

@ -188,6 +188,29 @@
back:
- BoxSurvivalSyndicateNitrogen
# Military / Double Extended
- type: loadout
id: EmergencyOxygenMilitaryDouble
effects:
- !type:GroupLoadoutEffect
proto: OxygenBreather
equipment:
pocket1: DoubleEmergencyOxygenTankFilled
storage:
back:
- BoxSurvivalMilitaryDouble
- type: loadout
id: EmergencyNitrogenMilitaryDouble
effects:
- !type:GroupLoadoutEffect
proto: NitrogenBreather
equipment:
pocket1: DoubleEmergencyNitrogenTankFilled
storage:
back:
- BoxSurvivalMilitaryDoubleNitrogen
# Pre-equipped species gear
# Full tank for vox as part of any Survival loadout

9
Resources/Prototypes/Loadouts/loadout_groups.yml
View file

@ -1611,6 +1611,15 @@
- EmergencyOxygenSyndicate
- LoadoutSpeciesVoxNitrogen
- type: loadoutGroup
id: SurvivalMilitaryDouble
name: loadout-group-survival-military
minLimit: 2
hidden: true
loadouts:
- EmergencyNitrogenMilitaryDouble
- EmergencyOxygenMilitaryDouble
- type: loadoutGroup
id: GroupSpeciesBreathTool
name: loadout-group-breath-tool

5
Resources/Prototypes/Loadouts/role_loadouts.yml
View file

@ -597,6 +597,11 @@
- GroupSpeciesBreathTool
- GroupTankHarness
- type: roleLoadout
id: RoleSurvivalMilitaryDouble
groups:
- SurvivalMilitaryDouble
- type: roleLoadout
id: RoleSurvivalNukie
groups: