Commit Graph
6 Commits
Author SHA1 Message Date
Coryler 04cd42187a Fix Devil being immune to Holy 2026-06-29 12:44:20 +02:00
Coryler 7b939bfd28 Fix files for upmerge changes. Notably Nubnody and Damagaeable 2026-06-29 12:44:06 +02:00
BarryNorfolk 987361b5ce Downstream fixes for .net10 2026-04-04 16:57:19 +02:00
BarryNorfolk 538a1b1839 Downstream devil fix to Painnumbness status effect 2026-04-04 16:54:51 +02:00
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
William LemonandTobias Berger 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