diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm index b8c29c287af..09304a82e0b 100644 --- a/code/defines/area/Space Station 13 areas.dm +++ b/code/defines/area/Space Station 13 areas.dm @@ -1126,6 +1126,10 @@ proc/process_ghost_teleport_locs() name = "\improper Toxins Mixing Room" icon_state = "toxmix" +/area/toxins/misc_lab + name = "Miscellaneous Research" + icon_state = "toxtest" + /area/toxins/server name = "\improper Server Room" icon_state = "server" @@ -1328,7 +1332,7 @@ proc/process_ghost_teleport_locs() icon_state = "ai_upload" /area/turret_protected/ai_upload_foyer - name = "Secure Tech Access" + name = "Secure Network Access" icon_state = "ai_foyer" /area/turret_protected/ai diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index c5eb2e3d716..7af910decb2 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -4153,7 +4153,7 @@ "bBS" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) "bBT" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) "bBU" = (/obj/machinery/atmospherics/pipe/simple/insulated,/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) -"bBV" = (/obj/machinery/ignition_switch{id = "mixingsparker"; pixel_x = 25; pixel_y = -5},/obj/machinery/door_control{id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = 25; pixel_y = 5},/obj/machinery/atmospherics/pipe/simple/insulated{dir = 6},/obj/machinery/meter,/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) +"bBV" = (/obj/machinery/ignition_switch{id = "mixingsparker"; pixel_x = 25; pixel_y = -5},/obj/machinery/door_control{id = "mixvent"; name = "Mixing Room Vent Control"; pixel_x = 25; pixel_y = 5; req_access_txt = "7"},/obj/machinery/atmospherics/pipe/simple/insulated{dir = 6},/obj/machinery/meter,/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing) "bBW" = (/obj/machinery/atmospherics/binary/pump{dir = 8; icon_state = "intact_on"; on = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/sign/fire{pixel_y = -32},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "dark"},/area/toxins/mixing) "bBX" = (/obj/machinery/sparker{id = "mixingsparker"; pixel_x = -25},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) "bBY" = (/obj/machinery/light/small,/turf/simulated/floor/engine/vacuum,/area/toxins/mixing) @@ -4864,7 +4864,7 @@ "bPB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) "bPC" = (/obj/item/weapon/monkeycube_box,/obj/item/weapon/monkeycube_box,/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) "bPD" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) -"bPE" = (/obj/machinery/door_control{id = "xenobio"; name = "Containment Blast Doors"; pixel_x = 6; pixel_y = 4},/obj/machinery/ignition_switch{id = "Xenobio"; pixel_x = -6; pixel_y = 4},/obj/structure/table,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) +"bPE" = (/obj/machinery/door_control{id = "xenobio"; name = "Containment Blast Doors"; pixel_x = 6; pixel_y = 4; req_access_txt = "55"},/obj/machinery/ignition_switch{id = "Xenobio"; pixel_x = -6; pixel_y = 4},/obj/structure/table,/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) "bPF" = (/obj/item/weapon/melee/baton{pixel_x = -3},/obj/structure/window/reinforced{dir = 4},/obj/structure/table,/turf/simulated/floor{dir = 5; icon_state = "warning"},/area/toxins/xenobiology) "bPG" = (/obj/machinery/door/window/northleft{name = "Containment Pen"; req_access_txt = "55"},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/toxins/xenobiology) "bPH" = (/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 6},/obj/item/weapon/wrench{pixel_x = 3},/obj/structure/table/reinforced,/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/toxins/xenobiology) @@ -5066,7 +5066,7 @@ "bTv" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bTw" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bTx" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) -"bTy" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 10},/obj/item/weapon/wrench,/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) +"bTy" = (/obj/structure/table,/obj/item/stack/sheet/metal{amount = 10},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/item/device/radio/electropack,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) "bTz" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) "bTA" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) "bTB" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "misclab"; name = "Test Chamber Blast Doors"; opacity = 0},/turf/simulated/floor/plating,/area/toxins/test_area) @@ -5141,8 +5141,8 @@ "bUS" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -5; pixel_y = 3},/obj/item/device/assembly/igniter{pixel_x = 5; pixel_y = -4},/obj/item/device/assembly/igniter{pixel_x = 2; pixel_y = 6},/obj/item/device/assembly/igniter{pixel_x = 2; pixel_y = -1},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) "bUT" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) "bUU" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) -"bUV" = (/obj/machinery/door_control{id = "misclab"; name = "Test Chamber Blast Doors"; pixel_x = 6; pixel_y = -24},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) -"bUW" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/weapon/crowbar/red,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) +"bUV" = (/obj/machinery/door_control{id = "misclab"; name = "Test Chamber Blast Doors"; pixel_x = 6; pixel_y = -24; req_access_txt = "7"},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) +"bUW" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/weapon/crowbar/red,/obj/item/weapon/wrench,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) "bUX" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/test_area) "bUY" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/toxins/test_area) "bUZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/toxins/test_area)