diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm index 8a248c4ddc9..16ff0355dd9 100644 --- a/code/datums/supplypacks/supply.dm +++ b/code/datums/supplypacks/supply.dm @@ -179,7 +179,7 @@ cost=25 containertype = /obj/structure/closet/crate/secure/xion containername = "Away Team equipment" - access = access_eva + access = list(access_eva, access_awayteam) /datum/supply_pack/pilotgear name= "Pilot gear" diff --git a/code/datums/supplypacks/voidsuits_vr.dm b/code/datums/supplypacks/voidsuits_vr.dm index e8549769da1..baf6b0228b4 100644 --- a/code/datums/supplypacks/voidsuits_vr.dm +++ b/code/datums/supplypacks/voidsuits_vr.dm @@ -10,7 +10,7 @@ cost = 45 containertype = /obj/structure/closet/crate/secure containername = "Away Team voidsuit crate" - access = access_eva + access = list(access_eva, access_awayteam) /datum/supply_pack/voidsuits/explorer_medic name = "Away Team Medic voidsuits" @@ -105,7 +105,7 @@ cost = 150 containertype = /obj/structure/closet/crate/secure name = "Commonwealth exploration voidsuit crate" - access = access_eva + access = list(access_eva, access_awayteam) /datum/supply_pack/voidsuits/com_engineer name = "Commonwealth engineering voidsuit" diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index 330faaa9f4e..518e5bef63b 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -213,8 +213,8 @@ departments = list(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN faction = "Station" - total_positions = 5 - spawn_positions = 5 + total_positions = 2 + spawn_positions = 2 supervisors = "the Head of Personnel" selection_color = "#515151" economic_modifier = 5 diff --git a/code/game/jobs/job/medical_vr.dm b/code/game/jobs/job/medical_vr.dm index 0f30eb7b367..321f0599a5c 100644 --- a/code/game/jobs/job/medical_vr.dm +++ b/code/game/jobs/job/medical_vr.dm @@ -81,6 +81,8 @@ /datum/job/paramedic pto_type = PTO_MEDICAL alt_titles = list("Emergency Medical Technician" = /datum/alt_title/emt, "Medical Responder" = /datum/alt_title/medical_responder, "Search and Rescue" = /datum/alt_title/sar) + total_positions = 3 + spawn_positions = 3 /datum/alt_title/medical_responder title = "Medical Responder" diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm index b0bd2c682c4..ea952cc5153 100644 --- a/code/game/objects/items/devices/radio/headset_vr.dm +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -91,7 +91,7 @@ icon_state = "pilot_headset_alt" /obj/item/device/radio/headset/explorer - name = "away team's headset" + name = "away team member's headset" desc = "Headset used by the away team for exploring. Access to the away team channel." icon_state = "exp_headset" adhoc_fallback = TRUE diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index b53916b4027..b2f63d3b33f 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -58,8 +58,8 @@ var/list/department_radio_keys = list( ":г" = "Supply", ".г" = "Supply", ":м" = "Service", ".м" = "Service", ":з" = "AI Private", ".з" = "AI Private", - ":н" = "Away Team", ".н" = "Away Team", - ":ф" = "Talon", ".ф" = "Talon", //VOREStation Add + ":ф" = "Away Team", ".ф" = "Away Team", + ":н" = "Talon", ".н" = "Talon", //VOREStation Add ":п" = "Casino", ".п" = "Casino", ) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index d923b8ba8ce..d6d8e176c0b 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -8990,6 +8990,17 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/westspur) +"uA" = ( +/obj/item/weapon/paper_bin{ + pixel_y = 7 + }, +/obj/structure/table/steel, +/obj/item/weapon/pen, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "uB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -11371,6 +11382,42 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) +"An" = ( +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/structure/table/rack/shelf, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -4; + pixel_y = -6 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "Ao" = ( /obj/structure/table/rack/shelf/steel, /obj/item/gunbox{ @@ -12357,6 +12404,13 @@ outdoors = 0 }, /area/groundbase/level1/northspur) +"CN" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/mineral/equipment_vendor/survey, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "CO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 9 @@ -12540,12 +12594,16 @@ layer = 2.9 }, /obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical, -/obj/item/clothing/head/helmet/space/void/medical, /obj/machinery/door/window/brigdoor{ req_access = list(5) }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/medical, +/obj/item/clothing/suit/space/void/medical, +/obj/item/clothing/head/helmet/space/void/medical, +/obj/item/clothing/head/helmet/space/void/medical, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/gateway) "Dq" = ( @@ -16989,6 +17047,25 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/nwtunnel) +"Oi" = ( +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/item/device/bluespaceradio/groundbase_prelinked, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(43) + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/gateway) "Oj" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -17370,6 +17447,34 @@ "Pp" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level1/southeastspur) +"Pq" = ( +/obj/structure/table/rack/shelf, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/stack/marker_beacon/thirty{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = -4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/gateway) "Pr" = ( /obj/structure/bed/chair/sofa/bench{ dir = 1 @@ -19275,8 +19380,8 @@ }, /obj/effect/floor_decal/corner/pink/full, /obj/machinery/vending/wallmed1/public{ - pixel_y = -28; - dir = 1 + dir = 1; + pixel_y = -28 }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/womensrestroom) @@ -20450,10 +20555,14 @@ dir = 8; layer = 2.9 }, -/obj/item/clothing/mask/breath, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical, -/obj/item/clothing/head/helmet/space/void/medical, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, /obj/machinery/door/window/brigdoor/eastright{ req_access = list(5) }, @@ -29680,7 +29789,7 @@ lE Dp WY jW -XS +Oi hB AZ AZ @@ -30524,10 +30633,10 @@ MO MO lE wI -nR -XS -XS -XS +CN +An +Pq +uA WN FN nR diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 5505356ff19..ca3d5d17eb4 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -1,11 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( /turf/simulated/wall, -/area/groundbase/exploration/equipment) -"ab" = ( -/obj/machinery/suit_cycler/medical, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/paramedic) +/area/vacant/vacant_site) "ac" = ( /obj/effect/landmark/start/pilot, /obj/structure/closet/walllocker_double{ @@ -73,7 +69,7 @@ dir = 1 }, /turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "bk" = ( /obj/effect/floor_decal/industrial/outline, /obj/structure/closet/crate, @@ -95,19 +91,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) -"bS" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "cb" = ( /obj/structure/bed/psych{ name = "couch" @@ -189,10 +172,7 @@ /area/groundbase/medical/patient4) "dE" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/science{ - name = "Exploration"; - req_one_access = list(19,43,67) - }, +/obj/machinery/door/airlock, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -200,7 +180,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bmarble, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "dI" = ( /obj/machinery/firealarm, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -223,17 +203,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient2) -"dQ" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32; - pixel_y = -9 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "dR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, @@ -404,9 +373,8 @@ /obj/machinery/firealarm{ dir = 4 }, -/obj/structure/closet/secure_closet/guncabinet/excursion, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "gR" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -478,19 +446,12 @@ /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) "hQ" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/weapon/tank/jetpack/carbondioxide, /obj/machinery/light{ dir = 1 }, +/obj/structure/table/rack/shelf, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "ik" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -577,7 +538,7 @@ }, /obj/machinery/disposal, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "jv" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level3/nw) @@ -706,13 +667,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) -"ma" = ( -/obj/structure/closet/secure_closet/sar, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "me" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/medical, @@ -853,10 +807,6 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/civilian/kitchen) -"nN" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "nR" = ( /obj/effect/mouse_hole_spawner, /turf/simulated/floor/outdoors/grass/virgo3c, @@ -1157,17 +1107,9 @@ /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/escapepad) "rV" = ( -/obj/item/weapon/paper_bin{ - pixel_y = 7 - }, -/obj/structure/table/steel, -/obj/item/weapon/pen, /obj/machinery/light, -/obj/machinery/recharger{ - pixel_y = 4 - }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "sa" = ( /obj/structure/railing{ dir = 8 @@ -1241,16 +1183,6 @@ "tM" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level3/escapepad) -"tU" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "tY" = ( /obj/machinery/power/apc{ dir = 8 @@ -1314,15 +1246,6 @@ /obj/machinery/suit_cycler/pilot, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) -"uU" = ( -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) -"vp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "vs" = ( /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 @@ -1393,7 +1316,6 @@ /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "wm" = ( -/obj/structure/closet/secure_closet/explorer, /obj/machinery/power/apc{ dir = 8 }, @@ -1401,7 +1323,7 @@ icon_state = "0-4" }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "wn" = ( /obj/structure/bed/chair/shuttle{ dir = 4 @@ -1491,12 +1413,11 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) "xH" = ( -/obj/structure/closet/secure_closet/explorer, /obj/machinery/camera/network/exploration{ dir = 1 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "xI" = ( /obj/structure/table/glass, /turf/simulated/floor/carpet, @@ -1579,24 +1500,18 @@ /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level3/sw) "zF" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, /obj/machinery/status_display{ pixel_y = 32 }, +/obj/structure/table/rack/shelf, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "zG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "zJ" = ( /obj/structure/table/reinforced, /obj/structure/cable/yellow{ @@ -1634,8 +1549,8 @@ dir = 4 }, /obj/machinery/vending/wallmed1/public{ - pixel_y = -28; - dir = 1 + dir = 1; + pixel_y = -28 }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c{ outdoors = 0 @@ -1781,12 +1696,6 @@ outdoors = 0 }, /area/groundbase/level3/escapepad) -"CU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "De" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -1888,7 +1797,7 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Em" = ( /obj/structure/railing{ dir = 1 @@ -1899,13 +1808,9 @@ /turf/simulated/floor/bmarble, /area/groundbase/civilian/kitchen) "Es" = ( -/obj/structure/closet/secure_closet/pathfinder{ - req_access = list(62,43,67) - }, -/obj/item/device/bluespaceradio/groundbase_prelinked, /obj/machinery/camera/network/exploration, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Ev" = ( /obj/machinery/camera/network/cargo, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, @@ -2048,45 +1953,12 @@ /turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "FV" = ( -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/structure/table/rack/shelf, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 4; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -4; - pixel_y = -6 - }, /obj/machinery/light_switch{ dir = 1; pixel_y = -30 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Gb" = ( /obj/structure/railing/grey{ dir = 8 @@ -2162,7 +2034,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "HI" = ( /obj/machinery/light{ dir = 4 @@ -2214,43 +2086,11 @@ /turf/simulated/wall, /area/groundbase/medical/uhallway) "IC" = ( -/obj/structure/table/rack/shelf, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "ID" = ( /obj/structure/table/glass, /obj/item/weapon/clipboard, @@ -2272,7 +2112,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "IH" = ( /obj/effect/shuttle_landmark/premade/groundbase, /turf/simulated/floor/virgo3c{ @@ -2354,10 +2194,6 @@ }, /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) -"Ka" = ( -/obj/structure/closet/secure_closet/sar, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "Kh" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -2367,21 +2203,17 @@ /turf/simulated/floor, /area/groundbase/medical/patient1) "Kj" = ( -/obj/structure/closet/secure_closet/explorer, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Kl" = ( /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) "Kr" = ( /turf/simulated/open/virgo3c, /area/groundbase/level3/nw/open) -"KG" = ( -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "KN" = ( /obj/structure/table/steel, /turf/simulated/floor/bmarble, @@ -2531,14 +2363,8 @@ /area/groundbase/dorms/bathroom) "NX" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Oc" = ( /obj/machinery/light, /turf/simulated/floor/reinforced/virgo3c{ @@ -2557,7 +2383,7 @@ name = "lightsout" }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Oh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -2615,10 +2441,6 @@ }, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) -"Pf" = ( -/obj/machinery/mineral/equipment_vendor/survey, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) "Ph" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2828,12 +2650,8 @@ /turf/simulated/floor/bmarble, /area/groundbase/civilian/kitchen) "RM" = ( -/obj/machinery/photocopier/faxmachine{ - department = "Exploration" - }, -/obj/structure/table/steel, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "RY" = ( /obj/structure/railing/grey, /turf/simulated/open, @@ -2947,7 +2765,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Tv" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin, @@ -3031,16 +2849,11 @@ /area/groundbase/medical/cmo) "Un" = ( /obj/structure/table/rack/shelf, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/hand_labeler, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "Vh" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm, @@ -3137,7 +2950,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "WF" = ( /obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, @@ -3220,7 +3033,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/area/vacant/vacant_site) "YK" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -6906,7 +6719,7 @@ Xv qO qO aa -tU +NX jp Kj wm @@ -7048,11 +6861,11 @@ Xv qO qO aa -bS +hQ IG -vp +zG Wr -nN +rV aa qO qO @@ -7190,11 +7003,11 @@ Zo qO qO aa -tU +NX IG zG -ma -Ka +Wr +RM aa bi qO @@ -7475,9 +7288,9 @@ qO qO aa NX -KG +RM IC -Pf +RM FV aa bi @@ -7617,9 +7430,9 @@ qO qO aa hQ -uU -CU -KG +RM +IC +RM rV aa qO @@ -7761,7 +7574,7 @@ aa Es gx Un -dQ +RM RM aa qO @@ -16871,7 +16684,7 @@ ID lz Cv Vm -ab +og to to Qk