diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 04075fe825..b5f9ac3a2f 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -50,6 +50,7 @@
var/turf/base_turf //The base turf type of the area, which can be used to override the z-level's base turf
var/forbid_events = FALSE // If true, random events will not start inside this area.
var/no_spoilers = FALSE // If true, makes it much more difficult to see what is inside an area with things like mesons.
+ var/soundproofed = FALSE // If true, blocks sounds from other areas and prevents hearers on other areas from hearing the sounds within.
/area/Initialize()
. = ..()
@@ -379,9 +380,9 @@ var/list/mob/living/forced_ambiance_list = new
// Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
if(!(L && L.is_preference_enabled(/datum/client_preference/play_ambiance)))
return
-
+
var/volume_mod = L.get_preference_volume_channel(VOLUME_CHANNEL_AMBIENCE)
-
+
// If we previously were in an area with force-played ambiance, stop it.
if((L in forced_ambiance_list) && initial)
L << sound(null, channel = CHANNEL_AMBIENCE_FORCED)
diff --git a/code/game/machinery/painter_vr.dm b/code/game/machinery/painter_vr.dm
index 64490a19b2..00e5ebcd5f 100644
--- a/code/game/machinery/painter_vr.dm
+++ b/code/game/machinery/painter_vr.dm
@@ -17,7 +17,8 @@
var/list/allowed_types = list(
/obj/item/clothing,
/obj/item/weapon/storage/backpack,
- /obj/item/weapon/storage/belt
+ /obj/item/weapon/storage/belt,
+ /obj/item/device/radio/headset
)
/obj/machinery/gear_painter/update_icon()
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 2ab3cecae7..8e9e6da8f7 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -350,7 +350,7 @@
var/obj/item/projectile/P = initial(E.projectile_type)
//var/obj/item/ammo_casing/shottype = E.projectile_type
- GLOB.moved_event.register_global(src, /obj/machinery/porta_turret/proc/point_defense)
+ //GLOB.moved_event.register_global(src, /obj/machinery/porta_turret/proc/point_defense) //VOREStation Removal
projectile = P
lethal_projectile = projectile
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 5f587fccf2..f6045c6174 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -341,6 +341,8 @@ var/list/global/tank_gauge_cache = list()
return remove_air(moles_needed)
/obj/item/weapon/tank/process()
+ if(!air_contents)
+ return
//Allow for reactions
air_contents.react() //cooking up air tanks - add phoron and oxygen, then heat above PHORON_MINIMUM_BURN_TEMPERATURE
if(gauge_icon)
diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm
index 2706e11bd3..f7e399a267 100644
--- a/code/game/objects/structures/crates_lockers/__closets.dm
+++ b/code/game/objects/structures/crates_lockers/__closets.dm
@@ -260,7 +260,20 @@
return
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(opened)
+ if(W.is_wrench())
+ if(opened)
+ if(anchored)
+ user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
+ else
+ user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
+ if(do_after(user, 20 * W.toolspeed))
+ if(!src) return
+ to_chat(user, "You [anchored? "un" : ""]secured \the [src]!")
+ anchored = !anchored
+ return
+ else
+ to_chat(user, "You can't reach the anchoring bolts when the door is closed!")
+ else if(opened)
if(istype(W, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = W
MouseDrop_T(G.affecting, user) //act like they were dragged onto the closet
@@ -316,17 +329,6 @@
update_icon()
for(var/mob/M in viewers(src))
M.show_message("[src] has been [sealed?"sealed":"unsealed"] by [user.name].", 3)
- else if(W.is_wrench())
- if(sealed)
- if(anchored)
- user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
- else
- user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
- playsound(src, W.usesound, 50)
- if(do_after(user, 20 * W.toolspeed))
- if(!src) return
- to_chat(user, "You [anchored? "un" : ""]secured \the [src]!")
- anchored = !anchored
else
attack_hand(user)
return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index e5fc47c64a..9fae830b44 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -54,7 +54,20 @@
to_chat(user, "Access Denied")
/obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(opened)
+ if(W.is_wrench())
+ if(opened)
+ if(anchored)
+ user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
+ else
+ user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
+ if(do_after(user, 20 * W.toolspeed))
+ if(!src) return
+ to_chat(user, "You [anchored? "un" : ""]secured \the [src]!")
+ anchored = !anchored
+ return
+ else
+ to_chat(user, "You can't reach the anchoring bolts when the door is closed!")
+ else if(opened)
if(istype(W, /obj/item/weapon/storage/laundry_basket))
return ..(W,user)
if(istype(W, /obj/item/weapon/grab))
@@ -77,17 +90,6 @@
spark_system.start()
playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
playsound(src, "sparks", 50, 1)
- else if(W.is_wrench())
- if(sealed)
- if(anchored)
- user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
- else
- user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
- if(do_after(user, 20 * W.toolspeed))
- if(!src) return
- to_chat(user, "You [anchored? "un" : ""]secured \the [src]!")
- anchored = !anchored
- return
else if(istype(W,/obj/item/weapon/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
return ..(W,user)
else
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 415a26c78c..5b1214c675 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -4,6 +4,9 @@
return
var/turf/turf_source = get_turf(source)
+ if(!turf_source)
+ return
+ var/area/area_source = turf_source.loc
//allocate a channel if necessary now so its the same for everyone
channel = channel || open_sound_channel()
@@ -19,6 +22,11 @@
if(!M || !M.client)
continue
var/turf/T = get_turf(M)
+ if(!T)
+ continue
+ var/area/A = T.loc
+ if((A.soundproofed || area_source.soundproofed) && (A != area_source))
+ continue
var/distance = get_dist(T, turf_source)
if(distance <= maxdistance)
diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm
index 2723df7fe2..58ca3b3925 100644
--- a/code/modules/food/food/drinks.dm
+++ b/code/modules/food/food/drinks.dm
@@ -10,6 +10,7 @@
icon_state = null
flags = OPENCONTAINER
amount_per_transfer_from_this = 5
+ possible_transfer_amounts = list(5,10,15,25,30)
volume = 50
var/trash = null
diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm
index b067a35633..b97355b249 100644
--- a/code/modules/mining/ore.dm
+++ b/code/modules/mining/ore.dm
@@ -114,6 +114,7 @@
material = null
/obj/item/weapon/ore/New()
+ ..()
randpixel_xy()
/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 337a397df2..da4e871c1e 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -249,7 +249,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
icon_key += "[r_eyes], [g_eyes], [b_eyes]"
var/obj/item/organ/external/head/head = organs_by_name[BP_HEAD]
if(head)
- icon_key += "[head.eye_icon]"
+ if(!istype(head, /obj/item/organ/external/stump))
+ icon_key += "[head.eye_icon]"
for(var/organ_tag in species.has_limbs)
var/obj/item/organ/external/part = organs_by_name[organ_tag]
if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff.
diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm
index 016e3fce3c..c334a3a282 100644
--- a/code/modules/organs/internal/brain.dm
+++ b/code/modules/organs/internal/brain.dm
@@ -137,7 +137,8 @@ GLOBAL_LIST_BOILERPLATE(all_brain_organs, /obj/item/organ/internal/brain)
var/obj/item/organ/internal/brain/B = src
if(istype(B) && owner)
- B.transfer_identity(owner)
+ if(istype(owner, /mob/living/carbon))
+ B.transfer_identity(owner)
..()
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index 6404df13cd..db781017df 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -105,11 +105,6 @@
///// If user clicked on themselves
if(src == G.assailant && is_vore_predator(src))
- if(!G.affecting.devourable)
- to_chat(user, "They aren't able to be devoured.")
- log_and_message_admins("[key_name_admin(src)] attempted to devour [key_name_admin(G.affecting)] against their prefs ([G.affecting ? ADMIN_JMP(G.affecting) : "null"])")
- return FALSE
-
if(feed_grabbed_to_self(src, G.affecting))
qdel(G)
return TRUE
@@ -489,6 +484,11 @@
if(user_to_pred > 1 || user_to_prey > 1)
return FALSE
+ if(!prey.devourable)
+ to_chat(user, "They aren't able to be devoured.")
+ log_and_message_admins("[key_name_admin(src)] attempted to devour [key_name_admin(prey)] against their prefs ([prey ? ADMIN_JMP(prey) : "null"])")
+ return FALSE
+
// Prepare messages
if(user == pred) //Feeding someone to yourself
attempt_msg = "[pred] is attempting to [lowertext(belly.vore_verb)] [prey] into their [lowertext(belly.name)]!"
diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png
index 72c7582c2a..d04dbdceb9 100644
Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z7.png b/icons/_nanomaps/tether_nanomap_z7.png
index 0fa79b686d..526a173d19 100644
Binary files a/icons/_nanomaps/tether_nanomap_z7.png and b/icons/_nanomaps/tether_nanomap_z7.png differ
diff --git a/maps/submaps/admin_use_vr/ert.dm b/maps/submaps/admin_use_vr/ert.dm
index 3921de0f26..0c20920e72 100644
--- a/maps/submaps/admin_use_vr/ert.dm
+++ b/maps/submaps/admin_use_vr/ert.dm
@@ -154,7 +154,7 @@
/obj/effect/shuttle_landmark/shuttle_initializer/ert_ship_boat
name = "NRV Von Braun's Bay"
base_area = /area/ship/ert/hangar
- base_turf = /turf/simulated/floor/plating
+ base_turf = /turf/simulated/floor/reinforced
landmark_tag = "omship_spawn_ert_lander"
docking_controller = "ert_boarding_shuttle_dock"
shuttle_type = /datum/shuttle/autodock/overmap/ert_ship_boat
diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm
index 0081799cc3..7a06ab20d5 100644
--- a/maps/submaps/admin_use_vr/ert.dmm
+++ b/maps/submaps/admin_use_vr/ert.dmm
@@ -149,6 +149,18 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/med)
+"aK" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/white{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/ert/hangar)
"aQ" = (
/obj/structure/table/steel_reinforced,
/obj/item/weapon/storage/firstaid/surgery,
@@ -721,6 +733,14 @@
},
/obj/mecha/combat/gygax/serenity,
/obj/effect/floor_decal/industrial/outline,
+/obj/machinery/button/remote/blast_door{
+ description_fluff = "\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR.";
+ dir = 4;
+ id = "NRV_MECHS";
+ name = "MECH BAY CONTROL";
+ pixel_x = -25;
+ req_one_access = list(108)
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
"gk" = (
@@ -778,8 +798,12 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/armoury_st)
"gy" = (
-/obj/machinery/mech_recharger,
-/obj/mecha/combat/gygax,
+/obj/structure/table/rack/steel,
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse,
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
@@ -787,20 +811,9 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/atmos)
"gF" = (
-/obj/structure/table/rack/steel,
-/obj/item/mecha_parts/mecha_equipment/shocker,
-/obj/item/mecha_parts/mecha_equipment/shocker,
-/obj/machinery/power/apc/hyper{
- alarms_hidden = 1;
- dir = 1;
- name = "VB APC - North";
- pixel_y = 24
- },
-/obj/structure/cable/yellow{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/mech_recharger,
+/obj/mecha/combat/gygax,
+/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
"gN" = (
@@ -832,12 +845,17 @@
/area/ship/ert/engine)
"gW" = (
/obj/structure/table/rack/steel,
-/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,
-/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,
-/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
-/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
-/obj/machinery/firealarm/alarms_hidden{
- pixel_y = 26
+/obj/item/mecha_parts/mecha_equipment/shocker,
+/obj/item/mecha_parts/mecha_equipment/shocker,
+/obj/machinery/power/apc/hyper{
+ alarms_hidden = 1;
+ dir = 1;
+ name = "VB APC - North";
+ pixel_y = 24
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
},
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/techfloor,
@@ -868,6 +886,18 @@
/area/ship/ert/bridge)
"hj" = (
/obj/structure/table/rack/steel,
+/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,
+/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
+/obj/machinery/firealarm/alarms_hidden{
+ pixel_y = 26
+ },
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/mech_bay)
+"hk" = (
+/obj/structure/table/rack/steel,
/obj/item/mecha_parts/mecha_equipment/combat_shield,
/obj/item/mecha_parts/mecha_equipment/combat_shield,
/obj/item/mecha_parts/mecha_equipment/omni_shield,
@@ -878,16 +908,6 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
-"hk" = (
-/obj/structure/table/rack/steel,
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse,
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/mech_bay)
"hs" = (
/obj/machinery/pointdefense_control{
id_tag = "vonbraun_pd"
@@ -1057,9 +1077,13 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/bridge)
"iA" = (
-/obj/structure/window/reinforced,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/teleporter)
+/obj/machinery/door/blast/regular{
+ closed_layer = 4;
+ id = "NRV_DELTA";
+ layer = 4
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/ert/mech_bay)
"iB" = (
/turf/simulated/wall/shull,
/area/ship/ert/dock_port)
@@ -1184,7 +1208,7 @@
"ki" = (
/obj/machinery/door/blast/regular{
closed_layer = 4;
- id = "NRV_DELTA";
+ id = "NRV_MECHS";
layer = 4
},
/turf/simulated/floor/tiled/techmaint,
@@ -1771,11 +1795,6 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/atmos)
"nz" = (
-/obj/machinery/door/blast/regular{
- closed_layer = 4;
- id = "NRV_DELTA";
- layer = 4
- },
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
@@ -1790,20 +1809,33 @@
/obj/machinery/door/firedoor/multi_tile{
dir = 1
},
+/obj/machinery/door/blast/regular{
+ closed_layer = 4;
+ id = "NRV_MECHS";
+ layer = 4
+ },
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/mech_bay)
"nB" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/multi_tile{
+ dir = 1
+ },
+/obj/machinery/door/blast/regular{
+ closed_layer = 4;
+ id = "NRV_DELTA";
+ layer = 4
+ },
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/mech_bay)
"nC" = (
@@ -1816,19 +1848,24 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/engineering)
"nP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/mech_bay)
"nR" = (
-/obj/structure/table/rack/steel,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang,
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang,
-/turf/simulated/floor/tiled/techfloor,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/mech_bay)
"nX" = (
/obj/machinery/light/no_nightshift{
@@ -1853,6 +1890,7 @@
/obj/item/device/binoculars,
/obj/item/device/survivalcapsule,
/obj/item/device/survivalcapsule,
+/mob/living/simple_mob/animal/passive/mimepet,
/turf/simulated/floor/wood,
/area/ship/ert/commander)
"og" = (
@@ -2345,13 +2383,12 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
"qE" = (
-/obj/machinery/mech_recharger,
-/obj/machinery/alarm/alarms_hidden{
- dir = 1;
- pixel_y = -26
- },
-/obj/mecha/combat/durand,
+/obj/structure/table/rack/steel,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang,
/obj/effect/floor_decal/industrial/outline/red,
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
"qF" = (
@@ -2361,10 +2398,13 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/ert/eng_storage)
"qQ" = (
-/obj/structure/table/rack/steel,
-/obj/item/mecha_parts/mecha_equipment/gravcatapult,
-/obj/item/mecha_parts/mecha_equipment/wormhole_generator,
-/obj/effect/floor_decal/industrial/outline/grey,
+/obj/machinery/mech_recharger,
+/obj/machinery/alarm/alarms_hidden{
+ dir = 1;
+ pixel_y = -26
+ },
+/obj/mecha/combat/durand,
+/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
"qR" = (
@@ -2373,6 +2413,13 @@
/area/ship/ert/atmos)
"qS" = (
/obj/structure/table/rack/steel,
+/obj/item/mecha_parts/mecha_equipment/gravcatapult,
+/obj/item/mecha_parts/mecha_equipment/wormhole_generator,
+/obj/effect/floor_decal/industrial/outline/grey,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/mech_bay)
+"qT" = (
+/obj/structure/table/rack/steel,
/obj/item/mecha_parts/mecha_equipment/tool/jetpack,
/obj/item/mecha_parts/mecha_equipment/tool/jetpack,
/obj/item/mecha_parts/mecha_equipment/tool/jetpack,
@@ -2380,14 +2427,14 @@
/obj/effect/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
-"qT" = (
+"rp" = (
/obj/structure/table/rack/steel,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
-"rp" = (
+"rr" = (
/obj/structure/table/rack/steel,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy,
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy,
@@ -2399,13 +2446,6 @@
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/mech_bay)
-"rr" = (
-/obj/structure/table/rack/steel,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag,
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/mech_bay)
"rs" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal,
/turf/simulated/floor/tiled/techfloor,
@@ -3496,6 +3536,9 @@
dir = 1;
pixel_y = -26
},
+/obj/effect/floor_decal/corner/white{
+ dir = 8
+ },
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/hangar)
"zs" = (
@@ -3744,6 +3787,13 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/eng_storage)
+"Bl" = (
+/obj/structure/table/rack/steel,
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag,
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag,
+/obj/effect/floor_decal/industrial/outline/red,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/mech_bay)
"Bo" = (
/turf/simulated/wall/shull,
/area/ship/ert/barracks)
@@ -5352,7 +5402,7 @@
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/machinery/button/remote/blast_door{
- desc = "\[OOC] DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR.";
+ description_fluff = "\(OOC) DO NOT TOUCH THIS BUTTON WITHOUT THE EXPLICIT PERMISSION OF AN ADMINISTRATOR.";
dir = 1;
id = "NRV_DELTA";
name = "DELTA ACCESS CONTROL";
@@ -5422,6 +5472,16 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/teleporter)
+"Mx" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/white,
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/ert/hangar)
"My" = (
/obj/structure/cable/green{
d1 = 1;
@@ -5589,7 +5649,9 @@
"NI" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/secure/briefcase/nsfw_pack_hybrid,
-/obj/item/weapon/storage/belt/explorer/pathfinder,
+/obj/item/weapon/storage/belt/explorer/pathfinder{
+ name = "ERT Commander's belt"
+ },
/turf/simulated/floor/wood,
/area/ship/ert/commander)
"NJ" = (
@@ -6157,9 +6219,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/ert_ship_boat)
"QR" = (
-/obj/structure/bed/chair/bay/shuttle{
- dir = 4
- },
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/ert_ship_boat)
"QS" = (
@@ -6325,6 +6385,14 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/engineering)
+"Sh" = (
+/obj/machinery/door/airlock/glass_medical{
+ name = "Medical Bay";
+ req_access = list(103)
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/ert/med_surg)
"Sj" = (
/obj/machinery/light_switch{
dir = 4;
@@ -7002,7 +7070,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/teleporter)
"Yr" = (
-/obj/structure/window/reinforced,
/obj/machinery/light/no_nightshift{
dir = 4
},
@@ -14523,7 +14590,7 @@ Mm
jA
Wj
UU
-iA
+jA
jA
DS
lu
@@ -20188,7 +20255,7 @@ yz
ah
bM
bM
-qy
+bM
ki
nz
qy
@@ -20614,10 +20681,10 @@ yz
ah
bM
bM
-gy
-jQ
-np
-qE
+bM
+iA
+nB
+bM
bM
xO
WC
@@ -20757,8 +20824,8 @@ ai
bM
bM
gF
-kl
-nB
+jQ
+np
qQ
bM
xO
@@ -20771,7 +20838,7 @@ WC
HO
WC
WC
-Zx
+Mx
dq
wZ
gZ
@@ -20899,7 +20966,7 @@ ah
bM
bM
gW
-jY
+kl
nP
qS
bM
@@ -20913,8 +20980,8 @@ WC
HO
WC
WC
-Zx
-dq
+aK
+Sh
ij
nq
ij
@@ -21041,8 +21108,8 @@ ah
bM
bM
hj
-jQ
-jQ
+jY
+nR
qT
bM
yB
@@ -21324,9 +21391,9 @@ yz
af
bM
bM
-bM
-kn
-nR
+gy
+jQ
+jQ
rr
bM
yX
@@ -21467,9 +21534,9 @@ yz
ai
bM
bM
-bM
-bM
-bM
+kn
+qE
+Bl
bM
ib
za
@@ -21612,7 +21679,7 @@ bM
bM
bM
bM
-ai
+bM
yz
yz
yz
@@ -21624,7 +21691,7 @@ yz
yz
yz
yz
-Cr
+MZ
MZ
MZ
MZ
@@ -21754,7 +21821,7 @@ ag
bM
bM
bM
-ah
+ai
yz
yz
yz
@@ -21766,7 +21833,7 @@ yz
yz
yz
yz
-ci
+Cr
MZ
MZ
MZ
diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm
index 47817bb21f..5de144facc 100644
--- a/maps/submaps/admin_use_vr/kk_mercship.dmm
+++ b/maps/submaps/admin_use_vr/kk_mercship.dmm
@@ -455,11 +455,6 @@
/area/ship/manta/armoury_st)
"bL" = (
/obj/structure/table/rack,
-/obj/item/borg/sight/thermal,
-/obj/item/borg/sight/thermal,
-/obj/item/borg/sight/thermal,
-/obj/item/borg/sight/thermal,
-/obj/item/borg/sight/thermal,
/obj/effect/floor_decal/techfloor{
dir = 5
},
@@ -469,6 +464,12 @@
/obj/machinery/light_switch{
pixel_y = 23
},
+/obj/item/clothing/glasses/thermal,
+/obj/item/clothing/glasses/thermal,
+/obj/item/clothing/glasses/thermal,
+/obj/item/clothing/glasses/thermal,
+/obj/item/clothing/glasses/thermal,
+/obj/item/clothing/glasses/thermal,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"bP" = (
@@ -1129,7 +1130,9 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/teleporter)
"fp" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
+ },
/turf/simulated/wall/rshull,
/area/shuttle/manta_ship_boat)
"fr" = (
@@ -2048,20 +2051,19 @@
/turf/simulated/floor/reinforced,
/area/ship/manta/recreation)
"jl" = (
-/obj/structure/grille,
-/obj/structure/window/titanium/full,
-/obj/structure/window/titanium{
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/machinery/door/blast/regular{
- closed_layer = 4;
- dir = 4;
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
id = "Merc_Shuttle_Fore";
- layer = 4
+ name = "Boarding Shuttle Fore Ramp";
+ pixel_x = -24;
+ req_access = list(150)
},
-/obj/machinery/shield_diffuser,
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/window/titanium,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"jo" = (
@@ -2145,17 +2147,11 @@
/turf/simulated/floor/tiled/dark,
/area/ship/manta/recreation)
"jE" = (
-/obj/machinery/door/blast/regular{
- closed_layer = 4;
- dir = 4;
- id = "Merc_Shuttle_Fore";
- layer = 4
- },
-/obj/machinery/shield_diffuser,
-/obj/machinery/door/firedoor/border_only,
+/obj/effect/shuttle_landmark/shuttle_initializer/manta_ship_boat,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
+/obj/effect/overmap/visitable/ship/landable/manta_ship_boat,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"jF" = (
@@ -2188,6 +2184,13 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
+"jK" = (
+/obj/machinery/sleep_console{
+ dir = 2;
+ name = "stasis cell console"
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/manta_ship_boat)
"jP" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -2363,7 +2366,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/hallways_port)
"kT" = (
-/obj/structure/closet/crate,
+/obj/machinery/portable_atmospherics/canister/phoron/engine_setup,
/turf/simulated/floor/plating,
/area/ship/manta/hallways_port)
"kW" = (
@@ -2609,15 +2612,12 @@
/obj/structure/bed/chair/bay/shuttle{
dir = 4
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/machinery/light/no_nightshift{
+ dir = 8
},
-/obj/machinery/button/remote/blast_door{
- dir = 8;
- id = "Merc_Shuttle_Fore";
- name = "Boarding Shuttle Fore Ramp";
- pixel_x = -24;
- req_access = list(150)
+/obj/machinery/alarm/alarms_hidden{
+ dir = 4;
+ pixel_x = -26
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
@@ -2632,11 +2632,19 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"lZ" = (
-/obj/effect/shuttle_landmark/shuttle_initializer/manta_ship_boat,
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/grille,
+/obj/structure/window/titanium/full,
+/obj/structure/window/titanium{
dir = 1
},
-/obj/effect/overmap/visitable/ship/landable/manta_ship_boat,
+/obj/machinery/shield_diffuser,
+/obj/structure/window/titanium,
+/obj/machinery/door/blast/regular{
+ closed_layer = 4;
+ dir = 4;
+ id = "Merc_Shuttle_Fore";
+ layer = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"mb" = (
@@ -2646,9 +2654,16 @@
/turf/space,
/area/ship/manta/radiator_port)
"me" = (
+/obj/machinery/shield_diffuser,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
+/obj/machinery/door/blast/regular{
+ closed_layer = 4;
+ dir = 4;
+ id = "Merc_Shuttle_Fore";
+ layer = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"mo" = (
@@ -2679,15 +2694,12 @@
/obj/structure/bed/chair/bay/shuttle{
dir = 8
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/machinery/light/no_nightshift{
+ dir = 4
},
-/obj/machinery/button/remote/blast_door{
+/obj/machinery/firealarm/alarms_hidden{
dir = 4;
- id = "Merc_Shuttle_Fore";
- name = "Boarding Shuttle Fore Ramp";
- pixel_x = 24;
- req_access = list(150)
+ pixel_x = 26
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
@@ -2743,9 +2755,15 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"mN" = (
-/obj/machinery/computer/ship/engines{
- dir = 1
+/obj/machinery/firealarm/alarms_hidden{
+ dir = 8;
+ pixel_x = -26
},
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 4
+ },
+/obj/machinery/light/no_nightshift,
+/obj/structure/closet/walllocker/emerglocker/south,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"mO" = (
@@ -3339,13 +3357,7 @@
/obj/structure/bed/chair/bay/shuttle{
dir = 4
},
-/obj/machinery/light/no_nightshift{
- dir = 8
- },
-/obj/machinery/alarm/alarms_hidden{
- dir = 4;
- pixel_x = -26
- },
+/obj/structure/closet/walllocker/emerglocker/west,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"pB" = (
@@ -3404,13 +3416,7 @@
/obj/structure/bed/chair/bay/shuttle{
dir = 8
},
-/obj/machinery/light/no_nightshift{
- dir = 4
- },
-/obj/machinery/firealarm/alarms_hidden{
- dir = 4;
- pixel_x = 26
- },
+/obj/structure/closet/walllocker/emerglocker/east,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"pV" = (
@@ -3795,6 +3801,7 @@
/area/ship/manta/mech_bay)
"rU" = (
/obj/machinery/door/airlock/engineering{
+ name = "Lander Fuel Storage";
req_one_access = list(150)
},
/obj/structure/cable/orange{
@@ -3851,12 +3858,13 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"sn" = (
-/obj/structure/bed/chair/bay/shuttle{
- dir = 4
- },
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 4
+ },
+/obj/structure/closet/walllocker/emerglocker/west,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"sq" = (
@@ -3905,11 +3913,25 @@
},
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
+"sw" = (
+/obj/machinery/portable_atmospherics/canister/phoron/engine_setup,
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/door/window/brigdoor/northright{
+ dir = 8;
+ req_access = list(150);
+ req_one_access = list(150)
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/manta_ship_boat)
"sx" = (
+/obj/effect/floor_decal/industrial/warning/corner,
/obj/structure/bed/chair/bay/shuttle{
dir = 8
},
-/obj/effect/floor_decal/industrial/warning/corner,
+/obj/structure/closet/walllocker/emerglocker/east,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"sy" = (
@@ -4186,15 +4208,15 @@
id = "Merc_Shuttle_Boarding";
opacity = 0
},
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
/obj/machinery/button/remote/blast_door{
id = "Merc_Shuttle_Boarding";
name = "Boarding Shuttle Access";
pixel_y = 24;
req_access = list(150)
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"uh" = (
@@ -4239,15 +4261,15 @@
id = "Merc_Shuttle_Boarding";
opacity = 0
},
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
/obj/machinery/button/remote/blast_door{
- id = "ERT_Shuttle_Rear";
+ id = "Merc_Shuttle_Boarding";
name = "Boarding Shuttle Access";
pixel_y = 24;
req_access = list(150)
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"ux" = (
@@ -4948,12 +4970,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
"xf" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "Merc_Shuttle_Boarding";
- opacity = 0
- },
/obj/machinery/button/remote/blast_door{
dir = 1;
id = "Merc_Shuttle_Boarding";
@@ -4961,12 +4977,15 @@
pixel_y = -24;
req_access = list(150)
},
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "Merc_Shuttle_Boarding";
+ opacity = 0
+ },
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/obj/machinery/door/firedoor/multi_tile{
- dir = 1
- },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"xh" = (
@@ -4981,12 +5000,6 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"xo" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "Merc_Shuttle_Boarding";
- opacity = 0
- },
/obj/machinery/button/remote/blast_door{
dir = 1;
id = "Merc_Shuttle_Boarding";
@@ -4994,12 +5007,15 @@
pixel_y = -24;
req_access = list(150)
},
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "Merc_Shuttle_Boarding";
+ opacity = 0
+ },
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/multi_tile{
- dir = 1
- },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"xp" = (
@@ -5781,10 +5797,12 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
"Au" = (
-/obj/machinery/door/window/brigdoor/northleft{
- req_access = list(150);
+/obj/machinery/computer/ship/helm{
req_one_access = list(150)
},
+/obj/structure/window/titanium{
+ dir = 1
+ },
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
},
@@ -5829,35 +5847,30 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"AD" = (
-/obj/machinery/computer/shuttle_control/explore/manta_ship_boat,
-/obj/structure/window/titanium{
- dir = 1
- },
-/obj/structure/window/titanium{
- dir = 8
+/obj/machinery/door/window/brigdoor/northleft{
+ req_access = list(150);
+ req_one_access = list(150)
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"AE" = (
-/obj/structure/window/titanium{
- dir = 1
- },
-/obj/structure/window/titanium{
- dir = 4
- },
-/obj/machinery/computer/ship/helm{
+/obj/machinery/door/window/brigdoor/northright{
+ req_access = list(150);
req_one_access = list(150)
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"AJ" = (
-/obj/machinery/door/window/brigdoor/northright{
- req_access = list(150);
- req_one_access = list(150)
- },
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
+/obj/structure/window/titanium{
+ dir = 1
+ },
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 8
+ },
+/obj/structure/closet/walllocker/emerglocker/east,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"AO" = (
@@ -6524,12 +6537,22 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"Ec" = (
-/obj/machinery/light/no_nightshift{
- dir = 8
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 1
},
-/obj/machinery/alarm/alarms_hidden{
- dir = 4;
- pixel_x = -26
+/obj/machinery/button/remote/blast_door{
+ id = "Merc_Shuttle_Fore";
+ name = "Boarding Shuttle Fore Ramp";
+ pixel_x = -24;
+ pixel_y = 25;
+ req_access = list(150)
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "Merc_Shuttle_Boarding";
+ name = "Boarding Shuttle Side Hatches";
+ pixel_x = -41;
+ pixel_y = 25;
+ req_access = list(150)
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
@@ -6569,31 +6592,30 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
"En" = (
-/obj/structure/bed/chair/bay/shuttle{
+/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"Et" = (
/obj/structure/bed/chair/bay/shuttle{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/obj/machinery/button/remote/blast_door{
+ dir = 4;
id = "Merc_Shuttle_Fore";
name = "Boarding Shuttle Fore Ramp";
- pixel_x = -17;
- pixel_y = 42;
+ pixel_x = 24;
req_access = list(150)
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"Eu" = (
-/obj/machinery/light/no_nightshift{
- dir = 4
- },
-/obj/machinery/firealarm/alarms_hidden{
- dir = 4;
- pixel_x = 26
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 6
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
@@ -6653,12 +6675,18 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"EJ" = (
-/obj/structure/bed/chair/bay/shuttle{
- dir = 1
- },
/obj/structure/fuel_port{
pixel_y = -29
},
+/obj/machinery/alarm/alarms_hidden{
+ dir = 8;
+ pixel_x = 26
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
+/obj/structure/bed/chair/bay/shuttle{
+ dir = 8
+ },
+/obj/machinery/light/no_nightshift,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"EN" = (
@@ -6750,6 +6778,10 @@
dir = 1;
pixel_y = -23
},
+/obj/machinery/vending/fitness{
+ dir = 1;
+ prices = list()
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
"Fj" = (
@@ -7615,10 +7647,9 @@
/turf/simulated/floor/wood,
/area/ship/manta/commander)
"Ki" = (
-/obj/machinery/sleeper{
+/obj/machinery/computer/ship/engines{
dir = 4;
- name = "Stasis Cell";
- stasis_level = 10
+ req_one_access = list(150)
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
@@ -7684,10 +7715,15 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
"Kv" = (
-/obj/machinery/sleeper{
+/obj/machinery/portable_atmospherics/canister/phoron/engine_setup,
+/obj/machinery/atmospherics/portables_connector/fuel{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/door/window/brigdoor/northleft{
dir = 8;
- name = "Stasis Cell";
- stasis_level = 10
+ req_access = list(150);
+ req_one_access = list(150)
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
@@ -8073,6 +8109,15 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
/turf/simulated/floor/plating,
/area/ship/manta/radiator_star)
+"Ms" = (
+/obj/machinery/sleeper{
+ desc = "A stasis pod with built-in injectors, a dialysis machine, and a limited health scanner. This one is preconfigured to stasis levels, for keeping captives (or teammates) alive as long as possible.";
+ dir = 1;
+ name = "stasis cell";
+ stasis_level = 10
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/manta_ship_boat)
"Mt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 1
@@ -9191,6 +9236,12 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
+"Sh" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/manta_ship_boat)
"Sl" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/plating,
@@ -9238,15 +9289,12 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"SF" = (
-/obj/machinery/door/window/brigdoor/northleft{
- req_access = list(150);
- req_one_access = list(150)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
},
-/obj/machinery/atmospherics/portables_connector/fuel,
-/obj/machinery/portable_atmospherics/canister/phoron/engine_setup,
-/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/manta_ship_boat)
+/area/ship/manta/hangar)
"SG" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/turf/simulated/floor/plating,
@@ -9258,13 +9306,9 @@
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"SJ" = (
-/obj/machinery/door/window/brigdoor/northright{
- req_access = list(150);
- req_one_access = list(150)
+/obj/machinery/computer/shuttle_control/explore/manta_ship_boat{
+ dir = 4
},
-/obj/machinery/atmospherics/portables_connector/fuel,
-/obj/machinery/portable_atmospherics/canister/phoron/engine_setup,
-/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"SO" = (
@@ -20248,7 +20292,7 @@ fy
jc
lR
jc
-jc
+SF
tV
wZ
Al
@@ -20393,7 +20437,7 @@ je
ag
tW
xe
-ag
+je
je
je
je
@@ -20528,7 +20572,7 @@ yz
ce
dk
ec
-ag
+je
je
je
je
@@ -20536,7 +20580,7 @@ je
ud
xf
je
-je
+SJ
Ki
je
Eg
@@ -20670,7 +20714,7 @@ yz
ce
dk
ec
-ag
+lZ
jl
lX
pA
@@ -20812,18 +20856,18 @@ yz
ce
dk
ec
-ag
+me
jE
-lZ
+pH
pH
pH
pH
pH
AD
-En
pH
-pH
-SF
+Ms
+jK
+je
fp
ag
aJ
@@ -20954,18 +20998,18 @@ yz
ce
dk
ec
-ag
-jE
me
+En
+pH
pH
pH
pH
pH
AE
-Et
pH
-pH
-SJ
+Ms
+jK
+je
fp
ag
aJ
@@ -21096,8 +21140,8 @@ yz
ce
dk
ec
-ag
-jl
+lZ
+Et
ms
pS
sx
@@ -21105,9 +21149,9 @@ ur
ur
AJ
Eu
-pH
+Sh
EJ
-Eg
+ed
qa
qg
aJ
@@ -21238,7 +21282,7 @@ yz
ce
dk
ec
-ag
+je
je
je
je
@@ -21246,7 +21290,7 @@ je
uu
xo
je
-je
+sw
Kv
je
UY
@@ -21387,7 +21431,7 @@ je
ag
uy
xq
-ag
+je
je
je
je
diff --git a/maps/submaps/admin_use_vr/mercship.dm b/maps/submaps/admin_use_vr/mercship.dm
index ba81a160f4..3efc7456cb 100644
--- a/maps/submaps/admin_use_vr/mercship.dm
+++ b/maps/submaps/admin_use_vr/mercship.dm
@@ -173,7 +173,7 @@
/obj/effect/shuttle_landmark/shuttle_initializer/manta_ship_boat
name = "Mercenary Cruiser's Bay"
base_area = /area/ship/manta/hangar
- base_turf = /turf/simulated/floor/plating
+ base_turf = /turf/simulated/floor/reinforced
landmark_tag = "omship_spawn_manta_lander"
docking_controller = "manta_boarding_shuttle_dock"
shuttle_type = /datum/shuttle/autodock/overmap/manta_ship_boat
@@ -243,7 +243,9 @@ Finally, over in the port wing you'll find the recreation area and kitchen along
\
You don't want to know how long it's going to take to pay off.
\
\
-Capt. Thorne"}
+Capt. Thorne
\
+
+P.S. If you need to refuel the lander for some reason, there's a pair of spare fuel canisters in that closet space in the port fore wing edge, opposite the assault armory."}
/obj/item/weapon/paper/manta_approach_tactics
name = "Installation Approach"
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index f30a7570b2..b71ce07c95 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -657,6 +657,10 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"aaZ" = (
@@ -772,7 +776,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
dir = 5
},
@@ -788,6 +791,10 @@
/obj/structure/sign/poster{
pixel_x = 32
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"abj" = (
@@ -2029,23 +2036,16 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/triage)
"add" = (
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 4
- },
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"ade" = (
@@ -2648,15 +2648,29 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"adT" = (
-/obj/machinery/camera/network/security{
- dir = 8
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/red/border{
dir = 4
},
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 5
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"adU" = (
@@ -3583,21 +3597,19 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/briefingroom)
"afm" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -26
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
},
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/lobby)
+/area/tether/surfacebase/security/upperhall)
"afn" = (
/obj/structure/cable/green{
d1 = 4;
@@ -3664,40 +3676,34 @@
/area/rnd/xenobiology/xenoflora_storage)
"afs" = (
/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/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/lobby)
-"aft" = (
-/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
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
+ dir = 4
},
/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 8
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
+"aft" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/lobby)
+/area/tether/surfacebase/security/upperhall)
"afu" = (
/obj/structure/bed/chair{
dir = 8
@@ -3723,37 +3729,29 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/processing)
"afv" = (
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/structure/cable/green{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/lobby)
+/area/tether/surfacebase/security/upperhall)
"afw" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
+/obj/effect/landmark{
+ name = "lightsout"
},
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 1
},
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 5
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 5
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"afx" = (
@@ -4310,6 +4308,12 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
"agq" = (
@@ -4699,23 +4703,22 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/hologram/holopad,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/lobby)
-"agW" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -26
+/obj/machinery/hologram/holopad,
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/effect/floor_decal/borderfloor{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -4723,6 +4726,26 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
+"agW" = (
+/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/effect/floor_decal/borderfloor/corner,
+/obj/effect/floor_decal/corner/red/bordercorner,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"agX" = (
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lobby)
@@ -5024,6 +5047,9 @@
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lobby)
"ahx" = (
@@ -5096,12 +5122,21 @@
/area/tether/surfacebase/surface_three_hall)
"ahC" = (
/obj/structure/cable/green{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ 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/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lobby)
"ahD" = (
@@ -5142,7 +5177,17 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lobby)
"ahG" = (
@@ -5203,30 +5248,27 @@
/area/tether/surfacebase/security/lobby)
"ahJ" = (
/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner{
dir = 8
},
-/obj/structure/disposalpipe/junction,
-/obj/machinery/hologram/holopad,
-/obj/structure/cable/green{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/effect/floor_decal/corner/red/bordercorner{
dir = 8
},
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
+/area/tether/surfacebase/security/lobby)
"ahK" = (
/obj/structure/bed/chair{
dir = 1
@@ -5942,20 +5984,28 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"aiP" = (
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 2;
+ icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
+/area/tether/surfacebase/security/lobby)
"aiQ" = (
/obj/structure/window/reinforced{
dir = 4
@@ -6581,9 +6631,27 @@
},
/area/tether/surfacebase/security/lobby)
"ajP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"ajQ" = (
@@ -8394,12 +8462,6 @@
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
},
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/mauve/bordercorner2{
- dir = 4
- },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
"ann" = (
@@ -11701,6 +11763,24 @@
/obj/structure/closet/secure_closet/freezer/fridge,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
+"asM" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"asN" = (
/obj/machinery/alarm{
pixel_y = 25
@@ -12118,6 +12198,24 @@
},
/turf/simulated/floor/tiled,
/area/rnd/xenobiology/xenoflora)
+"atL" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"atM" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner/grey/diagonal,
@@ -13360,6 +13458,19 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_north_airlock)
+"awc" = (
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"awd" = (
/obj/machinery/librarycomp,
/obj/structure/table/woodentable,
@@ -13748,15 +13859,19 @@
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
"awI" = (
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 10
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/floor_decal/steeldecal/steel_decals4,
-/obj/structure/disposalpipe/junction{
- dir = 4
+/obj/machinery/hologram/holopad,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
+/area/tether/surfacebase/security/lobby)
"awJ" = (
/obj/machinery/smartfridge,
/obj/effect/floor_decal/borderfloor{
@@ -14150,6 +14265,13 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/bar_backroom)
+"axq" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"axr" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 5
@@ -19780,6 +19902,15 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/servicebackroom)
+"aGr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"aGs" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/research{
@@ -22288,10 +22419,24 @@
/turf/simulated/floor/reinforced,
/area/tether/surfacebase/shuttle_pad)
"aKJ" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether)
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 5
+ },
+/obj/structure/disposalpipe/sortjunction{
+ name = "HOS Office";
+ sortType = "HOS Office"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"aKK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -22417,12 +22562,19 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"aKY" = (
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tourbus/engines)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/lobby)
"aKZ" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -24532,38 +24684,45 @@
/turf/simulated/floor/tiled/dark,
/area/bridge)
"aPq" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/white,
+/area/tether/surfacebase/medical/uppersouthstairwell)
+"aPr" = (
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/machinery/power/apc{
name = "south bump";
pixel_y = -28;
req_access = list(67)
},
-/obj/structure/cable/green,
-/obj/effect/floor_decal/borderfloorwhite/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/paleblue/bordercorner2{
- dir = 9
- },
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2,
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
-"aPr" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/turf/simulated/floor/tiled/white,
-/area/tether/surfacebase/medical/uppersouthstairwell)
"aPs" = (
/turf/simulated/wall,
/area/tether/surfacebase/southhall)
@@ -25129,8 +25288,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/floor_decal/borderfloorwhite/corner2,
-/obj/effect/floor_decal/corner/paleblue/bordercorner2,
/obj/structure/flora/pottedplant{
icon_state = "plant-21"
},
@@ -25918,11 +26075,11 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/servicebackroom)
"aSm" = (
+/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/medical{
name = "Medical Admin Access"
},
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"aSn" = (
@@ -26190,12 +26347,90 @@
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/triage)
+"aSN" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/sortjunction/flipped{
+ dir = 1;
+ name = "Security";
+ sortType = "Security"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/lobby)
+"aSO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction/yjunction{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
+"aSP" = (
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4,
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
"aSQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_first_aid)
+"aSR" = (
+/obj/machinery/papershredder,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
+"aSS" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 6
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 6
+ },
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/security/upperhall)
+"aST" = (
+/obj/machinery/hologram/holopad,
+/obj/effect/landmark{
+ name = "lightsout"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/surface_three_hall)
"aSU" = (
/obj/machinery/vending/medical,
/obj/machinery/atmospherics/unary/vent_pump/on,
@@ -26248,6 +26483,19 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rnd/outpost/xenobiology/outpost_storage)
+"aSZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/surface_three_hall)
"aTa" = (
/obj/machinery/alarm{
dir = 4;
@@ -26293,6 +26541,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_first_aid)
+"aTg" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether)
"aTh" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 1
@@ -26331,6 +26584,13 @@
"aTk" = (
/turf/simulated/floor/tiled/techmaint,
/area/rnd/outpost/xenobiology/outpost_storage)
+"aTl" = (
+/obj/machinery/atmospherics/unary/engine{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tourbus/engines)
"aTm" = (
/turf/simulated/wall/r_wall,
/area/tether/surfacebase/medical/admin)
@@ -26952,19 +27212,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_three)
-"aUx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"aUy" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass_command{
@@ -28190,19 +28437,6 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/storage)
-"aWK" = (
-/obj/structure/disposalpipe/junction{
- dir = 2;
- icon_state = "pipe-j2"
- },
-/obj/machinery/hologram/holopad,
-/obj/effect/landmark{
- name = "lightsout"
- },
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/surface_three_hall)
"aWL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28249,19 +28483,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
-"aWP" = (
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"aWQ" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -36907,22 +37128,18 @@
/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
+/obj/effect/floor_decal/corner/mauve/border{
dir = 1
},
/obj/effect/floor_decal/borderfloor/corner2{
- dir = 1
+ dir = 4
},
-/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
- dir = 1
+/obj/effect/floor_decal/corner/mauve/bordercorner2{
+ dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
+/obj/effect/floor_decal/steeldecal/steel_decals7,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
@@ -38122,26 +38339,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
-"eSz" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"fcg" = (
/obj/structure/bed/chair/bay/chair{
dir = 8
@@ -38314,25 +38511,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
-"fRH" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "surfbriglockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/structure/window/reinforced/polarized/full{
- id = "hos_office"
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/tether/surfacebase/security/hos)
"fYr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 4
@@ -38482,21 +38660,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
-"gDk" = (
-/obj/effect/landmark{
- name = "lightsout"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"gHh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 10
@@ -38832,25 +38995,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
-"ieN" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 6
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 6
- },
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/obj/machinery/disposal,
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"ifI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/machinery/computer/atmos_alert{
@@ -40245,22 +40389,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
-"nEn" = (
-/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/effect/floor_decal/borderfloor/corner,
-/obj/effect/floor_decal/corner/red/bordercorner,
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"nJe" = (
/turf/simulated/floor/tiled/techfloor,
/area/teleporter/departing)
@@ -40322,29 +40450,6 @@
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
-"nYB" = (
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 5
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 5
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"oat" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/hologram/holopad,
@@ -40996,20 +41101,6 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/security/hos)
-"qnC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/disposalpipe/sortjunction{
- dir = 8;
- name = "Security";
- sortType = "Security"
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/surface_three_hall)
"qom" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -41335,20 +41426,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
-"rLM" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"rMS" = (
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -42149,15 +42226,6 @@
},
/turf/simulated/floor/tiled/monofloor,
/area/tether/surfacebase/shuttle_pad)
-"vaG" = (
-/obj/machinery/papershredder,
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/tether/surfacebase/security/upperhall)
"viF" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
@@ -52972,8 +53040,8 @@ aey
adW
adW
adW
-qAt
-eSz
+afv
+ajP
ajN
aUi
ado
@@ -53105,7 +53173,7 @@ qVj
gvp
lgb
aaY
-aWP
+add
adS
xsf
aWZ
@@ -53113,10 +53181,10 @@ qze
aez
nyy
agH
-agW
-gDk
-rLM
-abY
+afm
+afw
+asM
+axq
ajQ
aVL
adR
@@ -53247,7 +53315,7 @@ aWv
qnv
lWE
abi
-nYB
+adT
acr
jKY
adn
@@ -53255,12 +53323,12 @@ jmQ
agd
aeB
aHH
-add
-ahJ
-aiP
-ajP
-aUx
-vaG
+afs
+agV
+atL
+aGr
+aSO
+aSR
adR
aWq
ajM
@@ -53397,12 +53465,12 @@ whW
whW
iLF
adO
-qAt
-nEn
-adT
-afw
-awI
-ieN
+aft
+agW
+awc
+aKJ
+aSP
+aSS
aWb
aWn
aWF
@@ -53664,7 +53732,7 @@ aab
aOm
adG
ueB
-fRH
+dFg
dFg
ueB
ueB
@@ -53682,7 +53750,7 @@ afl
eCP
adO
adp
-afs
+ahC
agG
ahx
ahI
@@ -53824,7 +53892,7 @@ aeC
ade
adO
adX
-afm
+ahF
agP
ahy
ahV
@@ -53966,7 +54034,7 @@ afl
agc
adO
aef
-afs
+ahC
agT
ahA
ahX
@@ -54108,7 +54176,7 @@ afl
gzd
adO
aep
-aft
+ahJ
agU
kRa
ayC
@@ -54171,7 +54239,7 @@ jML
jHw
jpB
qWU
-aKY
+aTl
aKU
aOI
aPb
@@ -54250,14 +54318,14 @@ afl
gzd
adO
aes
-afv
-agV
-ahC
+aiP
+awI
+aKY
ahZ
aiS
ajL
aiV
-aWK
+aST
akE
alh
alh
@@ -54394,12 +54462,12 @@ adO
aeI
afR
ahu
-ahF
+aSN
aia
aiT
ajO
aWw
-qnC
+aSZ
aWV
ali
ali
@@ -55023,7 +55091,7 @@ caw
jHw
gHh
qWU
-aKY
+aTl
aKU
aOI
aKj
@@ -57008,7 +57076,7 @@ aNk
uSA
aNJ
aNP
-aKJ
+aTg
aKU
abg
aOk
@@ -57150,7 +57218,7 @@ aNl
aNl
aNK
aNP
-aKJ
+aTg
aKU
abg
aOk
@@ -57292,7 +57360,7 @@ aNm
aNl
aNK
aNP
-aKJ
+aTg
aKU
abg
aOk
@@ -57659,8 +57727,8 @@ afJ
aIt
aIt
aPq
-aSb
-boe
+aSm
+anL
bof
bog
boh
@@ -57801,8 +57869,8 @@ agi
aIR
aLL
aPr
-aSm
-nbM
+aSb
+boe
art
asm
akI
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 0900c5dd4f..03a0f35db0 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -2273,6 +2273,13 @@
/turf/simulated/floor/tiled,
/area/security/hallwayaux)
"aes" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/random/junk,
+/turf/simulated/floor,
+/area/maintenance/cargo)
+"aet" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
@@ -2280,13 +2287,6 @@
/turf/simulated/floor/tiled/asteroid_steel/airless,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/mining_outpost/shuttle)
-"aet" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 8
- },
-/turf/simulated/floor/tiled/asteroid_steel/airless,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/mining_outpost/shuttle)
"aeu" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -2342,8 +2342,7 @@
/area/security/security_bathroom)
"aex" = (
/obj/structure/shuttle/engine/propulsion{
- dir = 8;
- icon_state = "propulsion_r"
+ dir = 8
},
/turf/simulated/floor/tiled/asteroid_steel/airless,
/turf/simulated/shuttle/plating/airless/carry,
@@ -2351,6 +2350,14 @@
"aey" = (
/turf/simulated/floor/carpet,
/area/security/breakroom)
+"aez" = (
+/obj/structure/shuttle/engine/propulsion{
+ dir = 8;
+ icon_state = "propulsion_r"
+ },
+/turf/simulated/floor/tiled/asteroid_steel/airless,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/mining_outpost/shuttle)
"aeA" = (
/obj/effect/floor_decal/corner/red{
dir = 10;
@@ -19008,14 +19015,6 @@
},
/turf/simulated/floor,
/area/maintenance/cargo)
-"aRU" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/random/junk,
-/obj/structure/closet/secure_closet/pilot,
-/turf/simulated/floor,
-/area/maintenance/cargo)
"aRX" = (
/obj/structure/table/rack/shelf,
/obj/item/weapon/tank/oxygen,
@@ -22148,11 +22147,13 @@
"doD" = (
/obj/effect/floor_decal/industrial/warning/corner,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/handrail,
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
+/obj/structure/handrail{
+ dir = 8
+ },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
"dvH" = (
@@ -23008,12 +23009,12 @@
/obj/structure/bed/chair/shuttle{
dir = 8
},
-/obj/structure/closet/emergsuit_wall{
- dir = 1;
- pixel_y = -32
- },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
+"hBg" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/excursion/cargo)
"hIb" = (
/obj/machinery/light/small{
dir = 1
@@ -24569,7 +24570,9 @@
/area/shuttle/excursion/general)
"qEn" = (
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/handrail,
+/obj/structure/handrail{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
"qJK" = (
@@ -36528,9 +36531,9 @@ abY
acE
acK
acK
-adj
-adj
-adj
+acK
+acK
+acK
acK
acK
acK
@@ -36831,7 +36834,7 @@ ams
aXq
abe
aor
-aRU
+aes
aqb
aSf
aiV
@@ -37378,7 +37381,7 @@ aaa
abe
acs
acF
-adj
+qxW
qEn
oYj
qTB
@@ -37520,8 +37523,8 @@ aaa
abe
abY
acE
-adj
-qEn
+qxW
+hBg
fQo
lSD
eQX
@@ -37662,7 +37665,7 @@ aaa
abe
acA
acG
-adj
+qxW
doD
vpU
utX
@@ -40283,11 +40286,11 @@ avt
avt
adD
aZS
-aes
-aet
-aet
aet
aex
+aex
+aex
+aez
baB
adD
avt
diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm
index 7ed327bf89..5b483de782 100644
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -983,157 +983,200 @@
name = "\improper Construction Dorm 1"
icon_state = "Sleep"
flags = RAD_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/maintDorm2
name = "\improper Construction Dorm 2"
icon_state = "Sleep"
flags = RAD_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/maintDorm3
name = "\improper Construction Dorm 3"
icon_state = "Sleep"
flags = RAD_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/maintDorm4
name = "\improper Construction Dorm 4"
icon_state = "Sleep"
flags = RAD_SHIELDED
+ soundproofed = TRUE
//TFF 28/8/19 - cleanup of areas placement
/area/crew_quarters/sleep/vistor_room_1
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_2
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_3
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_4
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_5
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_6
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_7
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_8
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_9
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_10
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_11
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/vistor_room_12
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_1
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_2
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_3
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_4
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_5
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_6
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_7
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_8
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_9
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_10
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_1/holo
name = "\improper Dorm 1 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_3/holo
name = "\improper Dorm 3 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_5/holo
name = "\improper Dorm 5 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/Dorm_7/holo
name = "\improper Dorm 7 Holodeck"
icon_state = "dk_yellow"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm1
name = "\improper Visitor Lodging 1"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm2
name = "\improper Visitor Lodging 2"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm3
name = "\improper Visitor Lodging 3"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/crew_quarters/sleep/spacedorm4
name = "\improper Visitor Lodging 4"
icon_state = "dk_yellow"
lightswitch = 0
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_basic
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_desert
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_seating
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_beach
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_garden
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_boxing
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_snow
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_space
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/holodeck/holodorm/source_off
name = "\improper Holodeck Source"
flags = RAD_SHIELDED | BLUE_SHIELDED
+ soundproofed = TRUE
/area/ai_core_foyer
name = "\improper AI Core Access"