diff --git a/code/game/jobs/job/engineering_vr.dm b/code/game/jobs/job/engineering_vr.dm index 0ed001bd28e..e0f106ac804 100644 --- a/code/game/jobs/job/engineering_vr.dm +++ b/code/game/jobs/job/engineering_vr.dm @@ -3,6 +3,16 @@ pto_type = PTO_ENGINEERING dept_time_required = 60 + access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload) + + minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, + access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, + access_heads, access_construction, + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload) + /datum/job/engineer pto_type = PTO_ENGINEERING diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 1a29d1ec9d9..72286ca8809 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -3,6 +3,14 @@ pto_type = PTO_MEDICAL dept_time_required = 60 + access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, + access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, + access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels) + + minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, + access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, + access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels) + /datum/job/doctor spawn_positions = 5 pto_type = PTO_MEDICAL diff --git a/code/game/jobs/job/science_vr.dm b/code/game/jobs/job/science_vr.dm index 76100891274..cce9bfdcca5 100644 --- a/code/game/jobs/job/science_vr.dm +++ b/code/game/jobs/job/science_vr.dm @@ -4,11 +4,11 @@ dept_time_required = 60 access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, - access_tox_storage, access_teleporter, access_sec_doors, + access_tox_storage, access_teleporter, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany) minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, - access_tox_storage, access_teleporter, access_sec_doors, + access_tox_storage, access_teleporter, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany) diff --git a/code/game/jobs/job/security_vr.dm b/code/game/jobs/job/security_vr.dm index 24b4a333252..4f7604b9371 100644 --- a/code/game/jobs/job/security_vr.dm +++ b/code/game/jobs/job/security_vr.dm @@ -5,11 +5,11 @@ access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, - access_research, access_engine, access_mining, access_construction, access_mailsorting, + access_construction, access_heads, access_hos, access_RC_announce, access_keycard_auth, access_external_airlocks) minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, - access_research, access_engine, access_mining, access_construction, access_mailsorting, + access_construction, access_heads, access_hos, access_RC_announce, access_keycard_auth, access_external_airlocks) /datum/job/warden diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm new file mode 100644 index 00000000000..b659e756b3a --- /dev/null +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -0,0 +1,2 @@ +/obj/item/weapon/card/id/gold/captain/spare/fakespare + rank = "null" \ No newline at end of file diff --git a/config/example/config.txt b/config/example/config.txt index eaff2461945..50ee910f8d2 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -545,4 +545,4 @@ ENABLE_NIGHT_SHIFTS # Uncomment to allow links of the following kinds. # # ALLOW_BYOND_LINKS # ALLOW_DISCORD_LINKS -ALLOW_URL_LINKS +ALLOW_URL_LINKS \ No newline at end of file diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index d880eb2c641..357a940e191 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -596,24 +596,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cargo/mining) "aaY" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "2-4" +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cargo/mining) @@ -2078,8 +2063,8 @@ /obj/machinery/door/airlock/glass_mining{ id_tag = "cargodoor"; name = "Cargo Office"; - req_access = list(31); - req_one_access = list() + req_access = list(); + req_one_access = list(48,50) }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -5442,17 +5427,7 @@ }, /area/tether/surfacebase/surface_one_hall) "ajb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/structure/catwalk, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common{ +/obj/machinery/door/airlock/maintenance/cargo{ name = "Mining Maintenance Access"; req_one_access = list(48) }, @@ -8208,10 +8183,52 @@ "anF" = ( /obj/machinery/door/airlock/maintenance/cargo{ name = "Mining Maintenance Access"; - req_one_access = list(48) + req_one_access = list(48,50) }, /turf/simulated/floor/plating, /area/tether/surfacebase/cargo/office) +"anG" = ( +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = list(47,24) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/rnd/hallway) +"anH" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/bed/chair/office/dark, +/obj/structure/barricade/cutout/ntsec{ + fake_desc = "You have to be closer to examine the Silent Tether Guard."; + fake_name = "Silent Tether Guard" + }, +/turf/simulated/floor/tiled, +/area/security/checkpoint) "anI" = ( /obj/structure/cable{ d2 = 2; @@ -8235,6 +8252,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) +"anK" = ( +/obj/structure/symbol/lo, +/turf/simulated/wall{ + can_open = 1 + }, +/area/maintenance/lower/atmos) "anL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/outline/blue, @@ -8589,6 +8612,16 @@ /obj/random/maintenance/cargo, /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/emergency_storage/atrium) +"aop" = ( +/obj/effect/decal/cleanable/dirt, +/obj/random/action_figure, +/obj/random/action_figure, +/obj/random/action_figure, +/obj/structure/closet/wardrobe/grey{ + starts_with = list(/obj/structure/barricade/cutout/viva, /obj/item/clothing/under/color/grey = 3, /obj/item/clothing/shoes/black = 3, /obj/item/clothing/head/soft/grey = 3, /obj/item/clothing/mask/gas/wwii = 3, /obj/item/weapon/storage/toolbox/mechanical = 3, /obj/item/clothing/gloves/fyellow = 3, /obj/item/weapon/card/id/gold/captain/spare/fakespare = 3, /obj/item/weapon/soap/syndie = 3, /obj/item/weapon/storage/box/mousetraps = 3) + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "aoq" = ( /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) @@ -12978,26 +13011,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"avY" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 8 - }, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/bed/chair/office/dark, -/turf/simulated/floor/tiled, -/area/security/checkpoint) "avZ" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -17830,22 +17843,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/hallway) -"aJt" = ( -/obj/machinery/door/airlock/maintenance/rnd, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/rnd/hallway) "aJu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/green{ @@ -25448,13 +25445,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/lower/atmos) -"aXQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/random/action_figure, -/obj/random/action_figure, -/obj/random/action_figure, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "aXR" = ( /obj/structure/window/reinforced, /obj/structure/closet/masks, @@ -36972,7 +36962,7 @@ aGX awn awn awn -aJt +anG awn aKL aLr @@ -44905,7 +44895,7 @@ evF ast auR avq -avY +anH awM axs awN @@ -45804,7 +45794,7 @@ aWo aWM aWV aVn -aXQ +aop aYi aYE aZd @@ -45946,7 +45936,7 @@ aUP aUP bcT aVn -aVn +anK aYi aYi aYi diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 0576e2644cd..46e00db73bc 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -2479,6 +2479,22 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) +"afc" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/medical{ + id_tag = null; + name = "Resleeving Backroom"; + req_access = list(0); + req_one_access = list(0) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/resleeving) "afd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 4; @@ -2706,6 +2722,38 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/evidence) +"afr" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air/airlock{ + start_pressure = 4559.63 + }, +/turf/simulated/floor/tiled/dark, +/area/tcommsat/computer) +"afs" = ( +/obj/machinery/door/airlock/maintenance/sec{ + name = "Riot Control"; + req_access = list(); + req_one_access = list(63,24) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4; + icon_state = "intact" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4; + icon_state = "intact-scrubbers" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor, +/area/tether/surfacebase/security/gasstorage) "aft" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2816,6 +2864,56 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) +"afC" = ( +/obj/machinery/door/airlock/security{ + name = "Observation"; + req_one_access = list(63,4) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/security/interrogation) +"afD" = ( +/obj/machinery/door/airlock/maintenance/sec{ + name = "Riot Control"; + req_access = list(); + req_one_access = list(63,4) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/turf/simulated/floor, +/area/tether/surfacebase/security/interrogation) +"afE" = ( +/obj/machinery/door/airlock/security{ + name = "Evidence Storage"; + req_one_access = list(38,63) + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/tether/surfacebase/security/evidence) "afF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -17708,11 +17806,6 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"aIs" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/dark, -/area/tcommsat/computer) "aIt" = ( /obj/structure/filingcabinet, /obj/machinery/status_display{ @@ -21961,21 +22054,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) -"aQm" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/medical{ - id_tag = null; - name = "Resleeving Backroom"; - req_access = list(5) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) "aQn" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -24595,18 +24673,6 @@ "aUk" = ( /turf/simulated/wall/r_wall, /area/tether/surfacebase/security/evidence) -"aUl" = ( -/obj/machinery/door/airlock/security{ - name = "Evidence Storage"; - req_access = newlist(); - req_one_access = list(1,38) - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/tether/surfacebase/security/evidence) "aUm" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -24783,30 +24849,6 @@ }, /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) -"aUD" = ( -/obj/machinery/door/airlock/maintenance/sec{ - name = "Riot Control"; - req_access = list(1) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4; - icon_state = "intact" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - icon_state = "intact-scrubbers" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor, -/area/tether/surfacebase/security/gasstorage) "aUE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25153,25 +25195,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhallway) -"aVb" = ( -/obj/machinery/door/airlock/security{ - name = "Observation"; - req_one_access = list(1,4) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/tether/surfacebase/security/interrogation) "aVc" = ( /obj/structure/cable/green{ d1 = 4; @@ -28563,25 +28586,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) -"fXU" = ( -/obj/machinery/door/airlock/maintenance/sec{ - name = "Riot Control"; - req_access = list(1) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 8 - }, -/turf/simulated/floor, -/area/tether/surfacebase/security/interrogation) "fYA" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -38310,7 +38314,7 @@ aTv aTP aUf abE -aUD +afs aUN aUN aTB @@ -39306,7 +39310,7 @@ aTr aUs aPh aUQ -aVb +afC aUQ aUQ aUQ @@ -39870,11 +39874,11 @@ aab aTs aTL aTV -aUl +afE aUv aUI aUQ -fXU +afD aUQ aUQ aUQ @@ -43783,7 +43787,7 @@ aGO arZ aac aHP -aIs +afr aIS aJv aKd @@ -44555,7 +44559,7 @@ aab aah aah aah -aQm +afc aah aah aah diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 2666ca859ef..e48479aa87d 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -1333,7 +1333,7 @@ "acE" = ( /obj/machinery/door/airlock/glass_security{ name = "Break Room"; - req_access = list(1) + req_access = list(63) }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2085,7 +2085,7 @@ id_tag = "SurfaceBrigAccess"; layer = 2.8; name = "Security"; - req_access = list(1) + req_access = list(63) }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2097,7 +2097,7 @@ id_tag = "SurfaceBrigAccess"; layer = 2.8; name = "Security"; - req_access = list(1) + req_access = list(63) }, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ @@ -3313,7 +3313,7 @@ "afU" = ( /obj/machinery/door/airlock/security{ name = "Security Processing"; - req_access = list(1) + req_access = list(63) }, /obj/structure/cable/green{ d1 = 4; @@ -4260,7 +4260,7 @@ "ahy" = ( /obj/machinery/door/airlock/glass_security{ name = "Front Desk"; - req_access = list(1) + req_access = list(63) }, /obj/structure/cable/green{ icon_state = "4-8" @@ -13056,7 +13056,7 @@ id_tag = "SurfaceFoyer"; layer = 2.8; name = "Security"; - req_access = list(1) + req_access = list(63) }, /obj/machinery/door/blast/regular{ density = 0; @@ -26405,10 +26405,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aTP" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether) +/obj/item/weapon/card/id/gold/captain/spare/fakespare, +/turf/simulated/floor/plating, +/area/tether/surfacebase/surface_three_hall) "aTQ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8; @@ -34515,6 +34514,11 @@ /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) "bhg" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether) +"bhh" = ( /obj/machinery/atmospherics/unary/engine{ dir = 1 }, @@ -48776,7 +48780,7 @@ jML jHw jpB qWU -bhg +bhh aKU aOI aPb @@ -49628,7 +49632,7 @@ caw jHw gHh qWU -bhg +bhh aKU aOI aPb @@ -51292,7 +51296,7 @@ aZR bbi ayx aqO -aqO +aTP asT aPp asT @@ -51613,7 +51617,7 @@ aNk uSA aNJ aNP -aTP +bhg aKU abg aOk @@ -51755,7 +51759,7 @@ aNl aNl aNK aNP -aTP +bhg aKU abg aOk @@ -51897,7 +51901,7 @@ aNm aNl aNK aNP -aTP +bhg aKU abg aOk diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index c4528b69a06..c9ff3f61904 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -91,19 +91,30 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "an" = ( +/obj/effect/floor_decal/corner/red{ + dir = 9; + icon_state = "corner_white" + }, +/obj/effect/floor_decal/corner/red{ + dir = 6; + icon_state = "corner_white" + }, /obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "brig_lockdown"; + name = "Security Blast Doors"; + opacity = 0 }, -/obj/machinery/door/airlock{ - name = "Visitation"; - req_one_access = list(1,38) +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/westleft{ + req_access = list(2) + }, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(2) }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/brig/visitation) "ao" = ( @@ -786,13 +797,21 @@ /turf/simulated/floor/tiled, /area/security/brig) "bs" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) +/obj/machinery/door/airlock{ + name = "Visitation"; + req_one_access = list(38,63) + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/security/brig/visitation) "bt" = ( /obj/structure/bed/chair{ dir = 1 @@ -893,12 +912,27 @@ /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) "bC" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/security{ + name = "Brig Recreation Storage"; + req_one_access = list(63) + }, +/turf/simulated/floor/tiled, +/area/security/recstorage) "bD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -1645,23 +1679,30 @@ /area/security/security_cell_hallway) "cx" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/door/airlock/security{ - name = "Observation"; - req_one_access = list(1,4) +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/tiled/dark, -/area/security/interrogation) +/obj/machinery/door/airlock/maintenance/sec{ + name = "Riot Control"; + req_access = list(); + req_one_access = list(2,63) + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/green, +/turf/simulated/floor, +/area/security/riot_control) "cy" = ( /obj/structure/device/piano, /turf/simulated/mineral/floor/vacuum, @@ -2227,30 +2268,24 @@ /turf/simulated/floor/tiled, /area/security/brig/visitation) "dl" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9; - icon_state = "corner_white" - }, -/obj/effect/floor_decal/corner/red{ - dir = 6; - icon_state = "corner_white" - }, /obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "brig_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor/westleft{ - req_access = list(1,2) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/door/window/brigdoor/eastright, -/turf/simulated/floor/tiled, -/area/security/brig/visitation) +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/security{ + name = "Observation"; + req_one_access = list(4,63) + }, +/turf/simulated/floor/tiled/dark, +/area/security/interrogation) "dm" = ( /obj/structure/table/woodentable, /obj/item/weapon/folder/yellow, @@ -2516,13 +2551,21 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "dI" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1) +/obj/machinery/door/airlock/maintenance/sec{ + name = "Riot Control"; + req_one_access = list(2,10,24) + }, +/turf/simulated/floor/plating, +/area/security/riot_control) "dJ" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -2627,29 +2670,27 @@ /turf/simulated/floor/tiled, /area/security/brig) "dR" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/sec{ name = "Riot Control"; - req_access = list(1) + req_one_access = list(2,10,24) }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/green, -/turf/simulated/floor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/security/riot_control) "dS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2709,26 +2750,13 @@ /turf/simulated/floor/tiled, /area/security/security_cell_hallway) "dU" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/security{ - name = "Brig Recreation Storage" - }, -/turf/simulated/floor/tiled, -/area/security/recstorage) +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "dV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -4631,6 +4659,21 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"gT" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) +"gU" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1) "gV" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -6114,22 +6157,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer_mezzenine) -"jh" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/obj/machinery/door/airlock/maintenance/sec{ - name = "Riot Control"; - req_one_access = list(1,10,24) - }, -/turf/simulated/floor/plating, -/area/security/riot_control) "ji" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22608,29 +22635,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) -"Yq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/sec{ - name = "Riot Control"; - req_one_access = list(1,10,24) - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/security/riot_control) "Yw" = ( /turf/simulated/floor/airless, /area/mine/explored/upper_level) @@ -29102,7 +29106,7 @@ af RE EP PM -an +bs EZ Ix BV @@ -29384,7 +29388,7 @@ ch ch af cX -dl +an cX af bi @@ -30533,7 +30537,7 @@ ct cv TY TY -jh +dI TY TY ac @@ -30815,7 +30819,7 @@ Ui aS gW Eu -dR +cx aJ aZ bo @@ -31102,7 +31106,7 @@ Oc TY TY TY -Yq +dR TY TY kj @@ -31801,7 +31805,7 @@ ba cA cU cU -dU +bC cU fd fd @@ -31809,7 +31813,7 @@ cl fd fd fd -cx +dl fd aj dW @@ -37500,11 +37504,11 @@ hl DI RX DL -bs -bC -bC -bC -dI +dU +gT +gT +gT +gU oY sW ef diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index cdbd4c79ac3..2d38a7c62db 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -10921,9 +10921,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/forensics) -"asN" = ( -/turf/simulated/floor/tiled/white, -/area/security/forensics) "asO" = ( /obj/machinery/door/window/eastright, /turf/simulated/floor/tiled/white, @@ -37453,7 +37450,7 @@ amb aqy arg asc -asN +acZ agc aqc avs diff --git a/vorestation.dme b/vorestation.dme index ae9cc57baa1..04ed3b7f868 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1276,6 +1276,7 @@ #include "code\game\objects\items\weapons\grenades\supermatter.dm" #include "code\game\objects\items\weapons\id cards\cards.dm" #include "code\game\objects\items\weapons\id cards\station_ids.dm" +#include "code\game\objects\items\weapons\id cards\station_ids_vr.dm" #include "code\game\objects\items\weapons\id cards\syndicate_ids.dm" #include "code\game\objects\items\weapons\implants\implant.dm" #include "code\game\objects\items\weapons\implants\implant_vr.dm"