Commit Graph

32623 Commits

Author SHA1 Message Date
Hitlinemoss
0202166406 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into moss-seniorcargo
Merged master into branch
2025-06-16 06:01:18 -04:00
PJBot
00b68d4c10 Automatic changelog update 2025-06-16 09:37:14 +00:00
qrwas
f8cf4dc829 Add group for loadouts (#36951)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-16 02:36:06 -07:00
beck-thompson
d8b70a3887 Revert "Randomized Markings" (#38345) 2025-06-16 00:50:17 -07:00
Helix-ctrl
1d4cf48c31 Add hints towards flash protection to all items which provide it (#37267)
* Update welding.yml

* Update FlashSystem.cs

Add subscriber event for flash immunity examine text

* Create flash-immunity-component.ftl

* Removed changed description text

* change to use entity version

* fixed mistake
2025-06-15 18:38:36 -04:00
PJBot
c83420fca5 Automatic changelog update 2025-06-15 21:12:59 +00:00
beck
b636e3fcba Randomized Markings (#34765)
randomized markings
2025-06-15 14:11:52 -07:00
PJBot
ef832141c6 Automatic changelog update 2025-06-15 19:11:31 +00:00
SlamBamActionman
9af0b354e3 Exo Station - Upstream Playtest Version (#33144)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-15 12:10:22 -07:00
ScarKy0
bc9059a72d Armblade Tweaks (#38337)
init
2025-06-15 20:23:02 +02:00
PJBot
be5df666f0 Automatic changelog update 2025-06-15 09:37:28 +00:00
SlamBamActionman
239f1c511e Ensure large entities don't get stuck on conveyor belt corners (#37466)
* Initial commit

* Also avoid the friction change doesn't make turned-off conveyor belts continue going

* Ensurecomp on conveyor starting

* i give up

* Minor brackets edit

* Documentation
2025-06-15 11:36:18 +02:00
github-actions[bot]
b2e8cff3ed Update Credits (#38321)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2025-06-15 11:26:03 +02:00
PJBot
b3561e0c3a Automatic changelog update 2025-06-15 08:28:40 +00:00
FungiFellow
43bad8184f Give Syndie-Cats Syndie Access (#38318)
* Update animals.yml

* Update animals.yml
2025-06-15 10:27:32 +02:00
PJBot
63ee7f6272 Automatic changelog update 2025-06-14 18:30:13 +00:00
ScarKy0
208b245dcb Retractable items system + Arm Blade action (#38150) 2025-06-14 21:29:06 +03:00
PJBot
635ea4b2b4 Automatic changelog update 2025-06-14 17:23:52 +00:00
nikitosych
1bbf094c79 Fix for holoparasite's ability to attack the host through mech (#36659) 2025-06-14 20:22:45 +03:00
PJBot
7cd7e33ae3 Automatic changelog update 2025-06-14 16:10:12 +00:00
Sparlight
937326460f Add pet bag - wearable backpack for pets (#37440)
* Add pet bag

* Trailing whitespace moment

* make the linter happy

* Fix trailing whitespace concern.

* Fix Construction component oopsy-daisy

* yml guideline moment

* remove weird extra whitespace

* make the maintainer happy

* Adjusted bag visuals based on feedback

* Allow the fox aghost admin to use pet bags
2025-06-14 09:09:05 -07:00
PJBot
f1ef41fad5 Automatic changelog update 2025-06-14 09:08:56 +00:00
Sparlight
67c8d1db87 Add corgium (#37951)
* Add corgi essence

* Adjust spacing concerns

* Renamed 'corgi essence' to 'corgium' based on maintainer discussion
2025-06-14 11:07:48 +02:00
PJBot
f276035f79 Automatic changelog update 2025-06-14 09:00:50 +00:00
Nox
d68990fd7a Added warden's uniforms to their dresser. (#38283)
* Added warden's uniforms to their dresser.

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

* Added warden's guitar

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

* Removed armored coats and guitar from warden dresser.

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

---------

Signed-off-by: Nox38 <nebulousnox38@gmail.com>
2025-06-14 10:59:40 +02:00
SyaoranFox
0518be5d38 Zombies won't attack Initial Infected (#38128)
* Added Zombie faction roles everywhere that makes sense for initial infected to be associated with Zombies.

* Adding faction component to round start zombie. (not hopeful)

* Removed stupid attempts and added zombie faction component to the zombie system when the player is given the ability to force themself to zombify.

* Changed use of "zombie" for ProtoId<NpcFactionPrototype>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Server/Zombies/ZombieSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Removed faction component from ZombieOutbreak event. Shouldn't cause problems with the event as II gets component with their ability to self zombify.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-06-13 17:56:57 -07:00
PJBot
deb92514d3 Automatic changelog update 2025-06-13 19:19:05 +00:00
Deerstop
34826a2cf6 Elkridge - Major Update (#38259)
* swap HOP and vault, fix cams, new genpop, shit ton of stuff

* fixed some initialised open doors, added posters to HOP/EVA

* implemented suggestions and feedback, lots of things
2025-06-13 15:17:57 -04:00
PJBot
ac9eb1a1ff Automatic changelog update 2025-06-13 18:55:28 +00:00
Kittygyat
98031d13a1 Added monkey/kobold emergency EVA sprites & the ability for them to wear them. (#37660)
* Added monkey/kobold emergency eva suit sprites, and the ability for them to wear it

* Added tag, fixed indentation

* Ok actually fixed the indentation this time
2025-06-13 20:54:21 +02:00
PJBot
0dbb01d623 Automatic changelog update 2025-06-13 16:12:22 +00:00
slarticodefast
ae8fdbfa51 Fix puncturase cauterizing bleeding (#38289)
fix puncturase cauterizing bleeding
2025-06-13 12:11:15 -04:00
PJBot
4f9e7fbc4d Automatic changelog update 2025-06-13 16:10:37 +00:00
qrwas
757ef3c62b fix missing locale for Undergarment (#38304) 2025-06-13 12:09:30 -04:00
PJBot
822c4118a3 Automatic changelog update 2025-06-13 15:53:26 +00:00
SyaoranFox
72b57392d1 Rat King changed to Antag (#38124)
* Changed rat king to be antag
Rat King guide updated to show antag rules

Initial infected given zombie faction
Zombies given zombie faction too (not sure if redundant or not)

* Given zombie faction to Initial Infected and Zombies in mind_roles

* Changed MindRoleGhostRoleAntag to MindRoleGhostRoleSoloAntagonist

removed components from antag listings

* Removed changes for zombies

* Update Resources/Prototypes/Roles/Antags/zombie.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Update Resources/Prototypes/ai_factions.yml

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>

* Changed mob prototype to match

* Forgot solo again

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
2025-06-13 17:52:19 +02:00
PJBot
e0e33263ab Automatic changelog update 2025-06-13 14:44:48 +00:00
M1tht1c
da76cc02c7 Fix visitor mindshields (#36537)
* Make visitor mindshields removable, and give disaster victims mindshields.

* Fix whitespace

* Fix ALL the whitespace
2025-06-13 16:43:41 +02:00
PJBot
01bbe013ab Automatic changelog update 2025-06-13 13:54:52 +00:00
Nikovnik
685e7028d2 Transparent tear gas (#36440)
* tweaked tear gas

* changed color of tear gas

* sped up metabolism rate of tear gas

* sped up tear gas passing more

* reduced tear gas content in grenades

* added threshold for better effect end timing

* removed clickable component from foams

* Suggestion changes

* Hide in spawn menu

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-06-13 09:53:44 -04:00
PJBot
834c950449 Automatic changelog update 2025-06-13 05:23:05 +00:00
hoshizora
0b161cba6b Fix crafting steps with modular machine parts (#38299)
fixed lines that were messing with construction menu entries for machine parts
2025-06-12 22:21:57 -07:00
PJBot
622e34aaa4 Automatic changelog update 2025-06-13 01:49:36 +00:00
Qerd
eab797939b Prediction for use of utensil on incompatible food (#38297)
Prediction our beloved
2025-06-12 18:48:28 -07:00
Perry Fraser
82f598a087 Use correct on-head rainbow lizard plushie sprite (#38286) 2025-06-12 14:24:19 -07:00
PJBot
6182bead20 Automatic changelog update 2025-06-12 21:17:16 +00:00
themias
19271e6bc9 Fix gas analyzer and anom scanner wrong state (#38285)
* Fix gas analyzer and anomaly scanner UI activation issue

* save

* fix comment

* milkalyzer
2025-06-12 14:16:07 -07:00
Perry Fraser
570accb102 fix: Correct respath for lizard smite icon (#38288) 2025-06-12 22:37:44 +02:00
kosticia
e55985e575 Make BODAs start with Russian accent. (#38275)
long hand of Kremlin
2025-06-12 09:19:08 -07:00
Perry Fraser
e09b7debe2 Fix some popup issues with pipe layer changes (#38244)
* fix: only show pipe layer popups to the user changing them

* fix: don't show pipe layer subfloor popup when not using a screwdriver

* fix: properly pass down user and used for serverside pipe layer changes

Technically this doesn't matter as the Shared codepath for this method
doesn't actually use these on the server: only the user is used for a
clientside popup. Still, will be good to have these for future changes
that might need them.
2025-06-11 22:31:48 -07:00