]> git.smokeofanarchy.ru Git - space-station-14.git/commit
ERT Overhaul 3/3: Loadouts (#38481)
authorNox <nebulousnox38@gmail.com>
Fri, 26 Dec 2025 21:33:43 +0000 (16:33 -0500)
committerGitHub <noreply@github.com>
Fri, 26 Dec 2025 21:33:43 +0000 (21:33 +0000)
commitabeeb910fb1c5639f6c6cc7134dff583f88708a4
tree831a6516f8226a83c2f936e48f6af161fd56c483
parent2aa29de1eeb8d38b649f809d902b728fd49221e5
ERT Overhaul 3/3: Loadouts (#38481)

* Initial commit: Added ERT web vest and sprites, added ERT magboots.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added duffle bag and magboots

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Half finished updating the web vest

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Removed unused items

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* 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>
* Added ERT chest rig, changed sprites of backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Parented all ERT hardsuit stats to nukie hardsuits

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* 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>
* First implementation of humanoid.yml

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added leader, chaplain, and half implemented paladin

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Bit more work on chaplain

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#

* Parented ERT backpacks to syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* changed size of ERT backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Started adding engineer

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Unparented ERT duffels from syndicate ones

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Finished ERT security, Leader, and Chaplain. Issue remaining with the fills and shotgun ammo, rifleman half done.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added all loadouts

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Updated labels and containers

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added names, finished loadouts.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Tested loadouts, added chaplain job icon (finally), ready to go!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added ERT survival box with double emergency tank

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* ERT now use double tanks by default

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

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

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed belt sprites

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed test fails

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Minor spelling mistake:

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed all known issues with the PR, ready for review!

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed ERT medic backpack sprite

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed random metadata

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed test fail

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Fixed test fail I hope?

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* defintely fixed test fails

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

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Slight loadout fixes to bring everything up to date.

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

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>
* revert contraband

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Finished reverting contraband

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

* Replaced the melee ert security with a marksman

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Added explosion resistance to backpacks

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* 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>
* Removed ERT duffel bag, made engi loadouts work without a duffel (still finishing medic loadouts)

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Removed ERT duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Finished updating loadouts to account for removed duffel bag.

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
* Replaced armed engineer's C4 with explosive cord

* Replaced leader's XL8 with a standard Lecter

* Updated leader loadout

* Minor fix to ERT leader

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

* Fixed rifleman, armed engineer, and test fail

* Finished vanguard, chaplain.

* Fixed minor spelling mistake

* Gave ERT medics back their omnizine

* Added ERT security breacher, made ERT survival boxes 2x2.

* Finished implementing security shotgunner

* one small thing

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Resources/Locale/en-US/random-metadata/random-metadata-formats.ftl
Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
Resources/Textures/Markers/jobs.rsi/ertchaplain.png [new file with mode: 0644]
Resources/Textures/Markers/jobs.rsi/ertchaplaineva.png [new file with mode: 0644]
Resources/Textures/Markers/jobs.rsi/meta.json