Commit Graph

30 Commits

Author SHA1 Message Date
Nox 90580db666 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>
2026-04-04 16:57:21 +02:00
Southbridge f17d19a1a9 Decal Spawners (#37066)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-05 19:00:53 +02:00
K-Dynamic 8bae27e02b Atmos air (6500 kPa) marker (#37061)
* air GM atmosphere

* atmos fix air miner
2025-05-18 16:09:56 +01:00
slarticodefast 78b5781b5f Paradox Clone (#35794)
* polymorph fixes

* paradox clone

* forensics cleanup

* bump doors

* 4

* attribution

* polymorphn't

* clean up objectives

* Update Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml

* review

* add virtual items to blacklist

* allow them to roll sleeper agent
2025-03-23 15:45:33 +00:00
slarticodefast ff5849e487 Cloning Refactor and bugfixes (#35555)
* cloning refactor

* cleanup and fixes

* don't pick from 0

* give dwarves the correct species

* fix dna and bloodstream reagent data cloning

* don't copy helmets

* be less redundant
2025-03-09 21:02:24 +00:00
brainfood1183 7934940e3b
Adds Hellspawn (Nar'Sie demon mob) (#20291)
* HellSpawn Mob

* added spawner

* summary for the namespace

* larger collider, cannot enter single tile corridors.

* fix

* remove duplicate from yml, fix attributions.

* moved action to shared, moved comp to shared, networked comp, separated heal, fixed attributions

* removed flammable from hellspawn
removed the healing effect from firestarter ability (healing can be separate ability).

* Update attributions.yml

fix attributions

* fix

* fix

(cherry picked from commit b06d9cb64a53e387240fa804853d3ee2a4d3f11b)
2024-01-26 21:37:35 +01:00
Fluffiest Floofers 91578c9463 Job Spawner icons cleanup (#20872)
* icons

* minor fixes

* another minor fix
2023-10-14 22:02:20 +02:00
Pieter-Jan Briers a242af506e
Adds the thermo-electric generator (#18840)
* Basic TEG start.

Connects via node group.

* Basic TEG test map

* Sensor monitoring basics, TEG circulator flow

* Basic power generation (it doesn't work)

* More sensor monitoring work

* Battery (SMES) monitoring system.

* Sensor monitoring fixes

Make it work properly when mapped.

* Test map improvements

* Revise TEG power output mechanism.

Now uses a fixed supplier with a custom ramping system.

* TEG test map fixes

* Make air alarms and pumps open UI on activate.

* Clean up thermo machines power switch.

Removed separate Enabled bool from the component that always matched the power receiver's state.

This enables adding a PowerSwitch component to give us alt click/verb menu.

* TEG but now fancy

* Make sensor monitoring console obviously WiP to mappers.

* Vending machine sound, because of course.

* Terrible, terrible graph background color

* Examine improvements for the TEG.

* Account for electrical power when equalizing gas mixtures.

* Get rid of the TegCirculatorArrow logic.

Use TimedDespawn instead. The "no show in right-click menuu" goes into a new general-purpose component.

Thanks Julian.

* Put big notice of "not ready, here's why" on the sensor monitoring console.

* TryGetComponent -> TryComp

* Lol there's a HideContextMenu tag

* Test fixes

* Guidebook for TEG

Fixed rotation on GuideEntityEmbed not working correctly.

Added Margin property to GuideEntityEmbed

* Make TEG power bar default to invisible.

So it doesn't appear in the guidebook and spawn menu.
2023-08-12 15:41:55 -05:00
Nairod aec3e18502
Senior Roles (#18181)
* Senior Roles

* Senior Researcher and first wave of touch-ups

* Senior Physician and second wave of touch ups

* Senior Officer and third wave of clean ups

* Fourth wave of touch ups

* Playtimetracker fix, I hope

* Supervisor adjustment

* Sci assistant supervisor fix.

* Allow antags for all except Senior Officer.
2023-07-25 21:06:31 -06:00
Puro 509761c260
[Brigmedic] Something like a "big update" (#15496)
* [Brigmedic] Something like a "big update"

* new locker

* hardsuit resprite

* resprite resprited hardsuit

back to the future

* custom headset

* remove key

* TrackingImplanter in locker

* pda UI fix

* brigmedic bedsheet

* added transparency

* mask

* desc

* name mask

* skirt of life

* Suits resprite

* PDA resprite | Brigmed - Brigmedic

* meta dic :)

* Beret + medical gown

* backpacks

* locker fill update

* why not?

bzzz Moth-pocalypse

* Brigmed - Brigmedic

* fix

* chance update
2023-04-26 00:48:44 -06:00
Puro 37f4cfe8b2
[Fix] Security cadet spawner icon (#15324)
* [Fix] Security cadet spawner icon

* fix meta

* mergefix
2023-04-12 12:33:19 -06:00
Puro 682c6e02cc
[Job] Brigmedic (#15319)
* [Job] Brigmedic

Everything is included!

* id meta fix

* fix brigmed.yml

* brigmed hardsuit migration
2023-04-11 17:11:01 -06:00
brainfood1183 c9e70d8ea0
Cluwne smite (#13367) 2023-03-06 11:09:24 -08:00
brainfood1183 dcea202bb9
fix cburn job spawner sprite (#13640) 2023-01-21 20:43:46 -04:00
Cheackraze a512a77046
Zookeeper (#12020)
* jumpsuit sprite

* hat and meta to match

* pda

* id card

* update spawner jobs.yml

* update identification_cards.yml

* Update pda.yml

* update jumpsuits.yml

* zookeeper job yml

* zookeeper icon

* update hats.yml

* woops fixed hats.yml

* fix id cards yml

* job spawner icon and json

* update map yml

* update departments yml

* job icon meta.json

* comes with the hat

* real

* real

* localization

* fix spawner jobs yml

* playtime tracker

* kettle spawn

* Revert "kettle spawn"

This reverts commit 37c241cb31a6f186f31a73f168a93649423e839a.

* kettle spawn

* service locked windoor

* updated sprites and updated meta.json thanks to EmoGarbage

* meta.json

* Update Resources/Textures/Objects/Devices/pda.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Update Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* credit to EmoGarbage404 and alphabetized

* license

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2022-10-23 14:42:25 -05:00
Rane e36b155325
Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
Rane 2e90b81910
Freezer fixatmos entity (#9314) 2022-07-02 19:13:52 -07:00
Emisse e4caedf031
Station Specific Jobs: Reporter and Psychologist (#8865)
* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json
2022-06-16 19:28:38 +10:00
Peptide90 b93286fc61
Emergency Response Team (#6258)
* Clothing pass 1

Backpacks, hardsuits and helmets pass 1

* ERT Leader Role first pass

* ERT Backpacks (nearly there)

* ERT Backpacks final

* ERT helmets pass 1

* remaining hardsuit sprites added.

* ERT leader ID

* removed duplicates

* hardsuits + helmets entities

* ID + PDA for ERT

* ERT leader role pass 1

* job icons / markers for ERT

* military / ert name dataset

* starting gear pass 1 for ERT

* removed in favor of singular ERT roles file

* ERT mobs for spawning

* ERT spawn points added

* fixed case on ERT name

* Increased ERT access to most areas

* ERT ghost role takeover fixes

* ERT removed invalid parent

* path issue resolved

* more file path fixes

* fixes random naming pt 1

* Buffs ERT hardsuits and integrates helmet

parents ert to syndie hardsuit and adds toggleable helmet

* Adds suit storage slot and cargo access

* Adds backpack fills for ERT

* Updates ERT loadout for filled backpacks

+ other misc changes

* buff ERT backpack storage

* fixes ert jani backpack fills

* tweaks spawn loadout to EVA

* gave centcom official AA

* formatting

* ERT shuttle mapped with spawners

* update access
2022-06-03 20:48:28 +10:00
Kara 4bf0aac814
Rename Assistant to Passenger (#8007)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-05-10 13:35:08 +10:00
20kdc ad6abcfff6
Timed mouse spawners (#7831) 2022-04-30 14:26:11 -07:00
Chris V 76dfa8ce57
Musician job completeness (#6889) 2022-02-25 22:11:04 -07:00
Peptide90 962f90e6f5
Adds Librarian and Lawyer roles (#6056) 2022-01-14 02:11:09 +11:00
wrexbe 40278353d3
Salvage (#5686)
Co-authored-by: 20kdc <asdd2808@gmail.com>
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2021-12-23 13:14:01 +01:00
Paul Ritter e4defccd33
Revert "Salvage 0.1" (#5684) 2021-12-03 23:42:38 +01:00
20kdc 0205846ab2
Salvage 0.1 (#5662) 2021-12-03 23:24:19 +01:00
20kdc 7ccf9668d4
Varied and semi-sprited atmos markers (#4944) 2021-10-19 21:07:47 +02:00
Swept bf99a91507
Revert "Revert "Slight changes to spawners"" (#3627)
* Revert "Revert "Slight changes to spawners (#3605)" (#3624)"

This reverts commit 8c01d9d9dc.

* Bring back clicktest.yml

* Update IgnoredComponents.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-03-12 21:28:40 +01:00
metalgearsloth 8c01d9d9dc
Revert "Slight changes to spawners (#3605)" (#3624)
This reverts commit a47e1b817c.
2021-03-12 20:22:33 +11:00
Swept a47e1b817c
Slight changes to spawners (#3605)
* Initial

* Done

* Ye

* Removes mouse spawns for now

* I'm an idiot!
2021-03-12 19:43:55 +11:00