From aa7b59756d4caba0885ab9e20030493ac1edde6a Mon Sep 17 00:00:00 2001 From: Mewchild Date: Wed, 18 Apr 2018 13:45:35 -0500 Subject: [PATCH 1/2] Xenobio lab updates --- maps/tether/tether-01-surface1.dmm | 60 +++++++++++++++--------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index bcc9dfd10da..1719709bb74 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -13052,6 +13052,12 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = -32; + tag = "icon-extinguisher_closed (NORTH)" + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aEG" = ( @@ -13942,6 +13948,12 @@ /obj/item/stack/material/phoron, /obj/item/stack/material/phoron, /obj/machinery/reagentgrinder, +/obj/structure/extinguisher_cabinet{ + dir = 8; + icon_state = "extinguisher_closed"; + pixel_x = 30; + tag = "icon-extinguisher_closed (WEST)" + }, /turf/simulated/floor/tiled, /area/outpost/research/xenobiology) "aHe" = ( @@ -13949,8 +13961,7 @@ /area/rnd/external) "aHg" = ( /obj/machinery/camera/network/research{ - dir = 4; - + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -14044,8 +14055,7 @@ /area/rnd/anomaly_lab/containment_one) "aHt" = ( /obj/machinery/camera/network/research{ - dir = 4; - + dir = 4 }, /obj/structure/cable/green{ d1 = 1; @@ -18688,6 +18698,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/item/weapon/melee/baton/slime/loaded, /turf/simulated/floor/tiled, /area/outpost/research/xenobiology) "bkt" = ( @@ -18708,7 +18719,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/item/weapon/melee/baton/slime/loaded, +/obj/item/device/slime_scanner, +/obj/item/device/slime_scanner, /turf/simulated/floor/tiled, /area/outpost/research/xenobiology) "bkI" = ( @@ -18724,7 +18736,10 @@ pixel_y = 24; req_access = list() }, -/obj/item/weapon/extinguisher, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/glasses/welding, +/obj/item/weapon/weldingtool, +/obj/item/weapon/weldingtool, /turf/simulated/floor/tiled, /area/outpost/research/xenobiology) "bkJ" = ( @@ -19216,6 +19231,12 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 5 }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + icon_state = "extinguisher_closed"; + pixel_x = 30; + tag = "icon-extinguisher_closed (WEST)" + }, /turf/simulated/floor/tiled, /area/outpost/research/xenobiology) "boy" = ( @@ -20446,33 +20467,9 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) -"bvN" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/rnd/hallway) "bvO" = ( @@ -22639,6 +22636,7 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/reinforced, /area/outpost/research/xenobiology) "bQB" = ( @@ -30630,7 +30628,7 @@ aAS aAS auu auu -bvN +bwi aEE aFk aGr From ec1f7e384f84ca2b67cbbefee65c3e0534b8d0a6 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Wed, 18 Apr 2018 14:08:22 -0500 Subject: [PATCH 2/2] Removes tags from added extinguisher cabinets --- maps/tether/tether-01-surface1.dmm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 1719709bb74..021d4b7a328 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -13055,8 +13055,7 @@ /obj/structure/extinguisher_cabinet{ dir = 1; icon_state = "extinguisher_closed"; - pixel_y = -32; - tag = "icon-extinguisher_closed (NORTH)" + pixel_y = -32 }, /turf/simulated/floor/tiled, /area/rnd/hallway) @@ -13951,8 +13950,7 @@ /obj/structure/extinguisher_cabinet{ dir = 8; icon_state = "extinguisher_closed"; - pixel_x = 30; - tag = "icon-extinguisher_closed (WEST)" + pixel_x = 30 }, /turf/simulated/floor/tiled, /area/outpost/research/xenobiology)