diff --git a/_maps/map_files/IceBox/IceBox.dmm b/_maps/map_files/IceBox/IceBox.dmm index c38ea0da32d0..06531d64a5b3 100644 --- a/_maps/map_files/IceBox/IceBox.dmm +++ b/_maps/map_files/IceBox/IceBox.dmm @@ -805,36 +805,6 @@ }, /turf/open/floor/plasteel, /area/storage/primary) -"abK" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt3"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) -"abL" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt2"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) "abM" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -1250,53 +1220,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) -"acC" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 3"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) -"acD" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt1"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) -"acE" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 2"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "acF" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -1326,22 +1249,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"acH" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 1"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "acI" = ( /obj/machinery/door/poddoor/preopen{ id = "executionfireblast"; @@ -2600,16 +2507,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"aeV" = ( -/obj/structure/table, -/obj/item/paper, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) "aeW" = ( /obj/machinery/requests_console{ department = "Security"; @@ -2892,17 +2789,6 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) -"afx" = ( -/obj/machinery/flasher{ - id = "PCell 3"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "afy" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4201,17 +4087,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"ahY" = ( -/obj/machinery/flasher{ - id = "PCell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "ahZ" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -5631,17 +5506,6 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/security/processing) -"akH" = ( -/obj/machinery/flasher{ - id = "PCell 1"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "akI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -6343,63 +6207,6 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) -"amf" = ( -/obj/structure/bed, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/flasher{ - id = "Cell 1"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) -"amg" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"amh" = ( -/obj/structure/bed, -/obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) -"ami" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 2"; - name = "Cell 2 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"amj" = ( -/obj/structure/bed, -/obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) -"amk" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) "aml" = ( /obj/machinery/light/small{ dir = 8 @@ -29506,21 +29313,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"; @@ -30199,10 +29991,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{ @@ -32445,14 +32233,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{ @@ -52131,8 +51911,8 @@ /area/crew_quarters/theatre) "caT" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 4 + dir = 4; + icon_state = "scrub_map_on-3" }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -52179,8 +51959,8 @@ /area/science/xenobiology) "caX" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 8 + dir = 8; + icon_state = "vent_map_on-1" }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -52224,8 +52004,8 @@ }, /obj/structure/reagent_dispensers/beerkeg, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 4 + dir = 4; + icon_state = "scrub_map_on-3" }, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -52247,8 +52027,8 @@ /area/maintenance/starboard/aft) "cbg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 8 + dir = 8; + icon_state = "vent_map_on-1" }, /turf/open/floor/wood, /area/crew_quarters/bar) @@ -52546,8 +52326,8 @@ /area/crew_quarters/kitchen) "cbL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 8 + dir = 8; + icon_state = "scrub_map_on-3" }, /obj/effect/spawner/lootdrop/mob/kitchen_animal, /turf/open/floor/plasteel/showroomfloor, @@ -52694,8 +52474,8 @@ /area/crew_quarters/kitchen) "ccc" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 8 + dir = 8; + icon_state = "vent_map_on-1" }, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) @@ -53070,8 +52850,8 @@ "ccS" = ( /obj/effect/landmark/start/cook, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - icon_state = "scrub_map_on-3"; - dir = 4 + dir = 4; + icon_state = "scrub_map_on-3" }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -53092,8 +52872,8 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 8 + dir = 8; + icon_state = "vent_map_on-1" }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -53475,8 +53255,8 @@ dir = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - icon_state = "vent_map_on-1"; - dir = 1 + dir = 1; + icon_state = "vent_map_on-1" }, /turf/open/floor/plasteel, /area/crew_quarters/bar) @@ -54416,6 +54196,12 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +"cgq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "cgv" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -57628,6 +57414,18 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"dub" = ( +/obj/machinery/flasher{ + id = "PCell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "dus" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, @@ -58826,6 +58624,18 @@ }, /turf/open/floor/plasteel/dark, /area/tcommsat/lounge) +"hAU" = ( +/obj/machinery/flasher{ + id = "PCell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "hCS" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -59062,6 +58872,20 @@ }, /turf/open/floor/carpet, /area/security/detectives_office) +"ivN" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 1"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "ixi" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, @@ -59928,6 +59752,20 @@ /obj/machinery/light, /turf/open/floor/engine, /area/escapepodbay) +"ltV" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 2"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "luw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -60423,6 +60261,15 @@ "nds" = ( /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"ngM" = ( +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "ngU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -60917,6 +60764,20 @@ }, /turf/open/floor/plasteel/dark, /area/tcommsat/lounge) +"paP" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt1"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "pbM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, /turf/open/floor/plasteel/white, @@ -61124,6 +60985,18 @@ "pOw" = ( /turf/closed/wall/r_wall, /area/hallway/primary/port) +"pOX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/flasher{ + id = "Cell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "pPf" = ( /obj/structure/table/wood, /obj/item/camera_film, @@ -61322,6 +61195,10 @@ }, /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) +"qzp" = ( +/obj/effect/variation/box/medbay/morgue, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "qAG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, @@ -61760,6 +61637,15 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"rVj" = ( +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "rVk" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -62595,6 +62481,20 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) +"udv" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt2"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "ueh" = ( /obj/machinery/computer/med_data{ dir = 1 @@ -63098,6 +62998,18 @@ /obj/effect/turf_decal/bot_white, /turf/open/floor/plasteel/dark, /area/tcommsat/entrance) +"vVu" = ( +/obj/machinery/flasher{ + id = "PCell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "vVZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -63247,6 +63159,20 @@ /obj/machinery/atmospherics/components/unary/vent_pump/layer1, /turf/open/floor/plating, /area/quartermaster/miningdock) +"wui" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 3"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "wuM" = ( /obj/machinery/meter, /obj/machinery/button/door{ @@ -63345,6 +63271,20 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"wDY" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt3"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "wEx" = ( /obj/machinery/conveyor{ dir = 4; @@ -90364,8 +90304,8 @@ aat abj abA acd -acC -afx +wui +vVu acd aef aeU @@ -90878,8 +90818,8 @@ aat aat aat acd -abK -aeV +wDY +aTN acd aeh aeL @@ -91392,8 +91332,8 @@ aat aat bay acd -acE -ahY +ltV +dub acd aej afy @@ -91906,8 +91846,8 @@ bac aat aat acd -abL -aeV +udv +aTN acd ael afy @@ -91922,7 +91862,7 @@ ajy aki akM aor -amf +pOX amQ ank ann @@ -92420,8 +92360,8 @@ bad aat aat acd -acH -akH +ivN +hAU acd aej afy @@ -92436,7 +92376,7 @@ ajz akk akN aqn -amg +alx amR ank anJ @@ -92934,8 +92874,8 @@ bad aar aat acd -acD -aeV +paP +aTN acd aeq aiB @@ -92950,7 +92890,7 @@ ajA akm akV aqa -amh +ngM amR ank ann @@ -93464,7 +93404,7 @@ ajH akk akN aqn -ami +alx amR ank ann @@ -93978,7 +93918,7 @@ ajB akm akV aqa -amj +rVj amR ank ann @@ -94492,7 +94432,7 @@ ajH akk akV aqn -amk +alx amR ank anL @@ -104041,11 +103981,11 @@ aYV bdQ aYV bfL -bhn -biz -biz -biz -bmR +cgq +bhm +bhm +bhm +qzp bfL bol bkU @@ -104813,9 +104753,9 @@ bdR bdb bdN bfi -bho -bho -bho +bhm +bhm +bhm bjv bfL bom @@ -105070,9 +105010,9 @@ aYV bey bfL bhm -biz -biz -biz +bhm +bhm +bhm bjx bfL boq diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index fba2136161e4..d3867dd70d70 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -798,36 +798,6 @@ }, /turf/open/floor/plasteel, /area/storage/primary) -"abK" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt3"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) -"abL" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt2"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) "abM" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -1249,53 +1219,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) -"acC" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 3"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) -"acD" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt1"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) -"acE" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 2"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "acF" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -1325,22 +1248,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"acH" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 1"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "acI" = ( /obj/machinery/door/poddoor/preopen{ id = "executionfireblast"; @@ -2569,16 +2476,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"aeV" = ( -/obj/structure/table, -/obj/item/paper, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/prison) "aeW" = ( /obj/machinery/requests_console{ department = "Security"; @@ -2821,17 +2718,6 @@ }, /turf/open/floor/plating, /area/security/execution/transfer) -"afx" = ( -/obj/machinery/flasher{ - id = "PCell 3"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "afy" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4065,17 +3951,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) -"ahY" = ( -/obj/machinery/flasher{ - id = "PCell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "ahZ" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -5470,17 +5345,6 @@ /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, /area/security/processing) -"akH" = ( -/obj/machinery/flasher{ - id = "PCell 1"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "akI" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -6119,63 +5983,6 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) -"amf" = ( -/obj/structure/bed, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/flasher{ - id = "Cell 1"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) -"amg" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"amh" = ( -/obj/structure/bed, -/obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) -"ami" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 2"; - name = "Cell 2 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"amj" = ( -/obj/structure/bed, -/obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) -"amk" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) "aml" = ( /obj/machinery/light/small{ dir = 8 @@ -50728,6 +50535,20 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"cQj" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt2"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "cQn" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold4w/yellow/visible, @@ -51133,6 +50954,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"daZ" = ( +/obj/effect/variation/box/medbay/morgue, +/turf/open/floor/plasteel/dark, +/area/medical/morgue) "dcF" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, @@ -51317,6 +51142,18 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/white, /area/medical/virology) +"dHD" = ( +/obj/machinery/flasher{ + id = "PCell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "dJo" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -51419,6 +51256,18 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"dWR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/flasher{ + id = "Cell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "dXk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52440,6 +52289,18 @@ }, /turf/open/floor/plating, /area/quartermaster/miningdock) +"gtw" = ( +/obj/machinery/flasher{ + id = "PCell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "gtZ" = ( /obj/structure/transit_tube/curved/flipped, /turf/open/space/basic, @@ -52502,10 +52363,6 @@ }, /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, @@ -52804,6 +52661,20 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/medical/paramedic) +"hlc" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 1"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "hlB" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -53814,6 +53685,20 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"jGH" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 3"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "jHx" = ( /obj/machinery/door/airlock/external{ name = "External Access"; @@ -54256,6 +54141,20 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/aft) +"kJS" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt1"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "kJW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -54473,6 +54372,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/science/misc_lab) +"loq" = ( +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "lor" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -56796,6 +56704,15 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"qQA" = ( +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "qQV" = ( /turf/template_noop, /area/template_noop) @@ -57345,6 +57262,20 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"skQ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt3"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "slk" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -57629,6 +57560,18 @@ }, /turf/open/floor/plating, /area/security/processing) +"sTo" = ( +/obj/machinery/flasher{ + id = "PCell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4 + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "sTv" = ( /obj/structure/cable{ icon_state = "4-8" @@ -58025,6 +57968,20 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/hallway/secondary/entry) +"tKr" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 2"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "tLh" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, @@ -86356,8 +86313,8 @@ aat abj abA acd -acC -afx +jGH +sTo acd aef aeU @@ -86870,8 +86827,8 @@ aat aat aat acd -abK -aeV +skQ +aTN acd aeh aeL @@ -87384,8 +87341,8 @@ aat aat bay acd -acE -ahY +tKr +dHD acd aej afy @@ -87898,8 +87855,8 @@ bac aat aat acd -abL -aeV +cQj +aTN acd ael afy @@ -87914,7 +87871,7 @@ ajy aki akM aor -amf +dWR amQ anw anz @@ -88412,8 +88369,8 @@ bad aat aat acd -acH -akH +hlc +gtw acd aej afy @@ -88428,7 +88385,7 @@ ajz akk akN aqn -amg +alx amR anw anc @@ -88926,8 +88883,8 @@ bad aar aat acd -acD -aeV +kJS +aTN acd aeq aiB @@ -88942,7 +88899,7 @@ ajA akm akV aqa -amh +qQA amR anw anz @@ -89456,7 +89413,7 @@ ajH akk akN aqn -ami +alx amR anw anz @@ -89970,7 +89927,7 @@ ajB akm akV aqa -amj +loq amR anw anz @@ -90484,7 +90441,7 @@ ajH akk akV aqn -amk +alx amR anw anr @@ -100037,7 +99994,7 @@ wec bhm bhm bhm -gCp +daZ bfL bol bkU diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm index c12aa20e0d59..76f437d3f8f9 100644 --- a/_maps/map_files/YogsDelta/YogsDelta.dmm +++ b/_maps/map_files/YogsDelta/YogsDelta.dmm @@ -15152,16 +15152,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel, /area/security/prison) -"azq" = ( -/obj/structure/table, -/obj/item/paper, -/obj/item/pen, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "azr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ @@ -15173,17 +15163,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"azs" = ( -/obj/structure/table, -/obj/item/paper, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/prison) "azt" = ( /obj/machinery/sparker{ dir = 1; @@ -20661,32 +20640,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"aHQ" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt3"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/structure/chair/stool, -/obj/machinery/camera{ - c_tag = "Prison - Cell 3"; - dir = 2; - name = "prison camera"; - network = list("ss13","prison") - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 8; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/security/prison) "aHR" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -20702,34 +20655,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"aHS" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt2"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/item/chair/stool, -/obj/machinery/camera{ - c_tag = "Prison - Cell 2"; - dir = 2; - name = "prison camera"; - network = list("ss13","prison") - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 8; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plasteel, -/area/security/prison) "aHT" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 8 @@ -20787,36 +20712,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) -"aIa" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt1"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera{ - c_tag = "Prison - Cell 1"; - dir = 2; - name = "prison camera"; - network = list("ss13","prison") - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 8; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plasteel, -/area/security/prison) "aIb" = ( /obj/machinery/door/window/eastright{ name = "Theatre Stage" @@ -28933,17 +28828,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/plasteel, /area/engine/atmos) -"aUv" = ( -/obj/structure/bed, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "aUw" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown, @@ -28966,18 +28850,6 @@ dir = 1 }, /area/engine/atmos) -"aUy" = ( -/obj/structure/bed, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "aUz" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Office"; @@ -114094,24 +113966,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/quartermaster/storage) -"doV" = ( -/obj/machinery/flasher{ - id = "PCell 3"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 4; - icon_state = "scrub_map_on-3" - }, -/turf/open/floor/plasteel, -/area/security/prison) "doW" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -114382,20 +114236,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"dpt" = ( -/obj/machinery/flasher{ - id = "PCell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 4; - icon_state = "scrub_map_on-3" - }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/security/prison) "dpu" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -114450,19 +114290,6 @@ }, /turf/open/floor/plasteel, /area/medical/medbay/central) -"dpz" = ( -/obj/machinery/flasher{ - id = "PCell 1"; - pixel_x = -28 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 4; - icon_state = "scrub_map_on-3" - }, -/turf/open/floor/plating{ - icon_state = "platingdmg1" - }, -/area/security/prison) "dpA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral{ @@ -117447,6 +117274,16 @@ }, /turf/open/floor/plasteel, /area/science/mixing) +"duI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/prison) "duO" = ( /obj/machinery/computer/mecha{ dir = 8 @@ -121347,8 +121184,8 @@ pixel_x = -32 }, /obj/structure/frame/computer{ - icon_state = "0"; - dir = 4 + dir = 4; + icon_state = "0" }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office/private_investigators_office) @@ -121647,8 +121484,8 @@ "dNi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/frame/computer{ - icon_state = "0"; - dir = 4 + dir = 4; + icon_state = "0" }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office/private_investigators_office) @@ -126900,6 +126737,33 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"lSP" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt2"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/machinery/camera{ + c_tag = "Prison - Cell 2"; + dir = 2; + name = "prison camera"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8; + icon_state = "vent_map_on-1" + }, +/turf/open/floor/plasteel, +/area/security/prison) "lTo" = ( /obj/docking_port/stationary{ area_type = /area/construction/mining/aux_base; @@ -126943,6 +126807,31 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab/range) +"mmP" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt3"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/machinery/camera{ + c_tag = "Prison - Cell 3"; + dir = 2; + name = "prison camera"; + network = list("ss13","prison") + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8; + icon_state = "vent_map_on-1" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/security/prison) "mvm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -127112,6 +127001,14 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"oRT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) "oSD" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -127135,6 +127032,20 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"oWw" = ( +/obj/machinery/flasher{ + id = "PCell 1"; + pixel_x = -28 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4; + icon_state = "scrub_map_on-3" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/security/prison) "oYI" = ( /obj/machinery/igniter/incinerator_toxmix, /turf/open/floor/engine/vacuum, @@ -127150,6 +127061,25 @@ }, /turf/open/floor/plating, /area/crew_quarters/theatre/abandoned) +"pby" = ( +/obj/machinery/flasher{ + id = "PCell 3"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4; + icon_state = "scrub_map_on-3" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "pfG" = ( /obj/effect/turf_decal/bot, /obj/item/twohanded/required/kirbyplants/random, @@ -127396,6 +127326,28 @@ /obj/effect/decal/remains/xeno, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"sgY" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/prison) +"skr" = ( +/obj/machinery/flasher{ + id = "PCell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4; + icon_state = "scrub_map_on-3" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/security/prison) "svv" = ( /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, @@ -127485,6 +127437,15 @@ }, /turf/open/floor/plating, /area/security/prison) +"uWt" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/security/prison) "uYS" = ( /obj/machinery/door/airlock/atmos/glass/critical{ heat_proof = 1; @@ -127687,6 +127648,35 @@ "xdD" = ( /turf/closed/wall/r_wall, /area/science/mixing/chamber) +"xCp" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt1"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera{ + c_tag = "Prison - Cell 1"; + dir = 2; + name = "prison camera"; + network = list("ss13","prison") + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 8; + icon_state = "vent_map_on-1" + }, +/turf/open/floor/plasteel, +/area/security/prison) "xDZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -179792,8 +179782,8 @@ ayu aPh aQZ aKV -aUv -doV +uWt +pby aAi aNM aCH @@ -180306,8 +180296,8 @@ ayw aBE aRb aKV -aHQ -azq +mmP +sgY aKV aOE aCH @@ -180820,8 +180810,8 @@ ayN ats aRd aKV -aUy -dpt +duI +skr aAi aOP aCG @@ -181334,8 +181324,8 @@ ayY aPn aRe aKV -aHS -azq +lSP +sgY aKV aOY aOM @@ -181848,8 +181838,8 @@ azb aPp aRg aKV -aUv -dpz +uWt +oWw aAi aPi aCG @@ -182362,8 +182352,8 @@ azr aPr aRi aKV -aIa -azs +xCp +oRT aKV aPN aCL diff --git a/_maps/map_files/YogsPubby/YogsPubby.dmm b/_maps/map_files/YogsPubby/YogsPubby.dmm index abff7808b5ae..66ca38824d75 100644 --- a/_maps/map_files/YogsPubby/YogsPubby.dmm +++ b/_maps/map_files/YogsPubby/YogsPubby.dmm @@ -1702,9 +1702,9 @@ dir = 8 }, /obj/machinery/atmospherics/components/binary/pump/on/layer3{ - name = "Waste Out"; + dir = 4; icon_state = "pump_on_map-3"; - dir = 4 + name = "Waste Out" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAS) @@ -2652,26 +2652,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"afk" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt2"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, -/obj/structure/chair, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8; - icon_state = "scrub_map_on-3" - }, -/turf/open/floor/plasteel, -/area/security/prison) "afl" = ( /obj/structure/chair/stool, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer1, @@ -2877,26 +2857,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"afH" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt1"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - req_access_txt = "0"; - specialfunctions = 4 - }, -/obj/structure/chair, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8; - icon_state = "scrub_map_on-3" - }, -/turf/open/floor/plasteel, -/area/security/prison) "afI" = ( /obj/machinery/computer/arcade, /turf/open/floor/plasteel/dark, @@ -2990,18 +2950,6 @@ }, /turf/open/floor/carpet, /area/medical/medbay/central) -"afW" = ( -/obj/machinery/flasher{ - id = "PCell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plasteel, -/area/security/prison) "afX" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plasteel/dark, @@ -3110,18 +3058,6 @@ }, /turf/open/floor/wood, /area/medical/medbay/central) -"agl" = ( -/obj/machinery/flasher{ - id = "PCell 1"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plasteel, -/area/security/prison) "agm" = ( /obj/structure/window/reinforced{ dir = 4; @@ -3365,27 +3301,6 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) -"agI" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Permabrig Cell 2"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/toy/plush/slimeplushie, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "agJ" = ( /obj/structure/chair/stool, /obj/effect/landmark/start/security_officer, @@ -3400,27 +3315,6 @@ }, /turf/open/floor/plasteel/showroomfloor, /area/security/main) -"agL" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Permabrig Cell 1"; - network = list("ss13","prison") - }, -/obj/item/radio/intercom{ - desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; - name = "Prison Intercom (General)"; - pixel_y = 24; - prison_radio = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/obj/item/toy/plush/lizardplushie, -/turf/open/floor/plasteel, -/area/security/prison) "agM" = ( /obj/machinery/door/window/westleft{ base_state = "left"; @@ -3515,13 +3409,6 @@ }, /turf/open/floor/plasteel, /area/security/main) -"agY" = ( -/obj/structure/table, -/obj/item/paper, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) "agZ" = ( /obj/machinery/button/flasher{ id = "executionflash"; @@ -3767,9 +3654,9 @@ dir = 9 }, /obj/machinery/atmospherics/components/binary/pump/on/layer1{ - name = "Air Out"; + dir = 8; icon_state = "pump_on_map-1"; - dir = 8 + name = "Air Out" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) @@ -11167,19 +11054,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/brig) -"avs" = ( -/obj/structure/bed, -/obj/machinery/flasher{ - id = "Cell 1"; - pixel_x = -28 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) "avt" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -11187,30 +11061,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"avu" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"avv" = ( -/obj/structure/bed, -/obj/machinery/flasher{ - id = "Cell 2"; - pixel_x = -28 - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) "avw" = ( /obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green{ @@ -11229,19 +11079,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"avy" = ( -/obj/structure/bed, -/obj/machinery/flasher{ - id = "Cell 3"; - pixel_x = -28 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) "avz" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -11249,17 +11086,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"avA" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 Locker" - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/brig) "avB" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -35023,8 +34849,8 @@ /area/security/checkpoint/science) "boa" = ( /obj/machinery/atmospherics/components/binary/valve/layer1{ - icon_state = "mvalve_map-1"; - dir = 8 + dir = 8; + icon_state = "mvalve_map-1" }, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -57415,6 +57241,19 @@ "fmh" = ( /turf/open/floor/wood, /area/maintenance/department/engine) +"fmC" = ( +/obj/machinery/flasher{ + id = "PCell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4; + icon_state = "vent_map_on-1" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "fon" = ( /obj/structure/lattice, /obj/structure/grille, @@ -57979,6 +57818,25 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"gYJ" = ( +/obj/machinery/camera{ + c_tag = "Permabrig Cell 2"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + dir = 2; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/toy/plush/slimeplushie, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "gYW" = ( /obj/machinery/door/airlock/public/glass{ name = "Departure Lounge" @@ -58001,6 +57859,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/chapel/office) +"hdK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "hdY" = ( /mob/living/simple_animal/hostile/retaliate/goose/vomit, /turf/open/floor/plating, @@ -59023,6 +58885,18 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"lCV" = ( +/obj/machinery/flasher{ + id = "Cell 3"; + pixel_x = -28 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "lEn" = ( /obj/structure/window/reinforced{ dir = 1 @@ -59205,6 +59079,25 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"mqy" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt2"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + req_access_txt = "0"; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8; + icon_state = "scrub_map_on-3" + }, +/turf/open/floor/plasteel, +/area/security/prison) "mtu" = ( /obj/structure/table, /obj/item/folder/yellow, @@ -59964,6 +59857,18 @@ icon_state = "platingdmg3" }, /area/maintenance/department/security/brig) +"oUd" = ( +/obj/machinery/flasher{ + id = "Cell 2"; + pixel_x = -28 + }, +/obj/effect/turf_decal/tile/green, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "oYj" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -60144,6 +60049,18 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"pSR" = ( +/obj/machinery/flasher{ + id = "Cell 1"; + pixel_x = -28 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "pVD" = ( /obj/machinery/light/small{ dir = 1 @@ -60814,6 +60731,25 @@ }, /turf/open/floor/plating, /area/chapel/main/monastery) +"smN" = ( +/obj/machinery/camera{ + c_tag = "Permabrig Cell 1"; + network = list("ss13","prison") + }, +/obj/item/radio/intercom{ + desc = "Talk through this. It looks like it has been modified to not broadcast."; + dir = 2; + name = "Prison Intercom (General)"; + pixel_y = 24; + prison_radio = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/plush/lizardplushie, +/turf/open/floor/plasteel, +/area/security/prison) "sqh" = ( /obj/structure/chair{ dir = 8 @@ -61538,6 +61474,25 @@ /obj/structure/chair, /turf/open/floor/carpet, /area/lawoffice) +"vky" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt1"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + req_access_txt = "0"; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8; + icon_state = "scrub_map_on-3" + }, +/turf/open/floor/plasteel, +/area/security/prison) "vlF" = ( /obj/item/coin/silver, /obj/effect/decal/cleanable/oil{ @@ -61796,6 +61751,19 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) +"wrI" = ( +/obj/machinery/flasher{ + id = "PCell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4; + icon_state = "vent_map_on-1" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "wwr" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -82090,8 +82058,8 @@ afM aeU aeU agy -agI -afW +gYJ +fmC agy adS aiE @@ -82604,8 +82572,8 @@ ahW aeU aeU agy -afk -agY +mqy +hdK agy aig aiE @@ -82882,7 +82850,7 @@ aon akO alt arS -avs +pSR awI axF aAA @@ -83118,8 +83086,8 @@ aiC aeU aeU agy -agL -agl +smN +wrI agy adW aiI @@ -83396,7 +83364,7 @@ aqf akQ alu arq -avu +avt awJ axG aAJ @@ -83632,8 +83600,8 @@ afI aeU aeU agy -afH -agY +vky +hdK agy ahI ajf @@ -83910,7 +83878,7 @@ aqf akQ alu arS -avv +oUd awK axG aAK @@ -84938,7 +84906,7 @@ aqf akQ alu arS -avy +lCV awK axG aAK @@ -85452,7 +85420,7 @@ arh akQ alw arq -avA +avz awJ axG aAK diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index e7b36f399f03..e08d294aa62a 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -1801,41 +1801,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/execution/education) -"ads" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 3"; - network = list("ss13","prison") - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) -"adt" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt3"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) -"adu" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 2"; - network = list("ss13","prison") - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) "adv" = ( /obj/machinery/button/door{ id = "permacell2"; @@ -1857,47 +1822,6 @@ }, /turf/open/floor/plasteel, /area/security/prison) -"adw" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt2"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/turf/open/floor/plating{ - icon_state = "platingdmg2" - }, -/area/security/prison) -"adx" = ( -/obj/structure/bed, -/obj/machinery/camera{ - c_tag = "Prison Cell 1"; - network = list("ss13","prison") - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/prison) -"ady" = ( -/obj/structure/chair/stool, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "permabolt1"; - name = "Cell Bolt Control"; - normaldoorcontrol = 1; - pixel_y = 25; - specialfunctions = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/prison) "adz" = ( /obj/machinery/door/airlock/external{ name = "Labor Camp Shuttle Airlock" @@ -1942,19 +1866,6 @@ }, /turf/open/floor/plasteel/dark, /area/security/execution/education) -"adC" = ( -/obj/machinery/flasher{ - id = "PCell 3"; - pixel_x = -28 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/security/prison) "adD" = ( /obj/structure/lattice, /obj/machinery/camera/motion{ @@ -2095,47 +2006,12 @@ }, /turf/open/floor/plasteel/white, /area/security/prison) -"adO" = ( -/obj/structure/table, -/obj/item/paper, -/obj/item/pen, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 8; - icon_state = "scrub_map_on-3" - }, -/turf/open/floor/plasteel, -/area/security/prison) -"adP" = ( -/obj/machinery/flasher{ - id = "PCell 2"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plasteel, -/area/security/prison) "adQ" = ( /obj/structure/bodycontainer/morgue{ dir = 8 }, /turf/open/floor/plasteel/dark, /area/security/prison) -"adR" = ( -/obj/machinery/flasher{ - id = "PCell 1"; - pixel_x = -28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4; - icon_state = "vent_map_on-1" - }, -/turf/open/floor/plasteel, -/area/security/prison) "adS" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1, /obj/machinery/portable_atmospherics/canister/air, @@ -15589,37 +15465,6 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"aAY" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/effect/decal/cleanable/dirt, -/obj/item/bedsheet/prisoner, -/turf/open/floor/plasteel, -/area/security/brig) -"aAZ" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 1"; - name = "Cell 1 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"aBa" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 2"; - name = "Cell 2 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) -"aBb" = ( -/obj/structure/closet/secure_closet/brig{ - id = "Cell 3"; - name = "Cell 3 Locker" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel, -/area/security/brig) "aBc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -83338,6 +83183,20 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"fzn" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt1"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "fEQ" = ( /turf/closed/wall, /area/science/nanite) @@ -83418,6 +83277,19 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"hcl" = ( +/obj/machinery/flasher{ + id = "PCell 2"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4; + icon_state = "vent_map_on-1" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "her" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -83589,6 +83461,14 @@ /obj/structure/table, /turf/open/floor/plating, /area/maintenance/port/aft) +"iXU" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 1"; + network = list("ss13","prison") + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "iZd" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -83629,6 +83509,19 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"jwc" = ( +/obj/machinery/flasher{ + id = "PCell 1"; + pixel_x = -28 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4; + icon_state = "vent_map_on-1" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plasteel, +/area/security/prison) "jwW" = ( /turf/closed/wall/mineral/plastitanium, /area/crew_quarters/fitness/recreation) @@ -83664,6 +83557,14 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/starboard/secondary) +"kdF" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 2"; + network = list("ss13","prison") + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "kdO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -83908,6 +83809,14 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) +"mZg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8; + icon_state = "scrub_map_on-3" + }, +/turf/open/floor/plasteel, +/area/security/prison) "nde" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -83927,6 +83836,21 @@ }, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) +"ngt" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt2"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/security/prison) "nwS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 8 @@ -83958,6 +83882,10 @@ /obj/item/storage/box/fancy/candle_box, /turf/open/floor/engine/cult, /area/library) +"nXT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/brig) "nYJ" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -84119,6 +84047,20 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plating, /area/ai_monitored/storage/satellite) +"qzY" = ( +/obj/machinery/flasher{ + id = "PCell 3"; + pixel_x = -28 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 4; + icon_state = "vent_map_on-1" + }, +/obj/effect/variation/box/sec/brig_cell/perma, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/security/prison) "qBh" = ( /obj/structure/table, /obj/item/paicard, @@ -84206,6 +84148,11 @@ /obj/machinery/vending/snack/random, /turf/open/floor/plasteel, /area/maintenance/department/science) +"rXI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/variation/box/sec/brig_cell, +/turf/open/floor/plasteel, +/area/security/brig) "rYE" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating, @@ -84312,6 +84259,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/crew_quarters/locker) +"tUH" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "permabolt3"; + name = "Cell Bolt Control"; + normaldoorcontrol = 1; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "tXK" = ( /obj/machinery/air_sensor/atmos/toxins_mixing_tank, /turf/open/floor/engine/vacuum, @@ -84390,6 +84351,14 @@ icon_state = "platingdmg2" }, /area/maintenance/starboard/secondary) +"veD" = ( +/obj/machinery/camera{ + c_tag = "Prison Cell 3"; + network = list("ss13","prison") + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/security/prison) "vgd" = ( /obj/item/taperecorder, /obj/item/camera, @@ -106574,8 +106543,8 @@ abZ acq acD abe -ads -adC +veD +qzY abe adf adh @@ -107088,8 +107057,8 @@ abE aaI acF abe -adt -adO +tUH +mZg abe adn aeY @@ -107602,8 +107571,8 @@ abX acc acn abe -adu -adP +kdF +hcl abe add afC @@ -108116,8 +108085,8 @@ acb acu aaR abe -adw -adO +ngt +mZg abe adv afh @@ -108630,8 +108599,8 @@ abC acw acH abe -adx -adR +iXU +jwc abe adL afK @@ -109144,8 +109113,8 @@ ace acx acM abe -ady -adO +fzn +mZg abe adM aeT @@ -109423,7 +109392,7 @@ arr asf aiq awG -aAY +rXI aCk aDw aDC @@ -109937,7 +109906,7 @@ asx asg dBG axd -aAZ +nXT aCm aDw aCs @@ -110451,7 +110420,7 @@ asx asj aiq axm -aAY +rXI aCk aDw ayn @@ -110965,7 +110934,7 @@ asx asg dBG axd -aBa +nXT aCm aDw ayy @@ -111479,7 +111448,7 @@ asx asj aiq axp -aAY +rXI aCk aDw ayy @@ -111993,7 +111962,7 @@ aAH asm dBG axd -aBb +nXT aCm aDw ayX diff --git a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue1.dmm b/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue1.dmm deleted file mode 100644 index 777968d2df3d..000000000000 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue1.dmm +++ /dev/null @@ -1,71 +0,0 @@ -//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 deleted file mode 100644 index bc88bfb7238b..000000000000 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue2.dmm +++ /dev/null @@ -1,83 +0,0 @@ -//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 deleted file mode 100644 index d28a51630c37..000000000000 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue3.dmm +++ /dev/null @@ -1,83 +0,0 @@ -//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 deleted file mode 100644 index 215b1c2cf413..000000000000 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue4.dmm +++ /dev/null @@ -1,79 +0,0 @@ -//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 deleted file mode 100644 index e4ba755bb8ff..000000000000 --- a/_maps/yogstation/RandomRuins/StationRuins/BoxStation/medbay_morgue5.dmm +++ /dev/null @@ -1,83 +0,0 @@ -//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/code/game/objects/effects/spawners/variation.dm b/code/game/objects/effects/spawners/variation.dm new file mode 100644 index 000000000000..326550b9a131 --- /dev/null +++ b/code/game/objects/effects/spawners/variation.dm @@ -0,0 +1,227 @@ +/* +Makes variations possible with code only. +This is mainly to prevent creating new map files when creating variations if possible. - Hopek +*/ + +/obj/effect/variation + name = "variation" + icon = 'icons/effects/landmarks_variation.dmi' + icon_state = "generic_green" + var/variations // number of variations + var/choice // chosen variation by choice() + var/chosen // has a choice been made for this place? + var/location_place // location of placement calculated from reference + var/ref_x // x of reference + var/ref_y // y of reference + var/ref_z // z of reference + +/obj/effect/variation/Initialize() + chosen = FALSE + +/obj/effect/variation/proc/place(x, y , item , direction) + if(!x) + x = 0 + if(!y) + y = 0 + if(item) + location_place = locate((ref_x + x) , (ref_y + y) , ref_z) + if(islist(item)) + for(var/I in item) + if(direction) + var/obj/H = new I(location_place) + H.dir = direction + return + else + new I(location_place) + else + if(direction) + var/obj/H = new item(location_place) + H.dir = direction + else + new item(location_place) + return + +/obj/effect/variation/proc/choice() + if(choice == "" || choice == 0) + choice = 1 + if(!chosen) + ref_x = src.x + ref_y = src.y + ref_z = src.z + qdel(src) // deletes the landmark after storing location values in choice() so it doesn't show up on the final product + chosen = TRUE + choice = rand(1,variations) + log_world("Chosen variation [choice] out of [variations] for [name]. Spawning on [ref_x],[ref_y],[ref_z].") + return choice + else + return choice + +// sec + +obj/effects/variation/sec + icon = 'icons/effects/landmarks_variation.dmi' + icon_state = "generic_red" + +/obj/effect/variation/box/sec/brig_cell + name = "Brig cell variation" + variations = 2 + +/obj/effect/variation/box/sec/brig_cell/Initialize() + // chooses between two basic cell variations + + var/list/bed = list( + /obj/structure/bed, + /obj/item/bedsheet/prisoner + ) + var/closet = /obj/structure/closet/secure_closet/brig/cell + + if(choice() == 1) + //variation 1 , default; bed left side + place(0,0,bed) + place(2,0,closet) + + if(choice() == 2) + //variation 2 , bed right side + place(2,0,bed) + place(0,0,closet) + + +/obj/effect/variation/box/sec/brig_cell/perma + name = "perma cell variation" + variations = 4 + +/obj/effect/variation/box/sec/brig_cell/perma/Initialize() // chooses between four perma cell variations + + var/list/bed = list( + /obj/structure/bed, + /obj/item/bedsheet/prisoner + ) + var/list/table = list( + /obj/structure/table, + /obj/item/paper, + /obj/item/pen + ) + var/stool = /obj/structure/chair/stool + + if(choice() == 1) + //variation 1 ; Default . + place(0,1,bed) + place(2,0,table) + place(2,1,stool) + + if(choice() == 2) + //variation 2 ; bed right corner + place(2,1,bed) + place(0,0,table) + place(0,1,stool) + + if(choice() == 3) + //variation 3 ; bed bottom left corner + place(0,0,bed) + place(2,1,table) + place(2,0,stool) + + if(choice() == 4) + //variation 4 ; bed bottom right corner + place(2,0,bed) + place(0,1,table) + place(0,0,stool) + + +// Medbay + +/obj/effect/variation/box/medbay/morgue + name = "Morgue variation" + variations = 5 + +/obj/effect/variation/box/medbay/morgue/Initialize() + + var/table = /obj/structure/table + var/box = /obj/item/storage/box/bodybags + var/pen = /obj/item/pen + var/paper = /obj/item/paper/guides/jobs/medical/morgue + var/casket = /obj/structure/bodycontainer/morgue + + if(choice() == 1) + // variation 1; default + place(0,0,table) + place(0,4,table) + place(0,0,paper) + place(0,4,box) + place(0,4,pen) + place(0,1,casket,EAST) + place(0,2,casket,EAST) + place(0,3,casket,EAST) + place(3,1,casket,WEST) + place(3,2,casket,WEST) + place(3,3,casket,WEST) + place(4,1,casket,EAST) + place(4,2,casket,EAST) + place(4,3,casket,EAST) + + if(choice() == 2) + // variation 2 + place(0,0,table) + place(0,1,table) + place(0,0,paper) + place(0,1,box) + place(0,1,pen) + place(2,0,casket,NORTH) + place(3,0,casket,NORTH) + place(4,0,casket,NORTH) + place(2,2,casket,WEST) + place(3,2,casket,EAST) + place(5,3,casket,WEST) + place(0,4,casket,SOUTH) + place(1,4,casket,SOUTH) + place(2,4,casket,SOUTH) + + if(choice() == 3) + // variation 3; default + place(0,0,table) + place(0,4,table) + place(0,0,paper) + place(0,4,box) + place(0,4,pen) + place(0,1,casket,EAST) + place(0,2,casket,EAST) + place(0,3,casket,EAST) + place(2,4,casket,SOUTH) + place(2,0,casket,NORTH) + place(3,0,casket,NORTH) + place(5,1,casket,WEST) + place(5,2,casket,WEST) + place(5,3,casket,WEST) + + if(choice() == 4) + // variation 4; default + place(4,3,table) + place(4,3,box) + place(4,3,paper) + place(4,3,pen) + place(0,0,casket,NORTH) + place(0,2,casket,EAST) + place(0,4,casket,SOUTH) + place(1,4,casket,SOUTH) + place(2,0,casket,NORTH) + place(3,0,casket,NORTH) + place(3,2,casket,WEST) + place(3,3,casket,WEST) + place(4,2,casket,EAST) + + if(choice() == 5) + // variation 5; default + place(1,2,table) + place(1,3,table) + place(1,2,paper) + place(1,3,box) + place(1,3,pen) + place(2,0,casket,WEST) + place(3,0,casket,EAST) + place(2,2,casket,SOUTH) + place(2,3,casket,NORTH) + place(3,2,casket,SOUTH) + place(3,3,casket,NORTH) + place(5,1,casket,EAST) + place(5,2,casket,EAST) + place(5,3,casket,EAST) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 1bfb7a230f21..a07071da8f00 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -237,6 +237,9 @@ anchored = TRUE var/id = null +/obj/structure/closet/secure_closet/brig/cell + name = "cell locker" + /obj/structure/closet/secure_closet/evidence anchored = TRUE name = "Secure Evidence Closet" diff --git a/icons/effects/landmarks_variation.dmi b/icons/effects/landmarks_variation.dmi new file mode 100644 index 000000000000..9fa9e7c4a3ce Binary files /dev/null and b/icons/effects/landmarks_variation.dmi differ diff --git a/yogstation.dme b/yogstation.dme index 1e2be9af0a16..cd5a545fed41 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -828,6 +828,7 @@ #include "code\game\objects\effects\spawners\lootdrop.dm" #include "code\game\objects\effects\spawners\structure.dm" #include "code\game\objects\effects\spawners\traps.dm" +#include "code\game\objects\effects\spawners\variation.dm" #include "code\game\objects\effects\spawners\vaultspawner.dm" #include "code\game\objects\effects\spawners\xeno_egg_delivery.dm" #include "code\game\objects\effects\temporary_visuals\clockcult.dm" diff --git a/yogstation/code/datums/ruins/station.dm b/yogstation/code/datums/ruins/station.dm index 0cfd1fa0ed2f..92340bf23445 100644 --- a/yogstation/code/datums/ruins/station.dm +++ b/yogstation/code/datums/ruins/station.dm @@ -104,31 +104,6 @@ id = "testing_site_3" suffix = "testingsite_range3.dmm" name = "Clown Bomb Range" - -/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" diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index 5ec2db6e29b6..ff6fe2ba6cd1 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -93,9 +93,6 @@ /obj/effect/landmark/stationroom/box/testingsite template_names = list("Bunker Bomb Range","Syndicate Bomb Range","Clown Bomb Range") - -/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")