Merge remote-tracking branch 'upstream/master' into adds_more_soul

ParadiseSS13 · Jan 19, 2025 · 6f2c5e5 · 6f2c5e5
2 parents ef30862 + 97e99fe
commit 6f2c5e5
Show file tree

Hide file tree

Showing 182 changed files with 2,262 additions and 1,448 deletions.
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm b/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm
@@ -126,7 +126,6 @@
 /area/ruin/space/powered)
 "lq" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/jacket/fluff,
 /obj/item/clothing/under/color/random,
 /obj/item/clothing/under/suit/navy,
 /obj/item/clothing/under/pants/blackjeans,

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm
@@ -143,7 +143,6 @@
 /area/ruin/space/powered)
 "nz" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/jacket/fluff,
 /obj/item/clothing/under/color/random,
 /obj/item/clothing/under/suit/navy,
 /obj/item/clothing/under/pants/blackjeans,