Merge remote-tracking branch 'upstream/master' into patch/zonesel

silicons · Aug 22, 2018 · a763bbf · a763bbf
2 parents 1017efb + 39a07a7
commit a763bbf
Show file tree

Hide file tree

Showing 50 changed files with 2,645 additions and 1,383 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
@@ -3475,7 +3475,8 @@
 /turf/open/floor/plasteel/airless,
 /area/ruin/space/derelict/hallway/primary/port)
 "lF" = (
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/ruin/space/derelict/hallway/primary)
 "lG" = (
 /turf/open/floor/plasteel/airless{

diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -161,7 +161,8 @@
 /area/shuttle/caravan/freighter3)
 "aN" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter3)
 "aO" = (
 /obj/machinery/airalarm/all_access{
@@ -179,7 +180,8 @@
 /mob/living/simple_animal/hostile/pirate/ranged/space{
 	environment_smash = 0
 	},
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter2)
 "aQ" = (
 /obj/structure/rack,
@@ -474,7 +476,8 @@
 /area/shuttle/caravan/freighter3)
 "gT" = (
 /mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter3)
 "gU" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -754,7 +757,8 @@
 	pixel_x = 24
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter3)
 "if" = (
 /obj/machinery/firealarm{
@@ -887,7 +891,8 @@
 	dir = 4
 	},
 /mob/living/simple_animal/hostile/syndicate/ranged/smg/space,
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter3)
 "iF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1001,7 +1006,8 @@
 /area/shuttle/caravan/freighter2)
 "jq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter2)
 "jr" = (
 /obj/effect/turf_decal/box/white/corners{
@@ -1075,7 +1081,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter2)
 "jK" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
@@ -1090,7 +1097,8 @@
 /mob/living/simple_animal/hostile/pirate/ranged/space{
 	environment_smash = 0
 	},
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/shuttle/caravan/freighter2)
 "jN" = (
 /turf/open/floor/plasteel/airless{

diff --git a/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm b/_maps/RandomRuins/SpaceRuins/cloning_facility.dmm
@@ -64,10 +64,12 @@
 /area/ruin/space/has_grav/powered/ancient_shuttle)
 "o" = (
 /obj/machinery/vending/snack/teal,
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/ruin/space/has_grav/powered/ancient_shuttle)
 "p" = (
-/turf/open/floor/plasteel/airless/floorgrime,
+/turf/open/floor/plasteel/airless,
+/obj/effect/decal/cleanable/dirt,
 /area/ruin/space/has_grav/powered/ancient_shuttle)
 "q" = (
 /obj/structure/sign/directions/science{

diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm
@@ -1058,7 +1058,8 @@
 /obj/effect/turf_decal/loading_area{
 	dir = 4
 	},
-/turf/open/floor/plasteel/floorgrime,
+/turf/open/floor/plasteel,
+/obj/effect/decal/cleanable/dirt,
 /area/awaymission/BMPship/Midship)
 "dP" = (
 /obj/machinery/conveyor{