diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9d1d6b3957c..8412adc0ed5 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -6451,6 +6451,13 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) +"apz" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/closet/wardrobe/pjs, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "apA" = ( /obj/machinery/power/apc{ areastring = "/area/maintenance/solars/starboard/fore"; @@ -13817,7 +13824,7 @@ "aJD" = ( /obj/machinery/door/airlock/maintenance{ name = "Bar Maintenance"; - req_one_access_txt = "12;25;26;35;28;22;37;46;38" + req_one_access_txt = "12;25;26;35;28;22;37;46;38;70" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -24845,8 +24852,8 @@ /area/medical/morgue) "bmX" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/closed/wall/r_wall, -/area/medical/medbay/zone2) +/turf/closed/wall, +/area/medical/morgue) "bmY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -25369,13 +25376,10 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "boq" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) +/obj/structure/chair/sofa/right, +/obj/item/toy/plush/moth, +/turf/open/floor/carpet, +/area/medical/psychology) "bor" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, @@ -25853,52 +25857,41 @@ /turf/open/floor/plating, /area/medical/pharmacy) "bpG" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Ward APC"; - pixel_y = 23 - }, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/closed/wall, +/area/medical/psychology) "bpH" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/sign/departments/psychology{ + pixel_x = 32 }, -/obj/structure/closet/wardrobe/pjs, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/medbay/central) "bpJ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/closet/wardrobe/mixed, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bpK" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 4 }, -/obj/structure/closet/wardrobe/pjs, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/open/floor/carpet, +/area/medical/psychology) "bpL" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/sign/poster/official/no_erp{ + pixel_y = 32 }, -/obj/structure/closet/wardrobe/mixed, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/obj/structure/chair/sofa/left, +/turf/open/floor/carpet, +/area/medical/psychology) "bpM" = ( /obj/structure/disposalpipe/segment, /obj/machinery/smartfridge/chemistry, @@ -25925,11 +25918,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bpQ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) "bpR" = ( @@ -26377,59 +26370,71 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bqZ" = ( -/obj/structure/cable, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/machinery/door/airlock/medical{ + name = "Psychology"; + req_access_txt = "70" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "brb" = ( /obj/effect/turf_decal/tile/blue, /obj/structure/table, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "brc" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "brd" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/turf/open/floor/carpet, +/area/medical/psychology) "brg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "brh" = ( -/obj/effect/turf_decal/tile/blue, -/obj/structure/cable, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bri" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "brj" = ( -/obj/structure/bed/roller, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 4 + dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/chair/office/light, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24 + }, +/obj/effect/landmark/start/psychologist, /turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"brk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "brm" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -26871,13 +26876,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) -"bsv" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) "bsw" = ( /obj/machinery/door/airlock/research{ name = "Robotics Lab"; @@ -27037,10 +27035,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"btl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) "btm" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2; @@ -27444,10 +27438,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bum" = ( /obj/machinery/holopad, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bun" = ( @@ -27456,8 +27452,6 @@ }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable, -/obj/structure/bed, -/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "buo" = ( @@ -27470,6 +27464,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bur" = ( @@ -27490,8 +27485,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, +/obj/structure/sign/poster/official/cleanliness{ + pixel_y = 32 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "buu" = ( @@ -27834,10 +27831,10 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "bvn" = ( -/obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/item/kirbyplants/random, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bvo" = ( @@ -27867,15 +27864,22 @@ /area/medical/medbay/zone2) "bvu" = ( /obj/effect/turf_decal/tile/blue, -/obj/machinery/light{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bvw" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/light_switch{ + pixel_y = -28 + }, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bvx" = ( /turf/closed/wall/r_wall, /area/science/research) @@ -28811,8 +28815,9 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "bye" = ( -/obj/structure/closet/wardrobe/white, /obj/effect/turf_decal/tile/blue, +/obj/structure/bed, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "byf" = ( @@ -29343,8 +29348,6 @@ "bzl" = ( /obj/machinery/light, /obj/effect/turf_decal/tile/blue, -/obj/structure/table, -/obj/effect/spawner/lootdrop/donkpockets, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bzm" = ( @@ -29352,20 +29355,8 @@ dir = 1; pixel_y = -26 }, +/obj/effect/turf_decal/tile/blue, /obj/structure/closet/wardrobe/white, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) -"bzn" = ( -/obj/machinery/camera{ - c_tag = "Ward Port"; - dir = 1; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/blue, -/obj/structure/chair{ - dir = 8 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bzo" = ( @@ -32917,9 +32908,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bIq" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bIr" = ( @@ -48521,6 +48510,17 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cYj" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Psychology Maintenance"; + req_access_txt = "70" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) "cYY" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -49609,6 +49609,11 @@ }, /turf/open/floor/plasteel, /area/vacant_room/commissary) +"gFW" = ( +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "gGJ" = ( /obj/machinery/camera/autoname{ dir = 5 @@ -49644,6 +49649,21 @@ dir = 4 }, /obj/structure/cable, +/obj/structure/sink/kitchen{ + pixel_y = 12 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) +"gIf" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/power/apc{ + name = "Ward APC"; + pixel_x = -32 + }, +/obj/structure/cable, +/obj/structure/chair, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "gIs" = ( @@ -49749,6 +49769,34 @@ }, /turf/open/floor/plasteel/dark, /area/security/execution/transfer) +"gVb" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = -14; + pixel_y = 3 + }, +/obj/item/paper_bin/carbon{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/pen, +/obj/machinery/power/apc{ + areastring = "/area/medical/psychology"; + name = "Psychology APC"; + pixel_y = -24 + }, +/obj/structure/cable, +/obj/machinery/camera{ + c_tag = "Medbay Psychology Office"; + dir = 1; + network = list("ss13","medbay") + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "gWd" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -50433,6 +50481,30 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/port) +"jqJ" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/noticeboard{ + pixel_y = -32 + }, +/obj/machinery/light_switch{ + pixel_x = -28 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "jrH" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "rnd2"; @@ -50447,6 +50519,14 @@ /obj/machinery/door/firedoor/heavy, /turf/open/floor/plasteel/white, /area/science/research) +"jsb" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/filingcabinet/filingcabinet, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "jsv" = ( /obj/machinery/power/apc{ areastring = "/area/lawoffice"; @@ -50722,6 +50802,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"kdS" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) "keQ" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall, @@ -50950,6 +51038,19 @@ }, /turf/open/floor/engine, /area/science/misc_lab) +"kMu" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/table, +/obj/effect/spawner/lootdrop/donkpockets, +/obj/machinery/camera{ + c_tag = "Medbay Ward"; + dir = 4; + network = list("ss13","medbay") + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "kMP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -51811,10 +51912,8 @@ /turf/open/floor/plasteel, /area/security/prison) "mYY" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/open/floor/carpet, +/area/medical/psychology) "ndR" = ( /obj/structure/cable, /obj/machinery/photocopier, @@ -52460,8 +52559,9 @@ dir = 4 }, /obj/structure/cable, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/machinery/airalarm{ + pixel_y = 24 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "oZc" = ( @@ -52845,6 +52945,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"pJG" = ( +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "pKm" = ( /obj/structure/table, /obj/item/nanite_remote, @@ -53138,8 +53242,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/closed/wall/r_wall, -/area/medical/medbay/zone2) +/turf/closed/wall, +/area/medical/psychology) "quT" = ( /obj/structure/lattice, /obj/structure/grille/broken, @@ -53644,6 +53748,11 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/prison) +"svW" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "swH" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53917,7 +54026,7 @@ /area/security/prison) "tiO" = ( /obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "tiW" = ( /obj/machinery/flasher{ @@ -54023,11 +54132,6 @@ /obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel, /area/hallway/primary/port) -"tsM" = ( -/obj/effect/turf_decal/tile/blue, -/obj/item/kirbyplants/random, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) "tti" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -54411,6 +54515,14 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"uFy" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/medical, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "uGz" = ( /obj/machinery/vending/wardrobe/chem_wardrobe, /turf/open/floor/plasteel/white, @@ -54494,7 +54606,7 @@ }, /obj/effect/turf_decal/tile/blue, /obj/structure/chair{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) @@ -55164,14 +55276,19 @@ /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) "wIs" = ( -/obj/effect/turf_decal/tile/blue, -/obj/machinery/camera{ - c_tag = "Ward Starboard"; - dir = 8; - network = list("ss13","medbay") +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/status_display/evac{ + pixel_x = 32 + }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "wJU" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -55386,7 +55503,7 @@ "xiw" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable, @@ -55469,11 +55586,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/xenobiology) -"xzI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) "xzN" = ( /obj/machinery/door/airlock/external{ name = "Common Mining Shuttle Bay" @@ -94410,7 +94522,7 @@ bkP bmV boc bqW -brh +bsx bua bua bua @@ -94667,11 +94779,11 @@ bkR bfL boo bqQ -bhg +bhh tiO bvn -fUn -fUn +gIf +kMu uTM bua bBJ @@ -94927,7 +95039,7 @@ bIq bri bsu fUn -brc +pJG bvo bzl bua @@ -95179,14 +95291,14 @@ biz biz bla bmY -boq -boq -brj +bhh +bqQ +bqP tiO -bvn +uFy bum vhn -bzn +bye bua bBL bhh @@ -95436,11 +95548,11 @@ biB biB bkU bmX +bhh +bqQ +bqP tiO -tiO -tiO -tiO -fUn +apz bul vhn bzm @@ -95692,12 +95804,12 @@ bhm bkb bhm bla -qsH +bmY bpH -fUn -fUn -brc -brc +bqQ +brh +tiO +gFW buq vhn bye @@ -95952,9 +96064,9 @@ blg qsH bpG bqZ -brk -bsv -xzI +bpG +bpG +bpG bun bvr bzo @@ -96209,11 +96321,11 @@ cTO qsH bpJ brc -brc -brc -btl +brj +jqJ +bpG but -bvw +vhn pdB ljx bBP @@ -96464,11 +96576,11 @@ bkc bfS blo qsH -bpH -brc -brc -brc -brc +boq +mYY +bvw +gVb +bpG gHL vhn bvs @@ -96723,9 +96835,9 @@ cTO qsH bpL mYY -brc -mYY -brc +svW +jsb +bpG oYY vhn brb @@ -96982,7 +97094,7 @@ bpK brd bvu wIs -tsM +bpG bux bvy ljx @@ -97235,11 +97347,11 @@ ipA gbT cTO qsH -ljx -ljx -ljx -ljx -ljx +bpG +bpG +cYj +bpG +bpG buG bvA ljx @@ -97494,7 +97606,7 @@ blq cTS cTK bpQ -cTK +kdS slk btm buy diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2460b897189..3c17e1033e2 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -382,7 +382,6 @@ /area/hallway/secondary/entry) "aaQ" = ( /obj/machinery/door/window{ - dir = 2; name = "Secure Art Exhibition"; req_access_txt = "37" }, @@ -13105,7 +13104,7 @@ "aDK" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Service Hallway Maintenance Hatch"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -13559,7 +13558,7 @@ /obj/machinery/door/airlock{ id_tag = "AuxCabinA"; name = "Cabin A"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -16598,7 +16597,7 @@ /obj/machinery/door/airlock{ id_tag = "AuxCabinB"; name = "Cabin B"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -29317,7 +29316,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, @@ -33301,7 +33300,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Service Foyer"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, @@ -84091,6 +84090,7 @@ dir = 5 }, /obj/structure/cable, +/obj/item/bot_assembly/medbot, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cZR" = ( @@ -84894,6 +84894,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"dbn" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/sign/departments/psychology{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "dbo" = ( /obj/machinery/door/window/brigdoor{ id = "medcell"; @@ -85049,8 +85059,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "dbC" = ( -/turf/closed/wall, -/area/medical/abandoned) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "dbD" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -86052,83 +86065,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "ddm" = ( -/obj/machinery/airalarm{ - dir = 4; - pixel_x = -23 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/item/stack/rods/ten, -/obj/item/stock_parts/capacitor, -/obj/item/circuitboard/machine/stasis, -/obj/item/stock_parts/manipulator, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"ddn" = ( -/obj/structure/mirror{ - icon_state = "mirror_broke"; - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) -"ddo" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/medical/abandoned) -"ddp" = ( -/obj/structure/table/glass, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/suture, -/obj/item/stack/medical/mesh, -/obj/structure/sign/warning/nosmoking{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) -"ddq" = ( -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) -"ddr" = ( -/obj/structure/mirror{ - icon_state = "mirror_broke"; - pixel_y = 28 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) -"dds" = ( -/obj/structure/frame/machine, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) +/turf/closed/wall, +/area/medical/psychology) "ddt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, @@ -86799,79 +86737,49 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "deN" = ( -/obj/structure/sign/departments/examroom{ - pixel_x = -32 +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -23 }, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 4 }, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) +/turf/open/floor/carpet, +/area/medical/psychology) "deO" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) +/obj/structure/chair/sofa/right, +/turf/open/floor/carpet, +/area/medical/psychology) "deP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 +/obj/structure/sign/poster/official/help_others{ + pixel_y = 32 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) +/obj/structure/chair/sofa/left, +/obj/item/toy/plush/moth, +/turf/open/floor/carpet, +/area/medical/psychology) "deQ" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"deR" = ( -/obj/item/crowbar/red, -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/bookcase/random/reference, +/turf/open/floor/plasteel/white, +/area/medical/psychology) +"deR" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"deS" = ( -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/medical/abandoned) -"deT" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall, -/area/medical/abandoned) +/obj/structure/bookcase/random/reference, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "deU" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -87329,124 +87237,55 @@ /turf/open/floor/plating, /area/medical/medbay/central) "dfM" = ( -/obj/item/bot_assembly/medbot, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, +/turf/closed/wall, /area/maintenance/starboard/aft) "dfN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/maintenance/starboard/aft) -"dfO" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; req_access_txt = "12" }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/structure/barricade/wooden, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"dfP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) -"dfQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"dfR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"dfS" = ( -/obj/item/wrench, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/landmark/xeno_spawn, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/medical/abandoned) -"dfT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue{ +/area/maintenance/starboard/aft) +"dfP" = ( +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/medical/psychology) +"dfQ" = ( +/turf/open/floor/carpet, +/area/medical/psychology) +"dfS" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/abandoned) -"dfU" = ( -/obj/effect/decal/cleanable/dirt, +/area/medical/psychology) +"dfT" = ( /obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12" + name = "Psychology Maintenance"; + req_access_txt = "70" }, -/obj/effect/mapping_helpers/airlock/abandoned, -/obj/structure/barricade/wooden, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel, -/area/medical/abandoned) +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"dfU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "dfV" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -88270,12 +88109,17 @@ /turf/closed/wall, /area/medical/medbay/central) "dht" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/sign/departments/medbay/alt{ + pixel_x = -32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "dhu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral, @@ -88286,68 +88130,37 @@ /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "dhv" = ( -/obj/machinery/shower{ +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Medbay - Psychology Office"; dir = 4; - name = "emergency shower" + name = "medbay camera"; + network = list("ss13","medbay") }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/abandoned) +/area/medical/psychology) "dhw" = ( -/turf/open/floor/plating, -/area/medical/abandoned) +/turf/open/floor/plasteel/white, +/area/medical/psychology) "dhx" = ( -/obj/machinery/iv_drip, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/medical/abandoned) -"dhy" = ( -/obj/structure/table/optable, -/obj/effect/decal/cleanable/blood/old, -/obj/effect/decal/cleanable/dirt, -/obj/item/surgical_drapes, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"dhz" = ( -/obj/structure/frame/computer, -/obj/item/circuitboard/computer/operating, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/medical/abandoned) -"dhA" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 26; - use_power = 0 - }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/abandoned) +/area/medical/psychology) +"dhy" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) +"dhz" = ( +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "dhB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -89120,69 +88933,49 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "diO" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Medbay Maintenance"; +/obj/structure/cable, +/obj/machinery/door/airlock/medical{ + name = "Medbay"; req_access_txt = "5" }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/maintenance/starboard/aft) +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "diP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/delivery, /obj/structure/cable, -/turf/open/floor/plasteel, -/area/maintenance/starboard/aft) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "diR" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = -12 +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/mirror{ - pixel_x = -28 +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) +"diS" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 }, /obj/structure/cable, -/turf/open/floor/plating, -/area/medical/abandoned) -"diS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white, -/area/medical/abandoned) +/area/medical/psychology) "diT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ - dir = 8 + dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/abandoned) -"diU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) -"diV" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/light_switch{ - pixel_x = 26 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/abandoned) +/area/medical/psychology) "diW" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -90119,9 +89912,6 @@ /turf/closed/wall, /area/medical/medbay/central) "dkG" = ( -/obj/structure/rack, -/obj/item/roller, -/obj/item/reagent_containers/blood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -90132,111 +89922,117 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/maintenance/starboard/aft) +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "dkH" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 4 + }, +/obj/structure/sign/departments/psychology{ + pixel_x = 32 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "dkI" = ( -/obj/structure/closet/secure_closet/medical2, -/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel/white, +/area/medical/psychology) +"dkJ" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light, +/obj/item/kirbyplants/random, /obj/machinery/power/apc{ - areastring = "/area/medical/abandoned"; - name = "Abandoned Medical Lab APC"; + areastring = "/area/medical/psychology"; + name = "Psychology APC"; pixel_x = 1; pixel_y = -23 }, /obj/structure/cable, -/turf/open/floor/plating, -/area/medical/abandoned) -"dkJ" = ( -/obj/machinery/light/small, -/obj/item/kirbyplants/random, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/medical/abandoned) +/turf/open/floor/plasteel/white, +/area/medical/psychology) "dkK" = ( -/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, /obj/machinery/status_display/evac{ pixel_y = -32 }, -/obj/item/storage/firstaid/regular, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/mask/surgical, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/abandoned) +/obj/structure/closet/secure_closet/psychology, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "dkL" = ( -/obj/structure/table/reinforced, -/obj/machinery/newscaster{ - pixel_y = -32 +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/item/hemostat, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/medical/abandoned) +/obj/effect/turf_decal/tile/blue, +/obj/structure/filingcabinet/filingcabinet, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "dkM" = ( -/obj/structure/table/reinforced, -/obj/machinery/status_display/evac{ +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = 14; + pixel_y = 3 + }, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/pen, +/turf/open/floor/plasteel/white, +/area/medical/psychology) +"dkN" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/noticeboard{ pixel_y = -32 }, -/obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/blood/random, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_y = 5 +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 }, -/obj/item/reagent_containers/syringe, -/obj/item/clothing/neck/stethoscope, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/abandoned) -"dkN" = ( -/obj/structure/table/reinforced, -/obj/machinery/light/small, -/obj/structure/bedsheetbin, -/obj/item/gun/syringe, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/abandoned) +/turf/open/floor/plasteel/white, +/area/medical/psychology) "dkO" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/space_heater, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/vending/wallmed{ + pixel_x = -32 + }, +/turf/open/floor/plasteel, /area/maintenance/starboard/aft) "dkP" = ( /obj/effect/decal/cleanable/dirt, @@ -91425,6 +91221,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, +/obj/structure/rack, +/obj/item/roller, +/obj/item/reagent_containers/blood, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dnM" = ( @@ -112291,6 +112090,13 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/maintenance/department/science) +"eHJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "eJc" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall, @@ -112529,6 +112335,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall, /area/maintenance/port) +"fJQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "fLR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -113205,6 +113017,14 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"iVw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "iZy" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -113406,6 +113226,13 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/engine/engineering) +"jKv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "jMX" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -113426,6 +113253,12 @@ /obj/structure/sign/departments/examroom, /turf/closed/wall, /area/medical/sleeper) +"jPq" = ( +/obj/machinery/space_heater, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "jRy" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -113446,6 +113279,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/science/mixing) +"jZv" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "jZH" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -113545,6 +113388,10 @@ }, /turf/open/floor/plasteel, /area/medical/morgue) +"kwH" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating, +/area/hallway/secondary/construction) "kxT" = ( /obj/effect/turf_decal/tile/blue, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -113606,6 +113453,21 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"kNS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch{ + req_access_txt = "12" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/maintenance/starboard/aft) "kZq" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -113714,6 +113576,16 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"lnB" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/maintenance/starboard/aft) "loc" = ( /turf/open/floor/plasteel, /area/medical/surgery/room_b) @@ -113725,6 +113597,20 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/lab) +"lrz" = ( +/obj/machinery/door/airlock/medical{ + name = "Psychology"; + req_access_txt = "70" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "lti" = ( /obj/machinery/atmospherics/components/trinary/mixer/flipped, /obj/effect/turf_decal/tile/neutral{ @@ -114169,6 +114055,21 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel/dark, /area/science/genetics) +"nhw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "npR" = ( /obj/structure/table, /obj/item/storage/secure/safe{ @@ -114304,8 +114205,7 @@ dir = 8 }, /obj/structure/sign/departments/chemistry{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -114453,6 +114353,16 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/medical/morgue) +"oEw" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "oGH" = ( /obj/machinery/shower{ pixel_y = 16 @@ -115117,6 +115027,16 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) +"rjQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/blue/filled/corner, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "rmX" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -115136,6 +115056,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/solars/port/fore) +"ryN" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/maintenance/starboard/aft) "rzc" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/turf_decal/bot, @@ -115349,6 +115279,31 @@ /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"sAm" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light_switch{ + pixel_x = 26 + }, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/psychologist, +/turf/open/floor/plasteel/white, +/area/medical/psychology) +"sAB" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_x = 28 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "sDV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -115440,6 +115395,11 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/mixing) +"tfD" = ( +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "tkj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -115630,8 +115590,7 @@ dir = 8 }, /obj/structure/sign/poster/official/report_crimes{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -116037,6 +115996,17 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"vNp" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) +"vOp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) "vQz" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 6 @@ -116143,6 +116113,12 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"wvD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "wAA" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall/r_wall, @@ -165476,7 +165452,7 @@ deK cPy iAW diN -dkv +dbn dma dnK dpD @@ -165982,7 +165958,7 @@ cRq cSZ cSZ cWA -cWA +dkO cZQ dbA ddl @@ -165991,7 +165967,7 @@ dfM dht diP dkG -dmf +dfM dnL dpE dpE @@ -166245,10 +166221,10 @@ dbB dbB deM dfN -dhu -dhu +rjQ +nhw dkH -dmg +kNS dnM cRr dhB @@ -166498,13 +166474,13 @@ cAw cAw cYg cZS -dbC -dbC -dbC -dfO -deT -dbC -dbC +cIW +ddm +ddm +ddm +ddm +lrz +ddm dmh dmh dmh @@ -167012,8 +166988,8 @@ cUV cAw cYi cZU -dbC -ddn +cIW +ddm deO dfQ dhw @@ -167269,12 +167245,12 @@ cUW cAw cYg cZU -dbC -ddo +eHJ +ddm deP -dfR +dfQ dhx -dhw +vNp dkK dmh dnP @@ -167526,9 +167502,9 @@ cAw cAw cYj cZV -dbC -ddp -deO +tfD +ddm +oEw dfS dhy diT @@ -167536,7 +167512,7 @@ dkL dmh dnQ dpH -dpG +kwH dsU dub dpG @@ -167783,12 +167759,12 @@ cCh cAw cYk cZV -dbC -ddq +cIW +ddm deQ -deO +wvD dhz -diU +dhw dkM dmh dnR @@ -168041,11 +168017,11 @@ cAw cYj cZV dbC -ddr +ddm deR -deQ -deO -dhw +jZv +sAB +sAm dkN dmh dnS @@ -168297,13 +168273,13 @@ cUY cAw cYl cZU -dbC -dds -deS +cHW +ddm +ddm dfT -dhA -diV -deS +ddm +ddm +ddm dmh dnT dpI @@ -168554,13 +168530,13 @@ cAw cAw cYm cZW -dbC -dbC -deT +cIW +vOp +cHW dfU -dbC -dbC -dbC +cHW +cIW +jPq dmh dmh dmh @@ -168812,12 +168788,12 @@ cAw cYn cZX dbD +fJQ ddt -ddt -dfV +iVw dbD -diW -dkO +lnB +dfV dbA dnU dbD @@ -169069,9 +169045,9 @@ cAw cYo cZR dbE +jKv cRr -cRr -dfW +ryN dhB cRr dkP diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index 2206a86e8ff..d18b28ba179 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -15507,20 +15507,14 @@ /area/science/xenobiology) "aJv" = ( /turf/closed/wall, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "aJw" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/turf/open/floor/carpet, +/area/medical/psychology) "aJx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -15717,8 +15711,6 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) "aJU" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -15726,7 +15718,7 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "aJV" = ( /obj/structure/closet/l3closet, /obj/effect/turf_decal/stripes/line{ @@ -15804,11 +15796,11 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "aKf" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 }, -/turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/turf/open/floor/carpet, +/area/medical/psychology) "aKg" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -15945,20 +15937,12 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "aKw" = ( -/obj/machinery/vending/wallmed{ - pixel_y = 28 +/obj/structure/chair/sofa/right, +/obj/structure/sign/poster/official/ian{ + pixel_y = 32 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/turf/open/floor/carpet, +/area/medical/psychology) "aKx" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/machinery/keycard_auth{ @@ -19658,7 +19642,7 @@ "aTo" = ( /obj/machinery/door/airlock/medical/glass{ name = "Service Door"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /turf/open/floor/plating, /area/maintenance/fore) @@ -20202,13 +20186,17 @@ pixel_y = -24 }, /obj/machinery/light, -/obj/machinery/iv_drip, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 + }, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "aUt" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 10 @@ -21694,14 +21682,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/white, /area/medical/virology) -"aXp" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/preopen{ - id = "surgeryb"; - name = "privacy shutters" - }, -/turf/open/floor/plating, -/area/medical/patients_rooms/room_a) "aXq" = ( /obj/structure/table/reinforced, /obj/item/folder/white, @@ -21718,12 +21698,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/turf/open/floor/carpet, +/area/medical/psychology) "aXs" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -21860,8 +21836,8 @@ /area/maintenance/fore) "aXH" = ( /obj/machinery/door/airlock/medical{ - name = "Surgery B"; - req_access_txt = "5" + name = "Psychology"; + req_access_txt = "70" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -21870,7 +21846,7 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "aXI" = ( /obj/item/radio/intercom{ pixel_y = 25 @@ -22041,8 +22017,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/psychologist, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "aXZ" = ( /obj/machinery/door/airlock/maintenance{ name = "Surgery Maintenance Access"; @@ -22140,16 +22118,14 @@ /turf/open/floor/plasteel, /area/medical/cryo) "aYl" = ( -/obj/structure/table/optable, -/obj/item/surgical_drapes, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/chair/comfy/brown{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/status_display/evac{ + pixel_x = -32 }, -/turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/turf/open/floor/carpet, +/area/medical/psychology) "aYm" = ( /obj/effect/landmark/blobstart, /turf/open/floor/plasteel/dark, @@ -24297,7 +24273,6 @@ /turf/open/floor/plasteel/white, /area/medical/surgery) "bdj" = ( -/obj/structure/closet/secure_closet/medical2, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -24305,8 +24280,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/filingcabinet/filingcabinet, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "bdk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 @@ -25289,31 +25265,10 @@ /turf/open/floor/plasteel, /area/engine/engine_room) "bfs" = ( -/obj/item/book/manual/wiki/surgery{ - pixel_z = 2 - }, -/obj/structure/table/glass, -/obj/item/storage/box/masks{ - pixel_x = 4 - }, -/obj/item/storage/box/gloves{ - pixel_x = -4 - }, -/obj/item/razor, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/button/door{ - id = "surgeryb"; - name = "Privacy Shutters Control"; - pixel_y = 26 - }, -/turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/obj/structure/chair/sofa/left, +/obj/item/toy/plush/moth, +/turf/open/floor/carpet, +/area/medical/psychology) "bft" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -25428,13 +25383,18 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/holopad, +/obj/machinery/camera{ + c_tag = "Medical - Psychology Office"; + dir = 8; + network = list("ss13","Medical") + }, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "bfF" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -27141,13 +27101,12 @@ /turf/open/floor/plasteel/white, /area/science/robotics/lab) "bjj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, -/obj/structure/sign/departments/examroom{ - pixel_x = -32 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/cable, +/obj/machinery/vending/wallmed{ + pixel_y = -28 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -41100,7 +41059,6 @@ /area/medical/virology) "bMe" = ( /obj/effect/landmark/blobstart, -/obj/machinery/smartfridge/organ, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -41108,8 +41066,21 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = 14; + pixel_y = 3 + }, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/pen, +/obj/structure/noticeboard{ + pixel_y = -32 + }, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "bMf" = ( /obj/structure/table/optable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -43115,9 +43086,9 @@ /area/maintenance/starboard) "bTY" = ( /obj/machinery/power/apc{ - areastring = "/area/medical/patients_rooms/room_a"; + areastring = "/area/medical/psychology"; dir = 4; - name = "Surgery B APC"; + name = "Psychology APC"; pixel_x = 24 }, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -43752,8 +43723,10 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "bXh" = ( -/obj/structure/girder, -/obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + name = "Psychology Maintenance"; + req_access_txt = "70" + }, /turf/open/floor/plating, /area/maintenance/port) "bXi" = ( @@ -44768,7 +44741,7 @@ /area/maintenance/port) "cbT" = ( /obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;22;25;26;28;35;37;38;46" + req_one_access_txt = "12;22;25;26;28;35;37;38;46;70" }, /obj/structure/cable, /turf/open/floor/plating, @@ -46450,6 +46423,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/sign/departments/psychology{ + pixel_x = -32 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "eKx" = ( @@ -48612,12 +48588,6 @@ /turf/open/floor/plasteel/dark, /area/engine/engine_room) "mkR" = ( -/obj/structure/table/glass, -/obj/item/scalpel, -/obj/item/circular_saw{ - pixel_z = 14 - }, -/obj/item/cautery, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -48628,8 +48598,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "mlN" = ( /obj/structure/closet/secure_closet/freezer/cream_pie, /obj/item/radio/intercom{ @@ -49273,8 +49244,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "onl" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "ool" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -52070,17 +52044,14 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/hop) "xyk" = ( -/obj/structure/table/glass, -/obj/item/hemostat, -/obj/item/retractor, -/obj/item/surgicaldrill, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/item/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/patients_rooms/room_a) +/area/medical/psychology) "xyz" = ( /obj/machinery/atmospherics/pipe/manifold/dark/visible{ dir = 1 @@ -73237,7 +73208,7 @@ beR qpo aGE bTY -bXh +rEa rEa rEa bMs @@ -73496,7 +73467,7 @@ aGE aJv aJv aJv -aJv +bXh aJv aJv bMs @@ -74521,11 +74492,11 @@ aGE bxv aGE aGE -aXp +aJv aXH aJv -aXp -aXp +aJv +aJv aJv acB bMs @@ -74780,7 +74751,7 @@ rdR aKh eJj aXP -bjj +rdR bbK bdl aKh @@ -75546,7 +75517,7 @@ aIg aIQ aJN aXw -bBQ +bjj aIY bNG aJi diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index b2d16dad9f4..720de7ae651 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -6097,7 +6097,7 @@ dir = 8 }, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "ajZ" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -6297,7 +6297,7 @@ /obj/structure/flora/junglebush/b, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "akr" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -8117,13 +8117,16 @@ /turf/open/floor/plasteel/dark, /area/maintenance/port) "and" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 4 }, -/obj/effect/turf_decal/tile/neutral, -/obj/structure/closet/secure_closet/personal/patient, -/turf/open/floor/plasteel/dark, -/area/medical/storage) +/obj/machinery/status_display/evac{ + pixel_x = -32; + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/medical/psychology) "ane" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -9914,22 +9917,15 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) "apW" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/item/radio/intercom{ pixel_x = -28; pixel_y = 22 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/chair/comfy/brown{ + dir = 4 }, -/turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/turf/open/floor/carpet, +/area/medical/psychology) "apX" = ( /turf/closed/wall/rust, /area/maintenance/central) @@ -10133,19 +10129,8 @@ /turf/open/floor/plasteel/dark, /area/maintenance/fore) "aqo" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/turf/open/floor/carpet, +/area/medical/psychology) "aqp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -10461,14 +10446,17 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aqP" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /obj/structure/cable, -/obj/structure/closet/secure_closet/personal/patient, -/turf/open/floor/plasteel/dark, -/area/medical/storage) +/obj/structure/chair/sofa/left, +/obj/machinery/power/apc{ + areastring = "/area/medical/psychology"; + dir = 1; + name = "Psychology APC"; + pixel_y = 24 + }, +/obj/item/toy/plush/moth, +/turf/open/floor/carpet, +/area/medical/psychology) "aqQ" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -11082,9 +11070,6 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -11515,22 +11500,9 @@ }, /area/maintenance/port/fore) "ass" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/newscaster{ - pixel_x = 30; - pixel_y = 32 - }, /obj/structure/cable, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/turf/open/floor/carpet, +/area/medical/psychology) "ast" = ( /obj/structure/chair/pew/left{ dir = 8 @@ -12406,8 +12378,8 @@ /area/medical/virology) "atL" = ( /obj/machinery/door/airlock/maintenance{ - name = "genetics maintenance"; - req_access_txt = "5; 9; 68" + name = "psychology maintenance"; + req_access_txt = "70" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -12427,7 +12399,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "atN" = ( /obj/structure/flora/tree/jungle/small, /obj/structure/disposalpipe/segment{ @@ -12435,7 +12407,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "atO" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -12464,7 +12436,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "atR" = ( /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/fernybush, @@ -12474,11 +12446,12 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "atS" = ( /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "atT" = ( /turf/closed/wall/r_wall, /area/bridge) @@ -12903,8 +12876,17 @@ /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/tile/blue, +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 + }, +/obj/machinery/light_switch{ + pixel_y = -24 + }, +/obj/machinery/light, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "auB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -13402,13 +13384,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, /obj/effect/landmark/xeno_spawn, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "avt" = ( @@ -13481,7 +13463,7 @@ }, /obj/structure/cable, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "avy" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -13506,8 +13488,8 @@ dir = 8 }, /obj/machinery/door/window/westleft{ - name = "Monkey Pen"; - req_access_txt = "9" + name = "Soothing Nature Exhibit"; + req_access_txt = "70" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13515,7 +13497,7 @@ /obj/effect/turf_decal/delivery, /obj/structure/cable, /turf/open/floor/plasteel/dark, -/area/medical/storage) +/area/medical/psychology) "avC" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -13529,7 +13511,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 8 }, -/obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -13541,7 +13522,7 @@ dir = 1 }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "avD" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -13603,7 +13584,7 @@ }, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "avH" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, @@ -13627,16 +13608,17 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1, -/obj/effect/landmark/event_spawn, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/psychologist, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "avJ" = ( /obj/machinery/door/firedoor, /obj/machinery/light/small{ @@ -13665,15 +13647,15 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ - dir = 1 - }, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "avM" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral{ @@ -13815,14 +13797,14 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ dir = 5 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "avU" = ( @@ -13851,14 +13833,14 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/landmark/start/medical_doctor, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "avX" = ( @@ -13875,14 +13857,14 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/landmark/event_spawn, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "avY" = ( @@ -13919,12 +13901,12 @@ /obj/effect/turf_decal/stripes/white/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/junction/yjunction, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 10 + }, /turf/open/floor/plasteel/dark, /area/medical/morgue) "awa" = ( @@ -14558,7 +14540,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /obj/structure/cable, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "awZ" = ( /turf/closed/wall/rust, /area/security/checkpoint/engineering) @@ -14590,6 +14572,10 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /turf/open/floor/plasteel/dark, /area/medical/morgue) "axe" = ( @@ -15893,13 +15879,13 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, -/obj/machinery/door/airlock/medical/glass{ - name = "Ward"; - req_access_txt = "5" - }, /obj/structure/cable, +/obj/machinery/door/airlock/medical{ + name = "Psychology"; + req_access_txt = "70" + }, /turf/open/floor/plasteel/dark, -/area/medical/storage) +/area/medical/psychology) "azg" = ( /obj/structure/table, /obj/item/hand_labeler, @@ -15920,6 +15906,8 @@ pixel_y = 2 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /turf/open/floor/plasteel/dark, /area/medical/morgue) "azi" = ( @@ -16467,6 +16455,8 @@ req_access_txt = "5" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /turf/open/floor/plasteel/dark, /area/medical/morgue) "aAa" = ( @@ -16975,6 +16965,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 9 + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/storage) "aAL" = ( @@ -17205,9 +17201,9 @@ /turf/open/floor/plasteel, /area/gateway) "aBi" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aBj" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -19569,7 +19565,7 @@ pixel_x = -23 }, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aFc" = ( /turf/open/floor/engine/co2, /area/engine/atmos) @@ -19749,6 +19745,9 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/structure/sign/departments/psychology{ + pixel_y = 32 + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/cryo) "aFs" = ( @@ -19779,6 +19778,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/storage) "aFu" = ( @@ -19808,15 +19810,16 @@ /turf/open/floor/plasteel, /area/engine/atmos) "aFx" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/structure/disposalpipe/junction/flip{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 9 + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/storage) "aFy" = ( @@ -21752,9 +21755,6 @@ /turf/open/floor/engine, /area/tcommsat/computer) "aIB" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, @@ -21762,11 +21762,8 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 10 + dir = 6 }, /turf/open/floor/plasteel/dark, /area/medical/morgue) @@ -23329,7 +23326,7 @@ "aKV" = ( /obj/structure/flora/junglebush/c, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aKW" = ( /obj/effect/turf_decal/bot, /obj/machinery/holopad, @@ -24027,11 +24024,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aMd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/effect/landmark/event_spawn, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aMe" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -25095,6 +25092,10 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/newscaster{ + pixel_x = 30; + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/medical/storage) "aNK" = ( @@ -25132,8 +25133,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/filingcabinet/filingcabinet, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aNN" = ( /turf/closed/wall/r_wall/rust, /area/medical/morgue) @@ -25152,8 +25154,21 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue, +/obj/structure/table/wood, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/pen, +/obj/item/folder/white{ + pixel_x = 14; + pixel_y = 3 + }, +/obj/structure/noticeboard{ + pixel_y = -32 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aNT" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 @@ -25209,8 +25224,14 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/machinery/camera{ + c_tag = "Medbay Psychology Office"; + dir = 8; + name = "medical camera"; + network = list("ss13","medical") + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aNW" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -25268,11 +25289,11 @@ "aOa" = ( /obj/structure/flora/junglebush/b, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aOb" = ( /obj/structure/flora/junglebush/large, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aOc" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/grassybush, @@ -25281,7 +25302,7 @@ dir = 9 }, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aOd" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -25405,10 +25426,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aOm" = ( /obj/item/toy/beach_ball{ pixel_y = 6 @@ -25417,7 +25437,7 @@ dir = 4 }, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aOn" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -25475,7 +25495,7 @@ dir = 4 }, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aOr" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -25571,16 +25591,6 @@ /turf/open/floor/plasteel/showroomfloor, /area/science/mixing) "aOx" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_x = 24; - pixel_y = 24 - }, -/obj/structure/mirror{ - pixel_x = 26 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -25592,10 +25602,9 @@ dir = 1 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/structure/bookcase/random/reference, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aOy" = ( /obj/machinery/door/airlock/maintenance{ name = "bar maintenance"; @@ -25681,7 +25690,7 @@ /obj/structure/flora/grass/jungle, /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aOD" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/box/corners{ @@ -25702,7 +25711,7 @@ pixel_y = 5 }, /turf/open/floor/grass, -/area/medical/storage) +/area/medical/psychology) "aOF" = ( /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/caution/stand_clear, @@ -25713,9 +25722,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 9 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -25727,6 +25733,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1, /turf/open/floor/plasteel/showroomfloor, /area/medical/storage) "aOH" = ( @@ -26072,6 +26079,12 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 6 + }, /turf/open/floor/plasteel/showroomfloor, /area/medical/storage) "aPe" = ( @@ -26087,10 +26100,8 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/bed, -/obj/item/bedsheet/medical, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aPf" = ( /turf/closed/wall/rust, /area/medical/virology) @@ -26298,10 +26309,12 @@ }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aPv" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -28495,7 +28508,7 @@ /area/medical/medbay/central) "aSv" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" + req_access_txt = "12;70" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -30481,19 +30494,8 @@ /turf/open/floor/plasteel/dark, /area/medical/virology) "aVj" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge{ - name = "Morgue"; - req_access_txt = "9" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/medical/morgue) +/turf/closed/wall/r_wall, +/area/medical/psychology) "aVk" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -31156,20 +31158,13 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/item/kirbyplants/random, /turf/open/floor/plasteel/showroomfloor, -/area/medical/storage) +/area/medical/psychology) "aWg" = ( /obj/structure/bodycontainer/morgue{ dir = 8 @@ -31257,11 +31252,8 @@ /area/medical/medbay/central) "aWm" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/sign/warning/securearea{ - pixel_y = 32 - }, /turf/open/floor/plating, -/area/medical/storage) +/area/medical/psychology) "aWn" = ( /obj/structure/chair/sofa/right{ color = "#c45c57"; @@ -31376,9 +31368,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, /obj/machinery/light_switch{ pixel_x = -24 }, @@ -49195,7 +49184,7 @@ "bvV" = ( /obj/machinery/door/airlock/grunge{ name = "Service Production"; - req_one_access_txt = "25;26;35;28;22;37;46;38" + req_one_access_txt = "25;26;35;28;22;37;46;38;70" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -93715,6 +93704,9 @@ /obj/machinery/holopad/secure, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"fSn" = ( +/turf/closed/wall/r_wall/rust, +/area/medical/psychology) "gXk" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral{ @@ -93728,6 +93720,9 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) +"jtY" = ( +/turf/closed/wall/rust, +/area/medical/psychology) "llk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -93770,6 +93765,13 @@ /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) +"rai" = ( +/obj/structure/chair/sofa/right, +/obj/structure/sign/poster/official/love_ian{ + pixel_y = 32 + }, +/turf/open/floor/carpet, +/area/medical/psychology) "rkn" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/asteroid/airless, @@ -93807,6 +93809,9 @@ /mob/living/simple_animal/hostile/asteroid/hivelord, /turf/open/floor/plating/asteroid/lowpressure, /area/space/nearstation) +"yio" = ( +/turf/closed/wall, +/area/medical/psychology) (1,1,1) = {" aaa @@ -111649,11 +111654,11 @@ cxf cxw aar apY -aOZ -aOZ +yio +yio atL -aPy -aOZ +jtY +yio aPA azU aAE @@ -111906,7 +111911,7 @@ cxf cxw cxN apZ -aOZ +yio ajY atM aFb @@ -112163,7 +112168,7 @@ cwp cxx cxG aqa -aPy +jtY aOa atN aOC @@ -112420,7 +112425,7 @@ cwp cwq cwy aqb -aOZ +yio aOb atQ aOE @@ -112677,7 +112682,7 @@ cwq cwp anP aqe -aOZ +yio akq atR avx @@ -112934,11 +112939,11 @@ bgN cwp anQ ail -aPa +fSn +aWm aWm -aPx avB -aPx +aWm aPA abl agH @@ -113190,13 +113195,13 @@ ajI alb cwq anR -aPc -aPc +aVj +aVj aOl aPe avC aNM -aPx +yio aNR aOj aOp @@ -113447,13 +113452,13 @@ cvv cvJ amh anV -aPc +aVj and apW aBi avG aNS -aOZ +yio aOe aJW aOh @@ -113704,13 +113709,13 @@ cvk czM cwy anW -aPa -and +fSn +rai aqo aMd avI auA -aPy +jtY aOd aNT aPh @@ -113961,7 +113966,7 @@ arT cxA czL anX -aPa +fSn aqP ass atS @@ -114218,13 +114223,13 @@ cvI cxB cwp ajv -aPc -aPc +aVj +aVj aOx aPu aWf aNV -aPx +yio aFr aNY aOv @@ -114479,7 +114484,7 @@ aiM asi aNN asi -aVj +aNN asi aPc aOW diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 34fa4230b8d..081750ba939 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1940,10 +1940,11 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/table/glass, -/obj/item/phone{ - pixel_x = -4; - pixel_y = -4 +/obj/machinery/computer/crew{ + dir = 1 + }, +/obj/structure/sign/warning/securearea{ + pixel_y = -32 }, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) @@ -37401,7 +37402,7 @@ "bFA" = ( /obj/machinery/door/airlock{ name = "Theatre Stage"; - req_one_access_txt = "12;46" + req_one_access_txt = "12;46;70" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -44127,7 +44128,7 @@ /obj/machinery/door/airlock{ name = "Service Hall"; req_access_txt = "null"; - req_one_access_txt = "25;26;35;28;22;37;46;38" + req_one_access_txt = "25;26;35;28;22;37;46;38;70" }, /obj/structure/cable, /turf/open/floor/plating, @@ -45881,7 +45882,7 @@ /obj/machinery/door/airlock{ name = "Service Hall"; req_access_txt = "null"; - req_one_access_txt = "25;26;35;28;22;37;46;38" + req_one_access_txt = "25;26;35;28;22;37;46;38;70" }, /turf/open/floor/plating, /area/maintenance/starboard) @@ -51325,7 +51326,8 @@ /area/maintenance/starboard/secondary) "clK" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "5" + name = "Psychology Maintenance"; + req_access_txt = "70" }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -58083,36 +58085,19 @@ /turf/open/floor/plasteel/white, /area/medical/abandoned) "cDN" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/computer/med_data/laptop, -/obj/machinery/airalarm{ - pixel_y = 25 - }, -/turf/open/floor/plasteel/white, -/area/medical/office) +/obj/structure/chair/sofa/left, +/turf/open/floor/carpet, +/area/medical/psychology) "cDO" = ( -/obj/structure/table/glass, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/item/radio/intercom{ + pixel_x = 28 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 4 }, -/obj/effect/turf_decal/tile/blue, -/obj/item/phone{ - pixel_x = -12; - pixel_y = 6 - }, -/turf/open/floor/plasteel/white, -/area/medical/office) +/turf/open/floor/carpet, +/area/medical/psychology) "cDR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -58402,11 +58387,11 @@ /area/science/test_area) "cEE" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/showcase/machinery/oldpod{ - desc = "An old NT branded sleeper, decommissioned after the lead acetate incident. None of the functional machinery remains inside."; - name = "decommissioned sleeper" +/obj/structure/showcase/machinery/cloning_pod{ + desc = "An old decommissioned scanner, permanently scuttled."; + icon_state = "scanner"; + name = "decommissioned cloning scanner" }, -/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/white, /area/medical/abandoned) "cEI" = ( @@ -58464,11 +58449,8 @@ /turf/open/floor/plating, /area/medical/abandoned) "cEN" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/office) +/turf/open/floor/carpet, +/area/medical/psychology) "cEO" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -58729,39 +58711,41 @@ /obj/machinery/light{ dir = 4 }, -/obj/vehicle/ridden/wheelchair, /turf/open/floor/plasteel/white, /area/medical/abandoned) "cFN" = ( -/obj/structure/sign/warning/securearea{ - pixel_x = -32 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -24 + }, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cFO" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/landmark/start/medical_doctor, /obj/effect/turf_decal/box/white{ color = "#52B4E9" }, /obj/machinery/holopad, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cFP" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cFR" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -59026,8 +59010,13 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/status_display/evac{ + pixel_x = -32; + req_access_txt = "70" + }, +/obj/structure/closet/secure_closet/psychology, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cGI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -59036,37 +59025,39 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cGJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cGK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/chair/office/light, /obj/structure/cable, +/obj/effect/landmark/start/psychologist, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cGL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /obj/structure/cable, /obj/machinery/power/apc{ - areastring = "/area/medical/office"; + areastring = "/area/medical/psychology"; dir = 4; - name = "Medbay Office APC"; + name = "Psychology APC"; pixel_x = 24 }, +/obj/item/kirbyplants/random, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cGN" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/plasteel/white, @@ -59241,6 +59232,7 @@ "cHv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, /obj/item/cigbutt/cigarbutt, /obj/item/candle{ pixel_x = -5 @@ -59270,46 +59262,35 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cHz" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/item/paper_bin, -/obj/item/pen, +/obj/structure/filingcabinet/filingcabinet, /obj/machinery/camera{ - c_tag = "Medbay Office"; + c_tag = "Medbay Psychology Office"; dir = 1; network = list("ss13","medbay") }, -/obj/machinery/light, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cHA" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/item/folder/white{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/phone{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/reagent_containers/food/drinks/mug/coco{ - pixel_x = -14; - pixel_y = 6 - }, -/obj/structure/sign/poster/official/get_your_legs{ +/obj/structure/noticeboard{ pixel_y = -32 }, +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 + }, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "cHD" = ( /obj/machinery/firealarm{ dir = 1; @@ -68408,9 +68389,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/reagent_dispensers/water_cooler, +/obj/structure/bookcase/random/reference, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "dyL" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue{ @@ -68445,12 +68426,10 @@ /area/maintenance/starboard/aft) "dzK" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/showcase/machinery/cloning_pod{ - desc = "An old prototype cloning pod, permanently decommissioned following the incident."; - name = "decommissioned cloner" +/obj/vehicle/ridden/wheelchair, +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plasteel/white, /area/medical/abandoned) "dzQ" = ( /obj/structure/reagent_dispensers/fueltank, @@ -69202,12 +69181,6 @@ /obj/item/clothing/mask/surgical, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"dJv" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/office) "dJG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -69603,11 +69576,6 @@ /turf/open/floor/plating, /area/medical/abandoned) "eCQ" = ( -/obj/structure/showcase/machinery/cloning_pod{ - desc = "An old decommissioned scanner, permanently scuttled."; - icon_state = "scanner"; - name = "decommissioned cloning scanner" - }, /turf/open/floor/plasteel/white, /area/medical/abandoned) "eCT" = ( @@ -69703,7 +69671,7 @@ }, /obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "eSm" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/light_construct{ @@ -70302,6 +70270,13 @@ name = "Ward APC"; pixel_x = -25 }, +/obj/structure/table/glass, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/glasses/blindfold, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/glasses/eyepatch, +/obj/item/clothing/suit/straight_jacket, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) "gmp" = ( @@ -70802,11 +70777,14 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "hkT" = ( -/obj/item/bedsheet/medical, -/obj/structure/bed/roller, /obj/structure/light_construct{ dir = 1 }, +/obj/effect/decal/cleanable/greenglow, +/obj/structure/showcase/machinery/cloning_pod{ + desc = "An old prototype cloning pod, permanently decommissioned following the incident."; + name = "decommissioned cloner" + }, /turf/open/floor/plasteel/white, /area/medical/abandoned) "hox" = ( @@ -71731,21 +71709,13 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "jIt" = ( -/obj/machinery/computer/med_data, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/sign/poster/official/get_your_legs{ + pixel_y = 32 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel/white, -/area/medical/office) +/obj/structure/chair/sofa/right, +/obj/item/toy/plush/moth, +/turf/open/floor/carpet, +/area/medical/psychology) "jKK" = ( /obj/machinery/door/airlock/external{ req_access_txt = "13" @@ -71875,10 +71845,6 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Medical Office"; - req_access_txt = "5" - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -71889,8 +71855,12 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/machinery/door/airlock/medical{ + name = "Psychology"; + req_access_txt = "70" + }, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "jTj" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -72050,15 +72020,11 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "kta" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/chair/comfy/brown{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue, -/obj/item/radio/intercom{ - pixel_x = 28 - }, -/turf/open/floor/plasteel/white, -/area/medical/office) +/turf/open/floor/carpet, +/area/medical/psychology) "ktv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -72614,11 +72580,21 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/computer/crew{ - dir = 1 +/obj/machinery/light_switch{ + pixel_x = 28 }, +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = -14; + pixel_y = 3 + }, +/obj/item/paper_bin/carbon{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/pen, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "lIl" = ( /obj/machinery/computer/operating{ dir = 8 @@ -72747,10 +72723,12 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/table/glass, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/computer/med_data{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) "lTA" = ( @@ -72969,7 +72947,7 @@ /area/maintenance/starboard/secondary) "mjT" = ( /turf/closed/wall, -/area/medical/office) +/area/medical/psychology) "mla" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -73342,7 +73320,7 @@ dir = 6 }, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "nmA" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible, /obj/structure/lattice, @@ -73605,12 +73583,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/closet{ - name = "nurse's locker" - }, -/obj/item/clothing/under/rank/medical/doctor/nurse, -/obj/item/clothing/head/nursehat, -/obj/item/storage/belt/medical, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) "nWN" = ( @@ -74044,6 +74016,9 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, +/obj/structure/sign/departments/psychology{ + pixel_x = -32 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "oUz" = ( @@ -74356,13 +74331,12 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/table/glass, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/glasses/blindfold, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/suit/straight_jacket, +/obj/structure/closet{ + name = "nurse's locker" + }, +/obj/item/clothing/under/rank/medical/doctor/nurse, +/obj/item/clothing/head/nursehat, +/obj/item/storage/belt/medical, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) "pER" = ( @@ -76737,18 +76711,15 @@ /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "veU" = ( -/obj/machinery/photocopier, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/structure/noticeboard{ - pixel_y = 32 - }, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "vgd" = ( /obj/item/taperecorder, /obj/item/camera, @@ -78119,7 +78090,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, -/area/medical/office) +/area/medical/psychology) "yaN" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate, @@ -98191,7 +98162,7 @@ xpZ sqe dPu iHk -nBA +dzK iHk kUH xpZ @@ -98447,7 +98418,7 @@ rKS xpZ xpZ xpZ -dzK +hYF eCw cGF hGB @@ -98703,7 +98674,7 @@ uSw wgZ klB nUa -xpZ +cGs eCQ cFL cGG @@ -98963,7 +98934,7 @@ aec xpZ xpZ xpZ -cGs +xpZ xpZ xpZ pUW @@ -99473,7 +99444,7 @@ seP wWt fqC jCZ -mjT +seP mjT veU nmr @@ -99730,9 +99701,9 @@ seP ooS fqC ljG -mjT +seP jIt -dJv +cEN cFO cGJ cHz @@ -99987,7 +99958,7 @@ seP cFR lbB tNc -mjT +seP cDN cEN cFP @@ -100244,7 +100215,7 @@ seP xyV hAu quD -mjT +seP cDO kta ePo @@ -100501,7 +100472,7 @@ seP seP seP seP -mjT +seP mjT mjT jTg diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 37d09e9f59b..a988f521987 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -19431,7 +19431,7 @@ "aYd" = ( /obj/machinery/door/airlock{ name = "Service Access"; - req_one_access_txt = "22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46;70" }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -23777,9 +23777,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/structure/sign/departments/examroom{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -23790,7 +23787,7 @@ "biR" = ( /obj/machinery/light, /obj/machinery/camera{ - c_tag = "Central Primary Hallway Genetics"; + c_tag = "Central Primary Hallway Custodial"; dir = 1 }, /obj/effect/turf_decal/tile/blue, @@ -24005,8 +24002,12 @@ /turf/closed/wall, /area/storage/emergency/port) "bjN" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, +/obj/machinery/door/airlock/medical{ + name = "Psychology Maintenance"; + req_access_txt = "70" + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel/freezer, /area/storage/emergency/port) "bjP" = ( /obj/machinery/space_heater, @@ -24393,6 +24394,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, +/obj/structure/table, +/obj/item/crowbar, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/freezer, /area/storage/emergency/port) "bkY" = ( @@ -24406,7 +24410,7 @@ dir = 1 }, /obj/machinery/camera{ - c_tag = "Ward Access"; + c_tag = "Port Emergency Storage"; network = list("ss13","medbay") }, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -24897,7 +24901,7 @@ /area/maintenance/department/engine) "bmg" = ( /obj/machinery/door/airlock/maintenance{ - name = "Genetics Maintenance"; + name = "Port Emergency Storage"; req_one_access_txt = "12;45;5;9" }, /obj/structure/cable, @@ -24922,13 +24926,12 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, +/obj/structure/sign/departments/psychology{ + pixel_y = -32 + }, /turf/open/floor/plasteel/freezer, /area/storage/emergency/port) "bmk" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/freezer, /area/storage/emergency/port) "bml" = ( @@ -25273,20 +25276,11 @@ /turf/closed/wall, /area/medical/medbay/zone2) "bnw" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Ward"; - req_one_access_txt = "5" - }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel/freezer, +/turf/closed/wall, /area/storage/emergency/port) "bnx" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -25643,46 +25637,30 @@ /turf/open/floor/plating, /area/medical/medbay/zone2) "bov" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_y = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/status_display/evac{ + pixel_y = 32 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/open/floor/carpet, +/area/medical/psychology) "bow" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 +/obj/structure/chair/sofa/right, +/obj/structure/sign/poster/official/work_for_a_future{ + pixel_y = 32 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/open/floor/carpet, +/area/medical/psychology) "box" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/sofa/left, +/obj/item/toy/plush/moth, +/turf/open/floor/carpet, +/area/medical/psychology) "boy" = ( -/obj/structure/closet/wardrobe/mixed, /obj/effect/turf_decal/tile/blue{ dir = 1 }, @@ -25690,9 +25668,8 @@ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "boz" = ( -/obj/machinery/vending/clothing, /obj/machinery/firealarm{ dir = 1; pixel_y = 27 @@ -25704,8 +25681,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, +/obj/structure/bookcase/random/reference, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "boA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/chair{ @@ -26101,32 +26079,23 @@ "bpy" = ( /obj/item/radio/intercom{ frequency = 1485; - name = "Station Intercom (Medbay)"; pixel_x = -30 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/chair/comfy/brown{ + dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/open/floor/carpet, +/area/medical/psychology) "bpz" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/open/floor/carpet, +/area/medical/psychology) "bpA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, -/obj/structure/cable, -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/turf/open/floor/carpet, +/area/medical/psychology) "bpB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -26137,8 +26106,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, +/turf/closed/wall, /area/medical/medbay/zone2) "bpD" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -26151,6 +26119,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/sign/departments/psychology{ + pixel_x = -32 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bpE" = ( @@ -26788,42 +26759,42 @@ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bqX" = ( -/obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) -"bqY" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) +"bqY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "bqZ" = ( /obj/structure/cable, /obj/structure/disposalpipe/junction/flip{ dir = 8 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bra" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical/glass{ - name = "Ward"; - req_one_access_txt = "5" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/airlock/medical{ + name = "Psychology"; + req_access_txt = "70" + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "brb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27423,48 +27394,48 @@ /turf/open/floor/grass, /area/medical/medbay/zone2) "bsr" = ( -/obj/machinery/camera{ - c_tag = "Ward Fore"; - dir = 4; - network = list("ss13","medbay") - }, -/obj/machinery/airalarm/unlocked{ - dir = 4; - pixel_x = -23 - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/closet/wardrobe/mixed, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/airalarm{ + acted_explosions = 4; + dir = 4; + pixel_x = -24 + }, +/obj/machinery/camera{ + c_tag = "Medbay Psychology Office"; + dir = 4; + network = list("ss13","medbay") + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bss" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 + dir = 4 }, -/obj/structure/bed, -/obj/item/bedsheet/medical, +/obj/structure/chair/office/light, +/obj/effect/landmark/start/psychologist, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bst" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/cable, -/obj/structure/bed, -/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bsu" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bsv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -27475,14 +27446,20 @@ dir = 4 }, /obj/item/kirbyplants/random, +/obj/machinery/power/apc{ + areastring = "/area/medical/psychology"; + dir = 4; + name = "Psychology APC"; + pixel_x = 24 + }, +/obj/structure/cable, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bsw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, +/turf/closed/wall, /area/medical/medbay/zone2) "bsx" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -28080,24 +28057,34 @@ /area/medical/medbay/zone2) "btW" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, +/obj/structure/filingcabinet/filingcabinet, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "btX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "btY" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags, -/obj/item/pen, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "btZ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/blue{ @@ -28479,25 +28466,14 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bvc" = ( -/obj/structure/table, -/obj/item/storage/box/rxglasses{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/gloves/color/latex, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bvd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable, -/obj/structure/bed, -/obj/item/bedsheet/medical, -/turf/open/floor/plasteel/white, +/turf/closed/wall, /area/medical/medbay/zone2) "bvf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -29063,6 +29039,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bwA" = ( @@ -29072,7 +29051,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bwB" = ( @@ -29784,7 +29765,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/structure/cable, /obj/structure/bed, /obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, @@ -29801,10 +29781,6 @@ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "byl" = ( @@ -30440,11 +30416,6 @@ /area/maintenance/department/engine) "bzE" = ( /obj/structure/flora/grass/jungle/b, -/obj/machinery/camera{ - c_tag = "Genetics Monkey Pen Aft"; - dir = 4; - network = list("ss13","medbay") - }, /obj/structure/flora/ausbushes/grassybush, /obj/machinery/light/small{ dir = 8 @@ -30453,8 +30424,7 @@ /area/medical/medbay/zone2) "bzF" = ( /obj/machinery/door/window/eastleft{ - name = "Petting Garden"; - req_one_access_txt = null + name = "Petting Garden" }, /mob/living/simple_animal/pet/dog/corgi/puppy, /turf/open/floor/grass, @@ -30478,7 +30448,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bzK" = ( @@ -30488,27 +30457,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bzL" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, /obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) -"bzM" = ( -/obj/item/kirbyplants{ - icon_state = "plant-10" - }, -/obj/effect/turf_decal/tile/green, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, +/obj/structure/cable, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bzN" = ( @@ -31009,26 +30962,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/structure/cable, /obj/structure/bed, /obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) -"bAV" = ( -/obj/machinery/shower{ - dir = 8 - }, -/obj/machinery/requests_console{ - department = "Genetics"; - name = "Genetics Requests Console"; - pixel_x = 32 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) "bAW" = ( /turf/closed/wall, /area/medical/virology) @@ -31544,7 +31481,7 @@ /area/medical/medbay/zone2) "bCb" = ( /obj/machinery/camera{ - c_tag = "Ward Aft"; + c_tag = "Medbay Ward"; dir = 1; network = list("ss13","medbay") }, @@ -31555,16 +31492,17 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bCc" = ( -/obj/structure/cable, /obj/effect/turf_decal/tile/blue{ dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bCd" = ( -/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "bCe" = ( /obj/machinery/power/apc{ dir = 4; @@ -32166,7 +32104,6 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bDn" = ( -/obj/structure/closet/secure_closet/personal/patient, /obj/effect/turf_decal/tile/blue{ dir = 8 }, @@ -32174,6 +32111,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/vending/clothing, /turf/open/floor/plasteel/white, /area/medical/medbay/zone2) "bDo" = ( @@ -49363,6 +49301,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/maintenance/department/engine) +"dOo" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Ward Maintenance"; + req_access_txt = "5" + }, +/turf/open/floor/plating, +/area/maintenance/department/engine) "dRU" = ( /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west, @@ -49601,6 +49546,19 @@ "ewV" = ( /turf/open/floor/carpet, /area/library/artgallery) +"ezx" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/shower{ + pixel_y = 20 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "ezF" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -50176,6 +50134,15 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/library/artgallery) +"fIn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/closet/secure_closet/psychology, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "fIN" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -50632,6 +50599,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"gDX" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "gDZ" = ( /obj/effect/turf_decal/box/corners{ dir = 1 @@ -51415,7 +51391,6 @@ "iiJ" = ( /obj/machinery/door/window/northright{ base_state = "left"; - dir = 1; icon_state = "left"; name = "Secure Art Exhibit"; req_access_txt = "37" @@ -52052,6 +52027,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) +"jGb" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Ward"; + req_access_txt = "5" + }, +/obj/structure/cable, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "jHP" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ @@ -54262,9 +54245,23 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/closet/wardrobe/mixed, +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = 14; + pixel_y = 3 + }, +/obj/item/paper_bin/carbon{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/light_switch{ + dir = 8; + pixel_y = -32 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "ofN" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/blue, @@ -56148,9 +56145,12 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/item/kirbyplants/random, +/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/white, -/area/medical/medbay/zone2) +/area/medical/psychology) "spz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable, @@ -56630,7 +56630,6 @@ /area/engine/engineering) "tqW" = ( /obj/machinery/door/window/northright{ - dir = 1; name = "Secure Art Exhibit"; req_access_txt = "37" }, @@ -57436,6 +57435,21 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/science/xenobiology) +"uYT" = ( +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = 4 + }, +/obj/structure/noticeboard{ + pixel_y = -32 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/medical/psychology) "vay" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -58413,6 +58427,22 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/quartermaster/office) +"xaF" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 14 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel/white, +/area/medical/medbay/zone2) "xaO" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -58603,6 +58633,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/department/science) +"xsf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/medical/medbay/zone2) "xsB" = ( /obj/structure/cable, /turf/open/floor/plasteel, @@ -81991,7 +82025,7 @@ bnv byd bzE bAN -bnv +dOo bDi bpu bsn @@ -83013,8 +83047,8 @@ bov bpy bqW bsr -bqW ofo +bnv bwx bpB bjQ @@ -83265,14 +83299,14 @@ bjj xQc bkY bmi -bjN +bjL bow bpz -bjQ +bCd bss -btV -bpz -bjQ +uYT +bnv +gDX byh bzI urO @@ -83529,7 +83563,7 @@ bqX bst btW bvd -btW +ezx byi bzJ bAT @@ -83781,16 +83815,16 @@ bla bmk bjN boy -bpB +bvc bqY bsu -btX -btX -btX +fIn +xsf +xaF btX bzK btV -bCd +bjQ bDm lku bFK @@ -84042,11 +84076,11 @@ spo bqZ bsv btY -bvc +bnv bwA byk bzL -bAV +bzL bCe bDn lku @@ -84302,7 +84336,7 @@ bnv bnv bnv bnv -bnv +jGb bnv bnv bnv @@ -84559,7 +84593,7 @@ btZ bvf bwB byl -bzM +bzN bAW bCf bDo diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 4d73369a318..7a087a9e70b 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -79,6 +79,7 @@ #define ACCESS_NETWORK 67 /// Pharmacy access (Chemistry room in Medbay) #define ACCESS_PHARMACY 69 ///Nice. +#define ACCESS_PSYCHOLOGY 70 //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 55a3da0bc35..5bcfa54e907 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -43,6 +43,7 @@ #define MIME (1<<12) #define ASSISTANT (1<<13) #define PRISONER (1<<14) +#define PSYCHOLOGIST (1<<15) #define JOB_AVAILABLE 0 #define JOB_UNAVAILABLE_GENERIC 1 @@ -81,12 +82,13 @@ #define JOB_DISPLAY_ORDER_PARAMEDIC 23 #define JOB_DISPLAY_ORDER_CHEMIST 24 #define JOB_DISPLAY_ORDER_VIROLOGIST 25 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26 -#define JOB_DISPLAY_ORDER_SCIENTIST 27 -#define JOB_DISPLAY_ORDER_ROBOTICIST 28 -#define JOB_DISPLAY_ORDER_GENETICIST 29 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30 -#define JOB_DISPLAY_ORDER_WARDEN 31 -#define JOB_DISPLAY_ORDER_DETECTIVE 32 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 -#define JOB_DISPLAY_ORDER_PRISONER 34 +#define JOB_DISPLAY_ORDER_PSYCHOLOGIST 26 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27 +#define JOB_DISPLAY_ORDER_SCIENTIST 28 +#define JOB_DISPLAY_ORDER_ROBOTICIST 29 +#define JOB_DISPLAY_ORDER_GENETICIST 30 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 31 +#define JOB_DISPLAY_ORDER_WARDEN 32 +#define JOB_DISPLAY_ORDER_DETECTIVE 33 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 34 +#define JOB_DISPLAY_ORDER_PRISONER 35 diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 3f431aa1b98..9665b9473f6 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -149,6 +149,8 @@ heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) if("Paramedic") heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) + if("Psychologist") + heirloom_type = /obj/item/storage/pill_bottle if("Chemist") heirloom_type = /obj/item/book/manual/wiki/chemistry if("Virologist") diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 528edb358b0..ccf84804fb0 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -784,6 +784,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Medbay Treatment Center" icon_state = "exam_room" +/area/medical/psychology + name = "Psychology Office" + icon_state = "psychology" //Security diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 87501ff7831..44a33a6f94c 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -60,6 +60,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) jobs["Mime"] = 67 jobs["Janitor"] = 68 jobs["Lawyer"] = 69 + jobs["Psychologist"] = 70 jobs["Admiral"] = 200 jobs["CentCom Commander"] = 210 jobs["Custodian"] = 211 diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index ba71b099fe2..3e95a91b1ac 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -187,6 +187,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "Virologist" icon_state = "Virologist" +/obj/effect/landmark/start/psychologist + name = "Psychologist" + icon_state = "Psychologist" + /obj/effect/landmark/start/chaplain name = "Chaplain" icon_state = "Chaplain" diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 99a30bb84f7..42b24fe85b8 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -69,6 +69,11 @@ icon_state = "srvsec_cypherkey" channels = list(RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_SECURITY = 1) +/obj/item/encryptionkey/headset_srvmed + name = "psychology radio encryption key" + icon_state = "srvmed_cypherkey" + channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SERVICE = 1) + /obj/item/encryptionkey/headset_com name = "command radio encryption key" icon_state = "com_cypherkey" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 7014941ced8..e36247388d1 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -157,6 +157,12 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "srvsec_headset" keyslot = new /obj/item/encryptionkey/headset_srvsec +/obj/item/radio/headset/headset_srvmed + name = "psychology headset" + desc = "A headset allowing the wearer to communicate with medbay and service." + icon_state = "med_headset" + keyslot = new /obj/item/encryptionkey/headset_srvmed + /obj/item/radio/headset/headset_com name = "command radio headset" desc = "A headset with a commanding channel." diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index a3e6c985fb8..4635dfbe846 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -44,6 +44,28 @@ new /obj/item/clothing/glasses/hud/health(src) return +/obj/structure/closet/secure_closet/psychology + name = "psychology locker" + req_access = list(ACCESS_PSYCHOLOGY) + icon_state = "cabinet" + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 + +/obj/structure/closet/secure_closet/psychology/PopulateContents() + ..() + new /obj/item/clothing/under/suit/black(src) + new /obj/item/clothing/under/suit/black/skirt(src) + new /obj/item/clothing/shoes/laceup(src) + new /obj/item/storage/backpack/medic(src) + new /obj/item/radio/headset/headset_srvmed(src) + new /obj/item/clipboard(src) + new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/ears/earmuffs(src) + new /obj/item/clothing/mask/muzzle(src) + new /obj/item/clothing/glasses/blindfold(src) + /obj/structure/closet/secure_closet/CMO name = "\proper chief medical officer's locker" req_access = list(ACCESS_CMO) diff --git a/code/game/objects/structures/signs/signs_departments.dm b/code/game/objects/structures/signs/signs_departments.dm index 4625eaca77a..907ad30fe3f 100644 --- a/code/game/objects/structures/signs/signs_departments.dm +++ b/code/game/objects/structures/signs/signs_departments.dm @@ -90,3 +90,7 @@ name = "\improper NANITE LAB" desc = "A sign labelling an area where testing and development of nanites is performed." icon_state = "nanites" +/obj/structure/sign/departments/psychology + name = "\improper PSYCHOLOGY" + desc = "A sign labelling where the Psychologist works, they can probably help you get your head straight." + icon_state = "psychology" diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index f4ca688db6f..74ed3424591 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -138,7 +138,7 @@ ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, - ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, + ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, ACCESS_PSYCHOLOGY, ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_PHARMACY, ACCESS_RC_ANNOUNCE, @@ -170,7 +170,7 @@ if(2) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) if(3) //medbay - return list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY) + return list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY, ACCESS_PSYCHOLOGY) if(4) //research return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK) if(5) //engineering and maintenance @@ -275,6 +275,8 @@ return "Robotics" if(ACCESS_VIROLOGY) return "Virology" + if(ACCESS_PSYCHOLOGY) + return "Psychology" if(ACCESS_CMO) return "CMO Office" if(ACCESS_QM) @@ -356,7 +358,7 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist", + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist", "Psychologist", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Prisoner") /proc/get_all_job_icons() //For all existing HUD icons diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 8165529bfbc..217619e4b60 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -18,7 +18,7 @@ outfit = /datum/outfit/job/cmo - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, + access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_MORGUE, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_PHARMACY, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM, diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index a83f9638e20..77b43f5100d 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -19,7 +19,7 @@ outfit = /datum/outfit/job/hop access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, + ACCESS_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm new file mode 100644 index 00000000000..7daf25e752b --- /dev/null +++ b/code/modules/jobs/job_types/psychologist.dm @@ -0,0 +1,35 @@ +/datum/job/psychologist + title = "Psychologist" + flag = PSYCHOLOGIST + department_head = list("Head of Personnel","Chief Medical Officer") + department_flag = CIVILIAN + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the head of personnel and the chief medical officer" + selection_color = "#dddddd" + + outfit = /datum/outfit/job/psychologist + + access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY) + minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY) + paycheck = PAYCHECK_MEDIUM + paycheck_department = ACCOUNT_SRV + + display_order = JOB_DISPLAY_ORDER_PSYCHOLOGIST + +/datum/outfit/job/psychologist + name = "Psychologist" + jobtype = /datum/job/psychologist + + ears = /obj/item/radio/headset/headset_srvmed + uniform = /obj/item/clothing/under/suit/black + shoes = /obj/item/clothing/shoes/laceup + id = /obj/item/card/id + belt = /obj/item/pda/medical + pda_slot = ITEM_SLOT_BELT + l_hand = /obj/item/clipboard + + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel/med + duffelbag = /obj/item/storage/backpack/duffelbag/med diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 825eeac9ab0..16a1c841207 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -41,6 +41,7 @@ GLOBAL_LIST_INIT(civilian_positions, list( "Cook", "Janitor", "Curator", + "Psychologist", "Lawyer", "Chaplain", "Clown", diff --git a/config/jobs.txt b/config/jobs.txt index a707cd7a753..6c52992eecb 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -36,6 +36,7 @@ Paramedic=2,2 Chemist=2,2 Geneticist=2,2 Virologist=1,1 +Psychologist=1,1 Scientist=5,3 Roboticist=2,2 diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 7ca094e3b8a..6435d0cdb79 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi index 7966836030d..9cc8b44de63 100644 Binary files a/icons/mob/landmarks.dmi and b/icons/mob/landmarks.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index d559c2162f2..adbb6905e10 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi index 5632d211b85..2234b56eab9 100644 Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 6072e372b04..4588d215aed 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index b04aa2c2b06..99992d7a9cb 100644 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 543074f3a32..57ea96af1d0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1968,6 +1968,7 @@ #include "code\modules\jobs\job_types\mime.dm" #include "code\modules\jobs\job_types\paramedic.dm" #include "code\modules\jobs\job_types\prisoner.dm" +#include "code\modules\jobs\job_types\psychologist.dm" #include "code\modules\jobs\job_types\quartermaster.dm" #include "code\modules\jobs\job_types\research_director.dm" #include "code\modules\jobs\job_types\roboticist.dm"