diff --git a/aurorastation.dme b/aurorastation.dme index aceca53ec5b..ca86b23b550 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1059,6 +1059,7 @@ #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm" +#include "code\game\objects\structures\crates_lockers\closets\secure\sciguncabinet.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm" #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "code\game\objects\structures\crates_lockers\crates\gear_loadout.dm" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/sciguncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/sciguncabinet.dm new file mode 100644 index 00000000000..aa776dd75f7 --- /dev/null +++ b/code/game/objects/structures/crates_lockers/closets/secure/sciguncabinet.dm @@ -0,0 +1,57 @@ +/obj/structure/closet/secure_closet/sciguncabinet + name = "science gun cabinet" + req_access = list(access_tox_storage) + icon = 'icons/obj/sciguncabinet.dmi' + icon_state = "base" + icon_off ="base" + icon_broken ="base" + icon_locked ="base" + icon_closed ="base" + icon_opened = "base" + anchored = 1 + canbemoved = 1 + + +/obj/structure/closet/secure_closet/sciguncabinet/Initialize() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/structure/closet/secure_closet/sciguncabinet/LateInitialize() + ..() + update_icon() + +/obj/structure/closet/secure_closet/sciguncabinet/toggle() + ..() + update_icon() + +/obj/structure/closet/secure_closet/sciguncabinet/update_icon() + cut_overlays() + if(opened) + add_overlay("door_open") + else + var/lazors = 0 + var/shottas = 0 + for (var/obj/item/gun/G in contents) + if (istype(G, /obj/item/gun/energy)) + lazors++ + if (istype(G, /obj/item/gun/projectile/)) + shottas++ + if (lazors || shottas) + for (var/i = 0 to 2) + if (lazors > 0 && (shottas <= 0 || prob(50))) + lazors-- + add_overlay("laser[i]") + else if (shottas > 0) + shottas-- + add_overlay("projectile[i]") + + add_overlay("door") + if(welded) + add_overlay(welded_overlay_state) + + if(broken) + add_overlay("broken") + else if (locked) + add_overlay("locked") + else + add_overlay("open") diff --git a/html/changelogs/FieryTech-PR-10614.yml b/html/changelogs/FieryTech-PR-10614.yml new file mode 100644 index 00000000000..c56442303bb --- /dev/null +++ b/html/changelogs/FieryTech-PR-10614.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: FieryTech + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a secure storage room for the science department, next to the conference room." + - rscadd: "Added a science gun locker sprite, and script, for the new secure storage room." diff --git a/icons/obj/sciguncabinet.dmi b/icons/obj/sciguncabinet.dmi new file mode 100644 index 00000000000..214de6d7649 Binary files /dev/null and b/icons/obj/sciguncabinet.dmi differ diff --git a/maps/_common/areas/station/research.dm b/maps/_common/areas/station/research.dm index 105129919e9..178d7a6e7f0 100644 --- a/maps/_common/areas/station/research.dm +++ b/maps/_common/areas/station/research.dm @@ -123,6 +123,10 @@ name = "Research - Toxins Storage" icon_state = "toxstorage" +/area/rnd/strongroom + name = "Research - Research Storage" + icon_state = "toxlab" + /area/rnd/test_area name = "Research - Toxins Test Area" icon_state = "toxtest" diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 8b3b54b004d..86ad7d55dc8 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -4238,12 +4238,8 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "ahT" = ( -/obj/effect/floor_decal/corner_wide/mauve/full{ - dir = 8 - }, -/obj/machinery/vending/cigarette, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) +/turf/simulated/wall/r_wall, +/area/rnd/strongroom) "ahU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -6457,6 +6453,29 @@ }, /turf/simulated/floor/plating, /area/security/investigations) +"ama" = ( +/obj/effect/floor_decal/corner_wide/mauve/full{ + dir = 8 + }, +/obj/structure/closet/secure_closet/sciguncabinet, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) +"amb" = ( +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 5 + }, +/obj/machinery/power/apc{ + dir = 1; + is_critical = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "amc" = ( /obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6474,12 +6493,8 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "ame" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/corner_wide/mauve{ - dir = 9 +/obj/effect/floor_decal/corner_wide/mauve/full{ + dir = 8 }, /obj/machinery/vending/snack, /turf/simulated/floor/tiled/white, @@ -6542,18 +6557,15 @@ /turf/simulated/floor/plating, /area/maintenance/security_starboard) "amj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/corner_wide/mauve/full{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/mech_recharger, +/obj/machinery/alarm{ + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/diagonal, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "amk" = ( /obj/structure/cable/green{ d1 = 1; @@ -6563,22 +6575,16 @@ /turf/simulated/floor/plating, /area/maintenance/vault) "aml" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Xenobiologist" - }, -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/bed/chair/plastic{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "amm" = ( /obj/machinery/button/remote/blast_door{ desc = "A remote control-switch for engine core."; @@ -7040,6 +7046,54 @@ }, /turf/simulated/floor/tiled, /area/security/training) +"ani" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) +"anj" = ( +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 6 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) +"ank" = ( +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) +"anl" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "anm" = ( /obj/effect/floor_decal/corner_wide/mauve/full, /turf/simulated/floor/tiled/white, @@ -7502,6 +7556,16 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/lawoffice/consular) +"aol" = ( +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "aom" = ( /obj/structure/table/reinforced/steel, /obj/structure/window/reinforced{ @@ -9711,6 +9775,76 @@ /obj/structure/bed/chair/office/bridge/generic, /turf/simulated/floor/carpet/rubber, /area/lawoffice/representative) +"asa" = ( +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 9 + }, +/obj/machinery/camera/network/research{ + c_tag = "Research - Research Storage"; + dir = 4 + }, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/stack/material/glass{ + amount = 50 + }, +/obj/item/stack/material/steel{ + amount = 50 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) +"asb" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) +"asc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/machinery/door/airlock/research{ + name = "Research storage"; + req_access = list(7) + }, +/obj/machinery/door/blast/regular{ + closed_layer = 3.5; + density = 0; + icon_state = "pdoor0"; + id = "RDStorage"; + name = "Storage lockdown"; + opacity = 0 + }, +/obj/machinery/button/remote/blast_door{ + id = "RDStorage"; + name = "Storage lockdown"; + pixel_x = 5; + pixel_y = 25; + req_access = list(30) + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "asd" = ( /obj/structure/table/rack, /obj/item/storage/box/flashbangs{ @@ -11596,6 +11730,18 @@ "avd" = ( /turf/simulated/wall, /area/hallway/primary/starboard) +"ave" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/maintenance{ + name = "Research Division Maintenance"; + req_access = list(47); + req_one_access = null + }, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/research) "avf" = ( /turf/simulated/wall/r_wall, /area/hallway/primary/starboard) @@ -12667,7 +12813,7 @@ /obj/machinery/air_sensor{ frequency = 1438; id_tag = "engine_sensor"; - output = 31 + output = 63 }, /turf/simulated/floor/greengrid/nitrogen{ icon = 'icons/turf/flooring/plating.dmi'; @@ -13688,6 +13834,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/vault) +"ayv" = ( +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "ayw" = ( /obj/structure/table/standard, /obj/item/paper_bin, @@ -14469,6 +14636,27 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/telesci) +"azS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) "azT" = ( /obj/item/storage/box/drinkingglasses{ layer = 3.3; @@ -14519,6 +14707,24 @@ /obj/item/paper_scanner, /turf/simulated/floor/tiled/white, /area/rnd/telesci) +"azV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) "azW" = ( /obj/machinery/computer/telescience{ starting_crystals = 4 @@ -15456,6 +15662,52 @@ }, /turf/simulated/floor/wood, /area/lawoffice/consular) +"aBs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Roboticist" + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/bed/chair/plastic{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) +"aBt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Roboticist" + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/bed/chair/plastic{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) "aBu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm/east, @@ -17481,6 +17733,30 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"aEI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Scientist" + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/bed/chair/plastic{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) "aEJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -20047,12 +20323,58 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"aIG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Scientist" + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/bed/chair/plastic{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) "aIH" = ( /obj/machinery/door/firedoor{ enable_smart_generation = 0 }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"aII" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Xenobiologist" + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/bed/chair/plastic{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) "aIJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -21786,6 +22108,27 @@ }, /turf/simulated/floor/plating, /area/security/brig) +"aLN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/floor_decal/corner/mauve/diagonal, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) "aLO" = ( /obj/structure/cable{ d1 = 2; @@ -29397,6 +29740,20 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) +"aYB" = ( +/obj/effect/floor_decal/corner_wide/mauve/full, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/reinforced{ + table_mat = "steel"; + table_reinf = "mhydrogen" + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "aYC" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) @@ -36098,6 +36455,23 @@ /obj/machinery/firealarm/north, /turf/simulated/floor/lino/grey, /area/crew_quarters/bar) +"bkq" = ( +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/door/window{ + dir = 1; + req_access = list(7) + }, +/obj/structure/table/reinforced{ + table_mat = "steel"; + table_reinf = "mhydrogen" + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "bkr" = ( /turf/simulated/wall, /area/medical/medbay2) @@ -36390,6 +36764,22 @@ }, /turf/simulated/floor/reinforced, /area/assembly/robotics) +"bkM" = ( +/obj/effect/floor_decal/corner_wide/mauve/full{ + dir = 4 + }, +/obj/structure/table/reinforced{ + table_mat = "steel"; + table_reinf = "mhydrogen" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/rnd/strongroom) "bkN" = ( /obj/structure/table/steel, /obj/item/device/robotanalyzer, @@ -44288,12 +44678,6 @@ /area/rnd/lab) "bAS" = ( /obj/structure/table/standard, -/obj/item/stack/material/steel{ - amount = 50 - }, -/obj/item/stack/material/glass{ - amount = 50 - }, /obj/effect/floor_decal/corner_wide/mauve{ dir = 6 }, @@ -46945,96 +47329,6 @@ /obj/random/loot, /turf/simulated/floor/plating, /area/maintenance/research_port) -"bGT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Roboticist" - }, -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/bed/chair/plastic{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) -"bGU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Roboticist" - }, -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/bed/chair/plastic{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) -"bGV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Scientist" - }, -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/bed/chair/plastic{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) -"bGW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Scientist" - }, -/obj/effect/floor_decal/corner/mauve/diagonal, -/obj/structure/bed/chair/plastic{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) -"bGY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/effect/floor_decal/corner/mauve/diagonal, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/research) "bHb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -47781,18 +48075,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/bridge_elevator) -"bIJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance{ - name = "Research Division Maintenance"; - req_access = list(47); - req_one_access = null - }, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep/research) "bIK" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/research) @@ -60957,11 +61239,6 @@ temperature = 278 }, /area/medical/surgerywing) -"gws" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "gxO" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -66044,6 +66321,11 @@ /obj/random/junk, /turf/simulated/floor/wood, /area/maintenance/bar) +"rpx" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "rpy" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -87807,13 +88089,13 @@ eOZ aab bBw beG -bbs -bbs -bbs -bcY -bbs -bbs -bbs +ahT +ahT +ahT +ahT +ahT +ahT +ahT beG bcY bcY @@ -88064,13 +88346,13 @@ bbs aaR bbs bCn -bbs -bEc -bbs -bcY -bbs -beC -bbs +ahT +ama +aml +ank +asa +aYB +ahT aOv cXM bcY @@ -88321,13 +88603,13 @@ bbs aKU aKU beG -bbs -bcY -bbs -beC -bbs -bcY -bbs +ahT +amb +ani +anl +asb +bkq +ahT qqW jBK bLf @@ -88578,13 +88860,13 @@ bbs bAz bbt bCp -bcY -bcY -bcY -bcY -bbs -bcY -bcY +ahT +amj +anj +aol +ayv +bkM +ahT wje kzl bcY @@ -88835,13 +89117,13 @@ vPm bAA dFK bcX -bIK -bIK -bIK -bIK -bIK -bIK -bIK +ahT +ahT +ahT +ahT +asc +ahT +ahT sNG bcY bcY @@ -89093,12 +89375,12 @@ bvS bvS bvS bvS -ahT +ame akH alz -ame +azS anB -bIJ +ave bJw bhl bLg @@ -89353,7 +89635,7 @@ bDk aif alc bFV -amj +azV aZj bIK bIK @@ -89610,7 +89892,7 @@ bDl bEe bET bFW -bGT +aBs apz bIK bJx @@ -89867,7 +90149,7 @@ bDm aif ald bFX -bGU +aBt bEe bIK bJx @@ -90124,7 +90406,7 @@ bvS ajz bET bFW -bGV +aEI alc bIK bJx @@ -90381,7 +90663,7 @@ bvS ajA bEV bFW -bGW +aIG bEe bIK bJx @@ -90638,7 +90920,7 @@ bvS ajI bEV bFX -aml +aII apz bIK bJx @@ -90895,7 +91177,7 @@ bvS akg bEX bFY -bGY +aLN apA bIK bIK @@ -101188,7 +101470,7 @@ bOt bOZ cbZ keq -gws +rpx keq bOR keq