Resprites added + map changes to replace showers (Mojave-Sun#2464)

HELP HELP HELP
EdwardNashton · Oct 8, 2023 · 734c2ab · 734c2ab
1 parent 6b36404
commit 734c2ab
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 93 deletions.
diff --git a/_maps/map_files/Drought/Drought.dmm b/_maps/map_files/Drought/Drought.dmm
@@ -4484,7 +4484,7 @@
 /turf/open/floor/plating/ms13/ground/desert,
 /area/ms13/legioncamp)
 "fci" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/square,
@@ -6354,7 +6354,7 @@
 /turf/open/floor/ms13/tile/large/cafeteria,
 /area/ms13/town)
 "hiJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -6930,7 +6930,7 @@
 /turf/open/floor/plating/ms13/ground/desertalt,
 /area/ms13/desert)
 "hPR" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -7773,7 +7773,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/water_baron/interior)
 "iJw" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	pixel_y = 24
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -8939,7 +8939,7 @@
 /turf/open/floor/ms13/tile/large/checkered,
 /area/ms13/town)
 "kbi" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/square,
@@ -12371,7 +12371,7 @@
 /area/ms13/town)
 "nOg" = (
 /obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /turf/open/floor/ms13/tile,
@@ -13226,7 +13226,7 @@
 /turf/open/floor/ms13/concrete/bricks,
 /area/ms13/town)
 "oLo" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -14072,7 +14072,7 @@
 /turf/open/floor/ms13/tile,
 /area/ms13/town)
 "pBY" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -15765,7 +15765,7 @@
 /turf/open/floor/ms13/concrete/industrial,
 /area/ms13/town)
 "rtD" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -17260,7 +17260,7 @@
 /turf/open/floor/wood/ms13/wide,
 /area/ms13/town)
 "tas" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,

diff --git a/_maps/map_files/Drought/Drought_above.dmm b/_maps/map_files/Drought/Drought_above.dmm
@@ -4123,7 +4123,7 @@
 /area/ms13/town)
 "ob" = (
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -4719,7 +4719,7 @@
 /area/ms13/town)
 "qd" = (
 /obj/effect/turf_decal/ms13/showerdrains/small,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -5518,7 +5518,7 @@
 /area/ms13/water_baron/interior)
 "sW" = (
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -5829,7 +5829,7 @@
 "uc" = (
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -6343,7 +6343,7 @@
 /turf/open/floor/wood/ms13/carpet/shaggy,
 /area/ms13/town)
 "vJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/square,
@@ -7659,7 +7659,7 @@
 /area/ms13/town)
 "Au" = (
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -7884,7 +7884,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/water_baron/interior)
 "Bh" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/square,
@@ -8400,7 +8400,7 @@
 /turf/open/floor/plating/ms13/ground/desert,
 /area/ms13/drylanders)
 "CX" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -10720,7 +10720,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/town)
 "KU" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/square,
@@ -12488,7 +12488,7 @@
 /area/ms13/town)
 "QV" = (
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -12547,7 +12547,7 @@
 /turf/open/openspace/ms13,
 /area/ms13/town)
 "Re" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -12825,7 +12825,7 @@
 /turf/open/openspace/ms13,
 /area/ms13/water_baron)
 "Se" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -13285,7 +13285,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/water_baron/interior)
 "TJ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	pixel_y = 17
 	},
 /obj/effect/mapping_helpers/sunlight/pseudo_roof_setter/wood,
@@ -13444,7 +13444,7 @@
 /turf/open/floor/ms13/concrete/industrial,
 /area/ms13/town)
 "Uk" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,

diff --git a/_maps/map_files/Drought/Drought_below.dmm b/_maps/map_files/Drought/Drought_below.dmm
@@ -208,7 +208,7 @@
 /turf/open/floor/plating/ms13/ground/mountain/drought,
 /area/ms13/underground/mountain)
 "bI" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -504,7 +504,7 @@
 /turf/open/floor/wood/ms13/wide,
 /area/ms13/town)
 "dP" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /turf/open/floor/ms13/tile,
@@ -580,7 +580,7 @@
 /turf/open/floor/ms13/metal/pipe,
 /area/ms13/underground/mountain_bunker)
 "en" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/machinery/light/ms13/bulb/industrial{
@@ -848,7 +848,7 @@
 /turf/open/floor/wood/ms13/wide,
 /area/ms13/town)
 "fQ" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /turf/open/floor/ms13/tile,
@@ -1839,7 +1839,7 @@
 /turf/open/floor/ms13/concrete/industrial,
 /area/ms13/town)
 "mN" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 8
 	},
 /obj/structure/ms13/storage/vent,
@@ -2672,7 +2672,7 @@
 /turf/open/floor/ms13/concrete,
 /area/ms13/underground/mountain_bunker)
 "sf" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	pixel_y = 24
 	},
 /turf/open/floor/ms13/tile,
@@ -2837,7 +2837,7 @@
 /turf/open/floor/plating/ms13/ground/desertalt,
 /area/ms13/town)
 "tn" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/effect/turf_decal/ms13/showerdrains/small,
@@ -4912,7 +4912,7 @@
 /turf/open/floor/ms13/metal/pipe/corner,
 /area/ms13/town)
 "HE" = (
-/obj/machinery/shower{
+/obj/machinery/shower/ms13{
 	dir = 4
 	},
 /obj/structure/ms13/storage/vent,