From f8bf40e7cc59fd23430f9cdd94ee6e00168c0860 Mon Sep 17 00:00:00 2001 From: Jittai Date: Wed, 31 Jan 2018 03:20:31 -0500 Subject: [PATCH] Morgue and Crematorium Repositions --- _maps/map_files/BoxStation/BoxStation.dmm | 19 +- .../map_files/Deltastation/DeltaStation2.dmm | 233 ++++++++++++++++-- _maps/map_files/MetaStation/MetaStation.dmm | 182 +++++++++++--- 3 files changed, 369 insertions(+), 65 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c81b9539e6..b268529331 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -13952,8 +13952,8 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "aIB" = ( -/obj/structure/bodycontainer/crematorium, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/bodycontainer/crematorium, /turf/open/floor/plasteel/dark, /area/chapel/office) "aIC" = ( @@ -23227,6 +23227,9 @@ /area/medical/morgue) "bho" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "bhp" = ( @@ -94960,9 +94963,9 @@ bdp bdc bfL beY -biz -biz -biz +bhm +bhm +bhm bkR bfL boo @@ -98586,7 +98589,7 @@ bIP bPA bJN bRU -bSZ +bEm bEm bJN bRU @@ -98594,7 +98597,7 @@ bXe bEm bJN bRU -bSZ +bEm bEm bDb cgi @@ -101156,7 +101159,7 @@ bOx bPJ bJN bEm -bSZ +bEm bRU bJN bEm @@ -101164,7 +101167,7 @@ bXe bRU bJN bEm -bSZ +bEm bRU bDb aaf diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 26a99bb158..94d523a70b 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -90910,18 +90910,24 @@ }, /area/medical/morgue) "dDM" = ( -/obj/structure/bodycontainer/morgue, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/plating, /area/medical/morgue) "dDN" = ( -/obj/structure/bodycontainer/morgue, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/medical/morgue) "dDO" = ( -/obj/structure/bodycontainer/morgue, /obj/effect/decal/cleanable/dirt, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -90931,6 +90937,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/plating, /area/medical/morgue) "dDQ" = ( @@ -91423,7 +91432,7 @@ "dEV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/plasteel/neutral, /area/medical/morgue) "dEW" = ( /turf/open/floor/plasteel/neutral, @@ -92749,6 +92758,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/neutral, /area/medical/morgue) "dHK" = ( @@ -93405,6 +93415,9 @@ "dIW" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -93419,6 +93432,9 @@ /obj/structure/sign/poster/official/bless_this_spess{ pixel_y = -32 }, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -93436,14 +93452,18 @@ }, /area/medical/morgue) "dIZ" = ( -/obj/structure/bodycontainer/morgue, /obj/effect/decal/cleanable/dirt, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/morgue) "dJa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/light_construct/small, -/obj/effect/landmark/event_spawn, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, /turf/open/floor/plating, /area/medical/morgue) "dJb" = ( @@ -101277,10 +101297,11 @@ /turf/closed/wall/r_wall, /area/chapel/office) "dZO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/bodycontainer/crematorium{ + dir = 4; id = "cremawheat" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -105531,6 +105552,45 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"QOn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/medical/morgue) +"QOo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/plasteel/vault{ + dir = 5 + }, +/area/medical/morgue) +"QOp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel/neutral, +/area/medical/morgue) +"QOq" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/medical/morgue) +"QOr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/open/floor/plasteel/vault{ + dir = 8 + }, +/area/medical/morgue) (1,1,1) = {" aaa @@ -127039,7 +127099,7 @@ dml dsX djb dvU -dxC +drv dru dhD aad @@ -135518,7 +135578,7 @@ doy dqo drM dtf -duB +duz dwd djA dzp @@ -136407,6 +136467,7 @@ aaa aaa aaa aaa +<<<<<<< HEAD aap aaw aaM @@ -136434,6 +136495,35 @@ aav aav acR acR +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aaa aaa @@ -140017,6 +140107,7 @@ aaa aaa aaa aaa +<<<<<<< HEAD adI aed aeu @@ -140029,6 +140120,20 @@ agV aeu aeu aeu +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aid aiA aeb @@ -144384,6 +144489,7 @@ aad aad aaa acF +<<<<<<< HEAD acZ adu adM @@ -144400,6 +144506,24 @@ ahB ahU aif adw +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aaO ajw @@ -146319,10 +146443,10 @@ dzR dAU dCA dDM -dDO +QOp dGl -dHG -dDN +dHH +QOq dCy dKZ dMy @@ -146575,7 +146699,7 @@ dym dzS dAV dCB -dDJ +QOn dEV dGm dHH @@ -146833,10 +146957,10 @@ dzT dAW dCB dDN -dDN +dEW dGl -dHG -dDO +dHH +QOr dCy dKX dMA @@ -146844,6 +146968,7 @@ dNS aaa aaa aaa +<<<<<<< HEAD dQS dRY dSX @@ -146868,6 +146993,32 @@ eeW eeW egI dSX +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aaa aaa @@ -147089,7 +147240,7 @@ dyo dzU dAX dCB -dDJ +QOn dEW dGn dHI @@ -147347,9 +147498,9 @@ dzV dAY dCB dDO -dDN +dEW dGl -dHG +dHH dIZ dCy dKZ @@ -152641,6 +152792,7 @@ atG auO aoF aaa +<<<<<<< HEAD ayF azI aAM @@ -152653,6 +152805,20 @@ aHZ aJw aKT aMa +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aad aQR @@ -153176,6 +153342,7 @@ aWa aXH aQS aad +<<<<<<< HEAD bcH bem bfK @@ -153194,6 +153361,26 @@ byB bAa bBX bDU +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa bHs bJl @@ -153433,6 +153620,7 @@ aQQ aXI aZj aad +<<<<<<< HEAD bcI ben bfL @@ -153440,6 +153628,12 @@ bgW biw bkh bmb +======= +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aaa brd @@ -171067,3 +171261,4 @@ aaa aaa aaa "} + diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index fd1880db11..41af8f6816 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -65873,6 +65873,9 @@ /area/medical/medbay/aft) "cFU" = ( /obj/machinery/light/small, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "cFV" = ( @@ -68982,8 +68985,10 @@ }, /area/medical/virology) "cLT" = ( -/obj/structure/bodycontainer/crematorium, /obj/effect/decal/cleanable/cobweb, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "cLU" = ( @@ -69295,9 +69300,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/button/crematorium{ - pixel_x = -25 - }, /turf/open/floor/plasteel/dark, /area/chapel/office) "cMD" = ( @@ -69742,7 +69744,11 @@ /turf/open/floor/plating/airless, /area/medical/virology) "cNt" = ( -/obj/structure/bodycontainer/morgue, +/obj/machinery/button/crematorium{ + id = "cremawheat"; + pixel_x = -26; + req_access_txt = "27" + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "cNu" = ( @@ -70312,6 +70318,11 @@ dir = 1; pixel_y = -22 }, +/obj/structure/table, +/obj/item/storage/box/bodybags{ + pixel_x = 2; + pixel_y = 2 + }, /turf/open/floor/plasteel/dark, /area/chapel/office) "cOG" = ( @@ -72353,7 +72364,6 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "cTf" = ( -/obj/structure/table, /obj/machinery/light/small{ dir = 8 }, @@ -72361,10 +72371,6 @@ dir = 4; pixel_x = -22 }, -/obj/item/storage/box/bodybags{ - pixel_x = 2; - pixel_y = 2 - }, /turf/open/floor/plasteel/dark, /area/chapel/office) "cTg" = ( @@ -75665,6 +75671,9 @@ dir = 2; network = list("SS13","Medbay") }, +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "dbs" = ( @@ -81255,9 +81264,29 @@ /turf/open/floor/plasteel/white, /area/science/circuit) "QuX" = ( +<<<<<<< HEAD /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/white, /area/science/circuit) +======= +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) +"QuY" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) +"QuZ" = ( +/obj/structure/bodycontainer/crematorium{ + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/chapel/office) +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) (1,1,1) = {" aaa @@ -91165,6 +91194,7 @@ bOd aZZ bOd EDi +<<<<<<< HEAD cVY cWp dlk @@ -91179,6 +91209,10 @@ cXa dlp cYy cVF +======= +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aaa aaa @@ -92695,11 +92729,19 @@ aVu bvF bxw aVs +<<<<<<< HEAD cVn cVu cVv cVB cVn +======= +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aVs aVu bMw @@ -93710,6 +93752,7 @@ aWZ djz aZZ djC +<<<<<<< HEAD bcT beC beC @@ -93717,6 +93760,15 @@ beC beC beC bcT +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) djz bsk djC @@ -94987,7 +95039,7 @@ auG dnd dhK dnk -aRG +dnH aSP dne dhM @@ -96256,6 +96308,7 @@ doJ atq aaf aaa +<<<<<<< HEAD awO ayh azi @@ -96263,6 +96316,12 @@ azh azi aDf aEu +======= +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa cUS cUV @@ -96778,6 +96837,7 @@ awO awN awN aaa +<<<<<<< HEAD cUS cUV cUV @@ -96790,6 +96850,23 @@ cUV cUV cVg cVj +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aip doJ @@ -101489,7 +101566,7 @@ cLT cMC cNt cTf -cNt +QuZ cMI cPC djX @@ -104477,6 +104554,7 @@ aol apD aqW dne +<<<<<<< HEAD atJ auS avV @@ -104486,6 +104564,17 @@ ayt ayt aCi aDt +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) azC aFW aHv @@ -106357,11 +106446,11 @@ cyf cyZ cAc ctA -cCf -cCf +cCj +cCj cDY -cCf -cCf +cCj +cCj cCe cHJ bTs @@ -106615,9 +106704,9 @@ cyZ cAd ctA dbr -cCj +QuX dDC -cCj +QuX cFU cCe ctK @@ -108437,6 +108526,7 @@ cQY cQK cQY cYJ +<<<<<<< HEAD cYO cYO cZo @@ -108450,6 +108540,21 @@ cYX cYV cZB cZe +======= +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +>>>>>>> 2db9ecb... Morgue and Crematorium Repositions (#35113) aaa aaa aaa @@ -113838,15 +113943,15 @@ cRi cRe cRi cSg -cSo +cSn cSn cSd cSg -cSo +cSn cSn cSd cSg -cSo +cSn cSn cRi cTA @@ -114080,8 +114185,8 @@ cIg dDF dvY cNj -dwN -dwN +ciL +ciL cPg dvY aaa @@ -114337,8 +114442,8 @@ cIg dxQ dvY cNk -dwN -dwN +ciL +ciL cPh dvY aaa @@ -115140,7 +115245,7 @@ cTt daA cSn cSn -cSo +cSn daL cRi daQ @@ -116408,15 +116513,15 @@ dcC dcM cSd cSn -cSo +cSn cSg cSd cSn -cSo +cSn cSg cSd cSn -cSo +cSn cSg cRi ddh @@ -118934,7 +119039,7 @@ alq alq dvY ckx -dwN +ciL dwQ cot cnb @@ -119191,10 +119296,10 @@ apc chE dvY cky -dwN +ciL dwX -dwN -dwN +ciL +ciL cou csb dvY @@ -119448,10 +119553,10 @@ avr chF dvY ckz -dwN +ciL dwY -dwN -dwN +ciL +ciL cgs csc dvY @@ -119709,7 +119814,7 @@ dwQ cnb cou cpK -dwN +ciL csc dvY Qtj @@ -120938,7 +121043,7 @@ aFs aGT axY aJm -aKy +aJu aMb EDE axY @@ -146794,3 +146899,4 @@ aaa aaa aaa "} +