From 568cae8d8a91946601c7c8eeda39e2729cec616e Mon Sep 17 00:00:00 2001 From: Jumps Date: Sun, 24 May 2020 14:00:36 -0700 Subject: [PATCH 1/3] initial --- _maps/map_files/YogsDelta/YogsDelta.dmm | 47 +++++++++--------- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 63 +++++++++++++++---------- 2 files changed, 61 insertions(+), 49 deletions(-) diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index f40e1100c1e5..2983f7c471bb 100644 --- a/_maps/map_files/YogsDelta/YogsDelta.dmm +++ b/_maps/map_files/YogsDelta/YogsDelta.dmm @@ -101609,14 +101609,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/science/xenobiology) -"cXm" = ( -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, -/obj/structure/table/reinforced, -/obj/item/extinguisher, -/turf/open/floor/circuit/green, -/area/science/xenobiology) "cXn" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -126676,19 +126668,6 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible, /turf/open/space, /area/space/nearstation) -"hFQ" = ( -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, -/obj/structure/table/reinforced, -/obj/item/extinguisher, -/obj/item/extinguisher, -/obj/item/pet_carrier/xenobio, -/obj/item/pet_carrier/xenobio, -/obj/item/pet_carrier/xenobio, -/obj/item/pet_carrier/xenobio, -/turf/open/floor/circuit/green, -/area/science/xenobiology) "hLm" = ( /obj/machinery/power/terminal{ dir = 4 @@ -126725,6 +126704,15 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit, /turf/open/floor/plating, /area/maintenance/port) +"iMT" = ( +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 8 + }, +/turf/open/floor/circuit/green, +/area/science/xenobiology) "iQh" = ( /obj/structure/bodycontainer/morgue{ dir = 1 @@ -127049,6 +127037,19 @@ /obj/structure/lattice, /turf/open/space, /area/space) +"nWW" = ( +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/obj/structure/table/reinforced, +/obj/item/pet_carrier/xenobio, +/obj/item/pet_carrier/xenobio, +/obj/item/pet_carrier/xenobio, +/obj/item/pet_carrier/xenobio, +/obj/item/extinguisher, +/obj/item/extinguisher, +/turf/open/floor/circuit/green, +/area/science/xenobiology) "olS" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt, @@ -160341,9 +160342,9 @@ cMY cMY cTV cVT -cXm +nWW cZb -hFQ +iMT dcu ddV cMY diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index c890b3b27837..b802c98d2bed 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -57241,18 +57241,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) -"bXg" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table/glass, -/obj/item/pet_carrier/xenobio, -/obj/item/pet_carrier/xenobio, -/turf/open/floor/plasteel, -/area/science/xenobiology) "bXh" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -57387,18 +57375,6 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) -"bXw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/table/glass, -/obj/item/pet_carrier/xenobio, -/obj/item/pet_carrier/xenobio, -/turf/open/floor/plasteel, -/area/science/xenobiology) "bXx" = ( /obj/machinery/shower{ dir = 8; @@ -83416,6 +83392,29 @@ /obj/item/clothing/suit/apron/chef, /turf/open/floor/plating, /area/maintenance/port/aft) +"gwI" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/table/glass, +/obj/item/pet_carrier/xenobio, +/obj/item/pet_carrier/xenobio, +/obj/item/pet_carrier/xenobio, +/obj/item/pet_carrier/xenobio, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"gyC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engine/break_room) "gLo" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -83765,6 +83764,18 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"kHv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/computer/camera_advanced/xenobio{ + dir = 2 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) "kKf" = ( /obj/structure/window/reinforced, /obj/structure/lattice, @@ -118262,7 +118273,7 @@ aaa aaf cqs cRS -bXg +kHv bXO cyk bYo @@ -118776,7 +118787,7 @@ aaa aaf cqs cRS -bXw +gwI bXP cym bYp From a57ed345aa0a773bdbb6b95531f045910cbfdcd4 Mon Sep 17 00:00:00 2001 From: Jumps Date: Sun, 24 May 2020 14:10:56 -0700 Subject: [PATCH 2/3] what is hourglass and why is he making my checks fail --- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index b802c98d2bed..bdbbdfce1daa 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -83309,7 +83309,7 @@ /obj/machinery/door/poddoor{ density = 1; id = "QMLoaddoor2"; - name = "Supply Dock Loading Door" + name = "Supply Dock Loading Door " }, /obj/machinery/conveyor{ dir = 4; From 1102bf7915769c3109745018f77215149d0797e8 Mon Sep 17 00:00:00 2001 From: Jumps Date: Sun, 24 May 2020 14:11:00 -0700 Subject: [PATCH 3/3] Revert "what is hourglass and why is he making my checks fail" This reverts commit a57ed345aa0a773bdbb6b95531f045910cbfdcd4. --- _maps/map_files/Yogsmeta/Yogsmeta.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index bdbbdfce1daa..b802c98d2bed 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -83309,7 +83309,7 @@ /obj/machinery/door/poddoor{ density = 1; id = "QMLoaddoor2"; - name = "Supply Dock Loading Door " + name = "Supply Dock Loading Door" }, /obj/machinery/conveyor{ dir = 4;