From 3ed7f0ee19684c6b0f6df152ffae3e7b37e91543 Mon Sep 17 00:00:00 2001 From: topham1 Date: Thu, 14 Apr 2016 03:27:03 -0500 Subject: [PATCH 1/3] adds two showers and a mirror to boxstation's medbay --- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 53 ++++++++++++------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 90408ea16ac..00d9caa71f9 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -37497,14 +37497,9 @@ icon_state = "alarm0"; pixel_x = -22 }, -/obj/machinery/camera{ - c_tag = "Medbay Treatment Center"; - dir = 4; - network = list("SS13"); - pixel_x = 0; - pixel_y = 0 +/obj/machinery/shower{ + dir = 4 }, -/obj/machinery/iv_drip, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -38106,17 +38101,25 @@ /turf/open/floor/plating, /area/security/checkpoint/supply) "bAp" = ( -/obj/machinery/iv_drip, +/obj/structure/closet/secure_closet/medical1, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, /turf/open/floor/plasteel{ icon_state = "white" }, /area/medical/sleeper) "bAq" = ( -/obj/machinery/light, /obj/machinery/sleeper{ icon_state = "sleeper-open"; dir = 8 }, +/obj/machinery/camera{ + c_tag = "Arrivals Bay 2"; + dir = 8; + network = list("SS13") + }, /turf/open/floor/plasteel, /area/medical/sleeper) "bAr" = ( @@ -38490,9 +38493,6 @@ }, /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/mask/muzzle, -/obj/machinery/light/small{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -38846,6 +38846,7 @@ dir = 2; pixel_y = 24 }, +/obj/machinery/iv_drip, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -39323,7 +39324,6 @@ /obj/item/weapon/folder/white, /obj/item/weapon/gun/syringe, /obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/soap/nanotrasen, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -39431,6 +39431,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/bed, +/obj/item/weapon/bedsheet/medical, /turf/open/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -39808,11 +39810,10 @@ }, /area/medical/sleeper) "bDD" = ( -/obj/structure/bed, -/obj/item/weapon/bedsheet/medical, /obj/structure/sign/nosmoking_2{ pixel_x = -28 }, +/obj/machinery/door/window/southright, /turf/open/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -39829,6 +39830,7 @@ network = list("SS13") }, /obj/structure/closet/wardrobe/pjs, +/obj/structure/window/reinforced, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -40788,6 +40790,7 @@ on = 1; pressure_checks = 1 }, +/obj/structure/window/reinforced, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -40871,7 +40874,8 @@ }, /area/medical/cmo) "bFF" = ( -/obj/machinery/light/small, +/obj/machinery/light, +/obj/item/weapon/soap/nanotrasen, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -40908,14 +40912,17 @@ }, /area/toxins/storage) "bFJ" = ( -/obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/machinery/shower{ + dir = 4 + }, /turf/open/floor/plasteel{ icon_state = "white" }, /area/medical/sleeper) "bFK" = ( -/obj/structure/closet/secure_closet/medical1, +/obj/structure/mirror{ + pixel_x = 28 + }, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -58422,6 +58429,12 @@ }, /turf/open/space, /area/space) +"coT" = ( +/obj/machinery/iv_drip, +/turf/open/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) "coU" = ( /obj/structure/table, /obj/item/weapon/surgicaldrill, @@ -103490,7 +103503,7 @@ bua bua bua bua -bhh +coT bhh btV bof From 1980610d0da41a81c8cb110849d8edd80cce9686 Mon Sep 17 00:00:00 2001 From: topham1 Date: Thu, 14 Apr 2016 03:36:54 -0500 Subject: [PATCH 2/3] properly edits c_tag of repositioned security camera --- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 130 ++++-------------- 1 file changed, 23 insertions(+), 107 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 00d9caa71f9..e05688d785b 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -2812,15 +2812,6 @@ /turf/open/floor/plasteel/shuttle, /area/shuttle/pod_3) "afq" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/status_display{ - density = 0; - layer = 3; - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/computer/shuttle/pod{ pixel_y = -32; possible_destinations = "pod_asteroid3"; @@ -2829,9 +2820,6 @@ /turf/open/floor/plasteel/shuttle, /area/shuttle/pod_3) "afr" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/item/device/radio/intercom{ pixel_y = 25 }, @@ -3098,9 +3086,6 @@ /obj/effect/landmark/start{ name = "Security Officer" }, -/obj/structure/chair{ - dir = 4 - }, /turf/open/floor/plasteel{ icon_state = "red"; dir = 8 @@ -3385,9 +3370,6 @@ /obj/effect/landmark/start{ name = "Security Officer" }, -/obj/structure/chair{ - dir = 4 - }, /turf/open/floor/plasteel{ icon_state = "redcorner"; dir = 1 @@ -3657,9 +3639,6 @@ /obj/effect/landmark/start{ name = "Security Officer" }, -/obj/structure/chair{ - dir = 4 - }, /turf/open/floor/plasteel, /area/security/main) "ahc" = ( @@ -4980,12 +4959,6 @@ /obj/structure/chair{ name = "Judge" }, -/obj/machinery/status_display{ - density = 0; - layer = 3; - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/light{ dir = 1 }, @@ -9133,9 +9106,6 @@ /turf/open/floor/wood, /area/lawoffice) "arY" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -10595,12 +10565,6 @@ }, /area/crew_quarters/sleep) "avm" = ( -/obj/machinery/status_display{ - density = 0; - layer = 3; - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -11198,9 +11162,6 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness) "awB" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Assistant" }, @@ -21659,12 +21620,6 @@ name = "Library Desk Door"; req_access_txt = "37" }, -/obj/machinery/status_display{ - density = 0; - layer = 3; - pixel_x = 0; - pixel_y = 32 - }, /turf/open/floor/wood, /area/library) "aTd" = ( @@ -24561,12 +24516,6 @@ }, /area/crew_quarters/locker) "aZy" = ( -/obj/machinery/status_display{ - density = 0; - layer = 3; - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/camera{ c_tag = "Conference Room"; dir = 2 @@ -27024,9 +26973,6 @@ }, /area/quartermaster/office) "beW" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Cargo Technician" }, @@ -38116,7 +38062,7 @@ dir = 8 }, /obj/machinery/camera{ - c_tag = "Arrivals Bay 2"; + c_tag = "Medbay Treatment Center"; dir = 8; network = list("SS13") }, @@ -41805,9 +41751,6 @@ /turf/open/floor/plasteel, /area/toxins/mixing) "bHv" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the test chamber."; dir = 8; @@ -42745,9 +42688,6 @@ /turf/open/floor/plasteel, /area/toxins/mixing) "bIW" = ( -/obj/structure/chair{ - dir = 4 - }, /turf/open/floor/plasteel{ dir = 6; icon_state = "warning" @@ -43408,9 +43348,6 @@ /turf/open/floor/plating/airless, /area/toxins/test_area) "bKh" = ( -/obj/structure/chair{ - dir = 4 - }, /turf/open/floor/plating/airless{ dir = 9; icon_state = "warnplate" @@ -44629,9 +44566,6 @@ /turf/open/floor/plating, /area/maintenance/asmaint2) "bMD" = ( -/obj/structure/chair{ - dir = 4 - }, /turf/open/floor/plating/airless{ dir = 10; icon_state = "warnplate" @@ -62771,9 +62705,6 @@ }, /area/shuttle/escape) "cxr" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -63411,9 +63342,6 @@ }, /area/shuttle/abandoned) "czb" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/decal/remains/human, /turf/open/floor/plasteel/shuttle{ icon_state = "shuttlefloor3" @@ -63668,15 +63596,6 @@ /turf/open/floor/plasteel/shuttle, /area/shuttle/pod_2) "czL" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/status_display{ - density = 0; - layer = 3; - pixel_x = 0; - pixel_y = 32 - }, /obj/machinery/computer/shuttle/pod{ pixel_y = -32; possible_destinations = "pod_asteroid4"; @@ -63685,9 +63604,6 @@ /turf/open/floor/plasteel/shuttle, /area/shuttle/pod_4) "czM" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/item/device/radio/intercom{ pixel_y = 25 }, @@ -73925,7 +73841,7 @@ awW awW arB cxu -cxA +cxC cxC cxH cxu @@ -75652,10 +75568,10 @@ aTp aTp aac cmH -cml -cml -cml -cml +aTp +aTp +aTp +aTp coh aTp aTp @@ -87002,7 +86918,7 @@ akC alj alY amI -anq +amI anM aop aoY @@ -91104,8 +91020,8 @@ aeO afF agj agJ -ahr -ahr +ahs +ahs aiD agj ajz @@ -92404,7 +92320,7 @@ anz aov aph aoc -arc +ata arY ata auh @@ -100632,7 +100548,7 @@ arj arj asZ aua -avB +aua awB axY azh @@ -112463,10 +112379,10 @@ asB aCR aEm aCR -aHp -aIF -aHp -aIF +aPl +aQv +aPl +aQv aCR aNY aCR @@ -115814,11 +115730,11 @@ cxd cxe cwU cwL -cxk -cxk -cxk -cxk -cxk +cxa +cxa +cxa +cxa +cxa cwL cwU cxQ @@ -117096,7 +117012,7 @@ cwL cwX cwL cwL -cxk +cxa cxj cwL cxq @@ -117348,8 +117264,8 @@ aaa aaa crx cwG -cwM -cwM +cwL +cwL cwW cxa cwL From ef289c6b34172ddffa24f5b528dababe98d744b7 Mon Sep 17 00:00:00 2001 From: topham1 Date: Thu, 14 Apr 2016 12:41:14 -0500 Subject: [PATCH 3/3] reverts medbay change to almost perfectly reflect older design without ruining erp hut --- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index e05688d785b..2d9cdf56cf0 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -36779,9 +36779,8 @@ pixel_x = -12; pixel_y = 2 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/structure/mirror{ + pixel_x = -28 }, /turf/open/floor/plasteel{ icon_state = "white" @@ -38052,6 +38051,10 @@ icon_state = "tube1"; dir = 8 }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -38792,7 +38795,6 @@ dir = 2; pixel_y = 24 }, -/obj/machinery/iv_drip, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -39270,6 +39272,7 @@ /obj/item/weapon/folder/white, /obj/item/weapon/gun/syringe, /obj/item/weapon/reagent_containers/dropper, +/obj/item/weapon/soap/nanotrasen, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -39377,8 +39380,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/machinery/iv_drip, /turf/open/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -39759,7 +39761,8 @@ /obj/structure/sign/nosmoking_2{ pixel_x = -28 }, -/obj/machinery/door/window/southright, +/obj/structure/bed, +/obj/item/weapon/bedsheet/medical, /turf/open/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -39775,8 +39778,7 @@ dir = 8; network = list("SS13") }, -/obj/structure/closet/wardrobe/pjs, -/obj/structure/window/reinforced, +/obj/machinery/iv_drip, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -40736,7 +40738,6 @@ on = 1; pressure_checks = 1 }, -/obj/structure/window/reinforced, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -40821,7 +40822,6 @@ /area/medical/cmo) "bFF" = ( /obj/machinery/light, -/obj/item/weapon/soap/nanotrasen, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -40858,17 +40858,14 @@ }, /area/toxins/storage) "bFJ" = ( -/obj/machinery/shower{ - dir = 4 - }, +/obj/structure/bed, +/obj/item/weapon/bedsheet/medical, /turf/open/floor/plasteel{ icon_state = "white" }, /area/medical/sleeper) "bFK" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, +/obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel{ icon_state = "white" }, @@ -58363,12 +58360,6 @@ }, /turf/open/space, /area/space) -"coT" = ( -/obj/machinery/iv_drip, -/turf/open/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) "coU" = ( /obj/structure/table, /obj/item/weapon/surgicaldrill, @@ -103419,7 +103410,7 @@ bua bua bua bua -coT +bhh bhh btV bof