Commit Graph

4 Commits

Author SHA1 Message Date
Tobias Berger 2025891fc2
Upstream Merge Changelog Fix (September/October Edition) (#5051)
* This vexes me

* Extra fixes for https://github.com/space-wizards/space-station-14/pull/41119

* Missing upmerge CL (here's hoping)

* Remove stray BOM
2025-12-29 22:43:44 +01:00
Vanessa 1dc29c9e32 Literally all of the damageable system refactor shitmed fixes. 2025-12-29 11:39:33 -06:00
Vanessa 49cb073873 Fixed Devil errors after rebasing. 2025-11-23 15:22:35 -06:00
William Lemon f563f2c566
Ports Devils from Goobstation (#4639)
* or your debil

* Woop

* Whoops, Missed this

* Whoops, Suicide System

* Hush... Extended tests... Hush

* AAAAAA

* No-longer jaunt whilst dead

* :)

* Update Content.Shared/_Lavaland/Chasm/PreventChasmFallingSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: William Lemon <William.Lemon2@gmail.com>

* Update Content.Server/_Goobstation/Possession/PossessionSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: William Lemon <William.Lemon2@gmail.com>

* Please tobysenpai forgive me

---------

Signed-off-by: William Lemon <William.Lemon2@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-11-20 10:11:07 +01:00