diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index cd65fb9f91..8f6e8e589e 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -22,7 +22,17 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
machinetype = 5
produces_heat = 0
delay = 7
- circuitboard = "/obj/item/weapon/circuitboard/telecomms/broadcaster"
+ circuit = /obj/item/weapon/circuitboard/telecomms/broadcaster
+
+/obj/machinery/telecomms/processor/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/crystal(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/micro_laser/high(src)
+ component_parts += new /obj/item/stack/cable_coil(src, 1)
/obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
// Don't broadcast rejected signals
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index b9fc81f724..80bea74ed4 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -12,7 +12,6 @@
/obj/machinery/telecomms
var/temp = "" // output message
- var/construct_op = 0
/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob)
@@ -21,7 +20,6 @@
if(istype(P, /obj/item/device/multitool))
attack_hand(user)
-
// REPAIRING: Use Nanopaste to repair 10-20 integrity points.
if(istype(P, /obj/item/stack/nanopaste))
var/obj/item/stack/nanopaste/T = P
@@ -34,75 +32,10 @@
return
- switch(construct_op)
- if(0)
- if(P.is_screwdriver())
- to_chat(user, "You unfasten the bolts.")
- playsound(src.loc, P.usesound, 50, 1)
- construct_op ++
- if(1)
- if(P.is_screwdriver())
- to_chat(user, "You fasten the bolts.")
- playsound(src.loc, P.usesound, 50, 1)
- construct_op --
- if(P.is_wrench())
- to_chat(user, "You dislodge the external plating.")
- playsound(src.loc, P.usesound, 75, 1)
- construct_op ++
- if(2)
- if(P.is_wrench())
- to_chat(user, "You secure the external plating.")
- playsound(src.loc, P.usesound, 75, 1)
- construct_op --
- if(P.is_wirecutter())
- playsound(src.loc, P.usesound, 50, 1)
- to_chat(user, "You remove the cables.")
- construct_op ++
- var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( user.loc )
- A.amount = 5
- stat |= BROKEN // the machine's been borked!
- if(3)
- if(istype(P, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/A = P
- if (A.use(5))
- to_chat(user, "You insert the cables.")
- construct_op--
- stat &= ~BROKEN // the machine's not borked anymore!
- else
- to_chat(user, "You need five coils of wire for this.")
- if(P.is_crowbar())
- to_chat(user, "You begin prying out the circuit board other components...")
- playsound(src.loc, P.usesound, 50, 1)
- if(do_after(user,60 * P.toolspeed))
- to_chat(user, "You finish prying out the components.")
-
- // Drop all the component stuff
- if(contents.len > 0)
- for(var/obj/x in src)
- x.loc = user.loc
- else
-
- // If the machine wasn't made during runtime, probably doesn't have components:
- // manually find the components and drop them!
- var/newpath = text2path(circuitboard)
- var/obj/item/weapon/circuitboard/C = new newpath
- for(var/I in C.req_components)
- for(var/i = 1, i <= C.req_components[I], i++)
- newpath = text2path(I)
- var/obj/item/s = new newpath
- s.loc = user.loc
- if(istype(P, /obj/item/stack/cable_coil))
- var/obj/item/stack/cable_coil/A = P
- A.amount = 1
-
- // Drop a circuit board too
- C.loc = user.loc
-
- // Create a frame and delete the current machine
- var/obj/structure/frame/F = new
- F.loc = src.loc
- qdel(src)
-
+ if(default_deconstruction_screwdriver(user, P))
+ return
+ if(default_deconstruction_crowbar(user, P))
+ return
/obj/machinery/telecomms/attack_ai(var/mob/user as mob)
attack_hand(user)
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index 50e2f504c9..d6cefb6828 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -32,7 +32,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
var/produces_heat = 1 //whether the machine will produce heat when on.
var/delay = 10 // how many process() ticks to delay per heat
var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub)
- var/circuitboard = null // string pointing to a circuitboard type
var/hide = 0 // Is it a hidden machine?
var/listening_level = 0 // 0 = auto set in New() - this is the z level that the machine is listening to.
@@ -256,7 +255,17 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
idle_power_usage = 600
machinetype = 1
produces_heat = 0
- circuitboard = "/obj/item/weapon/circuitboard/telecomms/receiver"
+ circuit = /obj/item/weapon/circuitboard/telecomms/receiver
+
+/obj/machinery/telecomms/receiver/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/subspace/ansible(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/micro_laser(src)
+ RefreshParts()
/obj/machinery/telecomms/receiver/receive_signal(datum/signal/signal)
@@ -312,7 +321,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 1600
machinetype = 7
- circuitboard = "/obj/item/weapon/circuitboard/telecomms/hub"
+ circuit = /obj/item/weapon/circuitboard/telecomms/hub
long_range_link = 1
netspeed = 40
var/list/telecomms_map
@@ -320,6 +329,13 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
/obj/machinery/telecomms/hub/Initialize()
. = ..()
LAZYINITLIST(telecomms_map)
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/stack/cable_coil(src, 2)
+ RefreshParts()
/obj/machinery/telecomms/hub/process()
. = ..()
@@ -365,12 +381,22 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
idle_power_usage = 600
machinetype = 8
produces_heat = 0
- circuitboard = "/obj/item/weapon/circuitboard/telecomms/relay"
+ circuit = /obj/item/weapon/circuitboard/telecomms/relay
netspeed = 5
long_range_link = 1
var/broadcasting = 1
var/receiving = 1
+/obj/machinery/telecomms/relay/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/stack/cable_coil(src, 2)
+ RefreshParts()
+
/obj/machinery/telecomms/relay/forceMove(var/newloc)
. = ..(newloc)
listening_level = z
@@ -420,10 +446,19 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 1000
machinetype = 2
- circuitboard = "/obj/item/weapon/circuitboard/telecomms/bus"
+ circuit = /obj/item/weapon/circuitboard/telecomms/bus
netspeed = 40
var/change_frequency = 0
+/obj/machinery/telecomms/bus/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/stack/cable_coil(src, 1)
+ RefreshParts()
+
/obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
if(is_freq_listening(signal))
@@ -473,23 +508,37 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
idle_power_usage = 600
machinetype = 3
delay = 5
- circuitboard = "/obj/item/weapon/circuitboard/telecomms/processor"
+ circuit = /obj/item/weapon/circuitboard/telecomms/processor
var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals
- receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
+/obj/machinery/telecomms/processor/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/treatment(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/amplifier(src)
+ component_parts += new /obj/item/weapon/stock_parts/subspace/analyzer(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/stack/cable_coil(src, 2)
+ RefreshParts()
- if(is_freq_listening(signal))
+/obj/machinery/telecomms/processor/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
- if(process_mode)
- signal.data["compression"] = 0 // uncompress subspace signal
- else
- signal.data["compression"] = 100 // even more compressed signal
+ if(is_freq_listening(signal))
- if(istype(machine_from, /obj/machinery/telecomms/bus))
- relay_direct_information(signal, machine_from) // send the signal back to the machine
- else // no bus detected - send the signal to servers instead
- signal.data["slow"] += rand(5, 10) // slow the signal down
- relay_information(signal, "/obj/machinery/telecomms/server")
+ if(process_mode)
+ signal.data["compression"] = 0 // uncompress subspace signal
+ else
+ signal.data["compression"] = 100 // even more compressed signal
+
+ if(istype(machine_from, /obj/machinery/telecomms/bus))
+ relay_direct_information(signal, machine_from) // send the signal back to the machine
+ else // no bus detected - send the signal to servers instead
+ signal.data["slow"] += rand(5, 10) // slow the signal down
+ relay_information(signal, "/obj/machinery/telecomms/server")
/*
@@ -510,7 +559,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
use_power = 1
idle_power_usage = 300
machinetype = 4
- circuitboard = "/obj/item/weapon/circuitboard/telecomms/server"
+ circuit = /obj/item/weapon/circuitboard/telecomms/server
var/list/log_entries = list()
var/list/stored_names = list()
var/list/TrafficActions = list()
@@ -534,6 +583,15 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
Compiler.Holder = src
server_radio = new()
+/obj/machinery/telecomms/server/Initialize()
+ . = ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+ component_parts += new /obj/item/stack/cable_coil(src, 1)
+ RefreshParts()
+
/obj/machinery/telecomms/server/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from)
if(signal.data["message"])
diff --git a/code/game/objects/items/devices/radio/encryptionkey_vr.dm b/code/game/objects/items/devices/radio/encryptionkey_vr.dm
index 4d2debc341..a70ad6f7df 100644
--- a/code/game/objects/items/devices/radio/encryptionkey_vr.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm
@@ -18,3 +18,9 @@
name = "research director's encryption key"
icon_state = "rd_cypherkey"
channels = list("Command" = 1, "Science" = 1, "Explorer" = 1)
+
+/obj/item/device/encryptionkey/ert
+ channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1)
+
+/obj/item/device/encryptionkey/omni //Literally only for the admin intercoms
+ channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1)
diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm
index 46d4ead3d8..d7216ed2d4 100644
--- a/code/game/objects/items/devices/radio/headset_vr.dm
+++ b/code/game/objects/items/devices/radio/headset_vr.dm
@@ -3,6 +3,7 @@
desc = "The headset of the boss's boss."
icon_state = "cent_headset"
item_state = "headset"
+ centComm = 1
ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/centcom/alt
@@ -13,5 +14,6 @@
name = "\improper NT radio headset"
desc = "The headset of a Nanotrasen corporate employee."
icon_state = "nt_headset"
+ centComm = 1
ks2type = /obj/item/device/encryptionkey/ert
diff --git a/code/global_vr.dm b/code/global_vr.dm
index 29e84bc93c..834ff2dc2c 100644
--- a/code/global_vr.dm
+++ b/code/global_vr.dm
@@ -12,6 +12,8 @@ var/list/shell_module_types = list(
"Medihound", "Janihound"
)
+var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals
+
var/global/list/acceptable_fruit_types= list(
"ambrosia",
"apple",
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index 1182129cd6..bf1165d2ea 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -62,4 +62,10 @@ proc/createRandomZlevel()
/obj/effect/landmark/gateway_scatter/Initialize()
. = ..()
awaydestinations += src
+
+/obj/effect/landmark/event_scatter
+ name = "uncalibrated gateway destination"
+/obj/effect/landmark/event_scatter/Initialize()
+ . = ..()
+ eventdestinations += src
//VOREStation Add End
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
index 66eda7f2ce..d49e8e586d 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
@@ -168,4 +168,8 @@ Swimsuits
//Tron Siren outfit
/datum/gear/uniform/siren
display_name = "jumpsuit, Siren"
- path = /obj/item/clothing/under/fluff/siren
\ No newline at end of file
+ path = /obj/item/clothing/under/fluff/siren
+
+/datum/gear/uniform/suit/v_nanovest
+ display_name = "Varmacorp nanovest"
+ path = /obj/item/clothing/under/fluff/v_nanovest
\ No newline at end of file
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index e3fcb5d985..4ac81ea4cc 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -308,11 +308,12 @@
var/list/valid_things = list()
if(isweakref(I.data))
var/atom/A = I.data.resolve()
- var/desired_type = A.type
- if(desired_type)
- for(var/atom/thing in nearby_things)
- if(thing.type == desired_type)
- valid_things.Add(thing)
+ if(A)
+ var/desired_type = A.type
+ if(desired_type)
+ for(var/atom/thing in nearby_things)
+ if(thing.type == desired_type)
+ valid_things.Add(thing)
else if(istext(I.data))
var/DT = I.data
for(var/atom/thing in nearby_things)
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
index 16f953e1e7..11cb589668 100644
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
@@ -36,6 +36,7 @@
max_n2 = 0
minbodytemp = 0
maxbodytemp = 900
+ movement_cooldown = 0
var/mob/living/carbon/human/humanform
var/obj/item/organ/internal/nano/refactory/refactory
@@ -200,7 +201,7 @@
target.forceMove(vore_selected)
to_chat(target,"\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!")
-/mob/living/simple_mob/protean_blob/attack_hand(var/atom/A) //VORESTATION AI TEMPORARY REMOVAL (Marking this as such even though it was an edit.)
+/mob/living/simple_mob/protean_blob/attack_target(var/atom/A)
if(refactory && istype(A,/obj/item/stack/material))
var/obj/item/stack/material/S = A
var/substance = S.material.name
@@ -346,8 +347,7 @@
var/atom/reform_spot = blob.drop_location()
//Size update
- transform = matrix()*blob.size_multiplier
- size_multiplier = blob.size_multiplier
+ resize(blob.size_multiplier, FALSE)
//Move them back where the blob was
forceMove(reform_spot)
diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
index 0d9ad6bd93..0d2000fa01 100755
--- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
+++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm
@@ -96,7 +96,8 @@
/mob/living/carbon/human/proc/shapeshifter_select_gender,
/mob/living/carbon/human/proc/shapeshifter_select_wings,
/mob/living/carbon/human/proc/shapeshifter_select_tail,
- /mob/living/carbon/human/proc/shapeshifter_select_ears
+ /mob/living/carbon/human/proc/shapeshifter_select_ears,
+ /mob/living/proc/eat_trash
)
var/global/list/abilities = list()
@@ -296,7 +297,6 @@
material_name = MAT_STEEL
/datum/modifier/protean/steel/tick()
- ..()
holder.adjustBruteLoss(-10,include_robo = TRUE) //Looks high, but these ARE modified by species resistances, so this is really 20% of this
holder.adjustFireLoss(-1,include_robo = TRUE) //And this is really double this
var/mob/living/carbon/human/H = holder
diff --git a/code/modules/multiz/structures_vr.dm b/code/modules/multiz/structures_vr.dm
index b66c148e3b..5d12621ff4 100644
--- a/code/modules/multiz/structures_vr.dm
+++ b/code/modules/multiz/structures_vr.dm
@@ -55,3 +55,22 @@
do_noeffect_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0)
else
do_noeffect_teleport(M, target, 1) ///You will appear adjacent to the beacon
+
+/obj/structure/portal_gateway
+ name = "portal"
+ desc = "Looks unstable. Best to test it with the clown."
+ icon = 'icons/obj/stationobjs_vr.dmi'
+ icon_state = "portalgateway"
+ density = 1
+ unacidable = 1//Can't destroy energy portals.
+ anchored = 1
+
+/obj/structure/portal_gateway/Bumped(mob/M as mob|obj)
+ if(istype(M,/mob) && !(istype(M,/mob/living)))
+ return //do not send ghosts, zshadows, ai eyes, etc
+ var/obj/effect/landmark/dest = pick(eventdestinations)
+ if(dest)
+ M << 'sound/effects/phasein.ogg'
+ playsound(src, 'sound/effects/phasein.ogg', 100, 1)
+ M.forceMove(dest.loc)
+ return
diff --git a/code/modules/reagents/reagent_containers/hypospray_vr.dm b/code/modules/reagents/reagent_containers/hypospray_vr.dm
index d0777e3216..526ae77fba 100644
--- a/code/modules/reagents/reagent_containers/hypospray_vr.dm
+++ b/code/modules/reagents/reagent_containers/hypospray_vr.dm
@@ -6,7 +6,7 @@
amount_per_transfer_from_this = 10
volume = 10
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/miner/New()
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/miner/Initialize()
..()
reagents.add_reagent("bicaridine", 5)
reagents.add_reagent("tricordrazine", 3)
@@ -18,7 +18,7 @@
desc = "Contains emergency trauma autoinjectors."
icon_state = "syringe"
-/obj/item/weapon/storage/box/traumainjectors/New()
+/obj/item/weapon/storage/box/traumainjectors/Initialize()
..()
for (var/i = 1 to 7)
new /obj/item/weapon/reagent_containers/hypospray/autoinjector/miner(src)
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index f5a3f4684c..35b205f982 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -1522,6 +1522,14 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "gnshorts"
+/obj/item/clothing/under/fluff/v_nanovest
+ name = "Varmacorp nanovest"
+ desc = "A nifty little vest optimized for nanite contact."
+ icon = 'icons/vore/custom_clothes_vr.dmi'
+ icon_state = "nanovest"
+ icon_override = 'icons/vore/custom_clothes_vr.dmi'
+ item_state = "nanovest"
+
//General use
/obj/item/clothing/suit/storage/fluff/loincloth
name = "Loincloth"
@@ -1908,4 +1916,4 @@ Departamental Swimsuits, for general use
return 1
/obj/item/clothing/under/fluff/slime_skeleton/digest_act(var/atom/movable/item_storage = null)
- return FALSE //Indigestible
\ No newline at end of file
+ return FALSE //Indigestible
diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt
index 323e6b6585..7bddbedf10 100644
--- a/config/alienwhitelist.txt
+++ b/config/alienwhitelist.txt
@@ -2,7 +2,7 @@ some~user - Species
911earlyarther - Xenomorph Hybrid
admiraldragon - Vox
-aether_elemental - Daemon
+aetherelemental - Daemon
arandomalien - Xenochimera
arokha - Protean
aruis - Diona
@@ -11,6 +11,7 @@ azmodan412 - Xenochimera
azmodan412 - Xenomorph Hybrid
bothnevarbackwards - Diona
cameron653 - Xenomorph Hybrid
+crossexonar - Protean
funnyman2003 - Xenochimera
hawkerthegreat - Vox
hollifex - Diona
@@ -40,6 +41,7 @@ silvertalismen - Vox
silvertalismen - Xenochimera
singo - Gutter
tastypred - Xenochimera
+timidvi - Diona
varonis - Xenochimera
verkister - Xenochimera
westfire - Xenomorph Hybrid
diff --git a/icons/obj/stationobjs_vr.dmi b/icons/obj/stationobjs_vr.dmi
index 799f106661..00a87e576b 100644
Binary files a/icons/obj/stationobjs_vr.dmi and b/icons/obj/stationobjs_vr.dmi differ
diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi
index 4ae6f9cef4..2a487aab35 100644
Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ
diff --git a/maps/submaps/shelters/shelter_4.dmm b/maps/submaps/shelters/shelter_4.dmm
index a0c0419103..c5fbcb5007 100644
--- a/maps/submaps/shelters/shelter_4.dmm
+++ b/maps/submaps/shelters/shelter_4.dmm
@@ -91,6 +91,10 @@
/obj/item/weapon/towel/random,
/obj/item/weapon/towel/random,
/obj/item/weapon/extinguisher/mini,
+/obj/item/weapon/reagent_containers/glass/beaker/large,
+/obj/item/weapon/reagent_containers/glass/beaker/large,
+/obj/item/weapon/reagent_containers/glass/beaker/large,
+/obj/item/weapon/reagent_containers/glass/beaker/large,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"i" = (
@@ -237,7 +241,9 @@
/obj/item/weapon/gun/projectile/pistol,
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/weapon/material/knife/tacknife/survival,
-/obj/item/weapon/storage/box/survival/comp,
+/obj/item/weapon/storage/box/survival/comp{
+ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
+ },
/turf/simulated/floor/carpet/bcarpet,
/area/survivalpod)
"C" = (
@@ -403,16 +409,17 @@
/area/survivalpod)
"R" = (
/obj/machinery/iv_drip,
-/turf/simulated/shuttle/floor/voidcraft/light,
-/area/survivalpod)
-"S" = (
/obj/effect/floor_decal/industrial/loading{
dir = 1
},
+/turf/simulated/shuttle/floor/voidcraft/light,
+/area/survivalpod)
+"S" = (
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
+/obj/machinery/chemical_dispenser/ert,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/survivalpod)
"T" = (
diff --git a/maps/tether/submaps/space/pois/_templates.dm b/maps/tether/submaps/space/pois/_templates.dm
index 938fdaaa60..33fcab8398 100644
--- a/maps/tether/submaps/space/pois/_templates.dm
+++ b/maps/tether/submaps/space/pois/_templates.dm
@@ -97,3 +97,10 @@
mappath = 'oldshuttle.dmm'
cost = 30
allow_duplicates = FALSE
+
+/datum/map_template/debrisfield/alien_massive_derelict
+ name = "Alien Derelict"
+ mappath = 'derelict.dmm'
+ cost = 35
+ allow_duplicates = FALSE
+ discard_prob = 50
diff --git a/maps/tether/submaps/space/pois/debrisfield_things.dm b/maps/tether/submaps/space/pois/debrisfield_things.dm
index 054606477c..13cd7f032d 100644
--- a/maps/tether/submaps/space/pois/debrisfield_things.dm
+++ b/maps/tether/submaps/space/pois/debrisfield_things.dm
@@ -16,6 +16,28 @@
/mob/living/simple_mob/animal/space/carp/large/huge = 1
)
+/obj/tether_away_spawner/debrisfield/derelict
+ name = "debris field derelict random mob spawner"
+ faction = "derelict"
+ mobs_to_pick_from = list(
+ /mob/living/simple_mob/mechanical/corrupt_maint_drone = 2,
+ /mob/living/simple_mob/mechanical/infectionbot = 3,
+ /mob/living/simple_mob/mechanical/combat_drone = 1
+ )
+
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm
+ name = "debris field derelict maint swarm"
+ faction = "derelict"
+ mobs_to_pick_from = list(
+ /mob/living/simple_mob/mechanical/corrupt_maint_drone = 4
+ )
+
+/obj/tether_away_spawner/debrisfield/derelict/mech_wizard
+ name = "debris field derelict wizard lol"
+ faction = "derelict"
+ mobs_to_pick_from = list(
+ /mob/living/simple_mob/mechanical/technomancer_golem = 2
+ )
//Sciship
/mob/living/simple_mob/tomato/space
diff --git a/maps/tether/submaps/space/pois/derelict.dmm b/maps/tether/submaps/space/pois/derelict.dmm
new file mode 100644
index 0000000000..bc5616cfdb
--- /dev/null
+++ b/maps/tether/submaps/space/pois/derelict.dmm
@@ -0,0 +1,4434 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"ab" = (
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"ac" = (
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"ad" = (
+/turf/simulated/wall/r_wall,
+/area/tether_away/debrisfield/explored)
+"ae" = (
+/turf/simulated/wall,
+/area/tether_away/debrisfield/explored)
+"af" = (
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 1e+006
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"ag" = (
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"ah" = (
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"ai" = (
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 1e+006
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"aj" = (
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"ak" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"al" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/bluegrid,
+/area/tether_away/debrisfield/explored)
+"am" = (
+/obj/effect/map_effect/interval/effect_emitter/sparks/frequent,
+/obj/effect/map_effect/interval/effect_emitter/smoke,
+/obj/machinery/door/airlock/alien,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"an" = (
+/obj/effect/map_effect/interval/effect_emitter/sparks/frequent,
+/obj/structure/door_assembly/door_assembly_alien,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"ao" = (
+/obj/structure/catwalk,
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"ap" = (
+/obj/structure/shuttle/engine/propulsion{
+ icon_state = "burst_l";
+ dir = 1
+ },
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"aq" = (
+/obj/structure/shuttle/engine/propulsion{
+ icon_state = "burst_l";
+ dir = 8
+ },
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"ar" = (
+/obj/structure/shuttle/engine/propulsion{
+ icon_state = "burst_l";
+ dir = 4
+ },
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"as" = (
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"at" = (
+/obj/structure/shuttle/engine/heater,
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"au" = (
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"av" = (
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"aw" = (
+/turf/simulated/floor/tiled/monotile,
+/area/tether_away/debrisfield/explored)
+"ax" = (
+/turf/simulated/floor/tiled/monofloor,
+/area/tether_away/debrisfield/explored)
+"ay" = (
+/turf/simulated/floor/greengrid,
+/area/tether_away/debrisfield/explored)
+"az" = (
+/obj/item/weapon/grenade/empgrenade,
+/obj/item/weapon/grenade/empgrenade,
+/obj/item/weapon/grenade/empgrenade,
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"aA" = (
+/obj/structure/prop/prism,
+/turf/simulated/floor/greengrid,
+/area/tether_away/debrisfield/explored)
+"aB" = (
+/obj/structure/prop/fake_ai,
+/turf/simulated/floor/greengrid,
+/area/tether_away/debrisfield/explored)
+"aC" = (
+/turf/simulated/floor/tiled/steel_ridged,
+/area/tether_away/debrisfield/explored)
+"aD" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/tiled/monotile,
+/area/tether_away/debrisfield/explored)
+"aE" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/tiled/monofloor,
+/area/tether_away/debrisfield/explored)
+"aF" = (
+/mob/living/simple_mob/mechanical/infectionbot{
+ faction = "derelict"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"aG" = (
+/obj/structure/old_roboprinter,
+/turf/simulated/floor/tiled/monofloor,
+/area/tether_away/debrisfield/explored)
+"aH" = (
+/obj/structure/old_roboprinter,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"aI" = (
+/obj/structure/ghost_pod/manual/lost_drone/dogborg,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"aJ" = (
+/obj/structure/ghost_pod/manual/lost_drone,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"aK" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/turf/simulated/floor/tiled/monofloor,
+/area/tether_away/debrisfield/explored)
+"aL" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/mob/living/simple_mob/mechanical/corrupt_maint_drone{
+ faction = "derelict"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"aM" = (
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"aN" = (
+/mob/living/simple_mob/mechanical/infectionbot{
+ faction = "derelict"
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"aO" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/tether_away/debrisfield/explored)
+"aP" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"aQ" = (
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc{
+ dir = 2;
+ name = "south bump";
+ pixel_y = -24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"aR" = (
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"aS" = (
+/mob/living/simple_mob/mechanical/infectionbot{
+ faction = "derelict"
+ },
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"aT" = (
+/turf/simulated/floor/tiled/neutral,
+/area/tether_away/debrisfield/explored)
+"aU" = (
+/obj/tether_away_spawner/debrisfield/derelict/mech_wizard,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"aV" = (
+/obj/structure/ghost_pod/manual/lost_drone/dogborg,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"aW" = (
+/obj/tether_away_spawner/debrisfield/derelict/mech_wizard,
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"aX" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"aY" = (
+/obj/structure/old_roboprinter,
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"aZ" = (
+/obj/tether_away_spawner/debrisfield/derelict,
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"ba" = (
+/obj/structure/prop/alien/computer/camera,
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"bb" = (
+/obj/structure/prop/alien/computer,
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"bc" = (
+/obj/structure/prop/alien/computer/camera/flipped,
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"bd" = (
+/obj/structure/prop/alien/dispenser,
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"be" = (
+/obj/structure/prop/alien/computer/camera,
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bf" = (
+/obj/structure/prop/alien/power,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bg" = (
+/obj/structure/prop/alien/computer/camera/flipped,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bh" = (
+/obj/structure/prop/alien/pod,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"bi" = (
+/obj/machinery/porta_turret/alien{
+ faction = "derelict";
+ use_power = 0
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"bj" = (
+/obj/effect/map_effect/interval/effect_emitter/sparks/frequent,
+/obj/structure/door_assembly/door_assembly_alien,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"bk" = (
+/obj/random/humanoidremains,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"bl" = (
+/obj/machinery/implantchair,
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"bm" = (
+/obj/machinery/dna_scannernew,
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"bn" = (
+/obj/machinery/replicator,
+/turf/simulated/floor/tiled/neutral,
+/area/tether_away/debrisfield/explored)
+"bo" = (
+/obj/machinery/transhuman/synthprinter,
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"bp" = (
+/obj/machinery/transhuman/resleever,
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"bq" = (
+/obj/machinery/vr_sleeper/alien,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"br" = (
+/obj/machinery/auto_cloner,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/tether_away/debrisfield/explored)
+"bs" = (
+/obj/machinery/artifact,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"bt" = (
+/obj/structure/prop/alien/power,
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bu" = (
+/obj/machinery/door/airlock/hatch{
+ icon_state = "door_locked";
+ id_tag = null;
+ locked = 1;
+ name = "AI Core";
+ req_access = list(16)
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"bv" = (
+/obj/machinery/door/airlock/alien,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"bw" = (
+/obj/machinery/door/airlock/alien,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"bx" = (
+/obj/machinery/door/airlock/alien/locked,
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"by" = (
+/obj/machinery/door/airlock/alien,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"bz" = (
+/obj/machinery/door/airlock/alien,
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bA" = (
+/obj/machinery/bomb_tester,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/tether_away/debrisfield/explored)
+"bB" = (
+/obj/random/humanoidremains,
+/obj/item/weapon/gun/energy/ionrifle,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/tether_away/debrisfield/explored)
+"bC" = (
+/obj/structure/prop/alien/power,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/bluegrid,
+/area/tether_away/debrisfield/explored)
+"bD" = (
+/obj/machinery/optable,
+/obj/random/humanoidremains,
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"bE" = (
+/obj/random/humanoidremains,
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"bF" = (
+/obj/tether_away_spawner/debrisfield/derelict,
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"bG" = (
+/obj/machinery/porta_turret/alien{
+ faction = "derelict";
+ use_power = 0
+ },
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"bH" = (
+/obj/random/tool/alien,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"bI" = (
+/obj/random/energy,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"bJ" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/turf/simulated/floor/tiled/monotile,
+/area/tether_away/debrisfield/explored)
+"bK" = (
+/obj/tether_away_spawner/debrisfield/derelict,
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bL" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/mob/living/simple_mob/mechanical/corrupt_maint_drone{
+ faction = "derelict"
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/tether_away/debrisfield/explored)
+"bM" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/item/weapon/grenade/empgrenade,
+/turf/simulated/floor/bluegrid,
+/area/tether_away/debrisfield/explored)
+"bN" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/bluegrid,
+/area/tether_away/debrisfield/explored)
+"bO" = (
+/turf/template_noop,
+/area/tether_away/debrisfield/explored)
+"bP" = (
+/obj/structure/old_roboprinter,
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bQ" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bR" = (
+/turf/template_noop,
+/area/tether_away/debrisfield/unexplored)
+"bS" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bT" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bW" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"bY" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/wall,
+/area/tether_away/debrisfield/explored)
+"bZ" = (
+/obj/effect/alien/egg,
+/obj/effect/alien/weeds,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"ca" = (
+/obj/effect/decal/mecha_wreckage/gygax/adv,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cb" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"cc" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"cd" = (
+/obj/machinery/door/airlock/alien,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"ce" = (
+/obj/machinery/door/airlock/alien,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cf" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cg" = (
+/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/bluegrid,
+/area/tether_away/debrisfield/explored)
+"ch" = (
+/obj/item/xenos_claw,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"ci" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"ck" = (
+/obj/machinery/door/airlock/alien,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cl" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cm" = (
+/obj/structure/cable,
+/obj/machinery/power/apc{
+ dir = 2;
+ name = "south bump";
+ pixel_y = -24
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cn" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"co" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"cp" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"cq" = (
+/obj/random/humanoidremains,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cr" = (
+/obj/structure/prop/prism,
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cs" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"ct" = (
+/obj/random/humanoidremains,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cu" = (
+/obj/machinery/door/airlock/alien,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cv" = (
+/obj/machinery/door/airlock/alien,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/tether_away/debrisfield/explored)
+"cw" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cx" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cy" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cz" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cA" = (
+/obj/machinery/door/airlock/alien,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cB" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"cC" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/white,
+/area/tether_away/debrisfield/explored)
+"cD" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cE" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cF" = (
+/obj/machinery/door/airlock/alien,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cG" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/neutral,
+/area/tether_away/debrisfield/explored)
+"cH" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cI" = (
+/obj/random/humanoidremains,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cJ" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cK" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cM" = (
+/obj/machinery/door/airlock/hatch{
+ icon_state = "door_locked";
+ id_tag = null;
+ locked = 1;
+ name = "AI Core";
+ req_access = list(16)
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cN" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cO" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cP" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cQ" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cR" = (
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 28
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"cS" = (
+/obj/machinery/power/apc/hyper{
+ pixel_y = 25
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/greengrid,
+/area/tether_away/debrisfield/explored)
+"cT" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/tether_away/debrisfield/explored)
+"cU" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"cV" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"cW" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/neutral,
+/area/tether_away/debrisfield/explored)
+"cX" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/neutral,
+/area/tether_away/debrisfield/explored)
+"cY" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/neutral,
+/area/tether_away/debrisfield/explored)
+"cZ" = (
+/obj/random/humanoidremains,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"da" = (
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 28
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tether_away/debrisfield/explored)
+"db" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"dc" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/tether_away/debrisfield/explored)
+"dd" = (
+/obj/machinery/porta_turret/alien{
+ faction = "derelict";
+ use_power = 0
+ },
+/turf/simulated/floor/greengrid,
+/area/tether_away/debrisfield/explored)
+"de" = (
+/obj/machinery/porta_turret/alien{
+ faction = "derelict";
+ use_power = 0
+ },
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"df" = (
+/obj/item/weapon/gun/energy/ionrifle,
+/turf/space,
+/area/tether_away/debrisfield/explored)
+"dg" = (
+/obj/machinery/door/airlock/alien/locked,
+/turf/simulated/floor/plating,
+/area/tether_away/debrisfield/explored)
+"dh" = (
+/obj/structure/prop/blackbox/xenofrigate,
+/turf/simulated/floor/greengrid,
+/area/tether_away/debrisfield/explored)
+
+(1,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(2,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+ap
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(3,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+ad
+ad
+ad
+as
+as
+as
+ae
+as
+as
+as
+bK
+ae
+bP
+bP
+ae
+bK
+as
+as
+as
+as
+ae
+as
+as
+as
+as
+as
+as
+as
+at
+ae
+ak
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(4,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+ad
+ad
+ad
+be
+as
+as
+ae
+as
+ae
+as
+as
+ae
+ae
+ae
+as
+as
+ae
+ae
+ae
+as
+as
+as
+ae
+as
+as
+ae
+ae
+ae
+ae
+as
+as
+at
+ae
+ak
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(5,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+ad
+ad
+ad
+bt
+bT
+bT
+bY
+bT
+bT
+bT
+bT
+bY
+bT
+bT
+cb
+bQ
+as
+as
+as
+as
+ae
+as
+as
+as
+as
+ae
+bK
+as
+ae
+as
+as
+at
+ae
+ak
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(6,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+ad
+ad
+ad
+ae
+ae
+as
+as
+as
+as
+as
+as
+ae
+cc
+as
+ae
+as
+as
+ae
+ae
+as
+as
+as
+as
+ae
+as
+as
+as
+as
+at
+ae
+ak
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(7,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+ap
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+cd
+bz
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(8,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+cc
+as
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(9,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+cc
+as
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(10,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+cc
+as
+ad
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(11,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+cc
+as
+ad
+ad
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+bO
+bO
+"}
+(12,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ce
+bv
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+bO
+bO
+"}
+(13,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+bB
+aC
+ac
+ac
+ac
+ac
+ae
+ac
+ac
+ac
+aM
+ae
+cf
+av
+ae
+aH
+ac
+ac
+ac
+ac
+ac
+ae
+bn
+aT
+aC
+aC
+aO
+ae
+bh
+ac
+ac
+ac
+ac
+aP
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+bO
+"}
+(14,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+aC
+ae
+ac
+ae
+bk
+ac
+ae
+ac
+bq
+ae
+aM
+ae
+cf
+av
+ae
+ac
+ac
+ac
+ac
+ae
+ac
+ae
+aT
+aT
+ae
+ae
+ae
+ae
+ae
+ac
+ae
+ac
+ac
+ae
+ad
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+"}
+(15,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aw
+aw
+aw
+aw
+ac
+ac
+ax
+ax
+ax
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ac
+ac
+ac
+ac
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+aM
+ae
+cf
+av
+ae
+aL
+ac
+ae
+ac
+ac
+ac
+ae
+aT
+cW
+cF
+cl
+cl
+cF
+cl
+cl
+cl
+cZ
+cD
+ab
+bu
+ab
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+"}
+(16,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aw
+aw
+ae
+ae
+ac
+ac
+ae
+ae
+ax
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ac
+ae
+ac
+ac
+ac
+ac
+ac
+bk
+ae
+ae
+ae
+aM
+ae
+cf
+av
+ae
+ae
+ac
+ae
+ae
+ac
+ac
+ae
+aT
+cX
+ae
+ac
+bk
+bw
+ac
+ac
+ac
+ac
+da
+ab
+ad
+ab
+ab
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+"}
+(17,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aD
+aw
+aw
+ae
+ac
+ac
+ae
+ax
+ax
+ad
+aa
+aa
+aa
+ae
+am
+ae
+aa
+aa
+aa
+ad
+ac
+ac
+ac
+ae
+ae
+ae
+ac
+ac
+ac
+ac
+ac
+aM
+ae
+cf
+av
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+bw
+aT
+cX
+ae
+aC
+aC
+ae
+ac
+ae
+ab
+ab
+ae
+ab
+ad
+ab
+ab
+de
+ad
+ad
+aa
+aa
+bO
+bO
+"}
+(18,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aw
+bJ
+aD
+ae
+ac
+ac
+ae
+aE
+aK
+ad
+aa
+aa
+aq
+ae
+ab
+ae
+aq
+aa
+aa
+ad
+bH
+ac
+ac
+ae
+bs
+ac
+ac
+ae
+ac
+ac
+ac
+aM
+ae
+cf
+av
+ae
+ac
+cy
+cl
+cl
+cl
+cl
+cF
+cG
+cY
+ae
+aO
+aC
+ae
+aJ
+ae
+ab
+ab
+ae
+aV
+ad
+ay
+ay
+ay
+dd
+ad
+ad
+aa
+aa
+bO
+"}
+(19,1,1) = {"
+aa
+af
+ai
+ai
+ai
+ai
+ad
+ae
+ae
+ae
+ae
+bw
+bw
+ae
+ae
+ae
+ad
+aa
+aa
+ae
+ae
+an
+ae
+ae
+aa
+aa
+ad
+ae
+ae
+bw
+ae
+ac
+ac
+ac
+ac
+ac
+ae
+ac
+aM
+ae
+cf
+av
+ae
+bw
+cA
+ae
+ae
+ae
+ae
+ae
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+dg
+dg
+ad
+ad
+ad
+ay
+ay
+ay
+ay
+dd
+ad
+ad
+aa
+aa
+"}
+(20,1,1) = {"
+aa
+ag
+ba
+au
+au
+au
+bx
+av
+av
+av
+av
+av
+av
+av
+av
+av
+ad
+aa
+aa
+ae
+ab
+ab
+ab
+ae
+aa
+aa
+ad
+bI
+ac
+ac
+ae
+ae
+ae
+ae
+ac
+ac
+bs
+ae
+aZ
+ae
+cf
+av
+ae
+ac
+cJ
+cD
+ac
+ac
+cr
+bi
+ad
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ad
+ay
+ay
+ay
+ay
+ay
+dd
+ad
+ad
+aa
+"}
+(21,1,1) = {"
+aa
+ag
+bb
+au
+au
+au
+bx
+av
+av
+av
+av
+av
+av
+av
+av
+av
+ad
+ad
+bG
+ae
+ca
+ab
+ab
+ae
+bG
+ad
+ad
+bk
+ac
+ac
+ae
+aN
+aM
+aM
+aM
+aM
+aM
+aZ
+ae
+ae
+cf
+av
+ae
+bi
+ac
+cJ
+cl
+cl
+cD
+ac
+ad
+ao
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ao
+ad
+ay
+ay
+ay
+ay
+ay
+ay
+dd
+ad
+aa
+"}
+(22,1,1) = {"
+aa
+ag
+bd
+au
+au
+au
+ae
+ae
+ae
+ae
+ae
+bv
+bv
+ae
+ae
+ae
+ae
+ad
+ad
+ae
+ae
+bw
+ae
+ae
+ad
+ad
+ad
+ae
+bw
+bw
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+bv
+bv
+ae
+ae
+ae
+ae
+ae
+ae
+cz
+ac
+ad
+ao
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ao
+ad
+ay
+ay
+aA
+aA
+ay
+ay
+ay
+ad
+aa
+"}
+(23,1,1) = {"
+aa
+ag
+bb
+au
+bF
+aQ
+ae
+al
+bM
+bN
+bw
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+db
+ch
+ci
+cw
+ci
+ci
+ci
+ck
+cV
+cm
+ad
+ao
+aa
+aa
+aa
+df
+az
+az
+aa
+aa
+aa
+ao
+ad
+ay
+ay
+dh
+aB
+ay
+ay
+dd
+ad
+aa
+"}
+(24,1,1) = {"
+aa
+ag
+bb
+au
+au
+cT
+bY
+bC
+cg
+bN
+cF
+ci
+ci
+ci
+ci
+ci
+ci
+cq
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+ci
+cU
+ci
+ci
+ci
+ci
+ci
+ci
+dc
+ci
+ci
+cx
+ci
+ci
+ci
+ck
+cl
+cD
+ad
+ao
+aa
+aa
+aa
+aa
+az
+az
+aa
+aa
+aa
+ao
+ad
+ay
+ay
+dh
+aB
+ay
+ay
+dd
+ad
+aa
+"}
+(25,1,1) = {"
+aa
+ag
+bd
+au
+au
+au
+ae
+ae
+ae
+ae
+ae
+bv
+bv
+ae
+ae
+ae
+ae
+ad
+ad
+ae
+ae
+bw
+ae
+ae
+ad
+ad
+ad
+ae
+bw
+bw
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+ae
+bj
+bv
+ae
+ae
+ae
+ae
+ae
+ae
+bk
+cz
+ad
+ao
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ao
+ad
+ay
+ay
+aA
+aA
+ay
+ay
+ay
+ad
+aa
+"}
+(26,1,1) = {"
+aa
+ag
+bb
+au
+au
+au
+bx
+av
+av
+av
+av
+av
+av
+av
+av
+av
+ad
+ad
+bG
+ae
+ca
+ab
+ab
+ae
+bG
+ad
+ad
+aF
+ac
+bk
+ac
+ac
+ac
+ac
+bH
+ae
+bL
+aY
+aY
+ae
+cs
+av
+ae
+bi
+cy
+cl
+cl
+cl
+cl
+cE
+ad
+ao
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ao
+ad
+ay
+ay
+ay
+ay
+ay
+ay
+dd
+ad
+aa
+"}
+(27,1,1) = {"
+aa
+ag
+bc
+au
+au
+au
+bx
+av
+av
+av
+av
+av
+av
+av
+av
+av
+ad
+aa
+aa
+ae
+ab
+ab
+ab
+ae
+aa
+aa
+ad
+aF
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
+aX
+aM
+aM
+ae
+cs
+av
+ae
+ac
+cz
+ac
+ac
+ac
+cr
+bi
+ad
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ao
+ad
+ay
+ay
+ay
+ay
+ay
+dd
+ad
+ad
+aa
+"}
+(28,1,1) = {"
+aa
+ah
+aj
+aj
+aj
+aj
+ad
+ae
+ae
+ae
+ae
+bw
+bw
+ae
+ae
+ae
+ad
+aa
+aa
+ae
+ae
+by
+ae
+ae
+aa
+aa
+ad
+ae
+ae
+ae
+ae
+ae
+ae
+ac
+ac
+ac
+aM
+bL
+bL
+ae
+cs
+av
+ae
+bw
+cA
+ae
+ae
+ae
+ae
+ae
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+dg
+dg
+ad
+ad
+ad
+ay
+ay
+ay
+ay
+dd
+ad
+ad
+aa
+aa
+"}
+(29,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aD
+aw
+aw
+ae
+ac
+ac
+ae
+aG
+aG
+ad
+aa
+aa
+ar
+ae
+ab
+ae
+ar
+aa
+aa
+ad
+bH
+ac
+ac
+ac
+bH
+ae
+ac
+ac
+ae
+ae
+ae
+ae
+ae
+cs
+av
+ae
+aR
+cB
+cC
+cC
+cC
+cC
+cF
+cG
+cG
+cl
+cD
+bZ
+ae
+ac
+ac
+ac
+ac
+ac
+bs
+ad
+cS
+ay
+ay
+dd
+ad
+ad
+aa
+aa
+bO
+"}
+(30,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aw
+aw
+aD
+ae
+ac
+ac
+ae
+ax
+ax
+ad
+aa
+aa
+aa
+ae
+by
+ae
+aa
+aa
+aa
+ad
+ac
+ac
+ae
+ac
+ac
+ac
+bk
+ac
+ac
+ac
+ac
+ac
+ae
+cs
+av
+ae
+aR
+aR
+aR
+aR
+aR
+aR
+bw
+aT
+aT
+ac
+cH
+ac
+ae
+ac
+bk
+ac
+ac
+ac
+ac
+ad
+cN
+ab
+de
+ad
+ad
+aa
+aa
+bO
+bO
+"}
+(31,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aw
+aw
+ae
+ae
+ac
+ac
+ae
+aK
+aK
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
+ct
+av
+ae
+aR
+ae
+bD
+ae
+bE
+aR
+ae
+aT
+aT
+ae
+cI
+cl
+cF
+cl
+cD
+ae
+ae
+ae
+ae
+ad
+cN
+ab
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+"}
+(32,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aw
+aw
+aw
+aw
+ac
+ac
+ax
+ax
+ax
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ac
+ac
+ae
+ac
+ac
+ae
+ae
+ae
+ae
+ae
+ac
+ae
+ae
+cs
+av
+ae
+aR
+aS
+ae
+aS
+aR
+aR
+ae
+aT
+aT
+ae
+ae
+ae
+ae
+ac
+cJ
+cF
+cK
+cP
+cK
+cM
+cO
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+"}
+(33,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+aC
+ae
+aM
+aM
+aM
+aM
+aM
+bo
+ae
+aC
+aC
+ae
+cs
+av
+ae
+aR
+aR
+aR
+aR
+ae
+aR
+ae
+aT
+aT
+aC
+aC
+aO
+ae
+ac
+ac
+ae
+ab
+cQ
+ab
+ad
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+"}
+(34,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+bA
+ae
+bp
+aM
+aM
+aM
+aM
+aW
+ae
+aC
+br
+ae
+cs
+av
+ae
+bl
+bm
+aR
+aR
+aR
+aS
+ae
+bn
+aT
+aC
+aC
+aO
+ae
+aI
+ac
+ae
+ab
+cR
+aU
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+bO
+"}
+(35,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+cu
+bv
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+bO
+bO
+"}
+(36,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+bW
+as
+ad
+ad
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bO
+bO
+bO
+bO
+bO
+bO
+bO
+bO
+"}
+(37,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+bW
+as
+ad
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(38,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+bW
+as
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(39,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+bW
+as
+ad
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(40,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+ap
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+cv
+bz
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(41,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+ad
+ad
+ad
+bS
+bT
+bT
+bT
+bT
+co
+ae
+bS
+bT
+cn
+as
+as
+as
+ae
+bK
+as
+as
+as
+as
+as
+bK
+ae
+as
+as
+as
+at
+ae
+ak
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(42,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+ad
+ad
+ad
+bf
+as
+bW
+as
+as
+ae
+as
+bW
+ae
+bW
+ae
+as
+as
+ae
+as
+ae
+ae
+ae
+as
+as
+as
+ae
+ae
+ae
+as
+ae
+as
+as
+at
+ae
+ak
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(43,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+ad
+ad
+ad
+bg
+bT
+cn
+ae
+as
+ae
+as
+bW
+ae
+bW
+ae
+as
+as
+ae
+as
+as
+as
+as
+as
+ae
+as
+as
+as
+as
+as
+ae
+as
+as
+at
+ae
+ak
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(44,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+ad
+ad
+ad
+bK
+ae
+as
+as
+as
+cp
+bT
+cn
+ae
+bQ
+bQ
+ae
+as
+as
+as
+as
+as
+ae
+as
+as
+as
+as
+as
+ae
+as
+at
+ae
+ak
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(45,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+ap
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
+(46,1,1) = {"
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+bR
+"}
diff --git a/maps/tether/submaps/underdark_pois/_templates.dm b/maps/tether/submaps/underdark_pois/_templates.dm
index cb81bb6b1f..b015159f83 100644
--- a/maps/tether/submaps/underdark_pois/_templates.dm
+++ b/maps/tether/submaps/underdark_pois/_templates.dm
@@ -85,7 +85,72 @@
cost = 5
allow_duplicates = FALSE
+/datum/map_template/underdark/old_drone_hive
+ name = "Underdark Old Drone Hive"
+ mappath = 'old_drone_hive.dmm'
+ cost = 25
+
+/datum/map_template/underdark/phoron_rat_den
+ name = "Underdark Phoron Rat Den"
+ mappath = 'phoron_rat_den.dmm'
+ cost = 35
+ allow_duplicates = FALSE
+
+/datum/map_template/underdark/subterranean_lake
+ name = "Underdark Underground Lake"
+ mappath = 'subterranean_lake.dmm'
+ cost = 5
+
+/datum/map_template/underdark/spider_nest
+ name = "Underdark Spider Nest"
+ mappath = 'spider_nest.dmm'
+ cost = 15
+
+/datum/map_template/underdark/rykka_easter_egg // bark bark Rykka was here. <3
+ name = "Underdark GSD"
+ mappath = 'rykka_easter_egg.dmm'
+ cost = 5
+ allow_duplicates = FALSE
+
+/datum/map_template/underdark/tree_shrine
+ name = "Underdark Tree"
+ mappath = 'tree_shrine.dmm'
+ cost = 10
+ allow_duplicates = FALSE
+
+/datum/map_template/underdark/abandoned_outpost
+ name = "Underdark Abandonded Outpost"
+ mappath = 'abandonded_outpost.dmm'
+ cost = 45
+ allow_duplicates = FALSE
+
+/datum/map_template/underdark/mimicry
+ name = "Underdark Mimic Death"
+ mappath = 'mimicry.dmm'
+ cost = 15
+
+/datum/map_template/underdark/wolf_den
+ name = "Underdark Wolf Den"
+ mappath = 'wolf_den.dmm'
+ cost = 15
+
+/datum/map_template/underdark/puzzle_corridor
+ name = "Underdark Puzzle Corridor"
+ mappath = 'puzzle_corridor.dmm'
+ cost = 10
+
/*
+// Comment out unfinished/unbalanced POI's here
+/datum/map_template/underdark/rad_threat
+ name = "Underdark Rad Threat"
+ mappath = 'rad_threat.dmm'
+ cost = 10
+
+/datum/map_template/underdark/broken_engine
+ name = "Underdark Broken Twin Engine"
+ mappath = 'broken_engine.dmm'
+ cost = 10
+
/datum/map_template/underdark/boss_mob
name = "Underdark Boss Mob Spawn"
mappath = 'boss_mob.dmm'
diff --git a/maps/tether/submaps/underdark_pois/abandonded_outpost.dmm b/maps/tether/submaps/underdark_pois/abandonded_outpost.dmm
new file mode 100644
index 0000000000..300da22c19
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/abandonded_outpost.dmm
@@ -0,0 +1,1045 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"ab" = (
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"ac" = (
+/turf/template_noop,
+/area/space)
+"ad" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"ae" = (
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"af" = (
+/obj/machinery/door/airlock/uranium,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"ag" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"ah" = (
+/obj/machinery/floodlight,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"ai" = (
+/obj/machinery/door/airlock/uranium,
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"aj" = (
+/obj/machinery/crystal,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"ak" = (
+/obj/machinery/light/flicker,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"al" = (
+/obj/machinery/mech_recharger,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"am" = (
+/obj/machinery/gravity_generator,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"an" = (
+/obj/machinery/implantchair,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"ao" = (
+/obj/machinery/particle_smasher,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"ap" = (
+/obj/machinery/particle_smasher,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aq" = (
+/obj/machinery/particle_accelerator/control_box,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"ar" = (
+/obj/structure/old_roboprinter,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"as" = (
+/obj/tether_away_spawner/underdark_drone_swarm,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"at" = (
+/obj/tether_away_spawner/underdark_hard,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"au" = (
+/obj/tether_away_spawner/underdark_normal,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"av" = (
+/obj/structure/ore_box,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aw" = (
+/obj/structure/dogbed,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"ax" = (
+/obj/structure/cult/forge,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"ay" = (
+/obj/structure/cult/tome,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"az" = (
+/obj/structure/bed,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aA" = (
+/obj/structure/barricade,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"aB" = (
+/obj/structure/barricade,
+/obj/structure/boulder,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"aC" = (
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aD" = (
+/obj/structure/sink,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aE" = (
+/obj/structure/sign/ironhammer,
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"aF" = (
+/obj/machinery/iv_drip,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aG" = (
+/obj/structure/table/steel,
+/obj/machinery/reagentgrinder,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aH" = (
+/obj/machinery/smartfridge,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aI" = (
+/obj/structure/filingcabinet,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aJ" = (
+/obj/machinery/vending/cola,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aK" = (
+/obj/machinery/vending/coffee,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aL" = (
+/obj/machinery/vending/fitness,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aM" = (
+/obj/machinery/replicator,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aN" = (
+/obj/machinery/vending/snack,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aO" = (
+/obj/machinery/porta_turret/stationary/syndie,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aP" = (
+/obj/structure/table/steel,
+/obj/machinery/recharger,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aQ" = (
+/obj/machinery/recharger/wallcharger,
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"aR" = (
+/obj/item/frame/apc,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aS" = (
+/obj/structure/table/steel,
+/obj/machinery/light_construct{
+ icon_state = "tube-construct-stage1";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aT" = (
+/obj/machinery/light_construct{
+ icon_state = "tube-construct-stage1";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aU" = (
+/obj/machinery/light_construct{
+ icon_state = "tube-construct-stage1";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aV" = (
+/obj/machinery/light_construct{
+ icon_state = "tube-construct-stage1";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aW" = (
+/obj/machinery/light_construct,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aX" = (
+/obj/machinery/light/flamp/flicker,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"aY" = (
+/obj/effect/decal/cleanable/cobweb,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"aZ" = (
+/obj/machinery/clonepod/transhuman,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"ba" = (
+/obj/effect/decal/mecha_wreckage/gygax/adv,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bb" = (
+/obj/effect/decal/mecha_wreckage/ripley,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bc" = (
+/obj/effect/decal/remains/deer,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"bd" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"be" = (
+/obj/effect/decal/remains/deer,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"bf" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"bg" = (
+/obj/machinery/door/airlock/uranium,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bh" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bi" = (
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bj" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bk" = (
+/obj/machinery/light_construct,
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bl" = (
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bm" = (
+/obj/structure/table/steel,
+/obj/machinery/microwave,
+/obj/effect/decal/cleanable/cobweb,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bn" = (
+/obj/structure/table/steel,
+/obj/machinery/microwave,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bo" = (
+/obj/structure/bed,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bp" = (
+/obj/tether_away_spawner/underdark_normal,
+/obj/effect/decal/cleanable/cobweb,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bq" = (
+/obj/tether_away_spawner/underdark_normal,
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"br" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bs" = (
+/obj/machinery/door/airlock/uranium,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bt" = (
+/obj/effect/decal/remains/tajaran,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bu" = (
+/obj/effect/decal/cleanable/spiderling_remains,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"bv" = (
+/obj/item/device/assembly/prox_sensor,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bw" = (
+/obj/item/device/electronic_assembly/drone/genbot,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bx" = (
+/obj/structure/table/steel,
+/obj/item/device/assembly/electronic_assembly,
+/obj/item/weapon/circuitboard/aicore,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"by" = (
+/obj/item/device/assembly/signaler,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bz" = (
+/obj/machinery/door/airlock/uranium{
+ hasShocked = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bA" = (
+/obj/machinery/door/airlock/uranium{
+ hasShocked = 1
+ },
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bB" = (
+/mob/living/simple_mob/mechanical/infectionbot,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bC" = (
+/obj/random/underdark,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"bD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/random/underdark,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+bc
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aj
+ad
+ad
+ad
+aj
+ad
+aa
+ac
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+aj
+ad
+ad
+ad
+aX
+ad
+ad
+aj
+ad
+ad
+ad
+aa
+ac
+"}
+(3,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ad
+aa
+ac
+"}
+(4,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ab
+aw
+ae
+aU
+au
+ab
+al
+aP
+bx
+aP
+al
+ab
+bp
+ae
+ab
+ad
+aa
+ac
+"}
+(5,1,1) = {"
+aj
+ad
+ad
+ad
+ah
+ad
+ad
+ai
+ae
+ae
+ae
+ae
+ab
+ae
+ae
+ae
+by
+ae
+ab
+ae
+ae
+ab
+ad
+aa
+ac
+"}
+(6,1,1) = {"
+aj
+ad
+ad
+ad
+ad
+ad
+ad
+ab
+aF
+ae
+aZ
+aM
+ab
+bv
+ae
+ae
+ae
+bC
+ab
+bi
+ae
+ab
+ad
+aa
+ac
+"}
+(7,1,1) = {"
+ad
+ad
+aj
+ad
+ad
+ad
+ad
+ab
+ab
+af
+ab
+ab
+ab
+aD
+bB
+ba
+bB
+ae
+bA
+br
+ae
+ab
+ad
+aa
+ac
+"}
+(8,1,1) = {"
+ad
+ad
+ad
+ad
+ad
+am
+ad
+ab
+ae
+ae
+ae
+av
+ab
+aT
+ae
+ae
+ae
+aI
+ab
+bj
+bj
+ab
+ad
+aa
+ac
+"}
+(9,1,1) = {"
+aA
+ad
+aX
+ad
+ad
+ad
+ad
+ai
+ae
+ae
+ae
+ae
+ab
+bw
+ae
+ae
+ae
+bC
+ab
+bj
+bj
+ab
+bc
+aa
+ac
+"}
+(10,1,1) = {"
+ad
+ad
+ad
+at
+ad
+bc
+ad
+ab
+av
+ae
+ae
+aV
+ab
+ax
+ae
+bj
+ae
+ay
+ab
+bj
+bD
+ab
+ad
+aa
+ac
+"}
+(11,1,1) = {"
+aA
+ad
+ad
+ad
+ad
+ad
+ak
+ab
+ab
+ae
+ag
+ab
+ab
+ab
+aQ
+bz
+ab
+ab
+ab
+ae
+bC
+ab
+ad
+aa
+ac
+"}
+(12,1,1) = {"
+aB
+aA
+aj
+ad
+ad
+ad
+aj
+ab
+aY
+ae
+ae
+aN
+ab
+aR
+aU
+bj
+ae
+ae
+aU
+ae
+aJ
+ab
+ad
+aa
+ac
+"}
+(13,1,1) = {"
+aA
+aA
+ad
+ad
+bd
+bd
+bf
+bg
+bh
+bh
+bh
+bh
+bg
+bh
+bj
+bj
+bt
+ae
+ae
+ae
+aK
+ab
+ad
+aa
+ac
+"}
+(14,1,1) = {"
+aA
+aA
+ad
+ad
+be
+ad
+ad
+ab
+bl
+ae
+ae
+ae
+ab
+bi
+ae
+bj
+ae
+ae
+ae
+ae
+aL
+ab
+bc
+aa
+ac
+"}
+(15,1,1) = {"
+aA
+bu
+ad
+ad
+ad
+ad
+ak
+ab
+ab
+ae
+ag
+ab
+ab
+ab
+aE
+bs
+aE
+ab
+ab
+ae
+bC
+ab
+ad
+aa
+ac
+"}
+(16,1,1) = {"
+ad
+ad
+aX
+ad
+ad
+ad
+ad
+ab
+bm
+ae
+ae
+aG
+ab
+ar
+ae
+bj
+ae
+ar
+ab
+ae
+bC
+ab
+ad
+aa
+ac
+"}
+(17,1,1) = {"
+aA
+bu
+ad
+ad
+ad
+ad
+ad
+ab
+aS
+ae
+ae
+aC
+ab
+ae
+ae
+ae
+ae
+ae
+ab
+ae
+ae
+ab
+ad
+aa
+ac
+"}
+(18,1,1) = {"
+bu
+ad
+ad
+aj
+ad
+aj
+ad
+ab
+aC
+au
+ae
+aC
+ab
+as
+ae
+ae
+ae
+as
+ab
+ae
+ae
+ab
+ad
+aa
+ac
+"}
+(19,1,1) = {"
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ab
+bn
+ae
+ae
+aH
+ab
+ae
+ae
+ae
+ae
+ae
+af
+ae
+bk
+ab
+ad
+aa
+ac
+"}
+(20,1,1) = {"
+aj
+ad
+ad
+ad
+ad
+ad
+ad
+ab
+ab
+ab
+af
+ab
+ab
+aT
+bb
+ae
+ae
+aW
+ab
+ae
+ae
+ab
+ad
+aa
+ac
+"}
+(21,1,1) = {"
+aj
+ad
+ad
+ao
+ad
+ah
+ad
+ab
+aT
+ae
+ae
+ae
+ab
+ae
+ae
+ae
+ae
+ae
+ab
+ae
+ae
+ab
+ad
+aa
+ac
+"}
+(22,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+bo
+az
+az
+an
+ab
+ap
+ae
+aO
+ae
+aq
+ab
+bq
+ae
+ab
+ad
+aa
+ac
+"}
+(23,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ad
+aa
+ac
+"}
+(24,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+aj
+ad
+ad
+aa
+ac
+"}
+(25,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+ad
+aj
+ad
+ad
+ad
+bc
+ad
+ad
+ad
+ad
+ad
+aa
+ac
+"}
diff --git a/maps/tether/submaps/underdark_pois/broken_engine.dmm b/maps/tether/submaps/underdark_pois/broken_engine.dmm
new file mode 100644
index 0000000000..7d966db623
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/broken_engine.dmm
@@ -0,0 +1,136 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"b" = (
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"c" = (
+/obj/machinery/door/airlock/glass_engineering,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"e" = (
+/obj/structure/sign/warning/radioactive,
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"f" = (
+/obj/structure/sign/warning/radioactive,
+/obj/effect/map_effect/interval/sound_emitter/geiger/high,
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"g" = (
+/obj/item/device/geiger,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"h" = (
+/obj/effect/map_effect/radiation_emitter/strong,
+/obj/item/poi/brokenoldreactor,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"i" = (
+/obj/effect/map_effect/interval/sound_emitter/geiger/ext,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+a
+e
+d
+d
+d
+d
+d
+b
+a
+"}
+(4,1,1) = {"
+a
+c
+d
+d
+d
+h
+d
+b
+a
+"}
+(5,1,1) = {"
+a
+f
+g
+d
+d
+i
+d
+b
+a
+"}
+(6,1,1) = {"
+a
+c
+d
+d
+d
+h
+d
+b
+a
+"}
+(7,1,1) = {"
+a
+e
+d
+d
+d
+d
+d
+b
+a
+"}
+(8,1,1) = {"
+a
+b
+b
+b
+b
+b
+b
+b
+a
+"}
+(9,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/maps/tether/submaps/underdark_pois/mimicry.dmm b/maps/tether/submaps/underdark_pois/mimicry.dmm
new file mode 100644
index 0000000000..001206a9d1
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/mimicry.dmm
@@ -0,0 +1,101 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"c" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/obj/structure/closet/crate,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"e" = (
+/obj/structure/closet/crate/mimic/cointoss,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"f" = (
+/obj/structure/closet/crate/mimic/guaranteed,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"g" = (
+/obj/structure/closet/crate/mimic/dangerous,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"h" = (
+/obj/structure/closet/crate/mimic/safe,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"i" = (
+/obj/effect/decal/remains/deer,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"j" = (
+/obj/effect/decal/remains/tajaran,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+b
+c
+e
+d
+g
+h
+f
+a
+"}
+(3,1,1) = {"
+b
+b
+c
+i
+c
+c
+d
+a
+"}
+(4,1,1) = {"
+b
+b
+c
+c
+c
+j
+g
+a
+"}
+(5,1,1) = {"
+b
+c
+d
+f
+d
+f
+d
+a
+"}
+(6,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+"}
diff --git a/maps/tether/submaps/underdark_pois/old_drone_hive.dmm b/maps/tether/submaps/underdark_pois/old_drone_hive.dmm
new file mode 100644
index 0000000000..c2e9d3ec78
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/old_drone_hive.dmm
@@ -0,0 +1,138 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"c" = (
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/obj/effect/decal/remains/tajaran,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"e" = (
+/obj/effect/decal/remains/tajaran,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"f" = (
+/obj/random/underdark,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"g" = (
+/obj/effect/decal/remains/deer,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"h" = (
+/obj/structure/ore_box,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"i" = (
+/turf/simulated/wall,
+/area/mine/explored/underdark)
+"j" = (
+/obj/random/underdark,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"k" = (
+/obj/structure/old_roboprinter,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"l" = (
+/obj/tether_away_spawner/underdark_drone_swarm,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+"m" = (
+/obj/structure/barricade,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"n" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+b
+b
+f
+b
+b
+i
+d
+i
+i
+i
+i
+i
+"}
+(2,1,1) = {"
+b
+b
+a
+b
+b
+i
+c
+c
+c
+c
+c
+i
+"}
+(3,1,1) = {"
+a
+e
+a
+m
+h
+n
+c
+k
+k
+k
+c
+i
+"}
+(4,1,1) = {"
+a
+a
+a
+m
+a
+c
+c
+c
+c
+c
+c
+i
+"}
+(5,1,1) = {"
+b
+b
+g
+b
+b
+i
+c
+l
+l
+l
+c
+i
+"}
+(6,1,1) = {"
+b
+b
+a
+b
+b
+i
+j
+i
+i
+i
+i
+i
+"}
diff --git a/maps/tether/submaps/underdark_pois/phoron_rat_den.dmm b/maps/tether/submaps/underdark_pois/phoron_rat_den.dmm
new file mode 100644
index 0000000000..5846c72a14
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/phoron_rat_den.dmm
@@ -0,0 +1,309 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/decal/cleanable/cobweb,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"c" = (
+/turf/simulated/mineral/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/obj/effect/decal/cleanable/blood/tracks/paw,
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"f" = (
+/obj/structure/barricade,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"g" = (
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"h" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"i" = (
+/obj/effect/decal/cleanable/blood/tracks/paw,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"j" = (
+/obj/effect/decal/remains/mouse,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"k" = (
+/mob/living/simple_mob/vore/aggressive/rat/phoron,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"l" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"m" = (
+/obj/effect/decal/remains/deer,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"n" = (
+/obj/structure/frame,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"o" = (
+/obj/structure/bonfire/permanent,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"p" = (
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"q" = (
+/obj/effect/decal/remains/tajaran,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"r" = (
+/obj/effect/decal/cleanable/blood/drip,
+/obj/structure/barricade,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"s" = (
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"t" = (
+/obj/structure/girder,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"u" = (
+/obj/structure/outcrop/diamond,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+b
+b
+b
+c
+c
+c
+c
+c
+c
+c
+c
+c
+"}
+(2,1,1) = {"
+b
+b
+b
+c
+a
+g
+g
+g
+g
+p
+m
+c
+"}
+(3,1,1) = {"
+b
+b
+b
+c
+g
+k
+g
+g
+k
+g
+p
+c
+"}
+(4,1,1) = {"
+c
+c
+c
+c
+g
+g
+g
+g
+g
+g
+q
+c
+"}
+(5,1,1) = {"
+a
+g
+g
+g
+g
+g
+g
+g
+g
+g
+g
+c
+"}
+(6,1,1) = {"
+d
+d
+d
+i
+j
+g
+g
+n
+g
+g
+g
+c
+"}
+(7,1,1) = {"
+c
+g
+h
+i
+g
+g
+g
+g
+g
+g
+g
+c
+"}
+(8,1,1) = {"
+c
+g
+h
+d
+d
+l
+m
+o
+g
+g
+q
+c
+"}
+(9,1,1) = {"
+c
+g
+g
+g
+g
+g
+h
+h
+g
+g
+g
+c
+"}
+(10,1,1) = {"
+c
+g
+g
+u
+g
+m
+g
+h
+g
+g
+s
+c
+"}
+(11,1,1) = {"
+f
+g
+g
+g
+g
+g
+g
+h
+g
+g
+g
+c
+"}
+(12,1,1) = {"
+f
+g
+g
+g
+g
+g
+g
+h
+g
+g
+g
+c
+"}
+(13,1,1) = {"
+c
+c
+c
+c
+g
+k
+g
+h
+g
+g
+g
+c
+"}
+(14,1,1) = {"
+b
+b
+b
+c
+g
+g
+g
+h
+g
+g
+m
+c
+"}
+(15,1,1) = {"
+b
+b
+b
+c
+t
+g
+g
+h
+g
+p
+m
+c
+"}
+(16,1,1) = {"
+b
+b
+b
+c
+c
+c
+c
+r
+c
+c
+c
+c
+"}
diff --git a/maps/tether/submaps/underdark_pois/puzzle_corridor.dmm b/maps/tether/submaps/underdark_pois/puzzle_corridor.dmm
new file mode 100644
index 0000000000..8e0f2ae6c0
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/puzzle_corridor.dmm
@@ -0,0 +1,111 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/unsimulated/mineral/virgo3b,
+/area/mine/explored/underdark)
+"c" = (
+/obj/tether_away_spawner/underdark_normal,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+d
+d
+d
+b
+a
+a
+b
+a
+b
+a
+b
+d
+d
+d
+"}
+(2,1,1) = {"
+b
+b
+b
+a
+a
+a
+b
+a
+b
+a
+c
+b
+b
+b
+"}
+(3,1,1) = {"
+a
+a
+a
+a
+a
+b
+a
+a
+b
+b
+b
+b
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+b
+a
+b
+a
+a
+a
+a
+b
+a
+a
+a
+a
+"}
+(5,1,1) = {"
+b
+b
+b
+a
+a
+a
+c
+b
+a
+a
+a
+b
+b
+b
+"}
+(6,1,1) = {"
+d
+d
+b
+a
+a
+b
+b
+a
+a
+b
+a
+b
+d
+d
+"}
diff --git a/maps/tether/submaps/underdark_pois/rad_threat.dmm b/maps/tether/submaps/underdark_pois/rad_threat.dmm
new file mode 100644
index 0000000000..3b82e11b08
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/rad_threat.dmm
@@ -0,0 +1,63 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"c" = (
+/obj/effect/map_effect/radiation_emitter{
+ desc = "if you can see this, poke a coder"
+ },
+/obj/item/poi/brokenoldreactor,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+b
+b
+a
+a
+b
+b
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+"}
+(3,1,1) = {"
+b
+a
+a
+c
+a
+b
+"}
+(4,1,1) = {"
+b
+a
+a
+a
+a
+b
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+b
+b
+a
+a
+b
+b
+"}
diff --git a/maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm b/maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm
new file mode 100644
index 0000000000..df6306c246
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/rykka_easter_egg.dmm
@@ -0,0 +1,66 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/simulated/mineral/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"c" = (
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/wolf/phoron{
+ attacktext = list("attacked, bites, gnaws");
+ color = "#6D5843";
+ desc = "This canine looks like a GSD. It has a collar tagged, 'Bitch'";
+ friendly = list("nuzzles, cuddles, rubs against");
+ name = "Rykka";
+ size_multiplier = 1.25;
+ tt_desc = "Canidae";
+ vore_bump_chance = 100;
+ vore_bump_emote = "clamps down on with iron jaws";
+ vore_default_contamination_color = "purple";
+ vore_default_contamination_flavor = "Acrid";
+ vore_digest_chance = 85;
+ vore_escape_chance = 5;
+ vore_pounce_chance = 100;
+ vore_pounce_maxhealth = 100;
+ vore_stomach_flavor = "A black-and-purple veined gut, pulsing warmly around you. Loud gurgles sound around you as the gut squishes inwards and attempts to crush you - Rykka seems intent on digesting you, like the meat you are.";
+ vore_stomach_name = "Gut"
+ },
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+b
+b
+a
+b
+b
+"}
+(2,1,1) = {"
+b
+a
+a
+a
+b
+"}
+(3,1,1) = {"
+a
+a
+c
+a
+a
+"}
+(4,1,1) = {"
+b
+a
+a
+a
+b
+"}
+(5,1,1) = {"
+b
+b
+a
+b
+b
+"}
diff --git a/maps/tether/submaps/underdark_pois/spider_nest.dmm b/maps/tether/submaps/underdark_pois/spider_nest.dmm
new file mode 100644
index 0000000000..0e3233e5f8
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/spider_nest.dmm
@@ -0,0 +1,111 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"c" = (
+/turf/simulated/mineral/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/obj/tether_away_spawner/underdark_normal,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"e" = (
+/obj/effect/decal/cleanable/spiderling_remains,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"f" = (
+/obj/effect/decal/cleanable/cobweb,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"g" = (
+/obj/effect/decal/cleanable/cobweb2,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"h" = (
+/obj/structure/barricade,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"i" = (
+/obj/structure/bonfire/permanent,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"j" = (
+/obj/random/underdark/uncertain,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"k" = (
+/obj/random/underdark,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"l" = (
+/obj/random/outcrop,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+b
+c
+a
+e
+a
+b
+"}
+(2,1,1) = {"
+c
+c
+a
+a
+a
+k
+"}
+(3,1,1) = {"
+e
+f
+a
+d
+a
+a
+"}
+(4,1,1) = {"
+e
+a
+a
+i
+a
+a
+"}
+(5,1,1) = {"
+l
+d
+a
+j
+a
+a
+"}
+(6,1,1) = {"
+b
+b
+a
+a
+d
+g
+"}
+(7,1,1) = {"
+b
+b
+a
+e
+c
+c
+"}
+(8,1,1) = {"
+b
+b
+h
+h
+c
+c
+"}
diff --git a/maps/tether/submaps/underdark_pois/subterranean_lake.dmm b/maps/tether/submaps/underdark_pois/subterranean_lake.dmm
new file mode 100644
index 0000000000..3a8f4b95a4
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/subterranean_lake.dmm
@@ -0,0 +1,162 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"b" = (
+/turf/simulated/floor/water,
+/area/mine/explored/underdark)
+"c" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/turf/simulated/floor/water/deep,
+/area/mine/explored/underdark)
+"e" = (
+/obj/tether_away_spawner/underdark_normal,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+"}
+(2,1,1) = {"
+a
+e
+c
+b
+b
+b
+b
+c
+c
+a
+"}
+(3,1,1) = {"
+c
+c
+b
+d
+d
+d
+d
+b
+c
+a
+"}
+(4,1,1) = {"
+c
+b
+d
+d
+d
+d
+d
+d
+b
+c
+"}
+(5,1,1) = {"
+c
+b
+d
+d
+d
+d
+d
+d
+b
+c
+"}
+(6,1,1) = {"
+c
+b
+d
+d
+d
+d
+d
+d
+b
+c
+"}
+(7,1,1) = {"
+c
+b
+d
+d
+d
+d
+d
+d
+b
+c
+"}
+(8,1,1) = {"
+c
+b
+d
+d
+d
+d
+d
+d
+b
+c
+"}
+(9,1,1) = {"
+c
+b
+d
+d
+d
+d
+d
+d
+b
+c
+"}
+(10,1,1) = {"
+c
+c
+b
+d
+d
+d
+d
+b
+c
+a
+"}
+(11,1,1) = {"
+a
+c
+c
+b
+b
+b
+b
+c
+e
+a
+"}
+(12,1,1) = {"
+a
+a
+c
+c
+c
+c
+c
+c
+a
+a
+"}
diff --git a/maps/tether/submaps/underdark_pois/tree_shrine.dmm b/maps/tether/submaps/underdark_pois/tree_shrine.dmm
new file mode 100644
index 0000000000..f8a43cfb93
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/tree_shrine.dmm
@@ -0,0 +1,115 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored/underdark)
+"c" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"d" = (
+/obj/structure/flora/ausbushes/fullgrass,
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored/underdark)
+"e" = (
+/obj/structure/flora/ausbushes/leafybush,
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored/underdark)
+"f" = (
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored/underdark)
+"g" = (
+/obj/structure/flora/ausbushes/brflowers,
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored/underdark)
+"h" = (
+/obj/structure/flora/tree/pine,
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored/underdark)
+"i" = (
+/obj/tether_away_spawner/underdark_hard,
+/turf/simulated/floor/outdoors/dirt/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+c
+c
+c
+c
+c
+c
+c
+c
+"}
+(2,1,1) = {"
+c
+i
+a
+a
+a
+a
+a
+c
+"}
+(3,1,1) = {"
+c
+a
+b
+b
+d
+h
+a
+c
+"}
+(4,1,1) = {"
+c
+a
+d
+b
+d
+d
+a
+c
+"}
+(5,1,1) = {"
+c
+a
+e
+d
+g
+d
+a
+c
+"}
+(6,1,1) = {"
+c
+a
+d
+f
+h
+b
+a
+c
+"}
+(7,1,1) = {"
+c
+a
+a
+a
+a
+a
+a
+c
+"}
+(8,1,1) = {"
+c
+c
+c
+c
+c
+c
+c
+c
+"}
diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm
index 3e5b682b20..e16151fbf1 100644
--- a/maps/tether/submaps/underdark_pois/underdark_things.dm
+++ b/maps/tether/submaps/underdark_pois/underdark_things.dm
@@ -9,7 +9,40 @@
poison_chance = 20
+// Adds Phoron Wolf
+/mob/living/simple_mob/animal/wolf/phoron
+
+ faction = "underdark"
+ movement_cooldown = 0
+
+ harm_intent_damage = 5
+ melee_damage_lower = 5
+ melee_damage_upper = 12
+
+ minbodytemp = 200
+
+// Lazy way of making sure wolves survive outside.
+ min_oxy = 0
+ max_oxy = 0
+ min_tox = 0
+ max_tox = 0
+ min_co2 = 0
+ max_co2 = 0
+ min_n2 = 0
+ max_n2 = 0
+
// Underdark mob spawners
+/obj/tether_away_spawner/underdark_drone_swarm
+ name = "Underdark Drone Swarm Spawner"
+ faction = "underdark"
+ atmos_comp = TRUE
+ prob_spawn = 100
+ prob_fall = 10
+ //guard = 20
+ mobs_to_pick_from = list(
+ /mob/living/simple_mob/mechanical/corrupt_maint_drone = 3,
+ )
+
/obj/tether_away_spawner/underdark_normal
name = "Underdark Normal Spawner"
faction = "underdark"
diff --git a/maps/tether/submaps/underdark_pois/wolf_den.dmm b/maps/tether/submaps/underdark_pois/wolf_den.dmm
new file mode 100644
index 0000000000..c342641c76
--- /dev/null
+++ b/maps/tether/submaps/underdark_pois/wolf_den.dmm
@@ -0,0 +1,268 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"b" = (
+/turf/template_noop,
+/area/mine/explored/underdark)
+"c" = (
+/turf/simulated/mineral/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"d" = (
+/obj/effect/decal/remains/tajaran,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"e" = (
+/obj/effect/decal/remains/mouse,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"f" = (
+/obj/effect/decal/remains/deer,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"g" = (
+/mob/living/simple_mob/animal/wolf/phoron,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"h" = (
+/obj/effect/decal/remains/ribcage,
+/obj/effect/decal/cleanable/blood,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"i" = (
+/obj/effect/decal/remains/deer,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"j" = (
+/mob/living/simple_mob/otie/feral{
+ faction = "underdark"
+ },
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"k" = (
+/obj/structure/dogbed,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"l" = (
+/obj/structure/barricade,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"m" = (
+/obj/item/broken_device/random,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"n" = (
+/obj/item/resonator/upgraded,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+"o" = (
+/obj/item/weapon/archaeological_find,
+/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
+/area/mine/explored/underdark)
+
+(1,1,1) = {"
+b
+b
+c
+c
+c
+c
+c
+b
+b
+c
+c
+c
+c
+c
+c
+"}
+(2,1,1) = {"
+b
+b
+c
+a
+a
+a
+l
+l
+l
+l
+a
+a
+a
+e
+c
+"}
+(3,1,1) = {"
+c
+c
+c
+a
+a
+a
+a
+a
+a
+a
+a
+g
+a
+a
+c
+"}
+(4,1,1) = {"
+a
+d
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+"}
+(5,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+i
+a
+a
+a
+n
+a
+a
+b
+"}
+(6,1,1) = {"
+a
+e
+a
+a
+h
+a
+a
+a
+k
+a
+a
+a
+a
+a
+b
+"}
+(7,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+b
+"}
+(8,1,1) = {"
+a
+a
+a
+m
+a
+j
+a
+a
+a
+a
+a
+a
+a
+a
+b
+"}
+(9,1,1) = {"
+g
+f
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+g
+c
+"}
+(10,1,1) = {"
+c
+c
+c
+a
+g
+a
+e
+a
+a
+a
+a
+e
+a
+a
+c
+"}
+(11,1,1) = {"
+b
+b
+c
+a
+a
+a
+l
+l
+l
+l
+a
+a
+a
+o
+c
+"}
+(12,1,1) = {"
+b
+b
+c
+c
+c
+c
+c
+b
+b
+c
+c
+c
+c
+c
+c
+"}
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 452bbd9111..f98378c8df 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -6119,6 +6119,12 @@
d2 = 4;
icon_state = "0-4"
},
+/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/zpipe/up/supply{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/public_garden_maintenence)
"akH" = (
@@ -6128,6 +6134,12 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
/turf/simulated/floor/plating,
/area/maintenance/lower/public_garden_maintenence)
"akI" = (
@@ -6209,6 +6221,8 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/tether/surfacebase/public_garden)
"akT" = (
@@ -6317,6 +6331,8 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden)
"alf" = (
@@ -6467,12 +6483,6 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden)
"alp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -6488,6 +6498,8 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden)
"alq" = (
@@ -6858,6 +6870,7 @@
icon_state = "0-2"
},
/obj/effect/floor_decal/industrial/warning,
+/obj/random/drinkbottle,
/turf/simulated/floor,
/area/maintenance/substation/mining)
"alT" = (
@@ -6886,9 +6899,6 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/alarm{
- pixel_y = 22
- },
/obj/effect/floor_decal/rust,
/turf/simulated/floor,
/area/maintenance/substation/mining)
@@ -23094,6 +23104,7 @@
pixel_x = 0;
pixel_y = 26
},
+/obj/random/drinkbottle,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_8)
"aLT" = (
@@ -23932,8 +23943,8 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_8)
"aNr" = (
-/obj/item/weapon/bedsheet/double,
/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/bluedouble,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_8)
"aNs" = (
@@ -24431,6 +24442,7 @@
pixel_x = 0;
pixel_y = 26
},
+/obj/random/carp_plushie,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_6)
"aOr" = (
@@ -24973,8 +24985,8 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_6)
"aPh" = (
-/obj/item/weapon/bedsheet/double,
/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/reddouble,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_6)
"aPi" = (
@@ -25736,9 +25748,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"aQE" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/sleep/Dorm_3)
"aQF" = (
/obj/machinery/light{
dir = 8
@@ -26182,8 +26191,8 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
"aRq" = (
-/obj/item/weapon/bedsheet/double,
/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/yellowdouble,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
"aRr" = (
@@ -26689,6 +26698,7 @@
dir = 1
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/random/action_figure,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
"aSr" = (
@@ -27316,8 +27326,8 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
"aTF" = (
-/obj/item/weapon/bedsheet/double,
/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/orangedouble,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
"aTG" = (
@@ -30861,6 +30871,29 @@
/obj/effect/step_trigger/teleporter/to_plains,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/tether/surfacebase/outside/outside1)
+"cGJ" = (
+/turf/simulated/floor/plating,
+/area/maintenance/lower/mining_eva)
+"guV" = (
+/obj/structure/closet,
+/obj/random/drinkbottle,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/tiled/techfloor,
+/area/maintenance/lower/vacant_site)
+"obY" = (
+/obj/machinery/alarm{
+ pixel_y = 22
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/substation/mining)
+"vNx" = (
+/turf/simulated/floor/plating,
+/area/maintenance/substation/mining)
+"yiv" = (
+/obj/structure/closet/crate,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/maintenance/substation/mining)
(1,1,1) = {"
aaa
@@ -33911,7 +33944,7 @@ aah
aah
aah
aah
-azs
+auK
auK
auK
auK
@@ -34053,7 +34086,7 @@ aah
aah
aah
aah
-azs
+auK
aAs
aBu
aCc
@@ -34195,7 +34228,7 @@ aah
aah
aah
aah
-azs
+auK
aAt
aBv
aBv
@@ -34337,7 +34370,7 @@ aah
aah
aah
aah
-azs
+auK
aAu
aBv
aah
@@ -34479,7 +34512,7 @@ aah
aah
aah
aah
-azs
+auK
aAu
aBv
aah
@@ -34621,7 +34654,7 @@ aah
aah
aah
aah
-azs
+auK
abB
aBv
aah
@@ -34763,7 +34796,7 @@ aah
aah
aah
aah
-azs
+auK
aAu
aBv
aah
@@ -34905,7 +34938,7 @@ aah
aah
aah
aah
-azs
+auK
aAv
aBv
aah
@@ -40978,7 +41011,7 @@ abT
abT
abT
abT
-abT
+aex
aex
aex
aex
@@ -41116,12 +41149,12 @@ aah
aah
aah
abT
-abT
+cGJ
acS
acS
adp
-abT
aex
+yiv
alS
amn
afX
@@ -41262,8 +41295,8 @@ acj
acX
acX
adL
-abT
aex
+vNx
alT
amo
amI
@@ -41404,8 +41437,8 @@ acQ
adl
ado
adM
-abT
aex
+obY
alU
amp
amJ
@@ -41546,7 +41579,7 @@ abn
abn
abT
adN
-abT
+aex
alC
alV
aex
@@ -43877,7 +43910,7 @@ aOj
aOj
aOj
aQb
-aQE
+aQb
aQb
aQb
aSi
@@ -44826,7 +44859,7 @@ anI
aob
aom
ahx
-apF
+guV
apF
ahc
apF
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 28b09e63ef..c903dc5e17 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -639,27 +639,18 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/public_garden_maintenence/upper)
"bp" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable/green{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/structure/cable/green{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 2;
+ icon_state = "1-2"
},
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -23;
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/lower/public_garden_maintenence/upper)
"bq" = (
@@ -4806,6 +4797,8 @@
d2 = 2;
icon_state = "32-2"
},
+/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
+/obj/machinery/atmospherics/pipe/zpipe/down/supply,
/turf/simulated/open,
/area/maintenance/lower/public_garden_maintenence/upper)
"kn" = (
@@ -4896,16 +4889,23 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"kw" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/obj/structure/cable/green{
d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -23;
- pixel_y = 0
+ d2 = 4;
+ icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/lower/public_garden_maintenence/upper)
"kx" = (
@@ -17834,15 +17834,8 @@
/obj/machinery/button/remote/blast_door{
id = "xenobiodiv7";
name = "Divider 7 Blast Doors";
- pixel_x = -38;
- pixel_y = 0;
- req_access = list(55)
- },
-/obj/machinery/button/remote/blast_door{
- id = "xenocont1";
- name = "Exterior Containment Blast Doors";
pixel_x = -30;
- pixel_y = -8;
+ pixel_y = -5;
req_access = list(55)
},
/obj/machinery/button/remote/blast_door{
@@ -21456,6 +21449,7 @@
d2 = 0;
icon_state = "16-0"
},
+/obj/structure/disposalpipe/up,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"Or" = (
@@ -21702,6 +21696,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"OJ" = (
@@ -21722,15 +21720,8 @@
/obj/machinery/button/remote/blast_door{
id = "xenobiodiv8";
name = "Divider 8 Blast Doors";
- pixel_x = 38;
- pixel_y = 0;
- req_access = list(55)
- },
-/obj/machinery/button/remote/blast_door{
- id = "xenocont2";
- name = "Exterior Containment Blast Doors";
pixel_x = 30;
- pixel_y = -8;
+ pixel_y = -5;
req_access = list(55)
},
/obj/machinery/button/remote/blast_door{
@@ -21784,16 +21775,28 @@
/area/rnd/outpost/xenobiology/outpost_slimepens)
"OP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ dir = 5
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ icon_state = "intact-supply";
+ dir = 5
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"OQ" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
@@ -21829,31 +21832,20 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
"OU" = (
-/obj/machinery/light{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/machinery/alarm{
- alarm_id = null;
- breach_detection = 0;
- dir = 1;
- icon_state = "alarm0";
- pixel_y = -22
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"OV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- icon_state = "intact-supply";
- dir = 5
- },
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"OW" = (
@@ -23241,6 +23233,11 @@
dir = 9
},
/obj/machinery/light/small,
+/obj/structure/mirror{
+ dir = 4;
+ pixel_x = 25;
+ pixel_y = 0
+ },
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/medical/resleeving)
"Rh" = (
@@ -27227,6 +27224,60 @@
/obj/item/toy/syndicateballoon,
/turf/simulated/floor,
/area/tether/surfacebase/outside/outside2)
+"WH" = (
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"WI" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/alarm{
+ alarm_id = null;
+ breach_detection = 0;
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -22
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"WJ" = (
+/obj/machinery/recharger/wallcharger{
+ pixel_y = -38
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_y = -28
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"WK" = (
+/obj/machinery/button/remote/blast_door{
+ id = "xenocont1";
+ name = "Exterior Containment Blast Doors";
+ pixel_x = -30;
+ pixel_y = -25;
+ req_access = list(55)
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"WL" = (
+/obj/machinery/button/remote/blast_door{
+ id = "xenocont2";
+ name = "Exterior Containment Blast Doors";
+ pixel_x = 30;
+ pixel_y = -25;
+ req_access = list(55)
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"WO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/green{
icon_state = "intact";
@@ -27355,6 +27406,23 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhallway)
+"XK" = (
+/turf/simulated/wall{
+ can_open = 1
+ },
+/area/maintenance/lower/bar)
+"Za" = (
+/turf/simulated/wall{
+ can_open = 0
+ },
+/area/maintenance/lower/bar)
+"Zt" = (
+/obj/structure/closet/crate,
+/obj/random/cash,
+/obj/random/contraband,
+/obj/random/drinkbottle,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/mining)
(1,1,1) = {"
aa
@@ -32589,8 +32657,8 @@ Hc
HV
Oj
Ja
-Ja
-OU
+WK
+WI
Hc
ab
ab
@@ -32729,10 +32797,10 @@ Nw
KZ
NT
OI
-OP
-OQ
-Ja
-Pw
+OU
+OV
+WH
+WJ
Hc
ab
ab
@@ -32870,7 +32938,7 @@ JE
Kq
He
Ot
-OV
+OP
Ol
OF
Ja
@@ -33012,7 +33080,7 @@ JD
OA
Op
Oq
-OA
+OQ
Ov
Ja
Ja
@@ -33441,7 +33509,7 @@ NW
OL
Mj
Ja
-Ja
+WL
Px
Hc
ab
@@ -33636,8 +33704,8 @@ ac
ac
bn
km
-kw
bp
+kw
bB
bX
bn
@@ -41881,7 +41949,7 @@ dJ
df
ad
Th
-Th
+Zt
ny
ny
dY
@@ -42166,8 +42234,8 @@ ec
du
du
du
-du
-du
+Za
+XK
du
du
du
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 209ce9bc2f..a0f4a2999d 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -5024,7 +5024,11 @@
dir = 8;
icon_state = "sink";
pixel_x = -12;
- pixel_y = 8
+ pixel_y = 0
+ },
+/obj/structure/mirror{
+ pixel_x = -25;
+ pixel_y = 0
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/recreation_area_restroom)
@@ -15732,13 +15736,11 @@
/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/effect/floor_decal/corner/mauve/border{
dir = 1
},
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/disposal,
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"Ao" = (
@@ -16300,9 +16302,6 @@
/turf/simulated/floor/tiled/steel_grid,
/area/assembly/robotics)
"AY" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/floor_decal/borderfloor{
dir = 1;
icon_state = "borderfloor";
@@ -16321,6 +16320,10 @@
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"AZ" = (
@@ -19423,9 +19426,9 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/disposalpipe/junction{
+ icon_state = "pipe-j2";
+ dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
@@ -19441,6 +19444,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"FP" = (
@@ -20780,32 +20787,10 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_south_airlock)
"HH" = (
-/obj/structure/lattice,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/zpipe/down/supply{
- dir = 1
- },
-/obj/structure/cable/green{
- d1 = 32;
- icon_state = "32-1"
- },
-/obj/structure/window/basic/full,
-/obj/structure/grille,
-/obj/structure/window/basic,
-/obj/structure/window/basic{
- dir = 8
- },
-/obj/structure/window/basic{
- dir = 1
- },
-/obj/structure/window/basic{
- dir = 4
- },
-/turf/simulated/open,
-/area/rnd/outpost/xenobiology/outpost_stairs)
+/obj/structure/shuttle/engine/propulsion,
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tether/surface)
"HI" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/alarm{
@@ -25074,6 +25059,24 @@
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
"Qd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_main)
+"Qe" = (
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28
@@ -25081,18 +25084,9 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_main)
-"Qe" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
@@ -25143,6 +25137,22 @@
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
"Qn" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/sortjunction{
+ name = "Xenobiology";
+ sortType = "Xenobiology"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_main)
+"Qo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
dir = 4
@@ -25153,9 +25163,26 @@
/obj/structure/cable/green{
icon_state = "2-4"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
-"Qo" = (
+"Qp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ icon_state = "intact-scrubbers";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_main)
+"Qq" = (
/obj/machinery/door/airlock/research{
name = "Xenobiology Office";
req_access = list();
@@ -25172,39 +25199,11 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/rnd/outpost/xenobiology/outpost_office)
-"Qp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- icon_state = "intact-scrubbers";
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_main)
-"Qq" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_main)
"Qr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -25307,16 +25306,22 @@
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
"QA" = (
-/obj/machinery/vending/coffee,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ icon_state = "intact-scrubbers";
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/obj/structure/cable/green{
- icon_state = "1-2"
+ icon_state = "4-8"
},
-/obj/machinery/light_switch{
+/obj/structure/disposalpipe/segment{
dir = 8;
- pixel_x = 24
+ icon_state = "pipe-c"
},
-/turf/simulated/floor/wood,
-/area/rnd/outpost/xenobiology/outpost_office)
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_main)
"QB" = (
/obj/machinery/light{
dir = 8;
@@ -25414,15 +25419,15 @@
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
"QL" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 28
+/obj/machinery/vending/coffee,
+/obj/structure/cable/green{
+ icon_state = "1-2"
},
-/obj/machinery/light{
- dir = 4
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = 24
},
-/obj/structure/cable/green,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
"QM" = (
@@ -25567,7 +25572,6 @@
"Rc" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
-/obj/structure/disposalpipe/junction,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -25578,6 +25582,9 @@
icon_state = "1-4"
},
/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/junction{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"Rd" = (
@@ -25661,22 +25668,24 @@
/turf/simulated/wall,
/area/rnd/outpost/xenobiology/outpost_decon)
"Ro" = (
-/obj/structure/table/standard,
-/obj/item/toy/plushie/purple_fox,
-/obj/machinery/firealarm{
- dir = 4;
- layer = 3.3;
- pixel_x = 26
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-2"
},
-/obj/machinery/recharger/wallcharger{
- pixel_x = 4;
- pixel_y = 28
+/obj/structure/cable/green{
+ icon_state = "1-8"
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+/obj/structure/cable/green{
+ icon_state = "1-4"
},
-/turf/simulated/floor/tiled/techmaint,
-/area/rnd/outpost/xenobiology/outpost_storage)
+/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_main)
"Rp" = (
/obj/structure/closet/l3closet/scientist,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -25755,6 +25764,7 @@
/obj/item/weapon/extinguisher,
/obj/item/clothing/shoes/galoshes,
/obj/item/clothing/shoes/galoshes,
+/obj/item/weapon/extinguisher,
/turf/simulated/floor/tiled/techmaint,
/area/rnd/outpost/xenobiology/outpost_storage)
"Rx" = (
@@ -26276,23 +26286,35 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/triage)
"Sr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
+/obj/structure/lattice,
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/zpipe/down/supply{
+ dir = 1
},
/obj/structure/cable/green{
- icon_state = "1-2"
+ d1 = 32;
+ icon_state = "32-1"
},
-/obj/structure/cable/green{
- icon_state = "1-4"
+/obj/structure/window/basic/full,
+/obj/structure/grille,
+/obj/structure/window/basic,
+/obj/structure/window/basic{
+ dir = 8
},
-/obj/structure/cable/green{
- icon_state = "1-8"
+/obj/structure/window/basic{
+ dir = 1
},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_main)
+/obj/structure/window/basic{
+ dir = 4
+ },
+/obj/structure/disposalpipe/down{
+ dir = 1
+ },
+/turf/simulated/open,
+/area/rnd/outpost/xenobiology/outpost_stairs)
"Ss" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -26969,8 +26991,21 @@
/area/maintenance/lower/mining)
"Tt" = (
/obj/structure/table/standard,
-/obj/item/weapon/gun/energy/taser/xeno,
-/obj/item/weapon/melee/baton/slime,
+/obj/item/toy/plushie/purple_fox,
+/obj/machinery/firealarm{
+ dir = 4;
+ layer = 3.3;
+ pixel_x = 26
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 4;
+ pixel_y = 28
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/item/weapon/reagent_containers/spray,
+/obj/item/weapon/reagent_containers/spray,
/turf/simulated/floor/tiled/techmaint,
/area/rnd/outpost/xenobiology/outpost_storage)
"Tu" = (
@@ -29542,11 +29577,6 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"WQ" = (
-/obj/machinery/light_switch{
- dir = 1;
- pixel_x = 0;
- pixel_y = -28
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -29555,16 +29585,12 @@
"WR" = (
/obj/structure/table/standard,
/obj/item/weapon/gun/energy/taser/xeno,
-/obj/item/weapon/melee/baton/slime,
+/obj/item/weapon/melee/baton/slime/loaded,
/obj/machinery/light_switch{
dir = 1;
pixel_x = 0;
pixel_y = -28
},
-/obj/machinery/recharger/wallcharger{
- pixel_x = 4;
- pixel_y = -28
- },
/turf/simulated/floor/tiled/techmaint,
/area/rnd/outpost/xenobiology/outpost_storage)
"WS" = (
@@ -29985,10 +30011,43 @@
/turf/simulated/floor/wood,
/area/library)
"Xy" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/carry,
-/area/shuttle/tether/surface)
+/obj/structure/table/standard,
+/obj/item/weapon/gun/energy/taser/xeno,
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 4;
+ pixel_y = -28
+ },
+/obj/item/weapon/melee/baton/slime/loaded,
+/turf/simulated/floor/tiled/techmaint,
+/area/rnd/outpost/xenobiology/outpost_storage)
+"Xz" = (
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 28
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/structure/cable/green,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/obj/machinery/disposal,
+/turf/simulated/floor/wood,
+/area/rnd/outpost/xenobiology/outpost_office)
+"XA" = (
+/obj/machinery/light{
+ icon_state = "tube1";
+ dir = 4
+ },
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = 0;
+ pixel_y = -28
+ },
+/turf/simulated/floor/tiled/white,
+/area/rnd/outpost/xenobiology/outpost_first_aid)
"XF" = (
/obj/machinery/power/apc{
dir = 2;
@@ -35228,9 +35287,9 @@ Of
Mm
PO
Qc
-Qn
-QA
+Qo
QL
+Xz
QU
Ra
MM
@@ -35242,7 +35301,7 @@ Mq
SB
PV
Te
-PV
+XA
SA
CO
dG
@@ -35370,7 +35429,7 @@ Of
OR
PP
OR
-Qo
+Qq
OR
OR
OR
@@ -35511,8 +35570,8 @@ Op
Ir
IX
QM
-Qd
-Qp
+Qe
+QA
QB
QM
QM
@@ -35653,19 +35712,19 @@ Lj
Pj
IZ
PR
-Qe
-Qq
+Qn
+Rc
QC
QC
QC
QC
PR
-Rc
+Ro
QC
RS
Se
+Qd
Sr
-HH
LP
Ml
Ml
@@ -36236,7 +36295,7 @@ Sv
SJ
SW
Ti
-Tt
+WR
SI
dG
dG
@@ -36378,7 +36437,7 @@ Sw
LO
SX
Rd
-WR
+Xy
SI
dG
OF
@@ -36660,7 +36719,7 @@ RV
Sh
Sy
SI
-Ro
+Tt
Rt
RA
SI
@@ -43879,7 +43938,7 @@ Nk
Nl
NJ
NP
-Xy
+HH
KU
bg
Ok
@@ -44021,7 +44080,7 @@ Nl
Nl
NK
NP
-Xy
+HH
KU
bg
Ok
@@ -44163,7 +44222,7 @@ Nm
Nl
NK
NP
-Xy
+HH
KU
bg
Ok
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 01a216cd3b..e1b0cc5eb9 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -131,7 +131,7 @@
"acA" = (/obj/effect/decal/cleanable/dirt,/obj/structure/closet,/obj/random/contraband,/obj/random/junk,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"acB" = (/obj/structure/table/steel,/obj/random/tool,/obj/random/maintenance/medical,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"acC" = (/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 1},/turf/simulated/floor/water/pool,/area/hallway/station/atrium)
-"acD" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/hallway/station/atrium)
+"acD" = (/obj/effect/landmark/engine_loader_pickable{clean_turfs = list(list(20,93,30,118),list(31,94,35,96),list(29,97,43,118),list(44,113,46,118))},/turf/space,/area/space)
"acE" = (/obj/structure/table/woodentable,/obj/machinery/door/blast/shutters{dir = 8; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/turf/simulated/floor/wood,/area/hallway/station/atrium)
"acF" = (/obj/structure/flora/ausbushes/ppflowers,/turf/simulated/floor/grass,/area/hallway/station/atrium)
"acG" = (/obj/structure/flora/ausbushes/brflowers,/turf/simulated/floor/grass,/area/hallway/station/atrium)
@@ -154,8 +154,7 @@
"acX" = (/obj/structure/table/reinforced,/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/industrial/danger{icon_state = "danger"; dir = 9},/obj/machinery/status_display{pixel_y = 32},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"acY" = (/obj/structure/bed/chair/wood{dir = 4},/turf/simulated/floor/grass,/area/hallway/station/atrium)
"acZ" = (/obj/structure/railing{dir = 4},/obj/structure/railing{dir = 1},/turf/simulated/floor/water/pool,/area/hallway/station/atrium)
-"ada" = (/obj/structure/table/wooden_reinforced,/turf/simulated/floor/grass,/area/hallway/station/atrium)
-"adb" = (/obj/structure/bed/chair/wood{dir = 1},/turf/simulated/floor/grass,/area/hallway/station/atrium)
+"ada" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/grass,/area/hallway/station/atrium)
"adc" = (/obj/structure/bed/chair/wood{dir = 8},/turf/simulated/floor/grass,/area/hallway/station/atrium)
"add" = (/obj/structure/bed/chair/wood,/turf/simulated/floor/grass,/area/hallway/station/atrium)
"ade" = (/obj/machinery/atmospherics/portables_connector,/turf/simulated/floor/tiled,/area/engineering/atmos/backup)
@@ -177,8 +176,8 @@
"adu" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/engineering/hallway)
"adv" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/turf/simulated/floor/tiled,/area/engineering/hallway)
"adw" = (/obj/structure/curtain/open/bed,/obj/structure/bed/padded,/obj/item/weapon/bedsheet/blue,/obj/random/plushie,/turf/simulated/floor,/area/maintenance/station/eng_lower)
-"adx" = (/obj/structure/table/marble,/obj/machinery/floor_light/prebuilt{on = 1},/obj/machinery/door/blast/shutters{dir = 2; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
-"ady" = (/obj/structure/table/marble,/obj/machinery/floor_light/prebuilt{on = 1},/obj/machinery/door/blast/shutters{dir = 2; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/turf/simulated/floor/wood,/area/hallway/station/atrium)
+"adx" = (/obj/structure/table/marble,/obj/machinery/floor_light/prebuilt{on = 1},/obj/machinery/door/blast/shutters{dir = 2; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
+"ady" = (/obj/machinery/floor_light/prebuilt{on = 1},/obj/machinery/door/blast/shutters{dir = 2; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/obj/structure/window/reinforced{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/hallway/station/atrium)
"adz" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal,/turf/simulated/floor/grass,/area/hallway/station/atrium)
"adA" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/device/flashlight/lamp{pixel_x = 2; pixel_y = 7},/turf/simulated/floor/lino,/area/chapel/office)
"adB" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 8},/obj/item/weapon/pen/blue{pixel_x = 2; pixel_y = 1},/turf/simulated/floor/lino,/area/chapel/office)
@@ -298,7 +297,6 @@
"afL" = (/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"afM" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"afN" = (/obj/machinery/disposal,/obj/effect/floor_decal/corner/lightgrey{dir = 9},/obj/effect/floor_decal/corner/lightgrey{dir = 6},/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled,/area/hallway/station/atrium)
-"afO" = (/obj/effect/landmark/engine_loader_pickable{clean_turfs = list(list(20,93,30,118),list(31,94,35,96),list(29,97,43,118),list(44,113,46,118))},/turf/space,/area/space)
"afP" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/machinery/door/firedoor/glass,/turf/simulated/floor,/area/engineering/engine_monitoring)
"afQ" = (/obj/machinery/light{dir = 1},/obj/machinery/recharge_station,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/yellow/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/yellow/bordercorner2{dir = 4},/turf/simulated/floor/tiled,/area/engineering/engine_monitoring)
"afR" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/carpet,/area/chapel/main)
@@ -324,8 +322,8 @@
"agl" = (/obj/structure/grille,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/door/firedoor/glass,/obj/structure/window/reinforced/polarized/full{id = "hop_office"},/obj/structure/window/reinforced/polarized{dir = 1; id = "hop_office"},/turf/simulated/floor/plating,/area/crew_quarters/heads/hop)
"agm" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced/polarized/full{id = "hop_office"},/turf/simulated/floor/plating,/area/crew_quarters/heads/hop)
"agn" = (/obj/structure/grille,/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/window/reinforced/polarized/full{id = "hop_office"},/turf/simulated/floor/plating,/area/crew_quarters/heads/hop)
-"ago" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
-"agp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
+"ago" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/lightgrey/bordercorner{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
+"agp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/station/atrium)
"agq" = (/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{dir = 2; icon_state = "pipe-c"},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/lightgrey/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
"agr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/structure/disposalpipe/segment,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/carpet,/area/chapel/main)
"ags" = (/obj/effect/floor_decal/chapel{dir = 1},/turf/simulated/floor/tiled/dark,/area/chapel/main)
@@ -647,13 +645,11 @@
"amw" = (/obj/structure/railing,/obj/structure/railing{icon_state = "railing0"; dir = 4},/turf/simulated/floor/water/pool,/area/hallway/station/atrium)
"amx" = (/obj/structure/railing,/obj/structure/railing{dir = 8},/turf/simulated/floor/water/pool,/area/hallway/station/atrium)
"amy" = (/obj/structure/table/marble,/obj/machinery/floor_light/prebuilt{on = 1},/obj/item/weapon/reagent_containers/food/drinks/shaker,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/reagent_containers/food/snacks/donut/jelly,/turf/simulated/floor/wood,/area/hallway/station/atrium)
-"amz" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/donut/chaos,/turf/simulated/floor/wood,/area/hallway/station/atrium)
-"amA" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,/turf/simulated/floor/grass,/area/hallway/station/atrium)
-"amB" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/wood,/area/hallway/station/atrium)
+"amA" = (/obj/structure/table/wooden_reinforced,/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly,/obj/structure/table/woodentable,/turf/simulated/floor/grass,/area/hallway/station/atrium)
"amC" = (/obj/structure/table/woodentable,/obj/machinery/door/blast/shutters{dir = 8; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/wood,/area/hallway/station/atrium)
"amD" = (/obj/structure/table/woodentable,/obj/machinery/door/blast/shutters{dir = 4; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/wood,/area/hallway/station/atrium)
"amE" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/plating,/area/storage/emergency_storage/emergency4)
-"amF" = (/obj/machinery/door/blast/shutters{dir = 2; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/turf/simulated/floor/wood,/area/hallway/station/atrium)
+"amF" = (/obj/machinery/door/blast/shutters{dir = 2; id = "cafe2"; layer = 3.1; name = "Cafe Shutters"},/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/condiment/small/sugar,/turf/simulated/floor/wood,/area/hallway/station/atrium)
"amG" = (/obj/structure/table/marble,/obj/machinery/floor_light/prebuilt{on = 1},/obj/machinery/chemical_dispenser/bar_coffee/full,/turf/simulated/floor/wood,/area/hallway/station/atrium)
"amH" = (/obj/structure/railing{dir = 4},/obj/structure/railing,/turf/simulated/floor/water/pool,/area/hallway/station/atrium)
"amI" = (/obj/structure/flora/ausbushes/brflowers,/obj/machinery/light/flamp/noshade,/turf/simulated/floor/grass,/area/hallway/station/atrium)
@@ -1338,7 +1334,7 @@
"aGi" = (/obj/structure/displaycase,/turf/simulated/floor/wood,/area/crew_quarters/captain)
"aGl" = (/obj/machinery/vending/coffee,/turf/simulated/floor/tiled/monotile,/area/bridge_hallway)
"aGs" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/turf/simulated/floor/tiled,/area/engineering/hallway)
-"aGx" = (/obj/structure/mirror{dir = 4; pixel_x = 32; pixel_y = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/engi_wash)
+"aGx" = (/obj/structure/mirror{dir = 4; pixel_x = 28; pixel_y = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/engi_wash)
"aGy" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/maintenance/station/eng_lower)
"aGz" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/floor_decal/sign/dock/one,/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"aGB" = (/turf/simulated/wall/r_wall,/area/engineering/engineering_airlock)
@@ -1381,7 +1377,7 @@
"aIi" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{icon_state = "intact"; dir = 9},/turf/simulated/floor/tiled,/area/engineering/hallway)
"aIj" = (/obj/machinery/teleport/hub{dir = 2},/turf/simulated/floor/tiled/dark,/area/teleporter)
"aIl" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/yellow/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/structure/extinguisher_cabinet{dir = 8; icon_state = "extinguisher_closed"; pixel_x = 30},/turf/simulated/floor/tiled,/area/engineering/hallway)
-"aIn" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/mirror{dir = 4; pixel_x = 32; pixel_y = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/engi_wash)
+"aIn" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/mirror{dir = 4; pixel_x = 28; pixel_y = 0},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/engi_wash)
"aIo" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 28},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"aIp" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/station/eng_lower)
"aIq" = (/obj/machinery/alarm{pixel_y = 22},/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/effect/decal/cleanable/dirt,/obj/random/maintenance/clean,/obj/random/maintenance/engineering,/obj/random/tool,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor,/area/maintenance/station/eng_lower)
@@ -1744,7 +1740,7 @@
"brv" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/storage/tools)
"brD" = (/obj/structure/table/reinforced,/obj/machinery/recharger{pixel_y = 0},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor/tiled,/area/crew_quarters/heads/hop)
"brV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/turf/simulated/floor/tiled/white,/area/crew_quarters/toilet)
-"brX" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/light{dir = 1},/obj/structure/mirror{dir = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/toilet)
+"brX" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/machinery/light{dir = 1},/obj/structure/mirror{dir = 4; pixel_x = 28; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/toilet)
"bsl" = (/obj/structure/flora/pottedplant,/obj/machinery/firealarm{dir = 2; layer = 3.3; pixel_x = 0; pixel_y = 26},/obj/machinery/camera/network/tether,/turf/simulated/floor/tiled,/area/hallway/station/docks)
"bsv" = (/obj/structure/bed/chair,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_x = 0; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/tiled,/area/hallway/station/docks)
"bsH" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/secure/briefcase,/obj/machinery/button/remote/blast_door{id = "bridge blast"; name = "Bridge Blastdoors"; pixel_x = 0; pixel_y = -20},/obj/item/weapon/book/manual/command_guide,/obj/item/weapon/book/manual/standard_operating_procedure,/turf/simulated/floor/tiled/dark,/area/bridge)
@@ -1767,7 +1763,7 @@
"bvb" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_command{name = "Bridge"; req_access = list(19)},/turf/simulated/floor/tiled/steel_grid,/area/bridge)
"bvd" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/blue/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals8{dir = 1},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/bridge_hallway)
"bvk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/bridge)
-"bvs" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{dir = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/toilet)
+"bvs" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/mirror{dir = 4; pixel_x = 28; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/crew_quarters/toilet)
"bvt" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/tiled,/area/hallway/station/docks)
"bvu" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/item/device/radio/intercom{dir = 2; pixel_y = -24},/turf/simulated/floor/tiled,/area/hallway/station/docks)
"bvE" = (/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 4; icon_state = "map"},/turf/simulated/floor/tiled,/area/hallway/station/docks)
@@ -1891,6 +1887,7 @@
"bNL" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/teleporter)
"bNV" = (/obj/effect/floor_decal/industrial/warning,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled,/area/teleporter)
"bNW" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/obj/effect/floor_decal/industrial/warning/corner{icon_state = "warningcorner"; dir = 8},/turf/simulated/floor/tiled,/area/teleporter)
+"bNZ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
"bPc" = (/obj/machinery/firealarm{dir = 4; layer = 3.3; pixel_x = 26},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
"bPj" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0},/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/tether/station/dock_two)
"bPl" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/tiled,/area/tether/station/dock_two)
@@ -1996,16 +1993,20 @@
"kLN" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 8; frequency = 1380; id_tag = "tether_dock_pump"},/obj/machinery/light/small,/obj/machinery/airlock_sensor{frequency = 1380; id_tag = "tether_dock_sensor"; pixel_x = 0; pixel_y = -25},/obj/machinery/embedded_controller/radio/airlock/docking_port{frequency = 1380; id_tag = "tether_dock_airlock"; pixel_x = 0; pixel_y = 30; req_one_access = list(13); tag_airpump = "tether_dock_pump"; tag_chamber_sensor = "tether_dock_sensor"; tag_exterior_door = "tether_dock_outer"; tag_interior_door = "tether_dock_inner"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
"lxQ" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/blue/border{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway)
"lGA" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"mbn" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/disposalpipe/sortjunction{dir = 4; icon_state = "pipe-j1s"; name = "Library"; sortType = "Library"},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
"mNU" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/tether/station/dock_one)
"nov" = (/obj/structure/railing,/obj/structure/table/rack{dir = 8; layer = 2.9},/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/tech_supply,/turf/simulated/floor,/area/engineering/shaft)
"oEH" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/station/docks)
+"qBc" = (/obj/structure/disposalpipe/junction{dir = 1; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
"scB" = (/obj/machinery/computer/shuttle_control/tether_backup{icon_state = "computer"; dir = 8},/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"tpQ" = (/obj/structure/morgue/crematorium{dir = 8},/obj/structure/cable/green{icon_state = "0-8"},/turf/simulated/floor/tiled/dark,/area/chapel/chapel_morgue)
"tKI" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1380; master_tag = "tether_dock"; name = "exterior access button"; pixel_x = -5; pixel_y = -26; req_one_access = list(13)},/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "tether_dock_outer"; locked = 1; name = "Docking Port Airlock"},/turf/simulated/floor/tiled/dark,/area/tether/station/dock_one)
+"uiN" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/snacks/donut/chaos,/turf/simulated/floor/grass,/area/hallway/station/atrium)
"uWS" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/access_button{command = "cycle_interior"; frequency = 1380; master_tag = "tether_dock"; name = "interior access button"; pixel_x = 28; pixel_y = 26; req_one_access = list(13)},/turf/simulated/floor/tiled,/area/tether/station/dock_one)
"vbm" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/tether/station/dock_one)
"vyI" = (/mob/living/simple_mob/animal/passive/snake/noodle,/turf/simulated/floor/outdoors/grass/forest,/area/crew_quarters/heads/chief)
"wlD" = (/obj/machinery/door/firedoor/glass,/obj/structure/grille,/obj/structure/window/reinforced/full,/turf/simulated/floor/plating,/area/tether/station/dock_one)
+"xfY" = (/obj/structure/disposalpipe/junction{dir = 8; icon_state = "pipe-j2"},/turf/simulated/floor/tiled,/area/hallway/station/atrium)
"xMk" = (/obj/structure/cable/green{icon_state = "16-0"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/railing{dir = 4},/obj/structure/railing,/turf/simulated/floor,/area/engineering/shaft)
(1,1,1) = {"
@@ -2057,7 +2058,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaaaaaaaaaaaaaaaacgaksaksaksaksaksacgaacaacaacarqarqarqarqarqaczaczaczaczaczaczaczanlakXakWaJsaJsaJsakZalcaJsaJsaJsaikaeGackaikackackackackackackacNaeHacNacQacVaaWabaabaaeJabaabaaaWadNakJajEaeyaeyaeyakKaeyaeyalJajxadOaacaacadPahAahSahXadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaaaaaaaacgacgacgalxalwalzabZaacaacaacarqnovxMkalKalGaczanLanPalNaowalRalWanRambalZamfamcamkamjamnanZamsampaczaeGackaikackackackackackackacNaeKaeNacQacVaeZacQafbafdacQacQafhacNajmajnajqajqajqajHaeyaeyalialCadOaacaacadPaiiaiJaiKadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaaaaaaaaaaaaaaaaaaahWabZabvabBabEabZabZabZabZabZalGhPianeancaczaopaoraoqaoqaoqaoqanoanranqanuantantantanzanyanCanBanFanDackaikackackackackackackacNacNacNaflafHafIafRafTagracQagsagtacNajMakMalhajQajRajJaeyaeyaljaeyadPadPadPadPaiLaiLaiLadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOahVaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaohaoXaojaolaokaonaomaooabZaczaczaotaczaoyaoZapcapbapbapbapbapbapeaoBaoFapgapgapgaijapgapgapgaijaoHjRSaikackackackackackackackackacNagyagAacQagEaheahgacQagyagAacNadOadOadOadOadOajNaeyaeyaljallakcakfaiSaiUaiSaiSakhadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacDahVaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaohaoXaojaolaokaonaomaooabZaczaczaotaczaoyaoZapcapbapbapbapbapbapeaoBaoFapgapgapgaijapgapgapgaijaoHjRSaikackackackackackackackackacNagyagAacQagEaheahgacQagyagAacNadOadOadOadOadOajNaeyaeyaljallakcakfaiSaiUaiSaiSakhadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVahVahVahVahVahVahVahVaaaaaaahWaohaqKaqIappapoaprapqapuapsapwapvapyapxapDapBapIapGapKapJapJapJapMapLapgapNapPapOapTapQapQapXaijapUachaikackackackackackackackackacNalmahiahiahmahnahpahuahualnacNajTajUaloajUajTakiakrakraktakuakvakwakxakyakzaiYajaadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahVaaaaaacbYaqeaqfadSaqaaqJaqhadYaqjaqiaqlaqkaqoaqmaquaqqaqDaqBaqFaqEaqQaqOaqSaqRapgaqvajFaqGaqGajFapQaqHaijapUachaikackackackackackackackackacNahCahEahLacVahPahUahLahCahEacNakAajVajVajVajWakBajOajOakCakDakcajbakEakFakGaiSakHadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaaaaaaaaaaaaaaaaaaahWahWahWahWabZarzaryaRdccearBadeaqMaqMaqMaqMacSaqNaqNarEarKaqNaqNacSarVarTaqTarXasgasbasnaskasraspasxassaijapUacjaikackackackackackackackackacNaiaaicaieaifaigahUacQagyaihacNajYajZakaakbakIakUakdalkalpalqadPajcadPakLalualealeadPaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -2066,22 +2067,22 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaah
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaahVaaaaaaahWaoharlarnawkaswaszasyaqMasAaenaenaenaenaenasUasUatAawBacSawMawDarHawOapgatdapQawRapQapQapQawTaijavPaiXaikackackackackackackackackacNaiEaiHahLacVaiIahUahLaiEaiHacNajoacmalLalaajkakQalfafCaacaacaacaacaacaacaacaacaacaacaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaahWabZabZarkaxBaxAaxHaxGaqMbkxaxPaxObZcatQbZdatNatSaxUaxYaxWatXatWarHaybapgatYatZawRayiauaalsaucaijaysabCaikaikaikaikaikaikafCafCafCafCaaTafaabhafWabhafcabhafaaaTafCafCafCafCalgafCafCafCafCaacaacaacaacaacaacaacaacaacaacaacaacaacaataaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVahWahWahWahWabZaueaueaueaueaueaqMaqMaqMaqMacSaukaenaulazeaenaenaqNauwauvauyazfauzauzauzazkauzauzauzauzaijavPanEachazDazBazBazJazJazIazXafYacfagdagqagvagBagCagDahNafgaiWajrajsafeagvaldajuaALaAHashashashashashashashashashashashashaacaacaataaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaAQavfavfatOaARaATaASaBlamdaBpaBmavsaBqaqNbZiafUasUasUaenawlaByatXawnaBBaBAaAWaBCaBXaBDaBEaAWaciaDDaaVavPalQaBHaBRalQalTalTalTalTagwabXacnacmaCeacpacpacpagxacpacpacpacpacpacpacpacractaCxaCwaCyamgamgamgamgamgamgamgamgamgamgalAalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaCBaCBatOauAauAauAauBaJlaCEauAauAaJwaCMaJxaenasUasUaCPaCQacSaCTaCRaKtaCVaAWaAWaAWaKNaLjaKUaLlaDjaaVapUalQaDsaDMalQasuaDPamEalTaDVacwadzacyacyacyacFamJacmacmacmacmamJacFacyacyacYadaacWaDZamMamgamgamgamgamgamgamgamgamgamgamNalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaEaaLIatOaEbauAauAavjaLXaEfauAauAaJwaCMaJxaMZaMBaNbaNaaenaqNaEzaExaKtaEAaAWaEEaBXaOLaEMaAWaETaERaaVapUaBHaEWaEXalQaFcaEZaFfaFeaFhacmacyacyacyacGacDamCamoadxadyamtamDacDacGacyacyadbadHaFzamMamgamgamgamgamgamgamgamgamgamgaFIalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaFKaFJatOaFLaFOaFLaFOaQvaFXbZtcalcakaqNaQZaQZaRwaRAaRyaRyaqNaEzaCRaKtaGsaAWaAWaAWaRZaGxaaVaaVaaVaaVaGyaGPaGIaofalQaogavSaoialTaHbacmacYamAadcacFacIacEacHadnagaacHamiacKacFacYadaadcadHaHzamMamgamgamgamgamgamgamgamgamgamgalAalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaHTaHQatOatOaSCaSCaSCaSCaHYaSCaSCaSCacSaqNaqNaByaIfaqNaqNacSaEzaIiaKtaIlaAWaBCaBXaTiaInaaVatpaIoaIqaIpalQalQalQalQaoOaoOalTalTaIsacmacYadaadcacGacIacEacHamaamyacHamiacKacGacYadaadcadHaITaoVamgamgamgamgamgamgamgamgamgamgalAaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaAQavfavfatOaARaATaASaBlamdaBpaBmavsaBqaqNbZiafUasUasUaenawlaByatXawnaBBaBAaAWaBCaBXaBDaBEaAWaciaDDaaVavPalQaBHaBRalQalTalTalTalTagwabXacnacmaCeacpacpacpagxacpxfYacpacpacpacpacpacractaCxaCwaCyamgamgamgamgamgamgamgamgamgamgalAalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaCBaCBatOauAauAauAauBaJlaCEauAauAaJwaCMaJxaenasUasUaCPaCQacSaCTaCRaKtaCVaAWaAWaAWaKNaLjaKUaLlaDjaaVapUalQaDsaDMalQasuaDPamEalTaDVacwadzacyacyacyacFamJacmacmadHacmamJacFacyacyacyadabNZaDZamMamgamgamgamgamgamgamgamgamgamgamNalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaEaaLIatOaEbauAauAavjaLXaEfauAauAaJwaCMaJxaMZaMBaNbaNaaenaqNaEzaExaKtaEAaAWaEEaBXaOLaEMaAWaETaERaaVapUaBHaEWaEXalQaFcaEZaFfaFeaFhacmacyacyacyacGacIamCamoadxadyamtamDacKacGacyacyacyadHaFzamMamgamgamgamgamgamgamgamgamgamgaFIalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaFKaFJatOaFLaFOaFLaFOaQvaFXbZtcalcakaqNaQZaQZaRwaRAaRyaRyaqNaEzaCRaKtaGsaAWaAWaAWaRZaGxaaVaaVaaVaaVaGyaGPaGIaofalQaogavSaoialTaHbacmacYamAadcacFacIacEacHadnagaacHamiacKacFacYuiNadcadHaHzamMamgamgamgamgamgamgamgamgamgamgalAalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaHTaHQatOatOaSCaSCaSCaSCaHYaSCaSCaSCacSaqNaqNaByaIfaqNaqNacSaEzaIiaKtaIlaAWaBCaBXaTiaInaaVatpaIoaIqaIpalQalQalQalQaoOaoOalTalTaIsacmacYadladcacGacIacEacHamaamyacHamiacKacGacYadladcadHaITaoVamgamgamgamgamgamgamgamgamgamgalAaacaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaJhaJkaJjaJnaJmbdsaoqaTKaTJaJyaTLaoqaoqaJSaoqaUlaTQaUoaUnaTKaUpaUlatWaKtaKbaAWaAWaAWaUUaKlaaVapiaKraUXaKzaeOaeOaeOaeOaeOaeOaesaeraeMacmacyacyacyacFacIacEacHamGadMacHamiacKacFacyacyacyadHaKQaLcamgamgamgamgamgamgamgamgamgamgalAaacaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaJhaJkaLpaLtaLraLAaLyaLGaLCaLKaLHaLOaLLaLUaLPaMaaLYaMdaMcaMgaLUaLPaMhaMkaMjaAWaMlaBXaUUaMpaaVaMtaMraMxaMuaeOafyafyafyafyaeOaePacmadHacmacTacyacyamJacIacEacHacHacHacHamiacKamJacyacyacTadHaMLamMamgamgamgamgamgamgamgamgamgamgalAalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaNeaNdaRbaRbagcagcagcagcaNoagcaRbaRbaltaltaNraltaltalvaXZaXZaXZaNFaNHaXZaoJaoJaoJaaVaaVaaVaqsaqtaOjaYfaeOafyafyafyafyafyaeUacmadHacmacmacmacmacmamzammammamFamFammammamzacmacmacmacmadHaFzamMamgamgamgamgamgamgamgamgamgamgaOOalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaGBaGBaRbaYEaYHaYFaYJaBgaOSaRVaZgaRbaOYaOWaPaalyalIaltaoGaZraZUaPjaZWaBwaPqbePbYEaoJaacaikaPGarbaPHardaeOafyafyafyafyafyaeUacmadHacmacmacmacmacmacUacUacUamBamBacUacUacUacmacmacmacmadHaCwamMamgamgamgamgamgamgamgamgamgamgarhalAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaNeaNdaRbaRbagcagcagcagcaNoagcaRbaRbaltaltaNraltaltalvaXZaXZaXZaNFaNHaXZaoJaoJaoJaaVaaVaaVaqsaqtaOjaYfaeOafyafyafyafyafyaeUacmadHacmacmacmacmacmacIammammamFamFammammacKacmacmacmacmadHaFzamMamgamgamgamgamgamgamgamgamgamgaOOalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWaGBaGBaGBaRbaYEaYHaYFaYJaBgaOSaRVaZgaRbaOYaOWaPaalyalIaltaoGaZraZUaPjaZWaBwaPqbePbYEaoJaacaikaPGarbaPHardaeOafyafyafyafyafyaeUacmadHacmacmacmacmacmacHacUacUacUacUacUacUacHacmacmacmacmadHaCwamMamgamgamgamgamgamgamgamgamgamgarhalAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWahWahWahWagiaQaaRVaRXbaAaTmaQkaQhaQlaRbaQsaQnaQwalXamYaltbbsaQDbbxaQJaQWaQQaQXaQXaRcaoJaacaikaRiarAaRrarCaeOafyafyafyafyaguafzacmadHacmacTacyacyacFacHacHacHacHacHacHacHacHacFacyacyacTadHaCwamMamgamgamgamgamgamgamgamgamgamgalAalAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaagiaSabcpaSebcnbcrbcwaRVaSuaRbandamZasSanQawmaSzbeJaSDbeLaSFbeNbeMbfobYtaSLaoJaacaikarZasaaSOascaeOaeOaeOaeOaeOaeOafAacmadHacmacyaddaddaddacGacFamIacmacmamIacFacGaddaddaddacyadHaTAashashashashashashashashasiamMasialAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaagibftbfvaRXaTRaRXbfTklOaTWaRbaTXaIOaIOaSBaXXaltaoIaUkbgCaUmbgEbgDaoIbgFaoJaeiaacaikaUEasDaUIaUFafCafCafCafCafCafCafDacmadHacmacyadladladlacyacyacyacmacmacyacyacyadladladlacyadHaCwasIasJasKasLaSoasNasOasIasPasQaVxalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaRbbhjbnwaVzaVBbnIaVHaVGvyIaRbaVNaVKaVWaVPaZnaltaTEbXGbXIaWdbXKbXJaoIbgFaoJaacaacaikaqsatoaWjatqafCafEafJafFafNafCaWnacmadHacmacyacCadEamuamradladcacmacmacYadladkadEamuacZacyadHaWJasIasJasKatxatyasNasOasIaXwaXlaXyalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahVaaaaaaaaaaRbbhjbnwaVzaVBbnIaVHaVGvyIaRbaVNaVKaVWaVPaZnaltaTEbXGbXIaWdbXKbXJaoIbgFaoJaacaacaikaqsatoaWjatqafCafEafJafFafNafCaWnacmadHacmacyacCadEamuamradladcacmacmacYuiNadkadEamuacZacyadHaWJasIasJasKatxatyasNasOasIaXwaXlaXyalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahWahWahWahWaRbaRbaXCaRbaRbaXRaRbaRbaRbaRbalvalvalvalvalvalvaoJatHaYaaXYaYcaYbaYgaYgaoJafCafCagbafCafCacoafCafCafnageageaggaYtaghacmadHacmacyadmamvamvamwadladcacmacmacYadlamxamvamvamHacyadHaFzasIasJasKatxatyasNasOasIaYWalAalAalAaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbbYfbYhbYgaRbaRbaRbbYibYjbYjbYlbYkbYmbYlbYlacsagRagQagTaZqagVagUagWagWagYagXagYagZahbahaaZPahcahGahFahHacpacrahIacpacpbayahJacyacyacyacyacyacyacTacmacmacTacyacyacyacyacyacyacWbaIasIasIasIauobaQasIasIasIbaTaurausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbbYJbaVbYKaRbbYNbYPbYjbYjbYjbYlacvamhacMadpadRadTadXadXaecaeeacpacpacpacpacpahHaimacpacpbbEacpaipaioaiqacpacpairacpacpacpaisahHacpacpaCxacmbbTacpacpacpacpacpacpacpacpacpahHbaybchbclbckbcxauZavaaeqavcasIbcObcKausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbbYJbaVbYKaRbbYNbYPbYjbYjbYjbYlacvamhacMadpadRadTadXadXaecaeeacpacpacpacpacpahHaimacpacpbbEacpaipaioaiqacpacpairacpacpacpaisahHacpacpaCxacmbbTacpacpacpacpacpacpacpacpacpmbnqBcbchbclbckbcxauZavaaeqavcasIbcObcKausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRbaRbaRbaRbaRbbYPbYPbYjbYjbYjbYjbYjbYjbZkbZmacsajKbdibdqbdnbdubdrbdFbdxbdKbdHbdSbdLbdWbdTbdZbdTbeebedbehbegbegbeibegbegbegbedbekbejbepbembevberbeBbezbezbeEbeHbeFbeKaqgaqxagoagpbeSbeYavZavZawaawbagzavcasIbaTbfkausaacaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbYPbZvbZvbZvbZvbZvbYPbYjbYjbYjbYjbYjbZzbYlbfFawsawpbfGbfJawsawsawsawtawtawtawuarebfQarfaaTaaTaaTawyawzawzawzawzawzawzawzawzawzawAbfWawCbfYawEawFawGawGawGawGawHawIawJawKawKalMaePbgfasIasIasIasIasIasIasIasIbcObgrausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacbYPbZvbZvbZvbZvbZvbYjbYjbZFbZDbZmbYjbYjbYlbYjawsawPbgGbgJbgHbgNawsawUbgObrvawubhcafoawZawubhgaxbawyaxcaxcaxcaxcaxcaxcaxcaxcaxdawEaxeaxfaxgawEbhrbhtaxjaxjaxjbmMawIaxkaxlawKamLacmbhHbhKbhJbhJbhLbidbhLbhJbhJbiraxtausaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm
index de7396d151..8337a7ca49 100644
--- a/maps/tether/tether-06-station2.dmm
+++ b/maps/tether/tether-06-station2.dmm
@@ -15240,11 +15240,11 @@
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"wT" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
/obj/machinery/light{
dir = 1
},
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"wU" = (
@@ -19212,7 +19212,7 @@
},
/obj/structure/mirror{
dir = 4;
- pixel_x = 32;
+ pixel_x = 28;
pixel_y = 0
},
/turf/simulated/floor/tiled/white,
@@ -20200,7 +20200,7 @@
},
/obj/structure/mirror{
dir = 4;
- pixel_x = 32;
+ pixel_x = 28;
pixel_y = 0
},
/obj/machinery/power/apc{
@@ -22454,6 +22454,12 @@
},
/turf/simulated/floor/tiled/white,
/area/maintenance/station/sec_lower)
+"Xd" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/bridge/meeting_room)
"Xk" = (
/obj/structure/table/steel,
/obj/item/device/flashlight/lamp{
@@ -36018,7 +36024,7 @@ yP
xN
yU
wo
-ac
+wo
ac
ac
ac
@@ -36578,14 +36584,14 @@ pB
qg
vK
wo
+Xd
wV
wV
wV
wV
wV
wV
-wV
-wV
+yU
wo
aP
aP
@@ -37001,9 +37007,9 @@ qc
qc
uj
uJ
+qc
vl
oY
-oY
aP
aP
aP
@@ -37143,9 +37149,9 @@ sU
tE
uk
uK
+qc
vl
oY
-oY
aa
aa
aa
@@ -37287,7 +37293,7 @@ oY
uL
oY
oY
-aa
+oY
aa
aa
aa
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index bb01a4beef..6ad1d6d757 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -12908,6 +12908,13 @@
/obj/structure/closet/secure_closet/detective,
/obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/gun/energy/taser,
+/obj/item/device/camera{
+ desc = "A one use - polaroid camera. 30 photos left.";
+ name = "detectives camera";
+ pictures_left = 30;
+ pixel_x = 2;
+ pixel_y = 3
+ },
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"tO" = (
@@ -21450,16 +21457,8 @@
/turf/simulated/floor,
/area/maintenance/station/cargo)
"Hf" = (
-/obj/structure/table/standard,
-/obj/random/soap,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
- },
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 24
- },
-/turf/simulated/floor/tiled/white,
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/medical_restroom)
"Hg" = (
/obj/machinery/firealarm{
@@ -22936,15 +22935,7 @@
pixel_x = -27;
pixel_y = 0
},
-/obj/machinery/camera/network/medbay{
- dir = 1
- },
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/obj/machinery/light_switch{
- pixel_y = -25
- },
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Jn" = (
@@ -23890,27 +23881,28 @@
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"KS" = (
-/obj/machinery/recharge_station,
-/obj/machinery/light/small{
- dir = 8
+/obj/structure/shuttle/engine/propulsion{
+ dir = 8;
+ icon_state = "propulsion_l"
},
-/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/medical_restroom)
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1/station)
"KT" = (
-/obj/machinery/door/airlock/medical{
- name = "Rest Room"
- },
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/shuttle/engine/propulsion{
dir = 8
},
-/turf/simulated/floor/tiled/steel_grid,
-/area/crew_quarters/medical_restroom)
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1/station)
"KU" = (
-/obj/machinery/alarm{
- pixel_y = 22
+/obj/structure/shuttle/engine/propulsion{
+ dir = 8;
+ icon_state = "propulsion_r"
},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/large_escape_pod1/station)
"KV" = (
/obj/structure/undies_wardrobe,
/turf/simulated/floor/tiled/white,
@@ -23925,9 +23917,6 @@
},
/obj/item/weapon/book/manual/stasis,
/obj/item/weapon/book/manual/resleeving,
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"KY" = (
@@ -23962,11 +23951,6 @@
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
-"Lb" = (
-/obj/structure/reagent_dispensers/water_cooler/full,
-/obj/effect/floor_decal/corner/paleblue/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medbreak)
"Lc" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/effect/floor_decal/steeldecal/steel_decals4{
@@ -24120,15 +24104,14 @@
/area/medical/sleeper)
"Lr" = (
/obj/machinery/vending/fitness,
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
+/obj/effect/floor_decal/spline/plain,
/obj/machinery/status_display{
density = 0;
layer = 4;
pixel_x = -32;
pixel_y = 0
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Ls" = (
@@ -24199,26 +24182,13 @@
/obj/random/maintenance/cargo,
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
-"LA" = (
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24;
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
"LB" = (
/obj/structure/sign/nosmoking_1,
/turf/simulated/wall/r_wall,
/area/medical/chemistry)
"LC" = (
/obj/machinery/vending/snack,
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"LD" = (
@@ -24530,47 +24500,21 @@
/obj/random/maintenance/cargo,
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
-"Mc" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 8
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
"Md" = (
/obj/machinery/door/airlock/medical{
name = "Rest Room"
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
-"Me" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
"Mf" = (
-/obj/structure/table/standard,
-/obj/random/soap,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/light/small{
dir = 8
},
-/obj/machinery/light{
- dir = 4
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
},
-/turf/simulated/floor/tiled/white,
+/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/medical_restroom)
-"Mg" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 8;
- icon_state = "propulsion_l"
- },
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1/station)
"Mh" = (
/obj/structure/cable/green{
d1 = 1;
@@ -24606,7 +24550,6 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Mj" = (
-/obj/structure/bed/chair,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -24617,13 +24560,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Mk" = (
-/obj/structure/bed/chair,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -24637,9 +24576,6 @@
dir = 4
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Ml" = (
@@ -24906,43 +24842,18 @@
},
/turf/simulated/floor/tiled/white,
/area/hallway/secondary/escape/medical_escape_pod_hallway)
-"Mz" = (
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -28
- },
-/obj/structure/cable/green{
- d2 = 2;
- icon_state = "0-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
-"MA" = (
-/obj/structure/sink{
- dir = 4;
- icon_state = "sink";
- pixel_x = 11;
- pixel_y = 0
- },
-/obj/structure/mirror{
- dir = 4;
- pixel_x = 32;
- pixel_y = 0
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
"MB" = (
-/obj/machinery/vending/cola,
/obj/machinery/light{
dir = 8;
icon_state = "tube1"
},
-/obj/effect/floor_decal/spline/plain{
- dir = 4
+/obj/machinery/light_switch{
+ dir = 4;
+ icon_state = "light1";
+ pixel_x = -24
},
+/obj/structure/reagent_dispensers/water_cooler/full,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"MC" = (
@@ -24956,16 +24867,6 @@
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
-"MD" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/effect/landmark/start{
- name = "Medical Doctor"
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medbreak)
"ME" = (
/obj/structure/table/glass,
/obj/item/weapon/deck/cards,
@@ -25041,50 +24942,35 @@
},
/turf/simulated/floor/tiled/white,
/area/hallway/secondary/escape/medical_escape_pod_hallway)
-"MN" = (
-/obj/structure/curtain/open/shower,
-/obj/machinery/shower{
- pixel_y = 10
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
+"MO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
-"MO" = (
-/obj/machinery/light{
- dir = 4
+/obj/machinery/alarm{
+ pixel_y = 22
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"MP" = (
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_x = 0;
+ pixel_y = 28
+ },
+/obj/structure/cable/green{
+ icon_state = "0-4"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
- dir = 5
+ dir = 4
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"MQ" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -25092,9 +24978,10 @@
icon_state = "intact-scrubbers";
dir = 4
},
-/obj/effect/floor_decal/steeldecal/steel_decals4,
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 10
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
@@ -25115,6 +25002,15 @@
icon_state = "intact-scrubbers";
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ icon_state = "intact-scrubbers";
+ dir = 4
+ },
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"MS" = (
@@ -25130,15 +25026,13 @@
icon_state = "intact-scrubbers";
dir = 4
},
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 1
},
+/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"MT" = (
@@ -25230,19 +25124,24 @@
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Nc" = (
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 5
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ icon_state = "intact-scrubbers";
+ dir = 5
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Nd" = (
@@ -25250,12 +25149,18 @@
/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2,
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/structure/cable/green{
+ icon_state = "2-8"
+ },
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Ne" = (
-/obj/structure/bed/chair{
- dir = 1
- },
/obj/machinery/camera/network/medbay{
dir = 1
},
@@ -25287,6 +25192,9 @@
},
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
+/obj/structure/bed/chair{
+ dir = 1
+ },
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Ni" = (
@@ -25335,42 +25243,17 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"Nm" = (
-/obj/machinery/alarm{
- dir = 1;
- icon_state = "alarm0";
- pixel_y = -22
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 10
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medical_restroom)
-"Nn" = (
-/obj/effect/floor_decal/steeldecal/steel_decals4{
+/obj/structure/table/standard,
+/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 6
- },
+/obj/machinery/light/small,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"No" = (
/obj/structure/table/standard,
/obj/item/weapon/storage/box/cups,
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/medbreak)
-"Np" = (
-/obj/structure/bed/chair{
- dir = 1
- },
/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/effect/landmark/start{
- name = "Paramedic"
- },
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"Nq" = (
@@ -25466,13 +25349,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_core_foyer)
-"Nx" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/crew_quarters/medical_restroom)
"Ny" = (
/obj/structure/table/standard,
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -25487,26 +25363,18 @@
/turf/simulated/floor/tiled/white,
/area/medical/virology)
"Nz" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"NA" = (
-/obj/machinery/disposal,
/obj/item/device/radio/intercom{
dir = 4;
pixel_x = 24
},
-/obj/item/device/radio/intercom/department/medbay{
- pixel_y = -24
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/table/standard,
+/obj/item/weapon/storage/mre/random,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
"NB" = (
@@ -25604,19 +25472,10 @@
/turf/simulated/floor/tiled/white,
/area/hallway/secondary/escape/medical_escape_pod_hallway)
"NH" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
-"NI" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 8
- },
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1/station)
"NJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
@@ -25754,14 +25613,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/turf/simulated/floor/tiled/white,
/area/medical/virologyaccess)
-"NY" = (
-/obj/structure/shuttle/engine/propulsion{
- dir = 8;
- icon_state = "propulsion_r"
- },
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/large_escape_pod1/station)
"NZ" = (
/obj/structure/shuttle/engine/heater{
dir = 8
@@ -26173,6 +26024,18 @@
/obj/structure/closet/walllocker/emerglocker/south,
/turf/simulated/shuttle/floor,
/area/shuttle/large_escape_pod1/station)
+"OP" = (
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/item/device/radio/intercom/department/medbay{
+ dir = 4;
+ pixel_x = 24
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medbreak)
"OQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9;
@@ -26783,6 +26646,29 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/medical/virologyisolation)
+"Qf" = (
+/obj/structure/toilet{
+ pixel_y = 15
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
+"Qr" = (
+/obj/machinery/shower{
+ pixel_y = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 5
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 6
+ },
+/obj/structure/curtain/open/shower,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
"Qt" = (
/turf/simulated/wall,
/area/tether/exploration)
@@ -26795,10 +26681,27 @@
},
/turf/simulated/floor/bluegrid,
/area/ai_core_foyer)
+"Qx" = (
+/obj/machinery/light/small{
+ icon_state = "bulb1";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
"Qz" = (
/obj/structure/railing,
/turf/simulated/floor,
/area/maintenance/cargo)
+"QE" = (
+/obj/effect/landmark/start{
+ name = "Medical Doctor"
+ },
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medbreak)
"QI" = (
/obj/structure/cable/cyan{
icon_state = "32-1"
@@ -27855,6 +27758,15 @@
},
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
+"Tb" = (
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 1e+006
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/crew_quarters/medical_restroom)
"Tc" = (
/obj/structure/handrail{
dir = 4
@@ -27878,6 +27790,25 @@
},
/turf/simulated/floor/carpet,
/area/security/breakroom)
+"Tf" = (
+/obj/structure/table/standard,
+/obj/random/soap,
+/obj/random/soap,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
+"Th" = (
+/obj/effect/landmark/start{
+ name = "Medical Doctor"
+ },
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medbreak)
"Ti" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -27914,6 +27845,12 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/tether)
+"Tt" = (
+/obj/structure/toilet{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
"Tu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
icon_state = "intact-supply";
@@ -27985,6 +27922,12 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
+"TP" = (
+/obj/structure/window/reinforced,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/crew_quarters/medbreak)
"TQ" = (
/obj/structure/table/woodentable,
/obj/item/weapon/storage/box/donkpockets,
@@ -28178,6 +28121,16 @@
},
/turf/simulated/floor/tiled,
/area/shuttle/excursion/tether)
+"Ut" = (
+/obj/effect/landmark/start{
+ name = "Medical Doctor"
+ },
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medbreak)
"Uu" = (
/obj/machinery/computer/security,
/turf/simulated/floor/wood,
@@ -28190,6 +28143,14 @@
/obj/random/soap,
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
+"Ux" = (
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medbreak)
"Uy" = (
/obj/machinery/requests_console{
announcementConsole = 1;
@@ -28499,12 +28460,34 @@
/obj/structure/flight_left,
/turf/simulated/floor/tiled,
/area/shuttle/excursion/tether)
+"Vv" = (
+/obj/structure/sink{
+ pixel_y = 26
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24;
+ pixel_y = 0
+ },
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
"Vw" = (
/obj/machinery/sleeper{
dir = 8
},
/turf/simulated/floor/tiled,
/area/shuttle/excursion/tether)
+"VA" = (
+/obj/effect/landmark/start{
+ name = "Medical Doctor"
+ },
+/obj/structure/bed/chair,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medbreak)
"VB" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -28697,10 +28680,34 @@
},
/turf/simulated/floor/tiled,
/area/shuttle/excursion/tether)
+"Wr" = (
+/obj/structure/table/standard,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/obj/item/weapon/towel/random,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
"Ws" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/wall/rshull,
/area/shuttle/excursion/tether)
+"Wv" = (
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
+"Ww" = (
+/turf/simulated/wall,
+/area/crew_quarters/heads/cmo)
"Wx" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -28718,6 +28725,14 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/shuttle/excursion/tether)
+"Wz" = (
+/obj/machinery/vending/cola,
+/obj/machinery/camera/network/medbay{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medbreak)
"WB" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -28729,7 +28744,7 @@
pixel_y = 0
},
/obj/structure/mirror{
- pixel_x = 30
+ pixel_x = 25
},
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
@@ -28737,6 +28752,23 @@
/obj/structure/flight_right,
/turf/simulated/floor/tiled,
/area/shuttle/excursion/tether)
+"WE" = (
+/obj/effect/decal/remains,
+/obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/head/beret/centcom/officer,
+/obj/item/clothing/shoes/laceup,
+/turf/simulated/mineral/floor/vacuum,
+/area/mine/explored/upper_level)
+"WF" = (
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 1e+006
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/crew_quarters/medical_restroom)
"WG" = (
/obj/machinery/disposal/deliveryChute{
dir = 8
@@ -29016,6 +29048,19 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/tether)
+"Yh" = (
+/obj/structure/sink{
+ dir = 4;
+ icon_state = "sink";
+ pixel_x = 11;
+ pixel_y = 0
+ },
+/obj/structure/mirror{
+ pixel_x = 25;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
"Yi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -29054,6 +29099,11 @@
},
/turf/simulated/floor/tiled,
/area/shuttle/excursion/tether)
+"Yp" = (
+/turf/simulated/wall{
+ can_open = 0
+ },
+/area/crew_quarters/medical_restroom)
"Ys" = (
/obj/structure/bed/chair/shuttle{
icon_state = "shuttle_chair";
@@ -29084,6 +29134,12 @@
},
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hos)
+"Yz" = (
+/obj/structure/window/reinforced,
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/crew_quarters/medical_restroom)
"YC" = (
/obj/effect/floor_decal/carpet,
/turf/simulated/floor/carpet,
@@ -29220,6 +29276,21 @@
/obj/structure/bookcase,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/cmo)
+"Zu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
+"Zx" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/medical_restroom)
"Zy" = (
/obj/structure/disposaloutlet{
dir = 8
@@ -34829,13 +34900,13 @@ ab
ab
ab
ab
-ab
-ab
-aa
-aa
-aa
-aa
-aa
+KE
+KE
+KE
+KE
+KE
+Tb
+WF
aa
aa
aa
@@ -34971,13 +35042,13 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-aa
-aa
+KE
+Qr
+Wv
+KE
+Vv
+Nl
+Yz
aa
aa
aa
@@ -35113,15 +35184,15 @@ ab
ab
ab
ab
-ab
-ab
-ab
KE
-KE
-KE
-KE
-aa
-aa
+Qx
+Nl
+Md
+Nl
+Nl
+Yz
+vt
+vt
aa
aa
aa
@@ -35254,17 +35325,17 @@ ab
ab
ab
ab
+ab
KE
+Tt
+Yh
KE
-KE
-KE
-KE
-MN
Nl
+Wr
KE
vt
-aa
-aa
+vt
+vt
aa
aa
aa
@@ -35396,17 +35467,17 @@ ab
ab
ab
ab
+ab
KE
-KS
+Yp
KE
-Mc
KE
MO
Nm
KE
vt
-aa
-aa
+vt
+vt
aa
aa
aa
@@ -35538,18 +35609,18 @@ ab
ab
ab
ab
+ab
KE
-KT
-KE
-Md
-KE
-KE
+Qf
+Zx
Md
+Zu
+Tf
KE
+ab
+vt
+vt
vt
-aa
-aa
-aa
aa
aa
aa
@@ -35680,14 +35751,16 @@ ab
ab
ab
ab
+ab
+KE
+KE
+KE
KE
-KU
-LA
-Me
-Mz
MP
-Nn
-Nx
+Nl
+KE
+ab
+ab
vt
vt
aa
@@ -35730,8 +35803,6 @@ aa
aa
aa
aa
-aa
-aa
"}
(46,1,1) = {"
aa
@@ -35822,14 +35893,16 @@ ab
ab
ab
ab
+ab
KE
-KV
Hf
Mf
-MA
+Md
MQ
-MA
-Nx
+KV
+KE
+ab
+ab
vt
vt
aa
@@ -35872,8 +35945,6 @@ aa
aa
aa
aa
-aa
-aa
"}
(47,1,1) = {"
aa
@@ -35973,6 +36044,7 @@ MR
KW
KW
KW
+KW
vt
vt
aa
@@ -36015,7 +36087,6 @@ aa
aa
aa
aa
-aa
"}
(48,1,1) = {"
aa
@@ -36114,6 +36185,7 @@ MB
MS
No
Jm
+Wz
KW
vt
vt
@@ -36157,7 +36229,6 @@ aa
aa
aa
aa
-aa
"}
(49,1,1) = {"
aa
@@ -36256,8 +36327,8 @@ MC
MT
Ld
Ld
-NH
-vt
+Ld
+TP
vt
vt
aa
@@ -36394,11 +36465,12 @@ Jr
KZ
LE
Mi
-MD
+Ld
MU
+Ut
Ld
Ld
-NH
+TP
vt
vt
vt
@@ -36441,7 +36513,6 @@ aa
aa
aa
aa
-aa
"}
(51,1,1) = {"
aa
@@ -36536,11 +36607,12 @@ Jr
La
LF
Mj
-ME
+VA
MV
-Np
+ME
+QE
Ld
-NH
+TP
vt
vt
vt
@@ -36583,7 +36655,6 @@ aa
aa
aa
aa
-aa
"}
(52,1,1) = {"
aa
@@ -36675,14 +36746,15 @@ IF
LT
Ke
Lp
-Lb
+Ld
Ld
Mk
-MF
+VA
MW
-Np
-Ld
+MF
+QE
NH
+TP
vt
vt
vt
@@ -36725,7 +36797,6 @@ aa
aa
aa
aa
-aa
"}
(53,1,1) = {"
aa
@@ -36820,11 +36891,12 @@ KF
Lc
Ld
Ml
+Ld
MG
-MG
+Th
Ld
Ld
-NH
+TP
vt
vt
vt
@@ -36867,7 +36939,6 @@ aa
aa
aa
aa
-aa
"}
(54,1,1) = {"
aa
@@ -36966,7 +37037,8 @@ MH
MH
MH
Nz
-NH
+Ux
+TP
vt
vt
vt
@@ -37009,7 +37081,6 @@ aa
aa
aa
aa
-aa
"}
(55,1,1) = {"
aa
@@ -37108,17 +37179,17 @@ MI
MY
Nq
NA
+OP
KW
-ab
-NW
-NW
-NW
-NW
-NW
-NW
-NW
-NW
-NW
+vt
+vt
+vt
+vt
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -37251,15 +37322,15 @@ Lg
KW
KW
KW
-ab
+KW
+NW
+NW
+NW
+NW
+NW
+NW
NW
-Oj
-Oy
-Ny
NW
-Oj
-Oy
-Ny
NW
aa
aa
@@ -37395,13 +37466,13 @@ ab
ab
ab
NW
-Ok
-OA
-OQ
+Oj
+Oy
+Ny
NW
-Ok
-OA
-OQ
+Oj
+Oy
+Ny
NW
aa
aa
@@ -37532,18 +37603,18 @@ Lh
Mq
Lh
Na
-Nr
-Nr
-Nr
-Nr
+Iy
+ab
+ab
+ab
NW
-Ol
-OB
-Ol
+Ok
+OA
+OQ
NW
-Ol
-Pn
-Ol
+Ok
+OA
+OQ
NW
aa
aa
@@ -37675,23 +37746,23 @@ Mr
Lh
Nb
Nr
-NB
-JZ
-NN
Nr
-Om
-OC
-OR
-OY
-Pf
-OC
-KA
+Nr
+Nr
NW
-PB
-PM
-PM
-PB
-PB
+Ol
+OB
+Ol
+NW
+Ol
+Pn
+Ol
+NW
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -37816,23 +37887,23 @@ LI
Ms
MJ
Nc
-Ns
-NC
-Kb
-NP
-NX
-On
-OD
-OS
-Pa
-Pg
-Po
-Pu
+Nr
+NB
+JZ
+NN
+Nr
+Om
+OC
+OR
+OY
+Pf
+OC
+KA
NW
-PD
-PN
-PS
-PW
+PB
+PM
+PM
+PB
PB
aa
aa
@@ -37958,24 +38029,24 @@ Jy
Mt
Lh
Nd
-Nt
-NE
-NK
-NQ
-Nr
-Oo
-OE
-OE
-Pb
-Pi
-Pp
-Pv
-PA
-PE
-PO
-PT
-PX
-Qa
+Ns
+NC
+Kb
+NP
+NX
+On
+OD
+OS
+Pa
+Pg
+Po
+Pu
+NW
+PD
+PN
+PS
+PW
+PB
aa
aa
aa
@@ -38100,23 +38171,23 @@ Jz
Mt
Lh
Ne
+Nt
+NE
+NK
+NQ
Nr
-Nr
-Nr
-Nr
-Nr
-Op
+Oo
OE
-OT
OE
-Pj
-NJ
-OE
-Ol
-PG
-PQ
-PU
-PQ
+Pb
+Pi
+Pp
+Pv
+PA
+PE
+PO
+PT
+PX
Qa
aa
aa
@@ -38242,23 +38313,23 @@ JA
Mu
Lh
Nf
-Iy
-ab
-ab
-ab
-NW
-Oq
-OF
-OU
+Nr
+Nr
+Nr
+Nr
+Nr
+Op
OE
-Pl
-NR
-Pw
-NW
-PH
+OT
+OE
+Pj
+NJ
+OE
+Ol
+PG
PQ
+PU
PQ
-PY
Qa
aa
aa
@@ -38389,19 +38460,19 @@ ab
ab
ab
NW
-Or
-OG
-OV
-Pd
-Pm
-Ps
-Px
+Oq
+OF
+OU
+OE
+Pl
+NR
+Pw
NW
-PJ
-PR
-PV
-KB
-PB
+PH
+PQ
+PQ
+PY
+Qa
aa
aa
aa
@@ -38531,18 +38602,18 @@ ab
ab
ab
NW
+Or
+OG
+OV
+Pd
+Pm
+Ps
+Px
NW
-NW
-NW
-NW
-NW
-NW
-Py
-NW
-PK
-PB
-PB
-PB
+PJ
+PR
+PV
+KB
PB
aa
aa
@@ -38672,20 +38743,20 @@ Iy
ab
ab
ab
-ab
-ab
-ab
-vt
-vt
-vt
-vt
-Pz
-aa
-PL
-aa
-aa
-aa
-aa
+NW
+NW
+NW
+NW
+NW
+NW
+NW
+Py
+NW
+PK
+PB
+PB
+PB
+PB
aa
aa
aa
@@ -38814,16 +38885,16 @@ Iy
ab
NL
NL
-Lu
+NL
NL
NL
NL
NL
vt
vt
+Pz
aa
-aa
-aa
+PL
aa
aa
aa
@@ -38955,11 +39026,11 @@ MK
Iy
ab
NL
-Mg
-NI
-NI
-NI
-NY
+KS
+KT
+KT
+KT
+KU
NL
vt
vt
@@ -39508,7 +39579,7 @@ EO
Fy
FS
GB
-Fz
+Ww
HN
HN
HN
@@ -41644,7 +41715,7 @@ ab
ab
ab
ab
-ab
+WE
ab
ab
ab
diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm
index 6b701f3a56..b28f538ceb 100644
--- a/maps/tether/tether-10-colony.dmm
+++ b/maps/tether/tether-10-colony.dmm
@@ -892,6 +892,11 @@
/obj/item/weapon/rig/ert/assetprotection,
/obj/item/weapon/rig/ert/assetprotection,
/obj/item/weapon/rig/ert/assetprotection,
+/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/unsimulated/floor{
icon_state = "dark"
},
@@ -1365,6 +1370,10 @@
pixel_x = 1;
pixel_y = 9
},
+/obj/item/clothing/glasses/graviton,
+/obj/item/clothing/glasses/graviton,
+/obj/item/clothing/glasses/graviton,
+/obj/item/clothing/glasses/graviton,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -1525,6 +1534,7 @@
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/effect/floor_decal/industrial/outline/blue,
+/obj/item/weapon/storage/box/traumainjectors,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -16598,12 +16608,24 @@
/area/centcom/control)
"Fo" = (
/obj/structure/table/reinforced,
-/obj/item/weapon/storage/box/survival/comp,
-/obj/item/weapon/storage/box/survival/comp,
-/obj/item/weapon/storage/box/survival/comp,
-/obj/item/weapon/storage/box/survival/comp,
-/obj/item/weapon/storage/box/survival/comp,
-/obj/item/weapon/storage/box/survival/comp,
+/obj/item/weapon/storage/box/survival/comp{
+ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
+ },
+/obj/item/weapon/storage/box/survival/comp{
+ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
+ },
+/obj/item/weapon/storage/box/survival/comp{
+ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
+ },
+/obj/item/weapon/storage/box/survival/comp{
+ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
+ },
+/obj/item/weapon/storage/box/survival/comp{
+ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
+ },
+/obj/item/weapon/storage/box/survival/comp{
+ starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
+ },
/turf/unsimulated/floor{
icon_state = "dark"
},
diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm
index b1d5280242..925b7f8a0d 100644
--- a/maps/tether/tether_shuttle_defs.dm
+++ b/maps/tether/tether_shuttle_defs.dm
@@ -174,19 +174,6 @@
departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B."
..()
-/datum/shuttle/ferry/multidock/specops/ert
- name = "Special Operations"
- location = 0
- warmup_time = 10
- area_offsite = /area/shuttle/specops/station //centcom is the home station, the Exodus is offsite
- area_station = /area/shuttle/specops/centcom
- docking_controller_tag = "specops_shuttle_port"
- docking_controller_tag_station = "specops_shuttle_port"
- docking_controller_tag_offsite = "specops_shuttle_fore"
- dock_target_station = "specops_centcom_dock"
- dock_target_offsite = "specops_dock_airlock"
-
-
//////////////////////////////////////////////////////////////
// RogueMiner "Belter: Shuttle
// TODO - Not implemented yet on new map
diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm
index 609e4f4eb4..0355d32641 100644
--- a/maps/tether/tether_shuttles.dm
+++ b/maps/tether/tether_shuttles.dm
@@ -300,6 +300,8 @@
docking_controller_tag = "specops_shuttle_hatch"
web_master_type = /datum/shuttle_web_master/specialops
can_rename = FALSE
+ can_cloak = TRUE
+ cloaked = FALSE
/datum/shuttle_web_master/specialops
destination_class = /datum/shuttle_destination/specialops