diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm index 33e3a32368f..a3e22a7a220 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm @@ -6,7 +6,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "c" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ pixel_y = -32 }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -15,7 +15,7 @@ /turf/closed/wall/mineral/titanium/survival/pod, /area/ruin/powered) "e" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4; pixel_x = 32 }, @@ -38,7 +38,7 @@ /turf/open/floor/pod/dark, /area/ruin/powered) "i" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 8; pixel_x = -32 }, @@ -126,7 +126,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "w" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ pixel_y = 32 }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -139,7 +139,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "y" = ( -/obj/structure/sign/mining{ +/obj/effect/turf_decal/mining{ pixel_y = 32 }, /obj/effect/decal/cleanable/blood/footprints{ diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 1ba6334ed50..88c74aaca09 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -11332,7 +11332,7 @@ /obj/structure/fence{ dir = 4 }, -/obj/structure/sign/mining, +/obj/effect/turf_decal/mining, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/cave) "Ck" = ( diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 5a4c46a7ec0..7f26627f21c 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -2650,7 +2650,7 @@ /obj/structure/fence{ dir = 4 }, -/obj/structure/sign/mining, +/obj/effect/turf_decal/mining, /turf/closed/mineral/random/snow, /area/icemoon/underground/unexplored/rivers) "tn" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ec540cb86c6..6488fb44e24 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -26417,7 +26417,7 @@ /area/hallway/secondary/entry) "bjX" = ( /obj/effect/turf_decal/bot, -/obj/structure/sign/mining, +/obj/effect/turf_decal/mining, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1, /turf/open/floor/plasteel, diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index cab6c6eda1b..5e4b797a85c 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -5177,7 +5177,7 @@ /obj/structure/fence{ dir = 4 }, -/obj/structure/sign/mining, +/obj/effect/turf_decal/mining, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors/explored) "YJ" = ( diff --git a/_maps/templates/shelter_1.dmm b/_maps/templates/shelter_1.dmm index 15e5574abad..f68cb172ea1 100644 --- a/_maps/templates/shelter_1.dmm +++ b/_maps/templates/shelter_1.dmm @@ -3,7 +3,7 @@ /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) "b" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 1 }, /turf/closed/wall/mineral/titanium/survival/pod, @@ -21,7 +21,7 @@ /turf/open/floor/pod, /area/survivalpod) "f" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 8 }, /turf/closed/wall/mineral/titanium/survival/pod, @@ -39,7 +39,7 @@ /turf/open/floor/pod, /area/survivalpod) "j" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4 }, /turf/closed/wall/mineral/titanium/survival/pod, @@ -56,7 +56,7 @@ /turf/open/floor/pod, /area/survivalpod) "m" = ( -/obj/structure/sign/mining/survival, +/obj/effect/turf_decal/mining/survival, /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) "n" = ( @@ -65,7 +65,7 @@ /turf/open/floor/pod, /area/survivalpod) "o" = ( -/obj/structure/sign/mining, +/obj/effect/turf_decal/mining, /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index e2b21fa1438..31aaf07d8da 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -3,7 +3,7 @@ /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) "b" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 1 }, /turf/closed/wall/mineral/titanium/survival/pod, @@ -20,7 +20,7 @@ /turf/open/floor/pod, /area/survivalpod) "d" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 8 }, /turf/closed/wall/mineral/titanium/survival/pod, @@ -44,7 +44,7 @@ /turf/open/floor/pod, /area/survivalpod) "j" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4 }, /turf/closed/wall/mineral/titanium/survival/pod, @@ -186,7 +186,7 @@ /turf/open/floor/carpet/black, /area/survivalpod) "C" = ( -/obj/structure/sign/mining/survival, +/obj/effect/turf_decal/mining/survival, /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) "D" = ( @@ -195,7 +195,7 @@ /turf/open/floor/pod, /area/survivalpod) "E" = ( -/obj/structure/sign/mining, +/obj/effect/turf_decal/mining, /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) diff --git a/_maps/templates/shelter_3.dmm b/_maps/templates/shelter_3.dmm index 30c427ce3b2..c4a0eec6c25 100644 --- a/_maps/templates/shelter_3.dmm +++ b/_maps/templates/shelter_3.dmm @@ -3,7 +3,7 @@ /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) "b" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 1 }, /turf/closed/wall/mineral/titanium/survival/pod, @@ -12,13 +12,13 @@ /turf/closed/wall/mineral/titanium/survival/nodiagonal, /area/survivalpod) "d" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 1 }, /turf/closed/wall/mineral/titanium/survival/nodiagonal, /area/survivalpod) "e" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 8 }, /turf/closed/wall/mineral/titanium/survival/nodiagonal, @@ -89,7 +89,7 @@ /turf/open/floor/pod/dark, /area/survivalpod) "o" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4 }, /obj/structure/disposalpipe/junction{ @@ -145,7 +145,7 @@ /turf/open/floor/pod/dark, /area/survivalpod) "w" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4 }, /obj/structure/disposalpipe/segment, @@ -170,7 +170,7 @@ /turf/open/floor/carpet/black, /area/survivalpod) "B" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4 }, /obj/structure/disposalpipe/segment{ @@ -232,7 +232,7 @@ /turf/open/floor/pod/light, /area/survivalpod) "J" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4 }, /turf/closed/wall/mineral/titanium/survival/nodiagonal, @@ -261,17 +261,17 @@ /turf/open/floor/pod/light, /area/survivalpod) "O" = ( -/obj/structure/sign/mining/survival{ +/obj/effect/turf_decal/mining/survival{ dir = 4 }, /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) "P" = ( -/obj/structure/sign/mining/survival, +/obj/effect/turf_decal/mining/survival, /turf/closed/wall/mineral/titanium/survival/pod, /area/survivalpod) "Q" = ( -/obj/structure/sign/mining/survival, +/obj/effect/turf_decal/mining/survival, /turf/closed/wall/mineral/titanium/survival/nodiagonal, /area/survivalpod) "R" = ( diff --git a/code/game/objects/effects/decals/turfdecal/markings.dm b/code/game/objects/effects/decals/turfdecal/markings.dm index 6f7c73eb29d..8b55bc7cc08 100644 --- a/code/game/objects/effects/decals/turfdecal/markings.dm +++ b/code/game/objects/effects/decals/turfdecal/markings.dm @@ -180,3 +180,9 @@ /obj/effect/turf_decal/raven/nine icon_state = "RAVEN9" + +/obj/effect/turf_decal/mining + icon_state = "mining" + +/obj/effect/turf_decal/mining/survival + icon_state = "survival" diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 92c2ec1f463..86d862a52b3 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -265,20 +265,6 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF invisibility = INVISIBILITY_ABSTRACT -//Signs -/obj/structure/sign/mining - name = "\improper Nanotrasen mining corps sign" - desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims." - icon = 'icons/turf/walls/survival_pod_walls.dmi' - icon_state = "ntpod" - buildable_sign = FALSE - -/obj/structure/sign/mining/survival - name = "shelter sign" - desc = "A high visibility sign designating a safe shelter." - icon = 'icons/turf/walls/survival_pod_walls.dmi' - icon_state = "survival" - //Fluff /obj/structure/tubes icon_state = "tubes" diff --git a/icons/turf/decals.dmi b/icons/turf/decals.dmi index 09c6db36d31..7a1c8741f30 100644 Binary files a/icons/turf/decals.dmi and b/icons/turf/decals.dmi differ diff --git a/icons/turf/walls/survival_pod_walls.dmi b/icons/turf/walls/survival_pod_walls.dmi index d6a8b097ce3..83fadb92f28 100644 Binary files a/icons/turf/walls/survival_pod_walls.dmi and b/icons/turf/walls/survival_pod_walls.dmi differ