Merge remote-tracking branch 'upstream/master'

_maps/deathmatch/OSHA_Violator.dmm

@@ -20,11 +20,18 @@
 /obj/structure/closet/secure_closet/engineering_welding,
 /turf/open/indestructible,
 /area/deathmatch)
+"cl" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/structure/cable,
+/turf/open/indestructible,
+/area/deathmatch)
 "cA" = (
 /turf/open/indestructible,
 /area/deathmatch)
 "cR" = (
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/effect/turf_decal/bot,
 /obj/structure/cable,
 /turf/open/indestructible,
@@ -36,7 +43,7 @@
 "dt" = (
 /obj/machinery/light/no_nightlight/directional/north,
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -578,7 +585,7 @@
 /area/deathmatch)
 "Bv" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -682,6 +689,13 @@
 /obj/machinery/light/no_nightlight/directional/west,
 /turf/open/indestructible,
 /area/deathmatch)
+"Gw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/cable,
+/turf/open/indestructible,
+/area/deathmatch)
 "Gx" = (
 /obj/machinery/conveyor/auto,
 /obj/structure/cable,
@@ -846,7 +860,7 @@
 /turf/open/indestructible,
 /area/deathmatch)
 "Pg" = (
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator,
 /obj/machinery/light/no_nightlight/directional/north,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -977,7 +991,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -1039,8 +1053,11 @@
 /turf/open/indestructible,
 /area/deathmatch)
 "YA" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
 /obj/structure/cable,
-/turf/closed/indestructible/fakeglass,
+/turf/open/indestructible,
 /area/deathmatch)
 "YJ" = (
 /obj/structure/cable,
@@ -1059,7 +1076,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -1070,6 +1087,12 @@
 	},
 /turf/open/indestructible,
 /area/deathmatch)
+"Zq" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/indestructible,
+/area/deathmatch)
 "Zr" = (
 /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle,
 /turf/open/space/basic,
@@ -1336,7 +1359,7 @@ je
 (11,1,1) = {"
 je
 ai
-YA
+cl
 ai
 gN
 cA
@@ -1911,7 +1934,7 @@ je
 (34,1,1) = {"
 je
 ai
-bl
+Zq
 ai
 ai
 Bf
@@ -1929,7 +1952,7 @@ Bf
 Bf
 ai
 ai
-bl
+Gw
 ai
 je
 "}