Merge branch 'master' into black_orbit

ss220club · Jan 30, 2025 · 4c44942 · 4c44942
2 parents b6d18bc + 94a38b3
commit 4c44942
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/html/changelogs/bandastation/AutoChangeLog-pr-1104.yml b/html/changelogs/bandastation/AutoChangeLog-pr-1104.yml
@@ -0,0 +1,4 @@
+author: "AyIong"
+delete-after: True
+changes:
+  - rscdel: "Удалены модульные спрайты огнетушителя"
diff --git a/modular_bandastation/aesthetics/_aesthetics.dme b/modular_bandastation/aesthetics/_aesthetics.dme
@@ -19,7 +19,6 @@
 #include "clothing/centcom/code/mod/mod_types.dm"
 #include "disposal/code/disposal.dm"
 #include "dresser/code/dresser.dm"
-#include "extinguisher/code/extinguisher.dm"
 #include "firealarm/code/firealarm.dm"
 #include "floors/code/floors.dm"
 #include "keycard_auth/code/keycard_auth.dm"

diff --git a/modular_bandastation/aesthetics/extinguisher/code/extinguisher.dm b/modular_bandastation/aesthetics/extinguisher/code/extinguisher.dm
diff --git a/modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi b/modular_bandastation/aesthetics/extinguisher/icons/extinguisher.dmi