Commit Graph

26990 Commits

Author SHA1 Message Date
Delta-V bot 3d955ba478 Automatic changelog update 2026-04-14 14:15:03 +02:00
Radezolid 9270b0f42c
Move the turret at the syndie ruin (#5655)
* Moved the pew-pewer

* fix?

* Change the position again
2026-04-14 14:14:43 +02:00
Delta-V bot 6b25a262b7 Automatic changelog update 2026-04-14 08:29:25 +02:00
Delta-V bot 4d205c3b8b Automatic changelog update 2026-04-12 20:56:20 +02:00
biddygelson de30a12014
Academy 1.7.0 (#5588)
* * removed mid-round antag spawn from arrivals bench.
* added mid-round antag spawn in maints below salvage, near airlock.
* replaced three air canisters in atmos with NO2, CO2, and Miasma to help atmos better support epistemics.
* added doors and airlocks to the passage between artifact research and cargo.
* added windoor to disposal to keep trash on the conveyor ( https://github.com/DeltaV-Station/Delta-v/issues/5509 )
* added lights to medbay, too dark!
* fixed disposal chutes outside vox box and tools room.
* moved archivist display room into artifact observation east.

* * fixed missing tile under disposal chute in sec
* fixed CJ's dresser
* added fax machines to; lawyer, library, logistics, engineering, medical
* epi lounge got an upgrade
* 5 gold and 5 silver added to robo
* gave a bar shelf to the bar

* * lawyer office front door and maintenance door replaced with "justice locked" versions.
* butlertron added
* armory, superweapon safe replaced with random rifle safe.

* * removed miasma canister from atmos, that xeno artifact lied to me!
* removed gold and silver from robo to make tester happy.
* replaced windoor in disposal with secure windoor, now ever more trash resistant!
2026-04-12 20:56:00 +02:00
Delta-V bot 20319994db Automatic changelog update 2026-04-12 05:47:29 +02:00
BarryNorfolk 0972b0f584
Dec/Jan 2026 upstream merge fixes (#5651)
Set the quantity of blood to something reasonable
2026-04-12 00:47:09 -03:00
github-actions[bot] dff658b754
Update Credits (#5652)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
2026-04-12 04:01:36 +02:00
Tobias Berger a3e9436cc0
Changelog Bot, you are evil 2026-04-11 22:09:12 +02:00
Delta-V bot adcb699751 Automatic changelog update 2026-04-11 21:42:07 +02:00
Tobias Berger a089e3508a
fix missing CL for #5316 2026-04-11 21:38:27 +02:00
BarryNorfolk 84af3d71eb
Remove extra sprites (#5649) 2026-04-11 19:00:51 +00:00
Tobias Berger 8aceccfb9d
Merge pull request #5316 from BarryNorfolk/merge_dec_jan
Upstream Merge (December 2025 - Jan 16th 2026)
2026-04-11 18:27:39 +00:00
BarryNorfolk 1ef385d3fe Update upstream changelogs 2026-04-11 19:22:06 +02:00
Delta-V bot 64cd94351d Automatic changelog update 2026-04-11 17:35:45 +02:00
BarryNorfolk 63b2eadada
[K9] Rework Grappling (#5337)
* Remove unused ProtoId

* Remove unused variable

* Move the entire of grappling into shared

* Move grappler to Secdog base to enable all secdogs to grapple

* Fix prediction on grappling from move to shared

* Also block any StandUpAttempt events

* Remove secdog hand disabling and up cooldown to 15 seconds

* Add grapple activation modes

* Implement new activation mode handling

* Allow damage accumlated to release grapples

* Add initial damage to activation mode

* Immediately refresh modifiers on releasing of grapple

* Check accumulated damage constantly, clear damage via timer

* Only emit popups from server side

* Update Laika's grappler component to use new activation mode

* Add event for entering stamina crit

* Release grapple when victim enters crit

* Minor rewording of grapple starting

* Typo

* Rely solely on the shared system for grappling now

* Change activation mode from class to interface
2026-04-11 17:35:25 +02:00
Delta-V bot aaf47d5115 Automatic changelog update 2026-04-11 15:14:34 +02:00
Minerva 24a3485951
Adds more Felinid and Vulpkanin customizations to Kitsune (#5607) 2026-04-11 10:14:14 -03:00
Delta-V bot 18f7c9cb14 Automatic changelog update 2026-04-11 14:47:15 +02:00
Coryn 2dc70e4040
Add ERT Accesses and Doors (#5639)
* Add ERT Accesses and Doors

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Universal Access Confurator ERT access added

* Requested Changes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-04-11 09:46:55 -03:00
Delta-V bot 1e5d902013 Automatic changelog update 2026-04-10 19:35:36 +02:00
Theo f6759ea97b
Punpun guns (#5563)
* turn clumsygunns off on punpun (this shit broken)

* fix

* punpun fails 20% of the time, new clumsygunshootcheck system
2026-04-10 19:35:16 +02:00
Theo fe7643caa3
Add hyper blade (#5458)
* add to uplink for 20tc 16 discount, not in nukie uplink

* 75% reflect lasers and bullets, reflects back in 10 degree arc, must be wielded to swing

* formatting

* add sprite offsets so it doesn't look goofy nd is placed predictably (except in pocket i can't fix that)

* Add ItemToggleOnWield component (not functional) so that sword must be wielded to turn on, also fix the sprite offset thing (need a new pocket / inhand sprite)

* use the desword code for requiring wielding, a bit buggy with putting into inventory and deactivating

* cannot be put in bag while active fix

* fix capitalization bug?
2026-04-10 19:27:58 +02:00
Delta-V bot 456bb629b8 Automatic changelog update 2026-04-10 10:48:46 +02:00
Minerva dbb4ca2cba
Adds long labcoats to Epistemics (#5633) 2026-04-10 08:48:26 +00:00
Delta-V bot 32ed6b7dbd Automatic changelog update 2026-04-09 19:13:50 +02:00
Field Command 54627c9f17
Fixed power load on strongbox shuttle (#5642)
* fixed power load on APC

* Evil Gremlins
2026-04-09 17:11:59 +00:00
Delta-V bot 2a9fd3f4cb Automatic changelog update 2026-04-08 20:17:55 +02:00
Stxcking 76c928e6d5
Tweak: Spaceman's Trumpets from One Mutation + Less Polyp Yield (#5576)
ough
2026-04-08 20:17:34 +02:00
Delta-V bot d9e0d48ef9 Automatic changelog update 2026-04-08 19:54:27 +02:00
Theo ad8ba75cec
make devil guidebook not lie (#5604)
* add DV guidebook for devil and make it not lie

* Whitespace fix

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Theo <tad3@illinois.edu>

* Whitespace fix

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Theo <tad3@illinois.edu>

* Whitespace fix

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Theo <tad3@illinois.edu>

* Whitespace fix

Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
Signed-off-by: Theo <tad3@illinois.edu>

---------

Signed-off-by: Theo <tad3@illinois.edu>
Co-authored-by: BarryNorfolk <barrynorfolkman@protonmail.com>
2026-04-08 19:54:06 +02:00
Delta-V bot ef6256edea Automatic changelog update 2026-04-08 15:35:53 +02:00
KOTOB ec1c0c66f4
Make Kitsune far easier to pet (#5596)
respectful coworker interaction
2026-04-08 15:35:32 +02:00
Delta-V bot 6a7848af6a Automatic changelog update 2026-04-08 15:26:52 +02:00
Theo e750af09ca
meat pizza takes cutlets instead of meat (#5602)
* meat pizza takes cutlets instead of meat

* Fixed comment

Signed-off-by: Radezolid <snappednexus@gmail.com>

---------

Signed-off-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
2026-04-08 08:26:31 -05:00
Delta-V bot e3edefcdd1 Automatic changelog update 2026-04-08 15:26:17 +02:00
Minerva 9edbe52f04
Adds DV-specific scrubs to Medical Doctor loadout (#5616) 2026-04-08 08:25:57 -05:00
Delta-V bot a801e64b88 Automatic changelog update 2026-04-08 10:48:12 +02:00
Lilith Ashley Nyx Arson 759c0629e9
Minor spelling mistake (impeCable -> impeCCable) (#5637)
minor spelling mistake (impeCable -> impeCCable)

Signed-off-by: Lilith Ashley Nyx Arson <lilith@arson.gg>
2026-04-08 08:47:51 +00:00
BarryNorfolk 074fb1775a Replace WeldingHealable for IPCs with upstream 2026-04-07 22:15:59 +02:00
BarryNorfolk 68e2f44690 Update name for BoxShellSoulbreaker to be in line with upstream 2026-04-07 22:15:59 +02:00
BarryNorfolk 3c719120d1 Add hitscan names for #41763 2026-04-07 21:44:19 +02:00
Delta-V bot 4f48dcbe49 Automatic changelog update 2026-04-07 18:39:07 +02:00
BarryNorfolk 39742fda38
Fix target immune (#5386)
* Add a new filter for checking ObjectiveImmune on both the mind and players' entity

* Swap from TargetObjectiveMind filter to ObjectiveImmune filtering

* Better if statement for checking body
2026-04-07 16:38:47 +00:00
Delta-V bot fac99246f0 Automatic changelog update 2026-04-07 12:23:37 +02:00
BarryNorfolk ec74175d39
Make both CosmicColossus and Skia immune to tasers (#5374)
* Add blacklisting for StunOnCollide on a tag

* Add new TaserImmune tag and apply it to BulletTaser

* Block Colossus and Skia from being tased
2026-04-07 10:23:17 +00:00
Delta-V bot 19700bf87c Automatic changelog update 2026-04-07 09:45:28 +02:00
Tobias Berger cb82b10dba
Fix bionic voice mask implant icon 2026-04-06 22:52:35 +02:00
Delta-V bot 903bece091 Automatic changelog update 2026-04-06 13:05:18 +02:00
Delta-V bot c1c34df2cc Automatic changelog update 2026-04-06 12:56:08 +02:00
muon 8da449de03
Update/fix existing furniture (#5355)
* renamed Δv railing to reinforced variant

* made delv railings craftable, TODO: fix decon and hitbox

* wip

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* commit fixes by the illustrious verybigman311

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: ergo chairs now unanchored on creation, counter corner textures fixed. TODO: counter intersect texture redos for metal, wood, craft

* rug and mat constructiongraphs added, countertops fixed. rug orientations need to be fixed

* i hope this will still work

* out of time

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* i forgot to remove this

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Delete useless constructiongraph

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Revert "Delete useless constructiongraph"

This reverts commit 2be446d310.

* final changes before review, fix offset desks

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update Resources/Prototypes/Entities/Structures/Walls/railing.yml

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Update Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/rugs_carpets.yml

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Apply suggestions from code review

Co-authored-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* Apply suggestions from code review

Co-authored-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>

* add locids

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* revert alt desk to normal

* fix test fails

* fix test fails pt. 2

* hopefully last fix

* rug fixes

* fix up mats required

* oops i forgot to add this

* Apply suggestions from Toby222's code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: muon <243844715+muonpoly@users.noreply.github.com>

* Apply additional suggestions from Toby222

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* oookay one last thing maybe

* apply additional review changes

---------

Signed-off-by: muon <ilovetoaaaaaainthemorn@gmail.com>
Signed-off-by: muon <243844715+muonpoly@users.noreply.github.com>
Co-authored-by: iipro-rgb <71106851+iipro-rgb@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2026-04-06 12:55:48 +02:00
Delta-V bot d2e94987c2 Automatic changelog update 2026-04-06 02:41:08 +02:00
Halo3moth 266312fd72
Super weapon replacement real not fake (#5542)
* boop

* forgor about the leviathan

* buff ICEE give cannon scope

* maybe fixed?

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update uplink_catalog.yml

* boop

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/safes.yml

Co-authored-by: Radezolid <snappednexus@gmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Radezolid <snappednexus@gmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* Update Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/security.yml

Co-authored-by: Radezolid <snappednexus@gmail.com>
Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* should be all of it

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
2026-04-05 21:40:48 -03:00
Delta-V bot 694af28924 Automatic changelog update 2026-04-05 22:35:31 +02:00
Theo 0d23ee226e
fireaxes can be placed in suitstorage (#5593) 2026-04-05 17:35:12 -03:00
Delta-V bot 96e53839af Automatic changelog update 2026-04-05 15:24:51 +02:00
Stxcking 2998efd4bf
Fix: Energy Gun Fire Mode Pop-up Message (#5624)
buh
2026-04-05 15:24:32 +02:00
Delta-V bot dbb8ff9c45 Automatic changelog update 2026-04-05 13:15:54 +02:00
Delta-V bot 6122ce9837 Automatic changelog update 2026-04-05 10:56:15 +02:00
github-actions[bot] 0f70e0695c
Update Credits (#5625)
Co-authored-by: DeltaV-Bot <github@deltav.gay>
2026-04-05 03:56:28 +02:00
Delta-V bot a10492a9d1 Automatic changelog update 2026-04-05 03:04:38 +02:00
Stxcking 2df248b2f3
Fix Dragon and Sharkminnows being Spacewind-ed (#5523)
* MoveByPressure set to false

same comp that makes dionas spacewind immune

* Telling the truth now
2026-04-04 22:04:17 -03:00
Delta-V bot accee36bd5 Automatic changelog update 2026-04-04 21:39:44 +02:00
DisposableCrewmember42 0ce8d934f4
cherry-pick: upstream's damage-dependent ghost sprites (#5516)
Ghost types  (space-wizards/space-station-14#37949)

* Empty commit

* yeah thingi

* added a GetHighestDamageTypes thingi to the DamageableSystem

* no idea why those files names are different only in github so just in case readding them

* yeah doing that

* first steps of moving the logic somewhere nicer

* still plenty to do

* gosh such a mess but getting progress done

* small fixie push

* big mess of bunch of stuff

* dealing with a conflict and fixing the random numbers

* testing if github will update now

* dealing with the other conflict

* github please update i beg you

* dealing with more conflicts

* hopefully this fixes it

* fixing conflicts again

* cleaning up stuffies

* sprite fixie

* general cleanup

* doing the small fixies first

* getting rid of the new event, gotta handle ashing next

* adding spaces to comments before i forget

* handling ashing

* think that did it?

* small fixies

* more small fixies

* last batch of quickie fixies before i gotta handle the bigger stuff

* last bunch of fixies i do understand

* small bit of progress yknow may as well yeah

* renaming and moving stuff to shared

* comment fixiees

* saving damage in a new component instead of in MindComponent

* protoid's and dict usage instead of the previously ickier methods

* small fixie before biggie fixie

* more fixies im slepy gosh

* thinkie that should fixie it

* smoothed the damage storage systeem so its less repetitive and icki and now itss cooler and i can go eepy

* lots of stuffies x3

* first step of getting git to detect my file name changes

* thinkie that should fixie it

* fixies

* just getting rid of the merge conflict, will check damageable later

* small thingies first

* more small stuffiees

* now all of the sprites have at leeast a 0

* dirtying the lastbody comp

* more fixies

* small thingi first

* another small fixie and a minor sprite fixie

* rng fixie

* moving the damage storage system to shared

* smoothing out code thats likely to be replaced soon but its good to do for now

* just showing progress bcus yis

* general progress stuffies mhm

* pushie

* small cleanup

* general progress :3

* in progress push for helpie

* proper pushie with progress and workies

* removed unnecessary usage of the storedamage component

* minor fixiees

* extra comments

* replaced a couple strings for ProtoId's

* gibbing related fixies :3

Signed-off-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
2026-04-04 21:39:24 +02:00
Delta-V bot a123f242c0 Automatic changelog update 2026-04-04 21:19:03 +02:00
Stxcking 08dae07425
New Fountain Variant: Icy (#5560)
* Oo Icy Fountain

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-04-04 16:18:44 -03:00
Delta-V bot 275ff0e7cb Automatic changelog update 2026-04-04 20:59:52 +02:00
Minerva 7182a2e310
Makes surgical caps optional for Surgeon loadout (#5614) 2026-04-04 18:59:32 +00:00
Delta-V bot b9b65de076 Automatic changelog update 2026-04-04 20:56:13 +02:00
Minerva 13bddb5b75
Adds DV-specific scrubs to the MediDrobe (#5613) 2026-04-04 15:55:52 -03:00
Delta-V bot b64912545f Automatic changelog update 2026-04-04 20:21:24 +02:00
Field Command 66a07d2a55
Cloak and hat for captain and HoS plus some extra. (#5601)
* Cloaks and hats for captain and HoS

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Removed time requirement

* evil

* Added fix

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2026-04-04 15:21:03 -03:00
BarryNorfolk 72ab0bb9d5 Fixup blood 2026-04-04 16:57:55 +02:00
BarryNorfolk ae1c3e33b6 Add missing string to silence console warnings 2026-04-04 16:57:55 +02:00
BarryNorfolk 104d2d53da Fix species name missing for kistune yaml 2026-04-04 16:57:55 +02:00
BarryNorfolk 46c0d794e1 Fix up some missing localisation strings 2026-04-04 16:57:55 +02:00
BarryNorfolk f068aa237d Remove extra chatsan-shrugs 2026-04-04 16:57:55 +02:00
Velken d3086de6d6 Admin Anomaly Scanner (#42443)
* admin anom scanner

* improvement

* green

* sprite
2026-04-04 16:57:55 +02:00
Samuka 66258005cb Adds more starting materials for the mothership (#42448)
* more mats

* update the guidebook

* missed a word
2026-04-04 16:57:55 +02:00
pathetic meowmeow 695ea81c05 Fix core pinpointer pieces having a 5-pointer recipe (#42446) 2026-04-04 16:57:55 +02:00
Nemanja edd857a7a2 Fix flatpacker exploit ignoring board costs (#42445)
Fix flatpacks ignoring costs and board requirements
2026-04-04 16:57:55 +02:00
ScarKy0 86d91c8cba Add Mortar and Handheld Juicer (#42019)
* init

* API

* testing

* review

* return

* good enough, fix later

TODO:
Proper prototype
DoAfter
Sounds

* "proper" prototype

TODO
DoAfter
Sprite

* proper protos, mortar sprite

* juicer sprites

TODO:
Juicer sounds
Makeshift crafting recipes
Add regular to vendors

* sprite tweak

* juicing sound, cleanup, construction

* vendors

* line end

* attribution newline

* small balance tweak

* Let it be known id never webedit

* meta

* item size

* review

* handhelds

* partial review

* cache solution, looping

* graph

* review

* popup

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-04-04 16:57:55 +02:00
B_Kirill d4da14de28 Camera map (#39684)
* Camera map

* I hope this helps

* Review 1

* Review 2

* Review 3

* Review 4

* Review 5

* Colorblind mode support

* Review 6

* Change design

* Map wire

* Logic fix

* Fix a terrible mistake

* Fix

* Fix 2

* Small rename

* More fix

* Better removal

* And another fix

* Will it work?

* It is literally pointless

* some small things
2026-04-04 16:57:55 +02:00
Velken 83b2bae724 Fix RCD light spam, bypass of indestructible tiles and some plating fixes (#42432)
* No more light spam, and some plating fixes

* fixed test
2026-04-04 16:57:55 +02:00
BarryNorfolk 693e29c0f2 Remove downstream construction-graph-tag-paper 2026-04-04 16:57:54 +02:00
ScarKy0 63975c4c49 Add Paper Centrifuge (#42040)
* init

* sound

* sprite, half functional construction

* proper recipe

* oops

* loop sound

* inhands

* review

* review squared
2026-04-04 16:57:54 +02:00
Kyle Tyo 0bf253f995 Add attribution to Tippy.rsi (#42346)
Update meta.json
2026-04-04 16:57:54 +02:00
BarryNorfolk 45bff60c3d Downstream fixes for #36132 (Vials) 2026-04-04 16:57:54 +02:00
āda 7467e96e99 Rebase vials to DrinkBase, closeable vials, mini vials (#36132)
* .rsi

* mini vial

* try stop TryStopNukeOpsFromConstantlyFailing from failing

* slight sprite change

* mail and lathe recipe

* real test fail

* resolve arbitrage

* cleanup

* always forgetting something

* always forgetting something

* drink no more

* remove integrated vial

* initial port

* Rename the rsi states

* Rename the rsi states

* up to standards

* finish

* testfail

* minor touchup

* arby

* op

* mix meta

* small changes to the vials

* commit

* commit

* style nit

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-04-04 16:57:54 +02:00
Orsoniks f55bd21846 Improved Health Examination Coloring (#38231)
* better colors

* fix worst offenders of contrast

---------

Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
2026-04-04 16:57:54 +02:00
rumaks bf45a27ec7 Make chemicals not react inside pills (and stomachs) (#41457)
no reactions in pills
2026-04-04 16:57:54 +02:00
Fruitsalad 036ed50b6e Cryo pod UI (#41850)
* Add CryoPodWindow (placeholder)

* Change HealthAnalyzerWindow: split off reusable HealthAnalyzerControl for cryo pod UI

* Improve CryoPodWindow: add health analyzer

* Improve CryoPodWindow: add eject button

This wasn't requested in the issue but I implemented it as practice with the UI system.

* Rewrote GasAnalyzerWindow, split off reusable gas mix viewer for cryo pod

* Change GasAnalyzerWindow: change back to three columns

With two rows you get a layouting bug when there's a lot of different gases, which looks somewhat bad. I didn't feel like fixing the layouting bug (it's an engine issue) so we're going back to three columns. That way you don't ever get two rows in practice.

* Change GasAnalyzerWindow: simplify by disabling Resizable

I added a lot of complexity to make resizable work nicely with a derived max & min size, but it's not necessary.

* Change GasAnalyzerWindow: file-wide namespace

* Change GasAnalyzerSystem: add GenerateGasMixEntry

* Split HealthAnalyzerUiState from HealthAnalyzerScannedUserMessage

* Rewrote CryoPodWindow, add atmos info

* Improve CryoPodWindow: add loading placeholder

* Improve CryoPodWindow: add internationalization support

* Fix GasAnalyzerControl: add missing translation

* Improve CryoPodWindow: add beaker info, high temperature warning

* Improve CryoPodWindow/System: inject button in window + necessary system changes

* Fix CryoPodWindow: Entering cryopod now closes window

This way you can't heal yourself with a cryopod.

* Change CryoPodWindow: add & update comments

* Change HealthAnalyzerComponent: remove `uiKey` property (no longer necessary)

* Tiny fixes

* Improve CryoPodUiMessage: replace string with enum

* Change GasAnalyzerWindow: simplify Measure code

* Change CryoPodComponent: rename Injecting to InjectionBuffer

* Change CryoPodBUI: tiny code simplification

* Fix HealthAnalyzerComponent: Removed stray import

* Improve CryoPodWindow: Prettier, concise atmos

* Improve CryoPodWindow: Chemicals bar chart

* Improve CryoPodWindow: Add Ruler to reagents

* Change CryoPodWindow: More horizontal layout

* Improve CryoPodWindow: Reduce height jiggling

The health analyzer's height changes a lot, which can be annoying with the buttons (for example when the oxygen damage label is popping in and out)

* Improve CryoPodWindow: Add setup checklist

This is mostly here to fill vertical space in the new horizontal layout.

* Improve CryoPodWindow: Eject beaker button

* Improve CryoPodWindow: Localization

* Improve CryoPodWindow: Add BeakerBarChart

An animated version of the chemicals chart

* Fix CryoPodSystem: Ejecting beaker no longer clears injection buffer

* Improve BeakerBarChart: Not animated on first frame

* Fix CryoPodWindow: Fix broken translation

* Improve CryoPodWindow: Reorder sections

* Fix BeakerBarChart: Tooltips now show up

* Change BeakerBarChart: Reorder functions

* Change CryoPodWindow: Reorder sections, change margins

* Change CryoPodWindow: Edit flavor text

* Revert changes to GasAnalyzerWindow

Since GasAnalyzerControl is no longer used in CryoPodWindow, these changes are no longer relevant to this PR.

* Tidy CryoPodWindow: Remove old workarounds

These are old layouting bug workarounds from the older version of CryoPodWindow that had a ScrollContainer in it. They're no longer necessary. Less ScrollContainers less problems.

* Tidy up: Remove unused imports

* Remove LabelledSplitBar

It was replaced by BeakerBarChart, which is a lot fancier.

* Tidy up: Tiny code style fix

* Change CryoPodSystem: Move code from server to shared

This is still without adding UI prediction

* move a ton of stuff to shared.

* one last thing

* Improve BeakerBarChart: Keep visual entry width when swapping beakers

* Improve BeakerBarChart: Respect beaker order of reagents

* Improve CryoPodWindow: Ensure space for injection buffer

 We need to keep space on the chart for the injection buffer after swapping to a full beaker.

* Improve CryoPodWindow: Prettier ejection error

* Improve CryoPodWindow: Add "Cooling patient" status

* BeakerBarChart: Fix UI scale bug

* BeakerBarChart: Fix bluespace beaker ugliness

* BeakerBarChart: Add more pod status strings

* HealthAnalyzerControl: Filewide namespace, sort imports

* Style fix: Replace `bool x = y` with `var x = y`

* CryoPodUiMessage: Split off separate class for inject

* SharedCryoPodSystem: Move message-related code into Subs.BuiEvents

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:54 +02:00
Samuka 477a2948fe Make heavy xenoborg able to "swim" in space (#42415)
MovementAlwaysTouching
2026-04-04 16:57:54 +02:00
Connor Huffine cccb70bcbc Make cancer mice actually hurt (#42298)
* Update animals.yml

* That was a bit too much
2026-04-04 16:57:54 +02:00
ArtisticRoomba 5b5a2529ac Increase TEG power generation by 75% (#42421)
increase TEG power by 75%
2026-04-04 16:57:54 +02:00
SnappingOpossum c47bbd3646 Move artifact random spawners to entity table spawners. (#42422)
* Move artifact random spawners to entity tables

* That's a pretty big thing to miss

* This is embarassing

* Apply review
2026-04-04 16:57:54 +02:00
War__Prophet 6f0d647451 Put arrows on all the single-directional pipes (#42408)
k
2026-04-04 16:57:54 +02:00
Samuka c037990939 Xenoborgs now drop pieces of pinpointer (#42295)
* add sprites

* update sprite

* repaired sprite

* repaired pinpointer

* different id

* piece of pinpointer core

* borgs drop the piece

* end of file new line

* typo

Co-authored-by: āda <ss.adasts@gmail.com>

* make the tape darker

* four variations

* same variation in the crafting menu

---------

Co-authored-by: āda <ss.adasts@gmail.com>
2026-04-04 16:57:54 +02:00
SlamBamActionman c35ef4ab65 Add a target station map to the LoneOp shuttle (#42376)
Initial commit
2026-04-04 16:57:54 +02:00
Vy d0ad7dbe97 Maid uniform sprite change. (#38335)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload
2026-04-04 16:57:54 +02:00
BarryNorfolk 669cc6f49b Downstream fixes for #42405 (Decouple gibbing) 2026-04-04 16:57:53 +02:00
pathetic meowmeow 66ddb7473f Decouple gibbing from the body system (#42405)
* Decouple gibbing from the body system

* allow gibs that don't drop giblets

* pass through user

* prediction gon

* comment

* destructible

* playpvs

* very very very very very very very minor cleanup

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
ScarKy0 b1b7e884f8 EmpResistance cleanup (#42402)
* init

* yeah

* Update SharedEmpSystem.cs
2026-04-04 16:57:53 +02:00
Sir Warock 969997a693 Pry open critical Borgs (#42319)
* One commit ops

* Please the maintainer gods

* More requested changes

* review

* actually this is probably a good idea

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:57:53 +02:00
ScarKy0 4204e1eeff Viper High Capacity Ammo (#42392)
* yeah

* Fix sprite & let mk58 use the mag

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2026-04-04 16:57:53 +02:00
ScarKy0 7e8ded7fc0 Buff throwing knives kit (#42391)
init
2026-04-04 16:57:53 +02:00
ConstantlyConfused a1c9b4ee3b A handful of typo fixes (#42396)
fix a handful of typos
2026-04-04 16:57:53 +02:00
War__Prophet d43c3ba32f WYA to Where you at (#42350)
* god is dead

* bro

* Update speech-chatsan.ftl
2026-04-04 16:57:53 +02:00
BarryNorfolk 1c571adb68 Downstream fixes for #38898 (Station tile changes) 2026-04-04 16:57:53 +02:00
Velken b9896377ad Allow station tiles to be placed on solid ground and other platings. (#38898)
* WORK IN PROGRESS 1

* ITS ALIVE, ALIVE!!!!

* clean up

* WIP 1

* fix small oversight

* big diff of doom

* added CVAR to tile history stack size

* component time

* filescoped namespaces + remove redundant nametag

* fix silly little mistakes

* typo

* TileStacksTest

* bweeeeeeh :P

* nuke cvar

* :3

* WIP2025

* Fix submodule

* It's beginning to look a lot like Christmas

* It's the Most Wonderful Time of the Year

* tiny fix

* fixed extra spacing on yaml

* slightly improve tilestacking test

* Part 1 out of 2 (part 2 tomorrow)

* Part 2

* add a simple tile construction test for tilestacking

* guh

* address reviews (no documentation yet)

* documentation be upon ye

* remove extra spaces

* prediction fix

* dirt

* oops :p

---------

Co-authored-by: Killerqu00 <killerqueen1777@gmail.com>
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2026-04-04 16:57:53 +02:00
alexalexmax 297276dcc3 Adds EMP Resistance component, gives it to ninja suit and headset (#42334)
* add comp and apply to ninja gear

* cleanup

* requested changes

---------

Co-authored-by: seanpimble <149889301+seanpimble@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
Errant abe17f5842 Role time tracking support for admins (#31776)
role time tracking support for admined players

Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
ScarKy0 ab9a1ecd68 Lower smuggler's satchel price to 1TC (#42381)
Update uplink_catalog.yml
2026-04-04 16:57:53 +02:00
SlamBamActionman ec13e683ff Add the Syndicate Delivery Console to the Nukie planet + target station maps (#42337)
* Initial commit

* Add station maps
2026-04-04 16:57:53 +02:00
ScarKy0 5351060f7b Lower hyperzine injector cost (#42383)
I love TC
2026-04-04 16:57:53 +02:00
Princess Cheeseballs ea166512c4 Balance swing at Vestine (#42302)
* AAAAAAAAAAAAAAAAAAAAAAA

* whhops

* full range whoop

* less diff any%

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
Kowlin cddae22e7a Allow the admin door remote to toggle overcharge (#42370)
* Allow the admin door remote to toggle overcharge

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
chaisftw 4ac5f8b1d3 Spray bottles with visible reagent contents (#42155)
* Spray bottles with visible reagent contents

* Fixed cargo catalog to correctly reference the new spray bottle rsi

* Fixed indentation on rsi meta files

* Updated copyright in spray_bottle.rsi meta

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

Co-authored-by: āda <ss.adasts@gmail.com>

* Updated to follow yml convention, modified to inherit from DrinkBase and renamed fill textures

* Fixed solution names

* Updated solution name in BorgMegaSprayBottle

* de-hardcode solution name

* less breaking

---------

Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:53 +02:00
BarryNorfolk 74f7357c40 Downstream fixes for #42123 (Medical borg module rework) 2026-04-04 16:57:52 +02:00
Princess Cheeseballs 13ddcdea36 Medical Cyborg Modules Rework. (#42123)
* PUSH!!!

* Femtanyl

* eh swap em back

* My PR is ruined!!!

* review 2 electric boogaloo

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:52 +02:00
Kyle Tyo 77f524fa25 Fix holywater locale string usage. (#42378)
Update chemistry-bottles.yml
2026-04-04 16:57:52 +02:00
Velken e6d30f7f95 Admin: fixes description for "help osay" (#42368)
2 diff 2 me
2026-04-04 16:57:52 +02:00
SlamBamActionman 7a324cfbe2 Add the ability for station maps to track grids they are not on (#41248)
* Initial commit

* Accidentally included the nukie map changes

* Fix the gridcheck

* Addressing review

* Review change

* Review comments
2026-04-04 16:57:52 +02:00
ScarKy0 dcf776afe4 Janiborg Module Cleanup (#42330)
init
2026-04-04 16:57:24 +02:00
BarryNorfolk fc1ea0522d Downstream fixes for #42253 (Predicted mind examine) 2026-04-04 16:57:24 +02:00
ScarKy0 e9b4130ec9 Predict Mind State Examine (#42253)
* init

* review

* i might be stupid

* docs

* datafieldn't

* update comments
2026-04-04 16:57:24 +02:00
SolidSyn 97ed41c408 Foldable wig on clowns mask (#42208)
* Clowns base mask now has the ability to toggle the wig on and off.

* Changes the clown mask to have a foldable wig.

* Adds my credit for the wigless sprites in the meta.json

* Redid the description.

* Added an a to the description. Smiles.

* Resolved changes, thanks beck!
2026-04-04 16:57:24 +02:00
SlamBamActionman 93db96603f Add the Syndicate Delivery Console + Corpsman Medicine Bundle (#41201)
* Initial commit

* Add a note to not abuse the darrrrn machine

* Remove nukie planet (hopefully) and fix duffelbag

* jug solution name

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
Hitlinemoss a0daca78de BUGFIX: Cabbage placed on taco shells no longer turns into a carrot (#42326)
BUGFIX: Cabbage places on tacos no longer looks like a carrot
2026-04-04 16:57:24 +02:00
B_Kirill 2155073625 Fix projectile deceleration (#42320) 2026-04-04 16:57:24 +02:00
ScarKy0 0115f943e6 Stake Admin Alert (#42324)
i forgot this is a thing
2026-04-04 16:57:24 +02:00
B_Kirill 1cf546113d Add craft for bonfire and bonfire with stake (#42211)
* Add craft for bonfire and bonfire with stake

* review

* review

* nullable MaxFireStacks

* retry

* retry

* review

* I will change it and hope that they will agree with me

* Revert "I will change it and hope that they will agree with me"

This reverts commit 83823692d0116bf9aa9eceb85a10e95c88b51fb9.

* construction

Merged the graphs
Changed the bonfire stake ID to follow the proper naming scheme

* add destroy sound

* planks Instead of logs

* of course I forgot about ftl

* Slarti review + Princess review

Yes I sneaked an admeme abuse change here

* a small fix

* clamp firestacks

* This was on purpose, leave as is

This reverts commit 7d63e38b66cb63e5e50b7fac5030013e2ef508b5.

* irrelevant

* Fixtures

* cleanup

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:24 +02:00
BarryNorfolk 44e41d5019 Downstream fixes for #29413 2026-04-04 16:57:24 +02:00
LevitatingTree 32d5681e9e Bring back shrug sanitization in a different form (#41236)
* Re-add chat-san & add o//

* changed o// to :?
2026-04-04 16:57:24 +02:00
BarryNorfolk ebefff61a2 Downstream fixes for #42292 (Handheld health analyzer) 2026-04-04 16:57:24 +02:00
āda 483989e1b1 Remove battery from the handheld health analyzer (#42292)
* commit

* review

* review 2

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Princess Cheeseballs a860d2e1b9 Goliath Hardsuit Fixes (#42303)
goliath hardsuit fixes

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
JackspajfMain 45c3eedb55 Fix Capitalization on HoP's Fountain Pen (#42300)
capitalization
2026-04-04 16:57:23 +02:00
BarryNorfolk 7fdccdb89b Downstream fixes for #38878 (Yaml test for non-existent components) 2026-04-04 16:57:23 +02:00
Perry Fraser a15d8db3a2 Remove yaml'd non-existent components + test for that (#38878)
* chore: remove some unregistered components

* feat: test for components being ignored on client + server
2026-04-04 16:57:23 +02:00
āda 2b54519baa Reorganize and clean Fun yml (#42184)
* don't look at this commit size i'm not proud

* self review

* more final changes

* more comments

* review

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
SomegnihT 0dd1a6708c Vox now say they become fried chicken upon taking enough heat dmg (#42280)
* Made it so that vox now say they become fried chicken upon taking enough heat dmg

* updated a comment to be more clear

* changed the name of bodyburnvox-text-other to bodyburn-vox-text-other

* forgot that I needed to also update the text in vox.yml to go with the previous commit change

* BurnBodyBehavior now takes bodyburn-text-others as default

* fixed suggested changes

* Relized I forgot to do a suggested change, I have now done it

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Samuka 5b0006bde9 Xenoborg camera monitor now shows xenoborgs names (#42205)
* update camera id

* revert code changes in SharedSurveillanceCameraSystem

* why change camera id if you can just send the entity name
2026-04-04 16:57:23 +02:00
āda 8eb0d3eb32 Grappling gun rope visual change (#42207)
* sprite changes

* system changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2026-04-04 16:57:23 +02:00
Kyle Tyo 75cb2931c5 Fix attributions for /Resources/Audio/Misc/ (#42230)
* commit

* cleanup
2026-04-04 16:57:23 +02:00
ScarKy0 caded37f81 Chameleon Projector Battery, Price Decrease (#42271)
* init

* fuck using

* glowup

* unused

* meta

* whuh

* review

* tests

* Update SharedChameleonProjectorSystem.cs
2026-04-04 16:57:23 +02:00
0-Anon 848a1e2185 Guarantee glue and lube in toybox (#42146)
Update fun.yml
2026-04-04 16:57:23 +02:00
SnappingOpossum 4ce6d3d1af Replace recently added StorageFill with EntityTableContainerFill (#42269)
I HATE STORAGE FILL
2026-04-04 16:57:23 +02:00
BarryNorfolk f8f03e2dd3 Downstream fixes for #42200 2026-04-04 16:57:23 +02:00
ThatGuyUSA 18280c51d1 [FEATURE] More icons (#42200)
* innit bruv, but also done!

* added comment to signify why it's like that

* init, but done

* init commit

* you think you got everythin, until you didn't

* credits and one last touch up

* i fucking hate git

* KILL OLD COMMITS

This reverts commit 6f834a51de611f215ede02f291a9d834777884a5.

* KILLING OLD COMMITS

This reverts commit 36e1f4a476b873f2326723740eccf455060520d8.

* I am going to become the joker

* one day i'll learn how to delete old commits properly

* god fucking damn it

* capitalization!
2026-04-04 16:57:23 +02:00