From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Date: Tue, 28 Oct 2025 19:14:52 +0000 (-0700)
Subject: Stable merge (#41171)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f039432aa5dfdd66b71daf922916663b53af4f88;p=space-station-14.git

Stable merge (#41171)

* [HOTFIX] Fix status effect removal from entity effects and buckets not being draggable (#41168)

just do less work it's that easy!

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

* [Hotfix] Fix Phalanx (#41170)

feex

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>

---------

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
---

f039432aa5dfdd66b71daf922916663b53af4f88