diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index 0506d647be..9c88e740a7 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -365,7 +365,7 @@ icon_state = "da" /obj/structure/symbol/em - desc = "It looks like the letter 'Y' with an underline." + desc = "It looks kind of like a cup. Specifically, a martini glass." icon_state = "em" /obj/structure/symbol/es @@ -381,7 +381,7 @@ icon_state = "gu" /obj/structure/symbol/lo - desc = "It looks kind of like a cup. Specifically, a martini glass." + desc = "It looks like the letter 'Y' with an underline." icon_state = "lo" /obj/structure/symbol/pr diff --git a/icons/obj/decals_vr.dmi b/icons/obj/decals_vr.dmi index 6f3a8d9510..6b05d6a003 100644 Binary files a/icons/obj/decals_vr.dmi and b/icons/obj/decals_vr.dmi differ diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 10ef6a7058..94d74be28d 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -374,9 +374,7 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "aaY" = ( -/obj/structure/frame{ - anchored = 0 - }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/shuttle/floor/darkred, /area/shuttle/excursion/tether) "aaZ" = ( @@ -5074,11 +5072,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 }, -/obj/machinery/atmospherics/pipe/tank/air{ - dir = 4; - icon_state = "air_map"; - start_pressure = 300; - volume = 20000 +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/excursion/tether) @@ -20890,8 +20886,8 @@ /obj/structure/table/rack/shelf, /obj/item/weapon/tank/oxygen, /obj/item/device/suit_cooling_unit, -/obj/item/clothing/suit/space, -/obj/item/clothing/head/helmet/space, +/obj/item/clothing/suit/space/void, +/obj/item/clothing/head/helmet/space/void, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -21563,20 +21559,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"hgY" = ( -/obj/machinery/washing_machine, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/station/explorer_meeting) "hJg" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin{ @@ -21603,6 +21585,9 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"jjb" = ( +/turf/simulated/mineral/vacuum, +/area/tether/station/explorer_meeting) "jop" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, @@ -21616,6 +21601,7 @@ /obj/item/device/taperecorder, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, +/obj/item/weapon/paper_bin, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) "jDS" = ( @@ -21657,6 +21643,9 @@ /obj/structure/closet/secure_closet/guncabinet/excursion, /turf/simulated/floor/tiled, /area/tether/station/explorer_prep) +"lnl" = ( +/turf/simulated/floor, +/area/mine/explored/upper_level) "lue" = ( /obj/structure/bed/chair/office/dark, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -21920,6 +21909,7 @@ icon_state = "bordercolor"; dir = 5 }, +/obj/machinery/washing_machine, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) "rhA" = ( @@ -22037,6 +22027,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) +"tWI" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled, +/area/tether/station/explorer_prep) "uzS" = ( /obj/structure/table/woodentable, /obj/item/weapon/folder/blue, @@ -34456,7 +34460,7 @@ aaU avK qgR aad -aac +lnl aaT aAC acp @@ -34598,7 +34602,7 @@ aap avK qgR aad -aac +lnl aaT aAF acp @@ -34740,7 +34744,7 @@ afd ate qgR aad -aac +lnl aaT aAE act @@ -34882,7 +34886,7 @@ arw vrH auU aad -aac +lnl aaT aAL aCx @@ -35024,7 +35028,7 @@ nxL coV abc aad -aac +lnl aaT aAH aCw @@ -36154,7 +36158,7 @@ bQJ bQT bQJ bQJ -aiv +bQJ aiv jDS wLj @@ -36295,9 +36299,9 @@ aei bQK bQK bQK +tWI jZJ -aiv -hgY +nYM uDP mFo mFo @@ -36433,13 +36437,13 @@ aaa aaa aaa aac -aac +aei aiv aiv aiv aiv aiv -hgY +nYM qzk dMN mcn @@ -36580,13 +36584,13 @@ aac aac aac aac +jjb nYM dvn ggi ggi ggi ggi -ggi wSk ash amg diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 2ba35e4a89..6bd9ba45f0 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -8906,7 +8906,8 @@ /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; name = "E.V.A."; - req_one_access = list(18) + req_access = list(); + req_one_access = list(18,19,43,67) }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, @@ -8927,7 +8928,8 @@ /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; name = "E.V.A."; - req_one_access = list(18) + req_access = list(); + req_one_access = list(18,19,43,67) }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -9144,6 +9146,7 @@ /obj/item/clothing/head/helmet/space/void/medical, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/medical, +/obj/item/clothing/head/helmet/space/void/medical, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "px" = ( @@ -9266,6 +9269,7 @@ /obj/item/clothing/head/helmet/space/void/security, /obj/item/clothing/shoes/magboots, /obj/item/clothing/suit/space/void/security, +/obj/item/clothing/head/helmet/space/void/security, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "pF" = ( @@ -10509,6 +10513,7 @@ /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/mask/breath, /obj/item/clothing/head/helmet/space/void/atmos, +/obj/item/clothing/head/helmet/space/void/atmos, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "rH" = (