diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 06964a3ed949..a2cb709704e2 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -28429,21 +28429,6 @@ "bhm" = ( /turf/open/floor/plasteel/dark, /area/medical/morgue) -"bhn" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags, -/obj/item/pen, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) -"bho" = ( -/obj/structure/bodycontainer/morgue{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "bhp" = ( /obj/machinery/power/apc{ areastring = "/area/medical/chemistry"; @@ -29122,10 +29107,6 @@ }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) -"biz" = ( -/obj/structure/bodycontainer/morgue, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "biA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -31323,14 +31304,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"bmR" = ( -/obj/structure/table, -/obj/item/paper/guides/jobs/medical/morgue{ - pixel_x = 5; - pixel_y = 4 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) "bmS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -52676,6 +52649,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"gCp" = ( +/obj/effect/landmark/stationroom/box/medbay/morgue, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "gCB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, @@ -59156,6 +59133,12 @@ "wcB" = ( /turf/closed/wall/r_wall, /area/tcommsat/entrance) +"wec" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "weD" = ( /obj/machinery/conveyor{ dir = 4; @@ -100193,11 +100176,11 @@ aYV bdQ aYV bfL -bhn -biz -biz -biz -bmR +wec +bhm +bhm +bhm +gCp bfL bol bkU @@ -100965,9 +100948,9 @@ bdR bdb bdN bfi -bho -bho -bho +bhm +bhm +bhm bjv bfL bom @@ -101222,9 +101205,9 @@ aYV bey bfL bhm -biz -biz -biz +bhm +bhm +bhm bjx bfL boq diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue1.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue1.dmm new file mode 100644 index 000000000000..777968d2df3d --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue1.dmm @@ -0,0 +1,71 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"G" = ( +/turf/template_noop, +/area/medical/morgue) +"H" = ( +/obj/structure/table, +/obj/item/paper/guides/jobs/medical/morgue{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/template_noop, +/area/medical/morgue) +"L" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/turf/template_noop, +/area/medical/morgue) +"T" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/template_noop, +/area/medical/morgue) +"W" = ( +/obj/structure/bodycontainer/morgue, +/turf/template_noop, +/area/medical/morgue) + +(1,1,1) = {" +L +W +W +W +H +"} +(2,1,1) = {" +G +G +G +G +G +"} +(3,1,1) = {" +G +G +G +G +G +"} +(4,1,1) = {" +G +T +T +T +G +"} +(5,1,1) = {" +G +W +W +W +G +"} +(6,1,1) = {" +G +G +G +G +G +"} diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue2.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue2.dmm new file mode 100644 index 000000000000..bc88bfb7238b --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue2.dmm @@ -0,0 +1,83 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"h" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/template_noop, +/area/medical/morgue) +"i" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/template_noop, +/area/medical/morgue) +"G" = ( +/turf/template_noop, +/area/medical/morgue) +"H" = ( +/obj/structure/table, +/obj/item/paper/guides/jobs/medical/morgue{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/template_noop, +/area/medical/morgue) +"L" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/turf/template_noop, +/area/medical/morgue) +"T" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/template_noop, +/area/medical/morgue) +"W" = ( +/obj/structure/bodycontainer/morgue, +/turf/template_noop, +/area/medical/morgue) + +(1,1,1) = {" +h +G +G +L +H +"} +(2,1,1) = {" +h +G +G +G +G +"} +(3,1,1) = {" +h +G +T +G +i +"} +(4,1,1) = {" +G +G +W +G +i +"} +(5,1,1) = {" +G +G +G +G +i +"} +(6,1,1) = {" +G +T +G +G +G +"} diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue3.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue3.dmm new file mode 100644 index 000000000000..d28a51630c37 --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue3.dmm @@ -0,0 +1,83 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"f" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/template_noop, +/area/medical/morgue) +"A" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/template_noop, +/area/medical/morgue) +"G" = ( +/turf/template_noop, +/area/medical/morgue) +"H" = ( +/obj/structure/table, +/obj/item/paper/guides/jobs/medical/morgue{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/template_noop, +/area/medical/morgue) +"L" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/turf/template_noop, +/area/medical/morgue) +"T" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/template_noop, +/area/medical/morgue) +"W" = ( +/obj/structure/bodycontainer/morgue, +/turf/template_noop, +/area/medical/morgue) + +(1,1,1) = {" +L +W +W +W +H +"} +(2,1,1) = {" +G +G +G +G +G +"} +(3,1,1) = {" +A +G +G +G +f +"} +(4,1,1) = {" +G +G +G +G +f +"} +(5,1,1) = {" +G +G +G +G +G +"} +(6,1,1) = {" +G +T +T +T +G +"} diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue4.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue4.dmm new file mode 100644 index 000000000000..215b1c2cf413 --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue4.dmm @@ -0,0 +1,79 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"o" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/template_noop, +/area/medical/morgue) +"q" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/template_noop, +/area/medical/morgue) +"v" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/paper/guides/jobs/medical/morgue{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/pen, +/turf/template_noop, +/area/medical/morgue) +"G" = ( +/turf/template_noop, +/area/medical/morgue) +"T" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/template_noop, +/area/medical/morgue) +"W" = ( +/obj/structure/bodycontainer/morgue, +/turf/template_noop, +/area/medical/morgue) + +(1,1,1) = {" +o +G +W +G +q +"} +(2,1,1) = {" +o +G +G +G +G +"} +(3,1,1) = {" +G +G +G +G +q +"} +(4,1,1) = {" +G +T +T +G +q +"} +(5,1,1) = {" +G +v +W +G +G +"} +(6,1,1) = {" +G +G +G +G +G +"} diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue5.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue5.dmm new file mode 100644 index 000000000000..e4ba755bb8ff --- /dev/null +++ b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue5.dmm @@ -0,0 +1,83 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"l" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/turf/template_noop, +/area/medical/morgue) +"z" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/template_noop, +/area/medical/morgue) +"G" = ( +/turf/template_noop, +/area/medical/morgue) +"H" = ( +/obj/structure/table, +/obj/item/paper/guides/jobs/medical/morgue{ + pixel_x = 5; + pixel_y = 4 + }, +/turf/template_noop, +/area/medical/morgue) +"L" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/turf/template_noop, +/area/medical/morgue) +"T" = ( +/obj/structure/bodycontainer/morgue{ + dir = 8 + }, +/turf/template_noop, +/area/medical/morgue) +"W" = ( +/obj/structure/bodycontainer/morgue, +/turf/template_noop, +/area/medical/morgue) + +(1,1,1) = {" +G +G +G +G +G +"} +(2,1,1) = {" +G +L +H +G +G +"} +(3,1,1) = {" +G +l +z +G +T +"} +(4,1,1) = {" +G +l +z +G +W +"} +(5,1,1) = {" +G +G +G +G +G +"} +(6,1,1) = {" +G +T +T +T +G +"} diff --git a/yogstation/code/datums/ruins/station.dm b/yogstation/code/datums/ruins/station.dm index 699e9a5e517b..e4525b2ffa60 100644 --- a/yogstation/code/datums/ruins/station.dm +++ b/yogstation/code/datums/ruins/station.dm @@ -90,6 +90,31 @@ suffix = "maint_detective.dmm" name = "Detective Room" +/datum/map_template/ruin/station/box/medbay/morgue + id = "medbay_morgue1" + suffix = "medbay_morgue1.dmm" + name = "Morgue" + +/datum/map_template/ruin/station/box/medbay/morgue/morgue2 + id = "medbay_morgue2" + suffix = "medbay_morgue2.dmm" + name = "Morgue 2" + +/datum/map_template/ruin/station/box/medbay/morgue/morgue3 + id = "medbay_morgue3" + suffix = "medbay_morgue3.dmm" + name = "Morgue 3" + +/datum/map_template/ruin/station/box/medbay/morgue/morgue4 + id = "medbay_morgue4" + suffix = "medbay_morgue4.dmm" + name = "Morgue 4" + +/datum/map_template/ruin/station/box/medbay/morgue/morgue5 + id = "medbay_morgue5" + suffix = "medbay_morgue5.dmm" + name = "Morgue 5" + /datum/map_template/ruin/station/box/dorms_edoor id = "dorms_edoor1" suffix = "dorms_edoor1.dmm" diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index 38e06d0925a0..8a45bbf82e73 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -91,5 +91,8 @@ /obj/effect/landmark/stationroom/box/aftmaint template_names = list("Roleplaying Room", "Detective Room") +/obj/effect/landmark/stationroom/box/medbay/morgue + template_names = list("Morgue", "Morgue 2", "Morgue 3", "Morgue 4", "Morgue 5") + /obj/effect/landmark/stationroom/box/dorm_edoor template_names = list("Dorm east door 1", "Dorm east door 2", "Dorm east door 3", "Dorm east door 4", "Dorm east door 5", "Dorm east door 6", "Dorm east door 7", "Dorm east door 8", "Dorm east door 9")