From fd80984256bc8b4416119cfc1395c3c3df696215 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Sat, 31 Aug 2019 02:09:15 -0500 Subject: [PATCH 1/5] Adds pet pens to Head of Staff officer --- maps/tether/tether-02-surface2.dmm | 131 ++- maps/tether/tether-05-station1.dmm | 44 +- maps/tether/tether-06-station2.dmm | 165 ++-- maps/tether/tether-07-station3.dmm | 1334 ++++++++++++++++------------ 4 files changed, 994 insertions(+), 680 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 394dbcdc46e..8e8e3059722 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1226,6 +1226,14 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/structure/table/rack, +/obj/item/weapon/rig/hazmat/equipped, +/obj/machinery/light_switch{ + dir = 2; + name = "light switch "; + pixel_x = 0; + pixel_y = 36 + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "cP" = ( @@ -4364,8 +4372,6 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/bar) "jv" = ( -/obj/structure/table/rack, -/obj/item/weapon/rig/hazmat/equipped, /obj/effect/floor_decal/borderfloor{ dir = 8; icon_state = "borderfloor"; @@ -4374,9 +4380,12 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -28 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -5104,8 +5113,9 @@ /obj/machinery/photocopier/faxmachine{ department = "Research Director's Office" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) @@ -5414,10 +5424,10 @@ /obj/machinery/computer/skills{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "lG" = ( @@ -12333,6 +12343,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"yg" = ( +/obj/machinery/door/airlock/command{ + id_tag = "RDdoor"; + name = "Research Director"; + req_access = list(30) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/rnd/rdoffice) "yi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12416,6 +12441,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) +"yr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "yx" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -12465,6 +12499,10 @@ }, /turf/simulated/open, /area/engineering/atmos) +"yD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/wall/r_wall, +/area/rnd/rdoffice) "yE" = ( /obj/machinery/light_switch{ dir = 4; @@ -16832,6 +16870,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/south) +"MK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "MN" = ( /obj/effect/floor_decal/borderfloor/shifted{ icon_state = "borderfloor_shifted"; @@ -17529,6 +17577,19 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/south) +"PN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "PP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17880,6 +17941,13 @@ /obj/structure/simple_door/wood, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) +"RO" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "RR" = ( /obj/structure/catwalk, /obj/effect/floor_decal/rust, @@ -18037,6 +18105,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) +"SQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) "SV" = ( /obj/structure/bed/chair, /obj/effect/floor_decal/rust, @@ -18323,6 +18397,9 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) +"UA" = ( +/turf/simulated/mineral, +/area/rnd/rdoffice) "UB" = ( /obj/machinery/power/apc{ dir = 1; @@ -25902,7 +25979,7 @@ ka cM ka ka -kb +ka ks ks ks @@ -26042,9 +26119,9 @@ ho jy bz cp -il -jy -jy +yD +UA +UA ks lk lI @@ -26184,9 +26261,9 @@ ho jy jy il -jy -jy -jy +cF +cF +cF ks ll lM @@ -26326,9 +26403,9 @@ ho jy bz il -jy -jy -jy +cF +jF +SQ ks lm ma @@ -26468,9 +26545,9 @@ vA jx bz il -jy -jy -jy +cF +RO +PN ks lC mb @@ -26612,7 +26689,7 @@ bz il cF cF -cF +yg cF cF cF @@ -26896,7 +26973,7 @@ il il cF cO -jE +MK kK lE jE @@ -27038,7 +27115,7 @@ il bz cF dP -jE +yr la lF md @@ -27180,7 +27257,7 @@ bz bz cF fQ -jF +jE kq lG me diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index e2fdc2a8675..b18ebffffff 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -11111,7 +11111,7 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "aBg" = ( -/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/closet/secure_closet/engineering_chief, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aBh" = ( @@ -11210,7 +11210,6 @@ /turf/simulated/floor/tiled, /area/engineering/engine_eva) "aBr" = ( -/obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -11220,6 +11219,7 @@ /obj/machinery/keycard_auth{ pixel_x = -28 }, +/obj/machinery/photocopier, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "aBt" = ( @@ -15387,7 +15387,9 @@ pixel_x = 25; pixel_y = 0 }, -/obj/structure/closet/secure_closet/engineering_chief, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aTX" = ( @@ -15599,9 +15601,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aVG" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -24 +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) @@ -15932,6 +15933,12 @@ /area/hallway/station/atrium) "aYE" = ( /obj/structure/table/reinforced, +/obj/machinery/light_switch{ + dir = 2; + name = "light switch "; + pixel_x = 10; + pixel_y = 36 + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aYF" = ( @@ -17210,7 +17217,6 @@ /area/hallway/station/atrium) "bfT" = ( /obj/structure/disposalpipe/segment, -/mob/living/simple_mob/animal/passive/snake/noodle, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) "bfW" = ( @@ -17490,6 +17496,11 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "bhr" = ( @@ -18976,7 +18987,6 @@ /turf/simulated/floor/tiled/monotile, /area/bridge_hallway) "bsO" = ( -/obj/structure/table/reinforced, /obj/machinery/power/apc{ dir = 2; name = "south bump"; @@ -18986,6 +18996,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/papershredder, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "bsP" = ( @@ -19002,11 +19013,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "bsR" = ( -/obj/structure/flora/pottedplant, /obj/machinery/camera/network/command{ c_tag = "Head of Personnel Office"; dir = 9 }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "bti" = ( @@ -22350,6 +22361,13 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"klO" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/northleft, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "kCH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -22493,6 +22511,10 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"vyI" = ( +/mob/living/simple_mob/animal/passive/snake/noodle, +/turf/simulated/floor/tiled, +/area/crew_quarters/heads/chief) "wlD" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -27979,7 +28001,7 @@ agc aRV aQh aRV -aRV +klO aVG aRb bYi @@ -28122,7 +28144,7 @@ aZg aQl aSu aTW -aBg +vyI aRb bYj bYj diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 251de4e3f16..d5e2ec27ca2 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -16167,6 +16167,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/light_switch{ + pixel_y = -26 + }, /turf/simulated/floor/tiled, /area/bridge/meeting_room) "yO" = ( @@ -16868,29 +16871,6 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) -"zH" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) -"zI" = ( -/obj/machinery/alarm{ - dir = 1; - icon_state = "alarm0"; - pixel_y = -22 - }, -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) -"zJ" = ( -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) -"zK" = ( -/obj/machinery/light_switch{ - pixel_y = -26 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "zL" = ( /obj/structure/cable/green{ d1 = 1; @@ -20082,6 +20062,13 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Hg" = ( +/obj/machinery/keycard_auth{ + pixel_y = -28 + }, +/obj/structure/flora/pottedplant, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "Hq" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -20155,12 +20142,6 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"HU" = ( -/obj/machinery/keycard_auth{ - pixel_y = -28 - }, -/turf/simulated/floor/wood, -/area/bridge/meeting_room) "Ik" = ( /obj/machinery/light/small{ dir = 8 @@ -20257,6 +20238,15 @@ /obj/structure/railing, /turf/simulated/open, /area/engineering/shaft) +"Jn" = ( +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "Jp" = ( /obj/machinery/alarm{ dir = 4; @@ -21154,6 +21144,10 @@ }, /turf/simulated/floor, /area/maintenance/station/sec_lower) +"Ry" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "RB" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -21324,6 +21318,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/maintenance/station/sec_lower) +"Tc" = ( +/obj/machinery/light, +/obj/structure/filingcabinet/filingcabinet, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "Tj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, @@ -34758,7 +34757,7 @@ yN wo wo wo -ac +wo ac aP aP @@ -34897,11 +34896,11 @@ xs xK ym yO -wV +Ry +Ry zG wo -ac -ac +aP aP aP aP @@ -35040,10 +35039,10 @@ wV yn yO wV -zH +wV +Ry wo -ac -ac +aP aP aP aP @@ -35182,10 +35181,10 @@ wV yn yO wV -zI +wV +Jn wo -ac -ac +aP aP aP aP @@ -35324,10 +35323,10 @@ xL yo yP xN -zJ +wV +Tc wo -ac -ac +aP aP aP aP @@ -35466,10 +35465,10 @@ xM yp yQ zc -zK +wV +wV wo -ac -ac +aP aP aP aP @@ -35609,9 +35608,9 @@ yq yR zc wV +wV wo -ac -ac +aP aP aP aP @@ -35751,9 +35750,9 @@ yr yS xN wV +wV wo -ac -ac +aP aP aP aP @@ -35886,16 +35885,16 @@ pB qg vK wo -wX wV wV -ys wV wV -HU +wV +wV +wV +wV wo -ac -ac +aP aP aP aP @@ -36028,16 +36027,16 @@ uH vk vL wo -wY -wY -wY -wY -wY -wY -wY +wX +wV +wV +ys +wV +wV +wV +Hg wo -ac -ac +aP aP aP aP @@ -36170,6 +36169,15 @@ uI tD oY oY +wY +wY +wY +wY +wY +wY +wY +wY +wo aP aP aP @@ -36178,15 +36186,6 @@ aP aP aP aP -ac -ac -aP -aP -aP -aP -aP -aP -aP aP aP aP @@ -36320,8 +36319,8 @@ aP aP aP aP -ac -ac +aP +aP aP aP aP @@ -36454,6 +36453,13 @@ uK vl oY oY +aa +aa +aa +aa +aa +aa +aa aP aP aP @@ -36463,13 +36469,6 @@ aP aP aP aP -ac -aP -aP -aP -aP -aP -aP aP aP aP @@ -36602,8 +36601,8 @@ aa aa aa aa -aP -aP +aa +aa aP aP aP diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index cebc9444282..d42c10ace24 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2941,6 +2941,14 @@ /obj/machinery/portable_atmospherics/powered/reagent_distillery, /turf/simulated/floor/tiled/white, /area/medical/chemistry) +"eP" = ( +/obj/machinery/door/airlock/engineering{ + name = "Cargo Substation"; + req_one_access = list(11,24,50) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/substation/cargo) "eS" = ( /obj/item/frame, /obj/effect/floor_decal/rust, @@ -3544,6 +3552,10 @@ "fP" = ( /turf/simulated/wall/r_wall, /area/ai_core_foyer) +"fQ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "fV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -6112,7 +6124,6 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "jV" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm{ dir = 4; @@ -6120,6 +6131,11 @@ pixel_x = -22; pixel_y = 0 }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor, /area/maintenance/station/cargo) "jW" = ( @@ -8482,6 +8498,9 @@ pixel_y = 7 }, /obj/item/weapon/pen/multi, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "nF" = ( @@ -8489,9 +8508,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/button/windowtint{ id = "hos_office"; pixel_x = -36; @@ -8514,6 +8530,9 @@ /obj/effect/landmark/start{ name = "Head of Security" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "nG" = ( @@ -12104,41 +12123,12 @@ /turf/simulated/floor/tiled, /area/security/hallway) "tc" = ( -/obj/structure/bed/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Chief Medical Officer" - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the CMO's office."; - id = "cmodoor"; - name = "CMO Office Door Control"; - pixel_x = -8; - pixel_y = -36 - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for shutters."; - id = "virologyquar"; - name = "Virology Emergency Lockdown Control"; - pixel_x = 0; - pixel_y = -28; - req_access = list(5) - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for shutters."; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Control"; - pixel_x = 0; - pixel_y = -36; - req_access = list(5) - }, -/obj/machinery/button/windowtint{ - id = "cmo_office_int"; - pixel_x = -6; - pixel_y = -28 - }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/glass, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/item/weapon/folder/white_cmo, +/obj/item/weapon/stamp/cmo, +/turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) "td" = ( /obj/effect/floor_decal/borderfloor{ @@ -14097,21 +14087,6 @@ "we" = ( /turf/space/cracked_asteroid, /area/mine/explored/upper_level) -"wf" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/machinery/button/windowtint{ - id = "cmo_office_ext"; - pixel_x = -20; - pixel_y = -25 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) "wg" = ( /obj/effect/floor_decal/spline/plain{ icon_state = "spline_plain"; @@ -16863,24 +16838,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"Ai" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24; - req_access = list() - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "Aj" = ( /obj/machinery/camera/network/tether, /obj/effect/floor_decal/borderfloor{ @@ -17237,7 +17194,7 @@ /area/maintenance/station/cargo) "AI" = ( /obj/structure/filingcabinet, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "AJ" = ( /obj/machinery/requests_console{ @@ -17246,7 +17203,7 @@ pixel_x = 32; pixel_y = 30 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "AK" = ( /obj/structure/table/standard, @@ -17255,7 +17212,7 @@ pixel_y = 7 }, /obj/item/device/megaphone, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "AL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17266,12 +17223,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "AM" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "AN" = ( /obj/machinery/status_display/supply_display, @@ -17520,7 +17477,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/hallway/station/upper) +/area/space) "Bi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -17893,7 +17850,7 @@ /obj/machinery/computer/supplycomp/control{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "BM" = ( /obj/structure/bed/chair/office/dark{ @@ -17907,7 +17864,7 @@ pixel_x = 26; pixel_y = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "BN" = ( /obj/structure/table/standard, @@ -17920,7 +17877,7 @@ pixel_x = 2; pixel_y = 6 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "BO" = ( /obj/structure/bed/chair{ @@ -17928,7 +17885,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "BP" = ( /obj/structure/cable/green{ @@ -17941,7 +17898,7 @@ pixel_x = 28 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "BQ" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -18383,10 +18340,10 @@ /obj/machinery/computer/security/mining{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "CD" = ( -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "CE" = ( /obj/structure/table/standard, @@ -18395,16 +18352,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "CF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/mob/living/simple_mob/animal/sif/fluffy, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "CG" = ( /obj/structure/cable/green{ @@ -18420,7 +18375,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "CH" = ( /obj/machinery/door/airlock/mining{ @@ -18841,16 +18796,21 @@ /turf/simulated/floor/wood, /area/medical/psych) "Dv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "Dw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, +/turf/simulated/floor/wood, /area/quartermaster/qm) "Dx" = ( /obj/structure/cable/green{ @@ -19317,31 +19277,29 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "El" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor, -/area/maintenance/station/cargo) +/mob/living/simple_mob/animal/sif/fluffy, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "Em" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; dir = 4 }, -/turf/simulated/floor, -/area/maintenance/station/cargo) +/turf/simulated/floor/wood, +/area/quartermaster/qm) "En" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 }, -/turf/simulated/floor, -/area/maintenance/station/cargo) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "Eo" = ( /obj/structure/closet, /obj/random/maintenance/cargo, @@ -19356,7 +19314,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Quartermaster-Office" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "Eq" = ( /obj/structure/table/standard, @@ -19380,16 +19338,16 @@ pixel_y = 7 }, /obj/item/weapon/cartridge/quartermaster, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "Er" = ( /obj/structure/closet/secure_closet/quartermaster, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "Es" = ( /obj/structure/closet, /obj/item/weapon/storage/backpack/dufflebag, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/quartermaster/qm) "Et" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -19742,11 +19700,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor, /area/medical/psych) -"Fe" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/cargo) "Ff" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, @@ -19755,30 +19708,10 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/station/cargo) -"Fh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/station/cargo) "Fi" = ( -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor, -/area/maintenance/station/cargo) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "Fj" = ( /turf/simulated/wall, /area/quartermaster/warehouse) @@ -20225,83 +20158,30 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"FU" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'HIGH VOLTAGE'"; - icon_state = "shock"; - name = "HIGH VOLTAGE"; - pixel_y = 0 - }, -/turf/simulated/wall, -/area/maintenance/station/cargo) "FV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"FW" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/alarm{ dir = 1; - icon_state = "pipe-c" + icon_state = "alarm0"; + pixel_y = -22 }, -/turf/simulated/floor, -/area/maintenance/station/cargo) -"FX" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/turf/simulated/floor/wood, +/area/quartermaster/qm) +"FW" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 +/mob/living/simple_mob/animal/sif/diyaab{ + ai_holder_type = /datum/ai_holder/simple_mob/passive; + desc = "It's a blue Diyaab! It seems to be very tame and quiet."; + name = "Silky" }, -/obj/machinery/door/airlock/maintenance/cargo{ - req_access = list(50); - req_one_access = list(48) - }, -/turf/simulated/floor, -/area/quartermaster/warehouse) +/turf/simulated/floor/wood, +/area/quartermaster/qm) "FY" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "FZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light_switch{ dir = 2; name = "light switch "; @@ -20314,15 +20194,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "Gb" = ( @@ -20334,11 +20205,6 @@ /obj/item/weapon/cell{ maxcharge = 2000 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/steel, /area/quartermaster/warehouse) "Gc" = ( @@ -20346,11 +20212,6 @@ dir = 8; layer = 2.9 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/camera/network/cargo{ c_tag = "CRG - Cargo Warehouse"; dir = 9 @@ -20657,42 +20518,8 @@ "GC" = ( /turf/simulated/wall, /area/maintenance/substation/cargo) -"GD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/engineering{ - name = "Cargo Substation"; - req_one_access = list(11,24,50) - }, -/turf/simulated/floor, -/area/maintenance/substation/cargo) -"GE" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/engineering{ - name = "Cargo Substation"; - req_one_access = list(11,24,50) - }, -/turf/simulated/floor, -/area/maintenance/substation/cargo) "GF" = ( /obj/structure/closet/crate, -/obj/structure/cable/green, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) @@ -20700,7 +20527,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "GH" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) @@ -20708,10 +20534,13 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/warehouse) "GJ" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + icon_state = "0-8" }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) @@ -21061,67 +20890,77 @@ /turf/simulated/floor, /area/maintenance/station/cargo) "Hs" = ( -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 24 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor, /area/maintenance/substation/cargo) "Ht" = ( +/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/substation/cargo) +"Hu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor, +/area/maintenance/substation/cargo) +"Hv" = ( +/obj/machinery/light/small{ + dir = 8; pixel_y = 0 }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/substation/cargo) -"Hu" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/substation/cargo) -"Hv" = ( -/obj/structure/closet/crate, -/obj/machinery/light/small{ - dir = 8; - pixel_y = 0 - }, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "Hw" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "Hx" = ( @@ -21129,14 +20968,19 @@ dir = 4 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "Hy" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -21144,6 +20988,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "Hz" = ( @@ -21157,9 +21006,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ dir = 4 @@ -21636,10 +21482,10 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/cable, /obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust, +/obj/structure/cable, /turf/simulated/floor, /area/maintenance/substation/cargo) "Il" = ( @@ -22606,6 +22452,11 @@ /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor, /area/maintenance/station/medbay) "JH" = ( @@ -23012,6 +22863,11 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor, /area/maintenance/station/medbay) "Kv" = ( @@ -23380,10 +23236,30 @@ pixel_x = -22; pixel_y = 0 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor, /area/maintenance/station/medbay) "KX" = ( /obj/structure/ladder, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor, /area/maintenance/station/medbay) "KY" = ( @@ -23648,18 +23524,20 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) "Lw" = ( -/obj/machinery/disposal, /obj/effect/floor_decal/borderfloorwhite{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 + dir = 9 }, -/obj/structure/disposalpipe/trunk, -/obj/item/device/radio/intercom{ +/obj/machinery/power/apc{ dir = 1; - pixel_y = 24; - req_access = list() + name = "north bump"; + pixel_x = 0; + pixel_y = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-2" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) @@ -24332,51 +24210,20 @@ /turf/simulated/open, /area/medical/surgery_hallway) "My" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/machinery/light_switch{ - dir = 2; - name = "light switch "; - pixel_x = 0; - pixel_y = 26 - }, -/obj/machinery/camera/network/medbay{ - dir = 4 - }, -/obj/item/modular_computer/console/preset/command, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) -"Mz" = ( /obj/structure/filingcabinet/chestdrawer{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, /obj/machinery/alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) -"MA" = ( +"Mz" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ pixel_x = 6; pixel_y = 4 }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, /obj/machinery/computer/skills{ pixel_x = -6; pixel_y = -3 @@ -24389,7 +24236,17 @@ pixel_x = 0; pixel_y = 30 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) +"MA" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24; + req_access = list() + }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) "MB" = ( /obj/structure/bed/padded, @@ -24439,6 +24296,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, +/obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "ME" = ( @@ -24581,18 +24439,41 @@ /turf/simulated/floor, /area/maintenance/station/medbay) "MN" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 +/obj/structure/bed/chair/office/light{ + dir = 4 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 +/obj/effect/landmark/start{ + name = "Chief Medical Officer" }, -/obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27; - pixel_y = 0 +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the CMO's office."; + id = "cmodoor"; + name = "CMO Office Door Control"; + pixel_x = -8; + pixel_y = -36 }, -/turf/simulated/floor/tiled/white, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for shutters."; + id = "virologyquar"; + name = "Virology Emergency Lockdown Control"; + pixel_x = 0; + pixel_y = -28; + req_access = list(5) + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for shutters."; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Control"; + pixel_x = 0; + pixel_y = -36; + req_access = list(5) + }, +/obj/machinery/button/windowtint{ + id = "cmo_office_int"; + pixel_x = -6; + pixel_y = -28 + }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) "MO" = ( /obj/structure/table/glass, @@ -24614,14 +24495,6 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_c) "MP" = ( -/obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/folder/white_cmo, -/obj/item/weapon/stamp/cmo, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) -"MQ" = ( /obj/structure/bed/chair{ dir = 8 }, @@ -24629,14 +24502,26 @@ dir = 1; icon_state = "pipe-c" }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) +"MQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "MR" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -24646,6 +24531,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "MS" = ( @@ -25175,31 +25065,30 @@ /area/crew_quarters/heads/cmo) "Ny" = ( /obj/structure/table/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) -"Nz" = ( -/obj/structure/table/glass, -/obj/machinery/photocopier/faxmachine{ - department = "CMO's Office" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) +"Nz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) "NA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/mob/living/simple_mob/animal/passive/cat/runtime, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "NB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9; pixel_y = 0 @@ -25323,39 +25212,17 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/bluegrid, /area/ai_core_foyer) -"NP" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) -"NQ" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/light, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) "NR" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/cable/green, -/obj/machinery/power/apc{ - dir = 2; - name = "south bump"; - pixel_y = -32 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "NS" = ( /obj/effect/floor_decal/borderfloorwhite{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 6 - }, -/obj/machinery/photocopier, -/obj/machinery/keycard_auth{ - pixel_y = -28 + dir = 4 }, +/obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "NT" = ( @@ -25366,7 +25233,9 @@ dir = 10 }, /obj/structure/extinguisher_cabinet{ - pixel_x = -27 + dir = 1; + icon_state = "extinguisher_closed"; + pixel_y = -32 }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) @@ -28453,6 +28322,14 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"SV" = ( +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27; + pixel_y = 0 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "SX" = ( /obj/machinery/door/airlock/security{ name = "Security Restroom"; @@ -28483,6 +28360,13 @@ }, /turf/simulated/floor/carpet, /area/security/breakroom) +"Te" = ( +/obj/structure/table/glass, +/obj/machinery/photocopier/faxmachine{ + department = "CMO's Office" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "Ti" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -28501,6 +28385,9 @@ /obj/item/clothing/head/helmet/space/void/pilot, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"To" = ( +/turf/simulated/floor, +/area/maintenance/station/cargo) "Tp" = ( /obj/structure/cable{ d1 = 1; @@ -28544,6 +28431,14 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"TF" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "TG" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -28565,6 +28460,19 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"TL" = ( +/obj/machinery/light_switch{ + dir = 2; + name = "light switch "; + pixel_x = 0; + pixel_y = 26 + }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, +/obj/item/modular_computer/console/preset/command, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "TO" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/secure/safe{ @@ -28614,6 +28522,17 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"TZ" = ( +/obj/machinery/door/airlock/glass_security{ + desc = "It opens and closes. Seals off a tactical boost in morale."; + name = "Tactical Pet Storage"; + req_one_access = list(58); + riding_datum = list(19) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "Ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -28632,6 +28551,20 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) +"Ui" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) +"Uj" = ( +/obj/machinery/papershredder, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) +"Uk" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) "Ul" = ( /obj/machinery/light, /obj/structure/stasis_cage, @@ -28708,6 +28641,18 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"Ut" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_x = 0; + pixel_y = 24 + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "Uu" = ( /obj/machinery/computer/security, /turf/simulated/floor/wood, @@ -28720,6 +28665,12 @@ /obj/random/soap, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"Ux" = ( +/obj/structure/bed/psych{ + name = "couch" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "Uy" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -28745,6 +28696,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"UA" = ( +/obj/machinery/button/windowtint{ + id = "cmo_office_ext"; + pixel_x = -20; + pixel_y = 25 + }, +/obj/machinery/keycard_auth{ + pixel_y = 28 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "UB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -28923,14 +28885,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) "Ve" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + icon_state = "intact-supply"; + dir = 5 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "Vf" = ( @@ -29002,6 +28966,8 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "Vu" = ( @@ -29031,6 +28997,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) +"VC" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "VD" = ( /obj/machinery/atmospherics/binary/pump, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -29044,6 +29014,12 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"VG" = ( +/obj/structure/filingcabinet/chestdrawer{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "VI" = ( /obj/machinery/light{ dir = 4 @@ -29090,6 +29066,18 @@ "VM" = ( /turf/simulated/open, /area/ai_core_foyer) +"VN" = ( +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "VQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; @@ -29122,10 +29110,45 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"VV" = ( +/obj/machinery/door/airlock/glass_mining{ + name = "Cargo Bay"; + req_access = list(31); + req_one_access = list() + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) +"VW" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 6 + }, +/mob/living/simple_mob/animal/passive/cat/runtime, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "VX" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"Wb" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE"; + pixel_y = 0 + }, +/turf/simulated/wall, +/area/maintenance/substation/cargo) "Wd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal{ dir = 4 @@ -29137,6 +29160,22 @@ "Wg" = ( /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"Wi" = ( +/obj/machinery/door/airlock/engineering{ + name = "Cargo Substation"; + req_one_access = list(11,24,50) + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/substation/cargo) "Wk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29147,6 +29186,30 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"Wl" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/dogbed{ + desc = "Runtime's bed. Some of her disappointment seems to have rubbed off on it."; + name = "cat bed" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) +"Wm" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "Wn" = ( /obj/structure/disposalpipe/segment, /obj/machinery/shuttle_sensor{ @@ -29183,6 +29246,25 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) +"Wy" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) +"WA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -29211,6 +29293,12 @@ }, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) +"WH" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "WR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, @@ -29281,6 +29369,22 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Xj" = ( +/obj/machinery/door/airlock/maintenance/cargo{ + req_access = list(50); + req_one_access = list(48) + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall, +/area/quartermaster/warehouse) "Xk" = ( /obj/structure/cable/cyan{ d2 = 4; @@ -29372,6 +29476,10 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/security/eva) +"XM" = ( +/obj/structure/table/glass, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "XN" = ( /obj/structure/shuttle/engine/heater, /obj/structure/window/reinforced{ @@ -29382,6 +29490,20 @@ }, /turf/simulated/floor/reinforced, /area/shuttle/excursion/tether) +"XO" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel, +/area/quartermaster/warehouse) +"XQ" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) "XR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29425,6 +29547,17 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"Yb" = ( +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) +"Ye" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/maintenance/station/cargo) "Yg" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 @@ -29463,6 +29596,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Yl" = ( +/turf/simulated/wall, +/area/space) "Ym" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -29480,7 +29616,8 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "Yu" = ( -/obj/structure/closet/secure_closet/hos2, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "Yw" = ( @@ -29505,6 +29642,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) +"YG" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "YH" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -29521,6 +29668,13 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"YO" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "YQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -29561,6 +29715,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) +"Zc" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "Zd" = ( /obj/machinery/conveyor{ dir = 4; @@ -29569,6 +29730,13 @@ /obj/structure/plasticflaps, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) +"Zj" = ( +/mob/living/simple_mob/animal/sif/shantak{ + ai_holder_type = /datum/ai_holder/simple_mob/passive; + name = "Scruffy" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "Zk" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning/corner{ @@ -29587,6 +29755,25 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Zr" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/door/window/westright, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) +"Zs" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/cmo) +"Zt" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/closet/secure_closet/hos2, +/turf/simulated/floor/wood, +/area/crew_quarters/heads/hos) "Zy" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -29634,6 +29821,17 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"ZJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/quartermaster/warehouse) "ZL" = ( /obj/machinery/door/airlock/hatch{ req_one_access = list(67) @@ -29657,6 +29855,15 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/eva) +"ZS" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "ZT" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/alarm{ @@ -29678,6 +29885,15 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"ZV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "ZW" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -33152,12 +33368,12 @@ aa aa aa aa -aa -aa -aa VL ae ad +aa +gm +aa ad ad ae @@ -33294,13 +33510,13 @@ aa aa aa aa -aa -aa -aa VL aa ae aa +ae +aa +aa aa ae aa @@ -33436,9 +33652,6 @@ aa aa aa aa -aa -aa -aa VL YW ae @@ -33448,6 +33661,9 @@ ae ae ae ae +ae +ae +ae YW ae ae @@ -33578,10 +33794,10 @@ aa aa aa aa -aa -aa -ab -ab +je +je +je +je je lj lu @@ -33720,13 +33936,13 @@ aa aa aa ab -ab -ab -ab -ab je +Zj +YO +WH +Uk my -kv +Zt nD nW TO @@ -33862,11 +34078,11 @@ ab ab ab ab -ab -ab -ab -ab je +fQ +Ui +VN +TZ Yu Vp Ve @@ -34004,10 +34220,10 @@ ab ab ab ab -ab -ab -ab -ab +je +je +je +je je Uu jM @@ -34898,15 +35114,15 @@ ab ab ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa +gm +ae +ad +ad +ae +ad +ad +ae +gm aa aa aa @@ -35033,7 +35249,7 @@ vt ab GT GT -GT +Yl GT GT GT @@ -35042,18 +35258,18 @@ ab ab aa aa -ad -ad -ae -ad -ad -ae aa aa aa aa aa aa +gm +aa +aa +aa +aa +aa aa aa aa @@ -35181,16 +35397,16 @@ HJ GT ab ab -ab -ab -ab -aa -aa -ae -aa -aa -ad +Me +Me +Me +uK +uK +uK +uK +Me aa +gm aa aa aa @@ -35323,18 +35539,18 @@ JP GT ab ab -ab -ab -ab -aa +Me +TL +SV +Uj +VC +VG +Te +xh aa ae aa aa -ad -aa -aa -aa aa aa aa @@ -35466,15 +35682,15 @@ Ix Ix Ix Me -Me -Me -uK -uK -Me -ae -ae -ad +UA +Yb +Yb +Yb +Yb +XM +xh aa +ad aa aa aa @@ -35610,13 +35826,13 @@ LF Me My MN -Nx -wf +XM +Yb +Yb +Ux xh aa -aa -ae -aa +ad aa aa aa @@ -35753,10 +35969,11 @@ Me Mz tc Ny -NP +Yb +Yb +XQ xh aa -aa ad aa aa @@ -35801,7 +36018,6 @@ aa aa aa aa -aa "} (44,1,1) = {" aa @@ -35895,12 +36111,12 @@ Me MA MP Nz -NP +Yb +Yb +Zs xh aa -aa -ad -aa +ae aa aa aa @@ -36037,9 +36253,10 @@ Me Lw MQ NA -NQ -Me -ab +Nx +Nx +YG +xh aa ad aa @@ -36085,7 +36302,6 @@ aa aa aa aa -aa "} (46,1,1) = {" aa @@ -36180,11 +36396,11 @@ LB MR NB NR +ZS +Zr Me -ab -ab -aa aa +ad aa aa aa @@ -36322,11 +36538,11 @@ MD MS NC NS +Wl +VW Me -ab -ab -aa aa +ad aa aa aa @@ -36463,11 +36679,11 @@ Me rC MT rC +rC Me Me -ab -ab -ab +Me +aa aa aa aa @@ -37437,7 +37653,7 @@ wT xK yu zq -Ai +Ae Bs Cm Dl @@ -40569,10 +40785,10 @@ Ei Fc Hp zD -ab -ab -ab -ab +Eo +Ff +Fg +AH ab ab ab @@ -40711,9 +40927,9 @@ ou Ef HL zD -ab -ab -ab +To +To +To JF JF JF @@ -40853,9 +41069,9 @@ zD Fd zD zD -AH -AH -AH +Ut +Ye +TF JF Kt KW @@ -40991,13 +41207,13 @@ AG BH BH BH -Ek -Fe +Wm +BH jV -Fe -Hr -Hr +Wm +Ek Hr +Wy JG Ku KX @@ -41132,13 +41348,13 @@ zF AH AH jJ -AH -El -Ff -AH -GC -GC -GC +zL +zL +zL +zL +Wb +Wi +eP GC GC Kv @@ -41274,10 +41490,10 @@ zG AH BI jO -AH +zL El -Fg -FU +Zc +CD GC Hs Ij @@ -41416,11 +41632,11 @@ zH AH BJ CA -AH +zL Em -Fh +CD FV -GD +GC Ht Ik IP @@ -41558,11 +41774,11 @@ zI AH BK CB -AH +zL En Fi FW -GE +GC Hu Il IQ @@ -41701,11 +41917,11 @@ zL zL zL zL -Eo -Fj -FX +VV +zL Fj Fj +Xj Fj Fj Fj @@ -41842,8 +42058,8 @@ zK AI BL CC -zL -zL +ZV +Dw zL FY GF @@ -41984,12 +42200,12 @@ zK AJ BM CD -CD +WA Ep zL FZ GG -GG +ZJ GG GI JH @@ -42272,7 +42488,7 @@ Dw Er zK Gb -GI +XO Hx Io GG From 42dc899967b4d4d328bd21ea5e450b5594959b88 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Sat, 31 Aug 2019 03:41:03 -0500 Subject: [PATCH 2/5] Small suggestions and fixes --- maps/tether/tether-02-surface2.dmm | 60 +++++++++++++++--------------- maps/tether/tether-05-station1.dmm | 1 + maps/tether/tether-07-station3.dmm | 9 ++++- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 8e8e3059722..f906692bf4a 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -4447,7 +4447,7 @@ /area/rnd/rdoffice) "jF" = ( /mob/living/simple_mob/slime/xenobio/rainbow/kendrick, -/turf/simulated/floor/tiled, +/turf/simulated/floor/reinforced, /area/rnd/rdoffice) "jG" = ( /obj/effect/decal/cleanable/dirt, @@ -12344,11 +12344,6 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "yg" = ( -/obj/machinery/door/airlock/command{ - id_tag = "RDdoor"; - name = "Research Director"; - req_access = list(30) - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -12356,7 +12351,11 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/turf/simulated/wall/r_wall, +/obj/machinery/door/airlock/glass_command{ + req_access = list(30) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, /area/rnd/rdoffice) "yi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12499,10 +12498,6 @@ }, /turf/simulated/open, /area/engineering/atmos) -"yD" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall/r_wall, -/area/rnd/rdoffice) "yE" = ( /obj/machinery/light_switch{ dir = 4; @@ -13266,6 +13261,9 @@ "Bw" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) +"BD" = ( +/turf/simulated/floor, +/area/maintenance/lower/rnd) "BH" = ( /obj/structure/catwalk, /obj/random/junk, @@ -16217,6 +16215,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/atmos) +"Jg" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/rnd/rdoffice) "Ji" = ( /turf/simulated/wall/r_wall, /area/engineering/lower/lobby) @@ -17588,7 +17592,7 @@ dir = 1; pixel_y = -22 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/reinforced, /area/rnd/rdoffice) "PP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17943,10 +17947,7 @@ /area/maintenance/lower/atmos) "RO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/reinforced, /area/rnd/rdoffice) "RR" = ( /obj/structure/catwalk, @@ -18109,7 +18110,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/reinforced, /area/rnd/rdoffice) "SV" = ( /obj/structure/bed/chair, @@ -18397,9 +18398,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) -"UA" = ( -/turf/simulated/mineral, -/area/rnd/rdoffice) "UB" = ( /obj/machinery/power/apc{ dir = 1; @@ -19465,6 +19463,10 @@ /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/wood, /area/vacant/vacant_bar_upper) +"YV" = ( +/obj/machinery/camera/network/research, +/turf/simulated/floor/reinforced, +/area/rnd/rdoffice) "YX" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -26119,9 +26121,9 @@ ho jy bz cp -yD -UA -UA +ii +ac +ac ks lk lI @@ -26259,8 +26261,8 @@ um vO ho jy -jy -il +BD +cF cF cF cF @@ -26402,8 +26404,8 @@ hq ho jy bz -il cF +YV jF SQ ks @@ -26544,8 +26546,8 @@ vW vA jx bz -il cF +Jg RO PN ks @@ -26686,7 +26688,7 @@ hq ho jy bz -il +cF cF cF yg @@ -26827,7 +26829,7 @@ hq ho ho jy -jy +BD cq cF cN diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index b18ebffffff..7902928d38a 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -15390,6 +15390,7 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/item/weapon/reagent_containers/food/snacks/snakesnack, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) "aTX" = ( diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index d42c10ace24..c11482b8d8c 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -28553,6 +28553,10 @@ /area/shuttle/excursion/tether) "Ui" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera/network/security{ + icon_state = "camera"; + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "Uj" = ( @@ -28562,7 +28566,9 @@ "Uk" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, /turf/simulated/floor, /area/crew_quarters/heads/hos) "Ul" = ( @@ -29200,6 +29206,7 @@ desc = "Runtime's bed. Some of her disappointment seems to have rubbed off on it."; name = "cat bed" }, +/obj/item/toy/plushie/mouse/fluff, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "Wm" = ( From 54ec20f5facb345e0bb959c74aa16497984794a0 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Sat, 31 Aug 2019 09:40:39 -0500 Subject: [PATCH 3/5] Makes the pens comfy --- code/game/machinery/doors/brigdoors.dm | 5 + maps/tether/tether-02-surface2.dmm | 37 +- maps/tether/tether-05-station1.dmm | 8 +- maps/tether/tether-07-station3.dmm | 470 ++++++++++++++----------- 4 files changed, 308 insertions(+), 212 deletions(-) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 0935dfa7248..2d1cffc26d1 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -351,6 +351,11 @@ name = "Cell 6" id = "Cell 6" +/obj/machinery/door_timer/tactical_pet_storags + name = "Tactical Pet Storage" + id = "tactical_pet_storage" + desc = "Opens and Closes on a timer. This one seals away a tactical boost in morale." + #undef FONT_SIZE #undef FONT_COLOR #undef FONT_STYLE diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index f906692bf4a..4f55e1a0566 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1051,12 +1051,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/rnd) "cq" = ( -/obj/effect/decal/cleanable/dirt, /obj/machinery/alarm{ dir = 1; pixel_y = -22 }, -/turf/simulated/floor/plating, +/turf/simulated/floor, /area/maintenance/lower/rnd) "cr" = ( /obj/structure/railing{ @@ -12351,11 +12350,19 @@ icon_state = "intact-scrubbers"; dir = 4 }, -/obj/machinery/door/airlock/glass_command{ - req_access = list(30) +/obj/machinery/door/window/eastleft{ + name = "Kendrick's Pen"; + req_access = list(30); + req_one_access = list(19) }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, +/obj/machinery/door/window/eastleft{ + dir = 8; + icon_state = "left"; + name = "Kendrick's Pen"; + req_access = list(30); + req_one_access = list(19) + }, +/turf/simulated/floor/reinforced, /area/rnd/rdoffice) "yi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12449,6 +12456,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) +"yw" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/rnd/rdoffice) "yx" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -16219,6 +16241,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/item/toy/plushie/farwa, /turf/simulated/floor/reinforced, /area/rnd/rdoffice) "Ji" = ( @@ -26690,7 +26713,7 @@ jy bz cF cF -cF +yw yg cF cF diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 7902928d38a..568fbb90746 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -15391,7 +15391,7 @@ dir = 1 }, /obj/item/weapon/reagent_containers/food/snacks/snakesnack, -/turf/simulated/floor/tiled, +/turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) "aTX" = ( /obj/machinery/computer/general_air_control{ @@ -15605,7 +15605,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) "aVH" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -22367,7 +22367,7 @@ dir = 8 }, /obj/machinery/door/window/northleft, -/turf/simulated/floor/tiled, +/turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) "kCH" = ( /obj/machinery/door/firedoor/glass, @@ -22514,7 +22514,7 @@ /area/tether/station/dock_one) "vyI" = ( /mob/living/simple_mob/animal/passive/snake/noodle, -/turf/simulated/floor/tiled, +/turf/simulated/floor/outdoors/grass/forest, /area/crew_quarters/heads/chief) "wlD" = ( /obj/machinery/door/firedoor/glass, diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index c11482b8d8c..b9b2a6ec0e1 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2704,6 +2704,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "eu" = ( @@ -3552,10 +3555,6 @@ "fP" = ( /turf/simulated/wall/r_wall, /area/ai_core_foyer) -"fQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) "fV" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -6031,6 +6030,9 @@ /turf/simulated/floor/tiled, /area/security/observation) "jM" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "jN" = ( @@ -7806,9 +7808,6 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "my" = ( -/obj/structure/closet/secure_closet/hos, -/obj/item/clothing/suit/space/void/security/fluff/hos, -/obj/item/clothing/head/helmet/space/void/security/fluff/hos, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "mz" = ( @@ -8476,6 +8475,9 @@ pixel_x = -32; pixel_y = 0 }, +/obj/structure/closet/secure_closet/hos, +/obj/item/clothing/head/helmet/space/void/security/fluff/hos, +/obj/item/clothing/suit/space/void/security/fluff/hos, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "nE" = ( @@ -8747,6 +8749,7 @@ icon_state = "tube1"; dir = 8 }, +/obj/structure/closet/secure_closet/hos2, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "nX" = ( @@ -8755,6 +8758,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "nY" = ( @@ -9025,10 +9031,12 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/carpet, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "ow" = ( /obj/machinery/hologram/holopad, +/obj/effect/floor_decal/carpet, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "ox" = ( @@ -17203,6 +17211,7 @@ pixel_x = 32; pixel_y = 30 }, +/obj/machinery/computer/security/mining, /turf/simulated/floor/wood, /area/quartermaster/qm) "AK" = ( @@ -17212,6 +17221,7 @@ pixel_y = 7 }, /obj/item/device/megaphone, +/obj/machinery/camera/network/cargo, /turf/simulated/floor/wood, /area/quartermaster/qm) "AL" = ( @@ -17843,15 +17853,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) -"BL" = ( -/obj/machinery/camera/network/cargo{ - dir = 4 - }, -/obj/machinery/computer/supplycomp/control{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "BM" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -18324,9 +18325,8 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_b) "CA" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled, -/area/maintenance/station/cargo) +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "CB" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -18336,12 +18336,6 @@ /obj/item/weapon/storage/box/lights/mixed, /turf/simulated/floor/tiled, /area/maintenance/station/cargo) -"CC" = ( -/obj/machinery/computer/security/mining{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "CD" = ( /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -18796,10 +18790,12 @@ /turf/simulated/floor/wood, /area/medical/psych) "Dv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/wood, /area/quartermaster/qm) "Dw" = ( @@ -19276,30 +19272,6 @@ }, /turf/simulated/floor, /area/maintenance/station/cargo) -"El" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/mob/living/simple_mob/animal/sif/fluffy, -/turf/simulated/floor/wood, -/area/quartermaster/qm) -"Em" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) -"En" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "Eo" = ( /obj/structure/closet, /obj/random/maintenance/cargo, @@ -19708,10 +19680,6 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/station/cargo) -"Fi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "Fj" = ( /turf/simulated/wall, /area/quartermaster/warehouse) @@ -20158,25 +20126,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"FV" = ( -/obj/machinery/alarm{ - dir = 1; - icon_state = "alarm0"; - pixel_y = -22 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) -"FW" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/mob/living/simple_mob/animal/sif/diyaab{ - ai_holder_type = /datum/ai_holder/simple_mob/passive; - desc = "It's a blue Diyaab! It seems to be very tame and quiet."; - name = "Silky" - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "FY" = ( /obj/structure/closet/crate, /turf/simulated/floor/tiled, @@ -28420,6 +28369,16 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"Tv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/toy/plushie/squid/blue, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "TD" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -28502,6 +28461,33 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) +"TU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) +"TW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hos) "TX" = ( /obj/machinery/alarm{ dir = 8; @@ -28523,22 +28509,37 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "TZ" = ( -/obj/machinery/door/airlock/glass_security{ - desc = "It opens and closes. Seals off a tactical boost in morale."; - name = "Tactical Pet Storage"; - req_one_access = list(58); - riding_datum = list(19) - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/door/window/brigdoor/southright{ + id = "tactical_pet_storage" + }, +/turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"Ua" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "Ub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"Ue" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE"; + pixel_y = 0 + }, +/turf/simulated/wall, +/area/quartermaster/qm) "Uf" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -28552,24 +28553,25 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "Ui" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/camera/network/security{ - icon_state = "camera"; - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/item/weapon/bone, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "Uj" = ( /obj/machinery/papershredder, /turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) "Uk" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "hos_office" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/turf/simulated/floor, +/obj/structure/window/reinforced, +/turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "Ul" = ( /obj/machinery/light, @@ -28901,6 +28903,9 @@ icon_state = "intact-supply"; dir = 5 }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "Vf" = ( @@ -28944,6 +28949,13 @@ }, /turf/simulated/wall/rshull, /area/shuttle/excursion/tether) +"Vl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/window/westleft{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "Vm" = ( /obj/structure/bed/chair/shuttle{ icon_state = "shuttle_chair"; @@ -28974,6 +28986,15 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "Vu" = ( @@ -29020,6 +29041,14 @@ }, /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"VF" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/dogbed, +/obj/item/toy/plushie/squid/pink, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "VG" = ( /obj/structure/filingcabinet/chestdrawer{ dir = 1 @@ -29073,16 +29102,13 @@ /turf/simulated/open, /area/ai_core_foyer) "VN" = ( -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/camera/network/security{ + icon_state = "camera"; + dir = 8 }, -/turf/simulated/floor/wood, +/obj/item/weapon/bone/skull/unathi, +/turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "VQ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -29116,22 +29142,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) -"VV" = ( -/obj/machinery/door/airlock/glass_mining{ - name = "Cargo Bay"; - req_access = list(31); - req_one_access = list() - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "VW" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 6 @@ -29166,6 +29176,16 @@ "Wg" = ( /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) +"Wh" = ( +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hos) "Wi" = ( /obj/machinery/door/airlock/engineering{ name = "Cargo Substation"; @@ -29262,16 +29282,6 @@ }, /turf/simulated/floor, /area/maintenance/station/cargo) -"WA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -29301,10 +29311,24 @@ /turf/simulated/floor/plating, /area/shuttle/excursion/tether) "WH" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/structure/dogbed, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hos) +"WN" = ( +/obj/effect/floor_decal/carpet{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "WR" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -29369,6 +29393,14 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) +"Xh" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/dogbed, +/mob/living/simple_mob/animal/sif/fluffy, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "Xi" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5; @@ -29565,6 +29597,10 @@ }, /turf/simulated/floor, /area/maintenance/station/cargo) +"Yf" = ( +/obj/machinery/computer/supplycomp/control, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "Yg" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 8 @@ -29625,6 +29661,10 @@ "Yu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door_timer/tactical_pet_storags{ + pixel_x = 32; + pixel_y = 34 + }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "Yw" = ( @@ -29635,6 +29675,16 @@ }, /turf/simulated/floor/reinforced, /area/tether/exploration) +"Yx" = ( +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hos) +"YC" = ( +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/carpet, +/area/crew_quarters/heads/hos) "YD" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -29676,11 +29726,11 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "YO" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 +/mob/living/simple_mob/animal/sif/shantak{ + ai_holder_type = /datum/ai_holder/simple_mob/passive; + name = "Scruffy" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "YQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29723,12 +29773,8 @@ /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/excursion/tether) "Zc" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) +/turf/simulated/floor/tiled, +/area/maintenance/station/cargo) "Zd" = ( /obj/machinery/conveyor{ dir = 4; @@ -29737,13 +29783,17 @@ /obj/structure/plasticflaps, /turf/simulated/floor/plating, /area/shuttle/excursion/tether) -"Zj" = ( -/mob/living/simple_mob/animal/sif/shantak{ - ai_holder_type = /datum/ai_holder/simple_mob/passive; - name = "Scruffy" +"Zi" = ( +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 }, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "Zk" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning/corner{ @@ -29752,6 +29802,17 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Zn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/mob/living/simple_mob/animal/sif/diyaab{ + ai_holder_type = /datum/ai_holder/simple_mob/passive; + desc = "It's a blue Diyaab! It seems to be very tame and quiet."; + name = "Silky" + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "Zo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -29762,6 +29823,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"Zp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/forest, +/area/quartermaster/qm) "Zr" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -29772,15 +29840,6 @@ /obj/structure/bookcase, /turf/simulated/floor/wood, /area/crew_quarters/heads/cmo) -"Zt" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/closet/secure_closet/hos2, -/turf/simulated/floor/wood, -/area/crew_quarters/heads/hos) "Zy" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -29828,6 +29887,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/tether) +"ZF" = ( +/turf/simulated/mineral/vacuum, +/area/crew_quarters/heads/hos) "ZJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29869,6 +29931,11 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/item/weapon/storage/box, +/obj/item/weapon/storage/box{ + pixel_x = 5; + pixel_y = -2 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "ZT" = ( @@ -29893,11 +29960,12 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "ZV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 4 }, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -33801,7 +33869,7 @@ aa aa aa aa -je +ZF je je je @@ -33943,13 +34011,13 @@ aa aa aa ab +ZF je -Zj YO WH Uk my -Zt +kv nD nW TO @@ -34085,8 +34153,8 @@ ab ab ab ab +ZF je -fQ Ui VN TZ @@ -34094,7 +34162,7 @@ Yu Vp Ve nX -nX +TW oX Sc mE @@ -34227,7 +34295,7 @@ ab ab ab ab -je +ZF je je je @@ -34236,7 +34304,7 @@ Uu jM nE Rq -jM +YC kv SP mF @@ -34659,10 +34727,10 @@ ab ab je ar -jM +WN et -jM -jM +Yx +Wh pa Sz mE @@ -41352,17 +41420,17 @@ xg xR yQ zF -AH -AH +zL +zL +zL +zL +Ue jJ -zL -zL -zL -zL -Wb +AH +AH Wi eP -GC +Wb GC Kv KY @@ -41494,14 +41562,14 @@ fa xR yQ zG -AH -BI -jO zL -El +Xh +Ua +VF +zL Zc -CD -GC +jO +AH Hs Ij IO @@ -41636,14 +41704,14 @@ xi xW yQ zH -AH -BJ -CA zL -Em -CD -FV -GC +Zp +CA +Zi +zL +BJ +BI +AH Ht Ik IP @@ -41778,14 +41846,14 @@ xj xX yQ zI -AH +zL +Zp +CA +Zn +zL BK CB -zL -En -Fi -FW -GC +AH Hu Il IQ @@ -41921,11 +41989,11 @@ xY yR zJ zL +Tv +Vl +TU zL zL -zL -VV -zL Fj Fj Xj @@ -42062,11 +42130,11 @@ xl xZ yS zK -AI -BL -CC +Yf +CD +CD ZV -Dw +AI zL FY GF @@ -42207,7 +42275,7 @@ zK AJ BM CD -WA +ZV Ep zL FZ From 0483a5771d4e7e85e492de483d44dcde2349b994 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Tue, 3 Sep 2019 02:07:49 -0500 Subject: [PATCH 4/5] Actually Defines new Pets. Runtime is no longer dirty --- .../mob/living/simple_mob/subtypes/animal/pets/cat.dm | 1 + .../simple_mob/subtypes/animal/sif/fluffy_vr.dm | 10 ++++++++++ .../living/simple_mob/subtypes/animal/sif/shantak.dm | 11 +++++++++-- maps/tether/tether-07-station3.dmm | 11 ++--------- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index 11d1c0e5045..0a4f254bbdc 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -102,6 +102,7 @@ icon_state = "cat" item_state = "cat" named = TRUE + makes_dirt = 0 //Vorestation Edit /mob/living/simple_mob/animal/passive/cat/kitten name = "kitten" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm index 8507480f01b..298cdffd84c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/fluffy_vr.dm @@ -14,6 +14,7 @@ health = 20 movement_cooldown = 5 + makes_dirt = 0 see_in_dark = 5 mob_size = MOB_TINY @@ -38,3 +39,12 @@ speak = list("Squee","Arf arf","Awoo","Squeak") emote_hear = list("howls","squeals","squeaks", "barks") emote_see = list("puffs its fur out", "shakes its fur", "stares directly at you") + +/mob/living/simple_mob/animal/sif/fluffy/silky + name = "Silky" + desc = "It's a blue Diyaab! It seems to be very tame and quiet." + + icon_state = "diyaab" + icon_living = "diyaab" + icon_dead = "diyaab_dead" + icon = 'icons/jungle.dmi' \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm index bb6a25604a9..a6948a3e00b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/shantak.dm @@ -95,5 +95,12 @@ // These ones only retaliate. Used for a PoI. -/mob/living/simple_mob/animal/sif/shantak/retaliate - ai_holder_type = /datum/ai_holder/simple_mob/retaliate \ No newline at end of file +/mob/living/simple_mob/animal/sif/shantak/retaliate + ai_holder_type = /datum/ai_holder/simple_mob/retaliate + +//Vorestation Addition +/mob/living/simple_mob/animal/sif/shantak/scruffy + name = "Scruffy" + ai_holder_type = /datum/ai_holder/simple_mob/passive + makes_dirt = 0 + faction = "neutral" \ No newline at end of file diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index b9b2a6ec0e1..6a2b7efffc2 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -29726,10 +29726,7 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/tether) "YO" = ( -/mob/living/simple_mob/animal/sif/shantak{ - ai_holder_type = /datum/ai_holder/simple_mob/passive; - name = "Scruffy" - }, +/mob/living/simple_mob/animal/sif/shantak/scruffy, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "YQ" = ( @@ -29806,11 +29803,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/mob/living/simple_mob/animal/sif/diyaab{ - ai_holder_type = /datum/ai_holder/simple_mob/passive; - desc = "It's a blue Diyaab! It seems to be very tame and quiet."; - name = "Silky" - }, +/mob/living/simple_mob/animal/sif/fluffy/silky, /turf/simulated/floor/outdoors/grass/forest, /area/quartermaster/qm) "Zo" = ( From 3c1e254ede78610e33d7d9f3aad0397a7879c750 Mon Sep 17 00:00:00 2001 From: Mewchild Date: Fri, 6 Sep 2019 16:57:49 -0500 Subject: [PATCH 5/5] Typo, VR Addition --- code/game/machinery/doors/brigdoors.dm | 3 ++- maps/tether/tether-07-station3.dmm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 2d1cffc26d1..7e25bb2df97 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -351,7 +351,8 @@ name = "Cell 6" id = "Cell 6" -/obj/machinery/door_timer/tactical_pet_storags + +/obj/machinery/door_timer/tactical_pet_storage //Vorestation Addition name = "Tactical Pet Storage" id = "tactical_pet_storage" desc = "Opens and Closes on a timer. This one seals away a tactical boost in morale." diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 6a2b7efffc2..add45a59f2a 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -29661,7 +29661,7 @@ "Yu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door_timer/tactical_pet_storags{ +/obj/machinery/door_timer/tactical_pet_storage{ pixel_x = 32; pixel_y = 34 },