diff --git a/_maps/map_files220/cyberiad/cyberiad.dmm b/_maps/map_files220/cyberiad/cyberiad.dmm index ac6e47b70033..98b7c9ac8c42 100644 --- a/_maps/map_files220/cyberiad/cyberiad.dmm +++ b/_maps/map_files220/cyberiad/cyberiad.dmm @@ -21587,15 +21587,12 @@ /turf/simulated/floor/carpet, /area/crew_quarters/captain) "bAb" = ( -/obj/structure/table/wood, /obj/machinery/alarm{ dir = 4; name = "west bump"; pixel_x = -24 }, -/obj/machinery/photocopier/faxmachine/longrange{ - department = "NT Representative's Office" - }, +/obj/machinery/photocopier, /turf/simulated/floor/wood, /area/ntrep) "bAc" = ( @@ -31933,12 +31930,13 @@ /turf/simulated/floor/plating/airless, /area/engine/engineering) "ckI" = ( -/obj/machinery/computer/security{ - network = list("SS13","Research Outpost","Mining Outpost","Telecomms") - }, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, +/obj/structure/table/wood, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "NT Representative's Office" + }, /turf/simulated/floor/wood, /area/ntrep) "ckL" = ( @@ -33022,10 +33020,11 @@ }, /area/hallway/primary/aft) "coH" = ( -/obj/machinery/computer/med_data, +/obj/machinery/computer/med_data/laptop, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, +/obj/structure/table/wood, /turf/simulated/floor/wood, /area/ntrep) "coL" = ( @@ -38734,6 +38733,12 @@ dir = 1; network = list("SS13","Engineering") }, +/obj/machinery/door_control{ + desc = "A remote control-switch for the SM Radiation Security Shutters"; + id = "engsm2"; + name = "SM Door Radiation Shutters Control"; + pixel_y = -27 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42207,6 +42212,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/yellow/partial{ + dir = 8 + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -42214,11 +42222,8 @@ }, /obj/structure/cable{ d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/decal/warning_stripes/yellow/partial{ - dir = 8 + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -43792,9 +43797,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/ai_status_display{ - pixel_y = -32 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -52882,7 +52884,10 @@ charge = 5e+006 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/cable, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -54453,11 +54458,8 @@ /area/engine/hallway) "fqN" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/power/terminal, +/obj/structure/cable, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -57442,17 +57444,20 @@ "guJ" = ( /obj/structure/table/reinforced, /obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/paper/tcommskey{ + pixel_x = 7; + pixel_y = 2 + }, +/obj/item/stamp/ce{ + pixel_x = 7 }, /obj/item/pen/multi{ pixel_y = 6; pixel_x = -5 }, -/obj/item/paper/tcommskey{ - pixel_x = 5 - }, -/obj/item/stamp/ce, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -64262,6 +64267,8 @@ name = "south bump"; pixel_y = -24 }, +/obj/machinery/space_heater, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -70475,10 +70482,10 @@ /turf/simulated/floor/plating, /area/maintenance/port) "lte" = ( -/obj/machinery/photocopier, /obj/machinery/light{ dir = 8 }, +/obj/structure/closet/cabinet, /turf/simulated/floor/wood, /area/ntrep) "ltK" = ( @@ -71792,6 +71799,20 @@ icon_state = "redfull" }, /area/security/permabrig) +"lTU" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/door_control{ + desc = "A remote control-switch for the SM Radiation Security Shutters"; + id = "engsm2"; + name = "SM Door Radiation Shutters Control"; + pixel_y = 5; + pixel_x = -27 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkyellowcorners" + }, +/area/engine/supermatter_room) "lUa" = ( /obj/structure/cable{ d1 = 4; @@ -78789,13 +78810,11 @@ /turf/simulated/floor/mech_bay_recharge_floor, /area/maintenance/asmaint) "oBJ" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/ai_status_display{ - pixel_y = 32 +/obj/machinery/shower{ + pixel_y = 20 }, +/obj/effect/turf_decal/siding/yellow/end, +/obj/structure/curtain/open/shower/engineering, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -80067,11 +80086,8 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "oYb" = ( -/obj/machinery/space_heater, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/obj/machinery/ai_status_display, +/turf/simulated/wall/r_wall, /area/engine/hallway) "oYe" = ( /obj/structure/cable{ @@ -81387,7 +81403,8 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 1; + icon_state = "darkyellow" }, /area/engine/supermatter_room) "pxz" = ( @@ -85006,7 +85023,7 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint) "qPa" = ( -/obj/item/radio/beacon/engine/tesling, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plating/airless, /area/space/nearstation) "qPt" = ( @@ -86281,16 +86298,17 @@ /obj/item/paper/gravity_gen, /obj/item/pen/blue, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/terminal{ - dir = 8 - }, -/obj/structure/cable, /obj/item/radio/intercom{ dir = 1; name = "south bump"; pixel_y = -22 }, /obj/machinery/light, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "darkblue" @@ -86839,11 +86857,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkbluecorners" @@ -94159,6 +94172,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/space_heater, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -104505,6 +104520,9 @@ /obj/item/cartridge/atmos, /obj/item/t_scanner, /obj/item/wrench, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -137414,9 +137432,9 @@ txJ ddm dtv cOi +oBJ +kfu deM -deM -oYb iTW cGK cGK @@ -137672,8 +137690,8 @@ jot dtv cOi oBJ +kfu deM -oYb ury qss xzG @@ -138441,7 +138459,7 @@ cPs cPs dkK cZU -cOi +oYb dfG uUy dgR @@ -139217,7 +139235,7 @@ cJH dke oLB cPE -cPE +lTU cQp kcJ nTG