diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index fee86003f411..7074bdbb8d97 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -635,17 +635,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/security/courtroom) -"abo" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/folder/white, -/obj/item/wrench/medical, -/obj/item/toy/figure/cmo, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/cmo) "abp" = ( /turf/closed/wall, /area/security/prison) @@ -22723,32 +22712,6 @@ "aPa" = ( /turf/closed/wall/r_wall/rust, /area/medical/storage) -"aPb" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/item/cartridge/medical{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/cartridge/medical{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/cartridge/medical{ - pixel_x = 4 - }, -/obj/item/cartridge/chemistry{ - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/clothing/neck/stethoscope{ - pixel_y = 5 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/crew_quarters/heads/cmo) "aPc" = ( /turf/closed/wall/r_wall, /area/medical/storage) @@ -23810,24 +23773,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/maintenance/port/fore) -"aQA" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = 2 - }, -/obj/item/healthanalyzer, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; - name = "Chief Medical Officer RC"; - pixel_y = 28 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/cmo) "aQB" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -97813,6 +97758,33 @@ }, /turf/open/floor/plating, /area/quartermaster/warehouse) +"raM" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/cartridge/medical{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/cartridge/medical{ + pixel_x = 5; + pixel_y = 1 + }, +/obj/item/cartridge/medical{ + pixel_x = 4 + }, +/obj/item/cartridge/chemistry{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/wrench/medical, +/obj/item/clothing/neck/stethoscope{ + pixel_y = 5 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/crew_quarters/heads/cmo) "rbv" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/plating{ @@ -100878,6 +100850,14 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plasteel/dark, /area/maintenance/aft) +"uvA" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/displaycase/cmo, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/cmo) "uwc" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12"; @@ -104019,6 +103999,28 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel/dark, /area/maintenance/disposal/incinerator) +"xIU" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer RC"; + pixel_y = 28 + }, +/obj/item/toy/figure/cmo{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 2 + }, +/obj/item/healthanalyzer, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/cmo) "xJk" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt, @@ -122916,7 +122918,7 @@ aOm abl abm agj -aPb +raM aPq aPV aOZ @@ -123171,7 +123173,7 @@ aum aOE aOq abl -abo +uvA agk agI vly @@ -123428,7 +123430,7 @@ auo awc aOc afD -aQA +xIU agl aRd mxg diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 7221f222d825..246d3679f93a 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -12276,6 +12276,20 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"aKi" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/twohanded/required/kirbyplants/random, +/obj/item/toy/figure/cmo, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "aKj" = ( /obj/effect/turf_decal/tile/neutral, /obj/machinery/door/firedoor/border_only{ @@ -31879,33 +31893,6 @@ "cOe" = ( /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cOj" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/folder/white, -/obj/item/cartridge/medical, -/obj/item/cartridge/medical{ - pixel_x = -2; - pixel_y = 6 - }, -/obj/item/cartridge/medical{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/cartridge/chemistry{ - pixel_y = 2 - }, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "cOw" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -33156,6 +33143,25 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"dCL" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/suit_storage_unit/cmo, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/computer/security/telescreen/cmo{ + pixel_y = 30 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "dDm" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -37192,16 +37198,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"gqS" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "gqU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 @@ -41106,6 +41102,18 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) +"iIn" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "iIo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -41139,6 +41147,21 @@ "iKq" = ( /turf/template_noop, /area/maintenance/starboard/aft) +"iKA" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "iLi" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -41802,26 +41825,6 @@ /obj/machinery/porta_turret/ai, /turf/open/floor/circuit/telecomms/server, /area/ai_monitored/turret_protected/ai) -"jfS" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/suit_storage_unit/cmo, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/button/door{ - id = "cmo"; - name = "CMO Shutter Control"; - pixel_x = -6; - pixel_y = 24; - req_access_txt = "40" - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "jgh" = ( /obj/machinery/doorButtons/access_button{ idDoor = "telecomms_airlock_exterior"; @@ -42702,6 +42705,21 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +"jFL" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "jGj" = ( /obj/machinery/power/apc{ areastring = "/area/medical/genetics"; @@ -43886,6 +43904,26 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"kug" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer RC"; + pixel_y = 32 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "kvn" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 @@ -43946,18 +43984,6 @@ /obj/machinery/space_heater, /turf/open/floor/plasteel/dark, /area/maintenance/department/tcoms) -"kxi" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "kxP" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 @@ -46722,19 +46748,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/maintenance/aft) -"mqq" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/cmo{ - pixel_y = 30 - }, -/obj/machinery/computer/med_data, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "mqv" = ( /obj/machinery/door/airlock/public/glass{ name = "Library" @@ -49801,6 +49814,32 @@ /obj/machinery/photocopier, /turf/open/floor/plasteel, /area/security/prison) +"oeb" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/door/airlock/command/glass{ + name = "Chief Medical Officer"; + req_access_txt = "40" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/white, +/area/crew_quarters/heads/cmo) "oef" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet/purple, @@ -52840,22 +52879,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"pVd" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/obj/machinery/light_switch{ - pixel_x = 28; - pixel_y = -9 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "pVj" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53590,6 +53613,29 @@ }, /turf/open/floor/plasteel/white, /area/medical/virology) +"qqG" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/obj/machinery/light_switch{ + pixel_x = 35; + pixel_y = -9 + }, +/obj/machinery/button/door{ + id = "cmo"; + name = "CMO Shutter Control"; + pixel_x = 25; + pixel_y = -9; + req_access_txt = "40" + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "qrJ" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod Two" @@ -53657,22 +53703,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/port/aft) -"qsL" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "qsO" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -54354,6 +54384,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/hallway/secondary/entry) +"qPq" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "qPt" = ( /obj/structure/sign/warning/securearea{ pixel_x = 32 @@ -57595,6 +57636,34 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"sSZ" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/folder/white, +/obj/item/cartridge/medical, +/obj/item/cartridge/medical{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/cartridge/medical{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/cartridge/chemistry{ + pixel_y = 2 + }, +/obj/item/clothing/neck/stethoscope, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "sTb" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -58436,23 +58505,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"trM" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "tsI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58912,31 +58964,6 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"tIX" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/door/airlock/command/glass{ - name = "Chief Medical Officer"; - req_access_txt = "40" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) "tJo" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -60483,6 +60510,16 @@ "uEa" = ( /turf/open/floor/plasteel/white, /area/medical/medbay/aft) +"uEc" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/displaycase/cmo, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "uEA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/biogenerator, @@ -61270,20 +61307,6 @@ }, /turf/open/floor/wood, /area/library) -"vfF" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "vfG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -63263,23 +63286,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"wte" = ( -/obj/machinery/computer/crew, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; - name = "Chief Medical Officer RC"; - pixel_y = 32 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "wtu" = ( /obj/structure/window/reinforced{ dir = 8 @@ -65209,6 +65215,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/dark, /area/science/xenobiology) +"xHF" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/computer/med_data, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/modular_computer/telescreen/preset/medical{ + pixel_y = 32 + }, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "xIh" = ( /obj/structure/closet/radiation, /obj/machinery/firealarm{ @@ -65576,20 +65598,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) -"xUb" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/item/twohanded/required/kirbyplants/random, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/item/toy/figure/cmo, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "xUt" = ( /obj/structure/cable{ icon_state = "4-8" @@ -106395,11 +106403,11 @@ aYV aYV aYV kiy -wte +kug bCY pve -xUb -qsL +iIn +aKi bEi sxa kub @@ -106652,11 +106660,11 @@ aYV aYV cBm kiy -mqq +xHF epR peX kJu -kxi +uEc bEi sxa kub @@ -106909,12 +106917,12 @@ aYV aYV nAK kiy -jfS -gqS -cOj -vfF -trM -tIX +dCL +qPq +sSZ +iKA +jFL +oeb nbu rNg hLI @@ -107167,7 +107175,7 @@ aYV aYV kiy cbh -pVd +qqG kUQ iQI dAf diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm index bef147c76a9f..48d9859184f0 100644 --- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm +++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm @@ -50705,26 +50705,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cnC" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, -/obj/structure/table/glass, -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "cnD" = ( /obj/item/cartridge/medical{ pixel_x = -2; @@ -50747,36 +50727,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/cmo) -"cnE" = ( -/obj/item/folder/blue, -/obj/structure/table/glass, -/obj/item/stamp/cmo, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) -"cnF" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/clothing/glasses/hud/health, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "cnG" = ( /obj/structure/closet/secure_closet/CMO, /obj/item/storage/secure/safe{ @@ -64097,6 +64047,22 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel, /area/maintenance/department/science) +"drG" = ( +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "dsf" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 @@ -65559,6 +65525,18 @@ /mob/living/simple_animal/pet/dog/corgi/Ian, /turf/open/floor/wood, /area/crew_quarters/heads/hop) +"eCN" = ( +/obj/structure/table/glass, +/obj/item/stamp/cmo, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "eCX" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/door/firedoor/border_only{ @@ -66119,6 +66097,22 @@ }, /turf/open/floor/plasteel, /area/engine/atmos_distro) +"fgQ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/displaycase/cmo, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "fhb" = ( /obj/effect/landmark/blobstart, /turf/open/floor/engine/cult, @@ -67815,6 +67809,29 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"gUl" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/folder/blue, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/pen, +/turf/open/floor/plasteel/cafeteria, +/area/crew_quarters/heads/cmo) "gXd" = ( /obj/machinery/mineral/stacking_unit_console{ machinedir = 8; @@ -72980,22 +72997,6 @@ /obj/structure/grille, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"mpI" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/plasteel/cafeteria, -/area/crew_quarters/heads/cmo) "mrM" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 @@ -107638,9 +107639,9 @@ caa coz cch cmu -cnC +drG qob -mpI +fgQ bFc bXf ctx @@ -108152,7 +108153,7 @@ cnV coE clo cmw -cnE +eCN mEa cdb bFe @@ -108409,7 +108410,7 @@ crw coF clo cmx -cnF +gUl ftd bEI cds diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 9b11f26ad2c7..062602bd4fbe 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -419,6 +419,7 @@ new /obj/item/rod_of_asclepius(owner.loc) if(owner.mind) owner.mind.transfer_to(healSnake) + healSnake.grab_ghost() qdel(owner) else if(iscarbon(owner)) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 99ec058e6edf..e65f6e713660 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -23,6 +23,7 @@ * Clockwork Watches * Toy Daggers * Turn Tracker + * ceremonial Rod of Asclepius */ @@ -1616,3 +1617,15 @@ obj/item/toy/turn_tracker /obj/item/storage/box/heretic_box/PopulateContents() for(var/i in 1 to rand(1,4)) new /obj/item/toy/reality_pierce(src) + +/* + * ceremonial Rod of Asclepius + */ + +/obj/item/toy/rod_of_asclepius + name = "ceremonial Rod of Asclepius" + desc = "A wooden rod about the size of your forearm with a snake carved around it, winding its way up the sides of the rod. This is a ceremonial recreation given to the Chief Medical Officer, and has 'Nanotrasen Emergency Medical' engraved at the bottom." + icon = 'icons/obj/lavaland/artefacts.dmi' + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + icon_state = "asclepius_dormant" diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index f43b9a75556c..91f0565c7f49 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -241,6 +241,10 @@ start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr req_access = list(ACCESS_RD) +/obj/structure/displaycase/cmo + start_showpiece_type = /obj/item/toy/rod_of_asclepius + req_access = list(ACCESS_CMO) + /obj/structure/displaycase/noalert alert = FALSE