diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index d30865c798..dc9d1ba2f4 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -36,7 +36,8 @@ Unsure where to begin contributing to Yawn-Wider? You can start by looking throu
Any code submissions that do not meet our coding standards are likely to be rejected, or at the very least, have a maintainer request changes on your PR. Save time and follow these standards from the start.
-* If it is something like a bugfix that VoreStation or Polaris would want (the codebases we use), code it in their code and make the PR to them. We regularly update from them. They would want any general gameplay bugfixes, and things that are obviously intended to work one way, but do not. They do not have any of our fluff species (vulp, akula, fenn, etc) so do not make PRs related to that, or any vore content to them.
+* If it is something like a bugfix that VoreStation or Polaris would want (the codebases we use), you may want to consider coding it there as well. They may want any general gameplay bugfixes, and things that are obviously intended to work one way, but do not. They do not have any of our fluff species (greys, geneshadekin) so do not make PRs related to that, or any vore content to them.
+* Change whitespace as little as possible. Do not randomly add/remove whitespace.
* Never edit stock Polaris or Vore .DMI files. If you are confused about which .DMI files we have added and which were there originally, refer to their repository and and see if they exist (https://github.com/PolarisSS13/Polaris) (https://github.com/VOREStation/VOREStation). All PRs with edits to stock .DMI files might be rejected.
* When changing any code in any stock Polaris .DM file, you must mark your changes:
* For single-line changes: //Yawn-Wider Edit - "Explanation" (Edit can also be Add for new lines or Removal if you are commenting the line out)
@@ -46,23 +47,11 @@ Any code submissions that do not meet our coding standards are likely to be reje
* Any new files should have "_yw" at the end. For example, "life_yw.dm". Just make them in the same location as the file they are related to.
* Map changes must be in tgm format. See the [Mapmerge2 Readme] for details.
-The `attempt_vr()` proc has been added for your convienence. It allows a many-line change to become a single-line change in the existing Polaris files, preserving mergeability and allowing better code separation while preventing your new code from causing runtimes that stop the original code from running. If you are wanting to inject new procedures into an existing proc, called `update_atoms()` for example, you would create `update_atoms_vr()` in a nearby `_vr.dm` file, and then call to it from a single line in the original `update_atoms()` with `attempt_vr()`.
-
-The syntax for `attempt_vr()` is: `attempt_vr(atom,"proc_name",list(arg1,arg2))`, where:
-* `atom` should be replaced with what your extended proc is defined on (if you are in something like /obj/machine/scanner/proc/update_things() and you are calling your newly defined /obj/machine/scanner/proc/update_things_vr() you can just put `src` here)
-* `proc_name` is a STRING that should be the name of your proc, such as "update_atoms_vr"
-* `list(arg1,arg2)` should contain any args you wish to pass to the proc
-
-As an example of something you can do with `attempt_vr()` in a single line, the grab and vore code is done with this in a single line. When a grab is clicked on someone, there is a line similar to:
-`if(attempt_vr(src,"handle_grabs_vr",list(src,attacker))) return`
-
-Then in our `handle_grabs_vr()` proc, if we want to avoid performing the stock game actions and have handled the vore stuff ourselves, we return true, and the original proc returns since attempt_vr returns true.
-
### Pull Requests
* Your submission must pass CI checking. The checks are important, prevent many common mistakes, and even experienced coders get caught by it sometimes. If you think there is a bug in CI, open an issue. (One known CI issue is comments in the middle of multi-line lists, just don't do it)
* Your PR should not have an excessive number of commits unless it is a large project or includes many separate remote commits (such as a pull from Polaris). If you need to keep tweaking your PR to pass CI or to satisfy a maintainer's requests and are making many commits, you should squash them in the end and update your PR accordingly so these commits don't clog up the history.
-* You can create a WIP PR, and if so, please mark it with [WIP] in the title so it can be labeled appropriately. These can't sit forever, though.
+* You can create a WIP PR, and if so, please mark it with [WIP] in the title **and make it a draft pr** so it can be labeled appropriately. These can't sit forever, though.
* If your pull request has many no-conflict merge commits ('merge from master' into your PR branch), it cannot be merged. Squash and make a new PR/forcepush to your PR branch.
### Git Commit Messages
diff --git a/code/_helpers/logging.dm b/code/_helpers/logging.dm
index 91908eb514..5d68dc9a8c 100644
--- a/code/_helpers/logging.dm
+++ b/code/_helpers/logging.dm
@@ -172,6 +172,9 @@
#endif
/proc/log_tgui(user_or_client, text)
+ if(!text)
+ stack_trace("Pointless log_tgui message")
+ return
var/entry = ""
if(!user_or_client)
entry += "no user"
diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 6c3d63f129..ec9633e20c 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -840,7 +840,11 @@ Turf and target are seperate in case you want to teleport some distance from a t
//Move the objects. Not forceMove because the object isn't "moving" really, it's supposed to be on the "same" turf.
for(var/obj/O in T)
O.loc = X
- O.update_light()
+ if(O.light_system == STATIC_LIGHT)
+ O.update_light()
+ else
+ var/datum/component/overlay_lighting/OL = O.GetComponent(/datum/component/overlay_lighting)
+ OL?.on_parent_moved(O, T, O.dir, TRUE)
if(z_level_change) // The objects still need to know if their z-level changed.
O.onTransitZ(T.z, X.z)
diff --git a/code/datums/autolathe/tools.dm b/code/datums/autolathe/tools.dm
index be182c0713..e62232540f 100644
--- a/code/datums/autolathe/tools.dm
+++ b/code/datums/autolathe/tools.dm
@@ -59,3 +59,7 @@
resources = list(MAT_PLASTIC = 5000, MAT_STEEL = 2000)
hidden = 1
man_rating = 2
+
+/datum/category_item/autolathe/tools/rsf
+ name = "rapid service fabricator"
+ path = /obj/item/weapon/rsf
diff --git a/code/datums/outfits/jobs/medical.dm b/code/datums/outfits/jobs/medical.dm
index dd5cb7fbcb..b474f92f72 100644
--- a/code/datums/outfits/jobs/medical.dm
+++ b/code/datums/outfits/jobs/medical.dm
@@ -92,7 +92,7 @@
/decl/hierarchy/outfit/job/medical/paramedic
name = OUTFIT_JOB_NAME("Paramedic")
- uniform = /obj/item/clothing/under/rank/medical/scrubs/black
+ uniform = /obj/item/clothing/under/rank/medical/paramedic
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket
shoes = /obj/item/clothing/shoes/boots/jackboots
l_hand = /obj/item/weapon/storage/firstaid/regular
@@ -103,5 +103,5 @@
/decl/hierarchy/outfit/job/medical/paramedic/emt
name = OUTFIT_JOB_NAME("Emergency Medical Technician")
- uniform = /obj/item/clothing/under/rank/medical/paramedic
+ uniform = /obj/item/clothing/under/rank/medical/paramedic_alt
suit = /obj/item/clothing/suit/storage/toggle/labcoat/emt
diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm
index 69f198bbd4..eb7d350c5f 100644
--- a/code/datums/supplypacks/medical.dm
+++ b/code/datums/supplypacks/medical.dm
@@ -202,7 +202,7 @@
/obj/item/clothing/under/rank/medical/paramedic,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/mask/gas,
- /obj/item/clothing/under/rank/medical/paramedic,
+ /obj/item/clothing/under/rank/medical/paramedic_alt,
/obj/item/clothing/accessory/stethoscope,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/clothing/shoes/boots/jackboots,
@@ -305,8 +305,8 @@
/datum/supply_pack/med/medicalbiosuits
name = "Medical biohazard gear"
contains = list(
- /obj/item/clothing/head/bio_hood = 3,
- /obj/item/clothing/suit/bio_suit = 3,
+ /obj/item/clothing/head/bio_hood/modern = 3,
+ /obj/item/clothing/suit/bio_suit/modern = 3,
/obj/item/clothing/head/bio_hood/virology = 2,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 1b47513e1b..d443b0bf0a 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -378,6 +378,7 @@
/atom/movable/proc/onTransitZ(old_z,new_z)
GLOB.z_moved_event.raise_event(src, old_z, new_z)
+ SEND_SIGNAL(src, COMSIG_MOVABLE_Z_CHANGED, old_z, new_z)
for(var/item in src) // Notify contents of Z-transition. This can be overridden IF we know the items contents do not care.
var/atom/movable/AM = item
AM.onTransitZ(old_z,new_z)
diff --git a/code/game/machinery/gear_dispenser.dm b/code/game/machinery/gear_dispenser.dm
index a2723a2597..adb204e4d9 100644
--- a/code/game/machinery/gear_dispenser.dm
+++ b/code/game/machinery/gear_dispenser.dm
@@ -80,15 +80,16 @@ var/list/dispenser_presets = list()
var/spawned = list()
voidsuit = new voidsuit_type(T)
- spawned += voidsuit
+ spawned += voidsuit // We only add the voidsuit so the game doesn't try to put the tank/helmet/boots etc into their hands
+
// If we're supposed to make a helmet
if(voidhelmet_type)
// The coder may not have realized this type spawns its own helmet
if(voidsuit.helmet)
error("[src] created a voidsuit [voidsuit] and wants to add a helmet but it already has one")
else
- voidsuit.attach_helmet(new voidhelmet_type())
- spawned += voidhelmet
+ voidhelmet = new voidhelmet_type()
+ voidsuit.attach_helmet(voidhelmet)
// If we're supposed to make boots
if(magboots_type)
// The coder may not have realized thist ype spawns its own boots
@@ -97,7 +98,6 @@ var/list/dispenser_presets = list()
else
magboots = new magboots_type(voidsuit)
voidsuit.boots = magboots
- spawned += magboots
if(refit)
voidsuit.refit_for_species(user.species?.get_bodytype()) // does helmet and boots if they're attached
@@ -109,7 +109,6 @@ var/list/dispenser_presets = list()
else
var/obj/item/life_support = new /obj/item/device/suit_cooling_unit(voidsuit)
voidsuit.cooler = life_support
- spawned += life_support
else if(user.species?.breath_type)
if(voidsuit.tank)
error("[src] created a voidsuit [voidsuit] and wants to add a tank but it already has one")
@@ -121,7 +120,6 @@ var/list/dispenser_presets = list()
if(tankpath)
var/obj/item/life_support = new tankpath(voidsuit)
voidsuit.tank = life_support
- spawned += life_support
else
voidsuit.audible_message("Dispenser warning: Unable to locate suitable airtank for user.")
@@ -567,6 +565,27 @@ var/list/dispenser_presets = list()
one_setting = /datum/gear_disp/voidsuit/autolok
special_frame = "frame_grey"
+////////////////////////////// MOEBIUS SUIT DISPENSERS ///////////////////////////
+/datum/gear_disp/voidsuit/aether
+ name = "Aether Voidsuit"
+ voidsuit_type = /obj/item/clothing/suit/space/void/aether
+ voidhelmet_type = /obj/item/clothing/head/helmet/space/void/aether
+ refit = FALSE // No animal sprites AAA!
+
+/obj/machinery/gear_dispenser/suit/aether
+ name = "\improper Aether Voidsuit Dispenser"
+ desc = "An industrial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
+ icon_state = "suitdispenserMB"
+ dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
+ one_setting = /datum/gear_disp/voidsuit/aether
+
+/obj/machinery/gear_dispenser/suit_fancy/aether
+ name = "\improper Aether Voidsuit Dispenser"
+ desc = "A commercial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
+ dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
+ one_setting = /datum/gear_disp/voidsuit/aether
+ special_frame = "frame_purple"
+
// Adminbuse
/obj/machinery/gear_dispenser/vv_get_dropdown()
. = ..()
diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm
index ddd4bcda09..cd23ffc624 100644
--- a/code/game/objects/items/uav.dm
+++ b/code/game/objects/items/uav.dm
@@ -97,8 +97,10 @@
return
// Can disasemble or reassemble from packed or off (and this one takes time)
if("(Dis)Assemble")
- if(can_transition_to(state == UAV_PACKED ? UAV_OFF : UAV_PACKED, user) && do_after(user, 10 SECONDS, src))
- return toggle_packed(user)
+ if(can_transition_to(state == UAV_PACKED ? UAV_OFF : UAV_PACKED, user))
+ user.visible_message("[user] starts [state == UAV_PACKED ? "unpacking" : "packing"] [src].", "You start [state == UAV_PACKED ? "unpacking" : "packing"] [src].")
+ if(do_after(user, 10 SECONDS, src))
+ return toggle_packed(user)
// Can toggle power from on and off
if("Toggle Power")
if(can_transition_to(state == UAV_ON ? UAV_OFF : UAV_ON, user))
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index b7371ce88c..a12ba0106a 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -13,6 +13,7 @@ RSF
opacity = 0
density = 0
anchored = 0.0
+ matter = list(DEFAULT_WALL_MATERIAL = 25000)
var/stored_matter = 30
var/mode = 1
var/obj/item/weapon/reagent_containers/glasstype = /obj/item/weapon/reagent_containers/food/drinks/metaglass
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 31e34b75af..555f002a31 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -158,6 +158,15 @@
usr.put_in_l_hand(src)
src.add_fingerprint(usr)
+/obj/item/weapon/storage/AltClick(mob/user)
+ if(user in is_seeing)
+ src.close(user)
+ // I would think there should be some incap check here or something
+ // But MouseDrop doesn't use one (as of this writing), so...
+ else if(isliving(user) && Adjacent(user))
+ src.open(user)
+ else
+ return ..()
/obj/item/weapon/storage/proc/return_inv()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index a89601cc0a..a1412ba7a9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -33,6 +33,7 @@
/obj/item/clothing/under/rank/nurse,
/obj/item/clothing/under/rank/orderly,
/obj/item/clothing/suit/storage/toggle/labcoat,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/medical,
@@ -127,6 +128,7 @@
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 66383849f0..a3fdc31f24 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -33,6 +33,7 @@
/obj/item/clothing/under/rank/research_director/rdalt,
/obj/item/clothing/under/rank/research_director/dress_rd,
/obj/item/clothing/suit/storage/toggle/labcoat,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/weapon/cartridge/rd,
/obj/item/clothing/shoes/white,
/obj/item/clothing/shoes/laceup/brown,
@@ -54,6 +55,7 @@
starts_with = list(
/obj/item/clothing/under/rank/scientist,
/obj/item/clothing/suit/storage/toggle/labcoat,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/shoes/white,
/obj/item/weapon/melee/umbrella, // vorestation addition,
/obj/item/clothing/glasses/science,
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index bc41dac203..33ea9c21eb 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -219,6 +219,7 @@
/obj/item/clothing/under/rank/scientist/skirt = 2,
/obj/item/clothing/under/rank/scientist/turtleneck = 3,
/obj/item/clothing/suit/storage/toggle/labcoat = 3,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/shoes/slippers = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 3ef89064f7..e1900bfe97 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -232,7 +232,7 @@ var/list/flooring_types
/decl/flooring/snow
name = "snow"
desc = "A layer of many tiny bits of frozen water. It's hard to tell how deep it is."
- icon = 'icons/turf/snow_new.dmi'
+ icon = 'icons/turf/outdoors.dmi'
icon_base = "snow"
footstep_sounds = list("human" = list(
'sound/effects/footstep/snow1.ogg',
diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm
index 36fc6e1572..e4e8fa1095 100644
--- a/code/game/turfs/flooring/flooring_premade.dm
+++ b/code/game/turfs/flooring/flooring_premade.dm
@@ -392,7 +392,7 @@
/turf/simulated/floor/outdoors/snow
name = "snow"
- icon = 'icons/turf/snow_new.dmi'
+ icon = 'icons/turf/outdoors.dmi'
icon_state = "snow"
initial_flooring = /decl/flooring/snow
movement_cost = 2
diff --git a/code/game/turfs/simulated/outdoors/snow.dm b/code/game/turfs/simulated/outdoors/snow.dm
index 6e89ed407f..48235c61f9 100644
--- a/code/game/turfs/simulated/outdoors/snow.dm
+++ b/code/game/turfs/simulated/outdoors/snow.dm
@@ -53,6 +53,16 @@
desc = "Looks slippery."
edge_blending_priority = 0
+/turf/simulated/floor/outdoors/ice/dark
+ name = "black ice"
+ icon_state = "ice_dark"
+ desc = "An uneven surface of dark rocks glazed over by solid ice. Looks slippey, maybe even painful"
+
+/turf/simulated/floor/outdoors/ice/dark_smooth
+ name = "smooth black ice"
+ icon_state = "ice_dark_smooth"
+ desc = "Dark rock that has been smoothened to be perfectly even. It's coated in a layer of slippey ice"
+
/turf/simulated/floor/outdoors/ice/Entered(var/mob/living/M)
sleep(1 * world.tick_lag)
if(istype(M, /mob/living))
diff --git a/code/modules/admin/view_variables/topic_list.dm b/code/modules/admin/view_variables/topic_list.dm
index c437a58a17..1f535f2b42 100644
--- a/code/modules/admin/view_variables/topic_list.dm
+++ b/code/modules/admin/view_variables/topic_list.dm
@@ -10,7 +10,7 @@
mod_list(target, null, "list", "contents", target_index, autodetect_class = FALSE)
if(href_list[VV_HK_LIST_REMOVE])
var/variable = target[target_index]
- var/prompt = tgui_alert(usr, "Do you want to remove item number [target_index] from list?", "Confirm", "Yes", "No")
+ var/prompt = tgui_alert(usr, "Do you want to remove item number [target_index] from list?", "Confirm", list("Yes", "No"))
if (prompt != "Yes")
return
target.Cut(target_index, target_index+1)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index de22b807de..63e5700689 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -23,6 +23,7 @@
//this is da important part wot makes things go
+GLOBAL_DATUM(gateway_station, /obj/machinery/gateway/centerstation)
/obj/machinery/gateway/centerstation
density = 1
icon_state = "offcenter"
@@ -35,12 +36,29 @@
var/obj/machinery/gateway/centeraway/awaygate = null
/obj/machinery/gateway/centerstation/Initialize()
+ if(GLOB.gateway_station)
+ warning("[src] at [x],[y],[z] appears to be an additional station-gateway")
+ else
+ GLOB.gateway_station = src
+
update_icon()
wait = world.time + config.gateway_delay //+ thirty minutes default
- awaygate = locate(/obj/machinery/gateway/centeraway)
+
+ if(GLOB.gateway_away)
+ awaygate = GLOB.gateway_away
+ else
+ awaygate = locate(/obj/machinery/gateway/centeraway)
+
. = ..()
density = 1 //VOREStation Add
+/obj/machinery/gateway/centerstation/Destroy()
+ if(awaygate?.stationgate == src)
+ awaygate.stationgate = null
+ if(GLOB.gateway_station == src)
+ GLOB.gateway_station = null
+ return ..()
+
/obj/machinery/gateway/centerstation/update_icon()
if(active)
icon_state = "oncenter"
@@ -204,8 +222,11 @@
/obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob)
if(istype(W,/obj/item/device/multitool))
- if(!awaygate)
- awaygate = locate(/obj/machinery/gateway/centeraway)
+ if(!awaygate)
+ if(GLOB.gateway_away)
+ awaygate = GLOB.gateway_away
+ else
+ awaygate = locate(/obj/machinery/gateway/centeraway)
if(!awaygate) // We still can't find the damn thing because there is no destination.
to_chat(user, "Error: Programming failed. No destination found.")
return
@@ -215,8 +236,7 @@
return
/////////////////////////////////////Away////////////////////////
-
-
+GLOBAL_DATUM(gateway_away, /obj/machinery/gateway/centeraway)
/obj/machinery/gateway/centeraway
density = 1
icon_state = "offcenter"
@@ -224,15 +244,32 @@
var/calibrated = 1
var/list/linked = list() //a list of the connected gateway chunks
var/ready = 0
- var/obj/machinery/gateway/centeraway/stationgate = null
+ var/obj/machinery/gateway/centerstation/stationgate = null
+/obj/machinery/gateway/centeraway/New()
+ density = 1
/obj/machinery/gateway/centeraway/Initialize()
+ if(GLOB.gateway_away)
+ warning("[src] at [x],[y],[z] appears to be an additional away-gateway")
+ else
+ GLOB.gateway_away = src
+
update_icon()
- stationgate = locate(/obj/machinery/gateway/centerstation)
+
+ if(GLOB.gateway_station)
+ stationgate = GLOB.gateway_station
+ else
+ stationgate = locate(/obj/machinery/gateway/centerstation)
. = ..()
density = 1 //VOREStation Add
+/obj/machinery/gateway/centeraway/Destroy()
+ if(stationgate?.awaygate == src)
+ stationgate.awaygate = null
+ if(GLOB.gateway_away == src)
+ GLOB.gateway_away = null
+ return ..()
/obj/machinery/gateway/centeraway/update_icon()
if(active)
@@ -240,10 +277,6 @@
return
icon_state = "offcenter"
-/obj/machinery/gateway/centeraway/New()
- density = 1
-
-
/obj/machinery/gateway/centeraway/proc/detect()
linked = list() //clear the list
var/turf/T = loc
@@ -317,7 +350,10 @@
return
else
// VOREStation Add
- stationgate = locate(/obj/machinery/gateway/centerstation)
+ if(GLOB.gateway_station)
+ stationgate = GLOB.gateway_station
+ else
+ stationgate = locate(/obj/machinery/gateway/centerstation)
if(!stationgate)
to_chat(user, "Error: Recalibration failed. No destination found... That can't be good.")
return
diff --git a/code/modules/busy_space_vr/organizations.dm b/code/modules/busy_space_vr/organizations.dm
index 05df67ce87..ec30b2a2a8 100644
--- a/code/modules/busy_space_vr/organizations.dm
+++ b/code/modules/busy_space_vr/organizations.dm
@@ -1402,7 +1402,7 @@
//////////////////////////////////////////////////////////////////////////////////
// Other
-/datum/lore/organization/other/kitsuhana //sorry KHI, but you're not a coherent stellar government, and you're definitely not a TSC. you get to go in the Others pool.
+/datum/lore/organization/other/kitsuhana //sorry KHI, but you're not a coherent stellar government, and you're definitely not a TSC. you get to go in the Others pool. //makes sense to me!
name = "Kitsuhana Heavy Industries"
short_name = "" //whitespace haaaack
desc = "A large post-scarcity amalgamation of races, Kitsuhana is no longer a company but rather a loose association of 'members' \
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 738ee9bce2..0a8f2fbe3b 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -135,43 +135,39 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies))
/datum/gear/suit/labcoat
- display_name = "labcoat"
+ display_name = "labcoat selection, public"
path = /obj/item/clothing/suit/storage/toggle/labcoat
-/datum/gear/suit/labcoat/blue
- display_name = "labcoat, blue"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/blue
+/datum/gear/suit/labcoat/New()
+ ..()
+ var/list/labcoats = list(
+ "White labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat,
+ "Blue-edge labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge,
+ "Green labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/green,
+ "Orange labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/orange,
+ "Purple labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/purple,
+ "Pink labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/pink,
+ "Red labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/red,
+ "Yellow labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/yellow
+ )
+ gear_tweaks += new/datum/gear_tweak/path(labcoats)
-/datum/gear/suit/labcoat/blue_edge
- display_name = "labcoat, blue-edged"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge
+/datum/gear/suit/labcoat_cmo
+ display_name = "labcoat selection, cmo"
+ path = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
+ allowed_roles = list("Chief Medical Officer")
-/datum/gear/suit/labcoat/green
- display_name = "labcoat, green"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/green
-
-/datum/gear/suit/labcoat/orange
- display_name = "labcoat, orange"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/orange
-
-/datum/gear/suit/labcoat/purple
- display_name = "labcoat, purple"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/purple
-
-/datum/gear/suit/labcoat/pink
- display_name = "labcoat, pink"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/pink
-
-/datum/gear/suit/labcoat/red
- display_name = "labcoat, red"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/red
-
-/datum/gear/suit/labcoat/yellow
- display_name = "labcoat, yellow"
- path = /obj/item/clothing/suit/storage/toggle/labcoat/yellow
+/datum/gear/suit/labcoat_cmo/New()
+ ..()
+ var/list/labcoats = list(
+ "CMO labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/cmo,
+ "CMO labcoat (alt)" = /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
+ "CMO labcoat (modern)" = /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo
+ )
+ gear_tweaks += new/datum/gear_tweak/path(labcoats)
/datum/gear/suit/labcoat/emt
- display_name = "labcoat, EMT (Medical)"
+ display_name = "labcoat, EMT"
path = /obj/item/clothing/suit/storage/toggle/labcoat/emt
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
@@ -189,6 +185,11 @@
path = /obj/item/clothing/suit/storage/apron/overalls
cost = 1
+/datum/gear/suit/cyberpunk
+ display_name = "cyberpunk jacket"
+ path = /obj/item/clothing/suit/cyberpunk
+ cost = 2
+
/datum/gear/suit/poncho
display_name = "poncho selection"
path = /obj/item/clothing/accessory/poncho
@@ -203,99 +204,80 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos))
/datum/gear/suit/roles/poncho
- display_name = "poncho, cargo"
+ display_name = "poncho selection, departments"
path = /obj/item/clothing/accessory/poncho/roles/cargo
cost = 1
-/datum/gear/suit/roles/poncho/security
- display_name = "poncho, security"
- path = /obj/item/clothing/accessory/poncho/roles/security
+/datum/gear/suit/roles/poncho/New()
+ ..()
+ var/list/ponchos = list(
+ "Cargo poncho" = /obj/item/clothing/accessory/poncho/roles/cargo,
+ "Security poncho" = /obj/item/clothing/accessory/poncho/roles/security,
+ "Medical poncho" = /obj/item/clothing/accessory/poncho/roles/medical,
+ "Engineering poncho" = /obj/item/clothing/accessory/poncho/roles/engineering,
+ "Science poncho" = /obj/item/clothing/accessory/poncho/roles/science
+ )
+ gear_tweaks += new/datum/gear_tweak/path(ponchos)
-/datum/gear/suit/roles/poncho/medical
- display_name = "poncho, medical"
- path = /obj/item/clothing/accessory/poncho/roles/medical
-/datum/gear/suit/roles/poncho/engineering
- display_name = "poncho, engineering"
- path = /obj/item/clothing/accessory/poncho/roles/engineering
+/datum/gear/suit/roles/cloak
+ display_name = "cloak selection, departments"
+ path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
-/datum/gear/suit/roles/poncho/science
- display_name = "poncho, science"
- path = /obj/item/clothing/accessory/poncho/roles/science
+/datum/gear/suit/roles/cloak/New()
+ ..()
+ var/list/cloaks = list(
+ "Cargo cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/cargo,
+ "Mining cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/mining,
+ "Security cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/security,
+ "Service cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/service,
+ "Engineer cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/engineer,
+ "Atmos cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/atmos,
+ "Research cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/research,
+ "Medical cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/medical
+ )
+ gear_tweaks += new/datum/gear_tweak/path(cloaks)
-/datum/gear/suit/roles/poncho/cloak/hos
+/datum/gear/suit/roles/cloak_hos
display_name = "cloak, head of security"
path = /obj/item/clothing/accessory/poncho/roles/cloak/hos
allowed_roles = list("Head of Security")
-/datum/gear/suit/roles/poncho/cloak/cmo
+/datum/gear/suit/roles/cloak_cmo
display_name = "cloak, chief medical officer"
path = /obj/item/clothing/accessory/poncho/roles/cloak/cmo
allowed_roles = list("Chief Medical Officer")
-/datum/gear/suit/roles/poncho/cloak/ce
+/datum/gear/suit/roles/cloak_ce
display_name = "cloak, chief engineer"
path = /obj/item/clothing/accessory/poncho/roles/cloak/ce
allowed_roles = list("Chief Engineer")
-/datum/gear/suit/roles/poncho/cloak/rd
+/datum/gear/suit/roles/cloak_rd
display_name = "cloak, research director"
path = /obj/item/clothing/accessory/poncho/roles/cloak/rd
allowed_roles = list("Research Director")
-/datum/gear/suit/roles/poncho/cloak/qm
+/datum/gear/suit/roles/cloak_qm
display_name = "cloak, quartermaster"
path = /obj/item/clothing/accessory/poncho/roles/cloak/qm
allowed_roles = list("Quartermaster")
-/datum/gear/suit/roles/poncho/cloak/captain
+/datum/gear/suit/roles/cloak_captain
display_name = "cloak, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/captain
allowed_roles = list("Site Manager")
-/datum/gear/suit/roles/poncho/cloak/hop
+/datum/gear/suit/roles/cloak_hop
display_name = "cloak, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/hop
allowed_roles = list("Head of Personnel")
-/datum/gear/suit/roles/poncho/cloak/cargo
- display_name = "cloak, cargo"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
-
-/datum/gear/suit/roles/poncho/cloak/mining
- display_name = "cloak, mining"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/mining
-
-/datum/gear/suit/roles/poncho/cloak/security
- display_name = "cloak, security"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/security
- allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
-
-/datum/gear/suit/roles/poncho/cloak/service
- display_name = "cloak, service"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/service
-
-/datum/gear/suit/roles/poncho/cloak/engineer
- display_name = "cloak, engineer"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/engineer
-
-/datum/gear/suit/roles/poncho/cloak/atmos
- display_name = "cloak, atmos"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/atmos
-
-/datum/gear/suit/roles/poncho/cloak/research
- display_name = "cloak, science"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/research
-
-/datum/gear/suit/roles/poncho/cloak/medical
- display_name = "cloak, medical"
- path = /obj/item/clothing/accessory/poncho/roles/cloak/medical
-
-/datum/gear/suit/roles/poncho/cloak/custom //A colorable cloak
- display_name = "cloak (colorable)"
+/datum/gear/suit/cloak_custom //A colorable cloak
+ display_name = "cloak, colorable"
path = /obj/item/clothing/accessory/poncho/roles/cloak/custom
-/datum/gear/suit/roles/poncho/cloak/custom/New()
+/datum/gear/suit/cloak_custom/New()
..()
gear_tweaks += gear_tweak_free_color_choice
@@ -304,44 +286,49 @@
path = /obj/item/clothing/suit/unathi/robe
cost = 1
-/datum/gear/suit/black_lawyer_jacket
- display_name = "suit jacket, black"
+/datum/gear/suit/lawyer_jackets
+ display_name = "suit jacket selection"
path = /obj/item/clothing/suit/storage/toggle/internalaffairs
-/datum/gear/suit/blue_lawyer_jacket
- display_name = "suit jacket, blue"
- path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
-
-/datum/gear/suit/purple_lawyer_jacket
- display_name = "suit jacket, purple"
- path = /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket
+/datum/gear/suit/lawyer_jackets/New()
+ ..()
+ var/list/jackets = list(
+ "Black suit jacket" = /obj/item/clothing/suit/storage/toggle/internalaffairs,
+ "Blue suit jacket" = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket,
+ "Purple suit jacket" = /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket
+ )
+ gear_tweaks += new/datum/gear_tweak/path(jackets)
/datum/gear/suit/suspenders
display_name = "suspenders"
path = /obj/item/clothing/suit/suspenders
/datum/gear/suit/forensics
- display_name = "forensics long, red"
+ display_name = "forensics uniform selection (Detective)"
path = /obj/item/clothing/suit/storage/forensics/red/long
allowed_roles = list("Detective")
-/datum/gear/suit/forensics/blue
- display_name = "forensics long, blue"
- path = /obj/item/clothing/suit/storage/forensics/blue/long
- allowed_roles = list("Detective")
+/datum/gear/suit/forensics/New()
+ ..()
+ var/list/uniforms = list(
+ "Red, long uniform" = /obj/item/clothing/suit/storage/forensics/red/long,
+ "Blue, long uniform" = /obj/item/clothing/suit/storage/forensics/blue/long,
+ "Red, short uniform" = /obj/item/clothing/suit/storage/forensics/red,
+ "Blue, short uniform" = /obj/item/clothing/suit/storage/forensics/blue
+ )
+ gear_tweaks += new/datum/gear_tweak/path(uniforms)
-/datum/gear/suit/forensics/blue/short
- display_name = "forensics, blue"
- path = /obj/item/clothing/suit/storage/forensics/blue
- allowed_roles = list("Detective")
+/datum/gear/suit/qm_coat
+ display_name = "coat, quartermaster"
+ path = /obj/item/clothing/suit/storage/qm
+ allowed_roles = list("Quartermaster")
-/datum/gear/suit/forensics/red/short
- display_name = "forensics, red"
- path = /obj/item/clothing/suit/storage/forensics/red
- allowed_roles = list("Detective")
+/datum/gear/suit/cargo_coat
+ display_name = "coat, cargo tech"
+ path = /obj/item/clothing/suit/storage/cargo
+ allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
// winter coats go here
-
/datum/gear/suit/wintercoat
display_name = "winter coat"
path = /obj/item/clothing/suit/storage/hooded/wintercoat
@@ -406,7 +393,6 @@
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
-
/datum/gear/suit/wintercoat/science/robotics
display_name = "winter coat, robotics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics
@@ -477,7 +463,6 @@
/datum/gear/suit/wintercoat/cosmic
display_name = "winter coat, cosmic"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic
-
// winter coats end here
/datum/gear/suit/varsity
@@ -505,20 +490,18 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tracks))
/datum/gear/suit/flannel
- display_name = "grey flannel"
+ display_name = "flannel jacket selection"
path = /obj/item/clothing/suit/storage/flannel
-/datum/gear/suit/flannel/red
- display_name = "red flannel"
- path = /obj/item/clothing/suit/storage/flannel/red
-
-/datum/gear/suit/flannel/aqua
- display_name = "aqua flannel"
- path = /obj/item/clothing/suit/storage/flannel/aqua
-
-/datum/gear/suit/flannel/brown
- display_name = "brown flannel"
- path = /obj/item/clothing/suit/storage/flannel/brown
+/datum/gear/suit/flannel/New()
+ ..()
+ var/list/flannel = list(
+ "Grey flannel" = /obj/item/clothing/suit/storage/flannel,
+ "Red flannel" = /obj/item/clothing/suit/storage/flannel/red,
+ "Aqua flannel" = /obj/item/clothing/suit/storage/flannel/aqua,
+ "Brown flannel" = /obj/item/clothing/suit/storage/flannel/brown
+ )
+ gear_tweaks += new/datum/gear_tweak/path(flannel)
/datum/gear/suit/denim_jacket
display_name = "denim jacket"
@@ -544,25 +527,20 @@
..()
gear_tweaks += gear_tweak_free_color_choice
-/datum/gear/suit/miscellaneous/sec_dep_jacket
- display_name = "department jacket, security"
+/datum/gear/suit/miscellaneous/dep_jacket
+ display_name = "department jacket selection"
path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
-/datum/gear/suit/miscellaneous/engi_dep_jacket
- display_name = "department jacket, engineering"
- path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
-
-/datum/gear/suit/miscellaneous/supply_dep_jacket
- display_name = "department jacket, supply"
- path = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
-
-/datum/gear/suit/miscellaneous/sci_dep_jacket
- display_name = "department jacket, science"
- path = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
-
-/datum/gear/suit/miscellaneous/med_dep_jacket
- display_name = "department jacket, medical"
- path = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
+/datum/gear/suit/miscellaneous/dep_jacket/New()
+ ..()
+ var/list/jacket = list(
+ "Security department jacket" = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket,
+ "Engineering department jacket" = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket,
+ "Cargo department jacket" = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket,
+ "Science department jacket" = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket,
+ "Medical department jacket" = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
+ )
+ gear_tweaks += new/datum/gear_tweak/path(jacket)
/datum/gear/suit/miscellaneous/peacoat
display_name = "peacoat"
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index 881d4dd8b3..1bee5c6744 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -31,16 +31,20 @@
path = /obj/item/clothing/suit/poncho
//Detective alternative
-/datum/gear/uniform/detective_alt
- display_name = "sleek modern coat, detective"
+/datum/gear/suit/detective_alt
+ display_name = "sleek modern coat selection, detective"
path = /obj/item/clothing/suit/storage/det_trench/alt
allowed_roles = list("Head of Security", "Detective")
-//Detective alternative
-/datum/gear/uniform/detective_alt2
- display_name = "sleek modern coat (long), detective"
- path = /obj/item/clothing/suit/storage/det_trench/alt2
- allowed_roles = list("Head of Security", "Detective")
+/datum/gear/suit/detective_alt/New()
+ ..()
+ var/list/coats = list(
+ "Modern coat (tan)" = /obj/item/clothing/suit/storage/det_trench/alt,
+ "Modern coat (long, tan)" = /obj/item/clothing/suit/storage/det_trench/alt2,
+ "Modern coat (black)" = /obj/item/clothing/suit/storage/det_trench/alt/black,
+ "Modern coat (long, black)" = /obj/item/clothing/suit/storage/det_trench/alt2/black
+ )
+ gear_tweaks += new/datum/gear_tweak/path(coats)
//Emergency Responder jackets for Parameds & EMTs, but also general Medical Staff
/datum/gear/suit/roles/medical/ems_jacket
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 bf41330812..572e19cb17 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
@@ -223,4 +223,18 @@ Talon jumpsuit
/datum/gear/uniform/talonbasic
display_name = "ITV Jumpsuit"
description = "A jumpsuit that is usually issued to ITV contractors, however others can purchase it to show their support towards ITV."
- path = /obj/item/clothing/under/rank/talon/basic
\ No newline at end of file
+ path = /obj/item/clothing/under/rank/talon/basic
+
+// Summer dresses
+/datum/gear/uniform/summerdress
+ display_name = "summer dress selection"
+ path = /obj/item/clothing/under/summerdress
+
+/datum/gear/uniform/summerdress/New()
+ ..()
+ var/list/dresses = list(
+ "black and white" = /obj/item/clothing/under/summerdress,
+ "blue and white" = /obj/item/clothing/under/summerdress/blue,
+ "red and white" = /obj/item/clothing/under/summerdress/red
+ )
+ gear_tweaks += new/datum/gear_tweak/path(dresses)
diff --git a/code/modules/client/verbs/who.dm b/code/modules/client/verbs/who.dm
index ccc3e0ac4e..445acdc1c7 100644
--- a/code/modules/client/verbs/who.dm
+++ b/code/modules/client/verbs/who.dm
@@ -69,7 +69,7 @@
var/temp = ""
var/category = R_ADMIN
// VOREStation Edit - Apply stealthmin protection to all levels
- if(C.holder.fakekey && !check_rights(R_ADMIN|R_MOD, FALSE, src)) // Only admins and mods can see stealthmins
+ if(C.holder.fakekey && !check_rights_for(src, R_ADMIN|R_MOD)) // Only admins and mods can see stealthmins
continue
// VOREStation Edit End
if(check_rights(R_BAN, FALSE, C)) // admins //VOREStation Edit
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 8114ccd550..03d9ec9fbc 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -542,7 +542,7 @@
// Generate and cache the on-mob icon, which is used in update_inv_head().
var/body_type = (H && H.species.get_bodytype(H))
- var/cache_key = "[light_overlay][body_type && sprite_sheets[body_type] ? "_[body_type]" : ""]"
+ var/cache_key = "[light_overlay][body_type && sprite_sheets[body_type] ? body_type : ""]"
if(!light_overlay_cache[cache_key])
var/use_icon = LAZYACCESS(sprite_sheets,body_type) || 'icons/mob/light_overlays.dmi'
light_overlay_cache[cache_key] = image(icon = use_icon, icon_state = "[light_overlay]")
@@ -737,7 +737,7 @@
var/fire_resist = T0C+100
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
allowed = list(/obj/item/weapon/tank/emergency/oxygen)
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
slot_flags = SLOT_OCLOTHING
var/blood_overlay_type = "suit"
blood_sprite_state = "suitblood" //Defaults to the suit's blood overlay, so that some blood renders instead of no blood.
diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm
index fe2176215a..0762fedeae 100644
--- a/code/modules/clothing/spacesuits/rig/modules/modules.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm
@@ -41,6 +41,7 @@
// Icons.
var/suit_overlay
+ var/suit_overlay_icon = 'icons/mob/rig_modules.dmi'
var/suit_overlay_active // If set, drawn over icon and mob when effect is active.
var/suit_overlay_inactive // As above, inactive.
var/suit_overlay_used // As above, when engaged.
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 43bcd583d2..4550eab088 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -8,7 +8,6 @@
* /obj/item/rig_module/device/arch_drill
* /obj/item/rig_module/device/anomaly_scanner
* /obj/item/rig_module/maneuvering_jets
- * /obj/item/rig_module/foam_sprayer
* /obj/item/rig_module/device/broadcaster
* /obj/item/rig_module/chem_dispenser
* /obj/item/rig_module/chem_dispenser/injector
@@ -411,11 +410,7 @@
jets.holder = null
jets.ion_trail.set_up(jets)
-/obj/item/rig_module/foam_sprayer
-
-
//Deployable Mop
-
/obj/item/rig_module/mounted/mop
name = "mop projector"
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index d518848dc2..cc7084341f 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -7,7 +7,6 @@
*/
/obj/item/weapon/rig
-
name = "hardsuit control module"
icon = 'icons/obj/rig_modules.dmi'
desc = "A back-mounted hardsuit deployment and control mechanism."
@@ -27,6 +26,8 @@
unacidable = 1
preserve_item = 1
+ var/default_mob_icon = 'icons/mob/rig_back.dmi'
+
var/suit_state //The string used for the suit's icon_state.
var/interface_path = "RIGSuit"
@@ -96,22 +97,8 @@
var/datum/effect/effect/system/spark_spread/spark_system
var/datum/mini_hud/rig/minihud
-/obj/item/weapon/rig/examine()
- . = ..()
- if(wearer)
- for(var/obj/item/piece in list(helmet,gloves,chest,boots))
- if(!piece || piece.loc != wearer)
- continue
- . += "[bicon(piece)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
-
- if(src.loc == usr)
- . += "The access panel is [locked? "locked" : "unlocked"]."
- . += "The maintenance panel is [open ? "open" : "closed"]."
- . += "Hardsuit systems are [offline ? "offline" : "online"]."
- . += "The cooling stystem is [cooling_on ? "active" : "inactive"]."
-
- if(open)
- . += "It's equipped with [english_list(installed_modules)]."
+ // Action button
+ action_button_name = "Hardsuit Interface"
/obj/item/weapon/rig/New()
..()
@@ -184,6 +171,23 @@
spark_system = null
return ..()
+/obj/item/weapon/rig/examine()
+ . = ..()
+ if(wearer)
+ for(var/obj/item/piece in list(helmet,gloves,chest,boots))
+ if(!piece || piece.loc != wearer)
+ continue
+ . += "[bicon(piece)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
+
+ if(src.loc == usr)
+ . += "The access panel is [locked? "locked" : "unlocked"]."
+ . += "The maintenance panel is [open ? "open" : "closed"]."
+ . += "Hardsuit systems are [offline ? "offline" : "online"]."
+ . += "The cooling stystem is [cooling_on ? "active" : "inactive"]."
+
+ if(open)
+ . += "It's equipped with [english_list(installed_modules)]."
+
// We only care about processing when we're on a mob
/obj/item/weapon/rig/Moved(old_loc, direction, forced)
if(ismob(loc))
@@ -587,7 +591,7 @@
cut_overlays()
if(!mob_icon || update_mob_icon)
- var/species_icon = 'icons/mob/rig_back.dmi'
+ var/species_icon = default_mob_icon
// Since setting mob_icon will override the species checks in
// update_inv_wear_suit(), handle species checks here.
if(wearer && sprite_sheets && sprite_sheets[wearer.species.get_bodytype(wearer)])
@@ -597,7 +601,7 @@
if(installed_modules.len)
for(var/obj/item/rig_module/module in installed_modules)
if(module.suit_overlay)
- chest.add_overlay(image('icons/mob/rig_modules.dmi', icon_state = "[module.suit_overlay]", dir = SOUTH))
+ chest.add_overlay(image(module.suit_overlay_icon, icon_state = "[module.suit_overlay]", dir = SOUTH))
if(wearer)
wearer.update_inv_shoes()
diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm
index c1d2fe2c5b..b28d93bc55 100644
--- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm
@@ -9,6 +9,11 @@
if(wearer && (wearer.back == src || wearer.belt == src))
tgui_interact(usr)
+// So the UI button clicks come here
+/obj/item/weapon/rig/ui_action_click()
+ if(usr == wearer && (wearer.back == src || wearer.belt == src))
+ tgui_interact(usr)
+
/obj/item/weapon/rig/verb/toggle_vision()
set name = "Toggle Visor"
diff --git a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm
index f543b95431..e0d14f189a 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm
@@ -53,3 +53,128 @@
/obj/item/weapon/rig/robotics
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/storage/box, /obj/item/weapon/storage/belt, /obj/item/device/defib_kit/compact)
+
+// 'Technomancer' hardsuit
+/obj/item/weapon/rig/focalpoint
+ name = "\improper F.P.E. hardsuit control module"
+ desc = "A high-end hardsuit produced by Focal Point Energistics, focused around repair and construction."
+
+ icon = 'icons/obj/rig_modules_vr.dmi' // the item
+ default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob
+ icon_state = "techno_rig"
+ suit_type = "\improper F.P.E. hardsuit"
+ cell_type = /obj/item/weapon/cell/hyper
+
+ // Copied from CE rig
+ slowdown = 0
+ offline_slowdown = 0
+ offline_vision_restriction = 0
+ rigsuit_max_pressure = 20 * ONE_ATMOSPHERE // Max pressure the rig protects against when sealed
+ rigsuit_min_pressure = 0 // Min pressure the rig protects against when sealed
+ min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+ max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE // so it's like a rig firesuit
+ armor = list("melee" = 40, "bullet" = 10, "laser" = 30, "energy" = 55, "bomb" = 70, "bio" = 100, "rad" = 100)
+
+ chest_type = /obj/item/clothing/suit/space/rig/focalpoint
+ helm_type = /obj/item/clothing/head/helmet/space/rig/focalpoint
+ boot_type = /obj/item/clothing/shoes/magboots/rig/focalpoint
+ glove_type = /obj/item/clothing/gloves/gauntlets/rig/focalpoint
+
+/obj/item/weapon/rig/focalpoint/equipped
+ initial_modules = list(
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/teleporter, // Try not to set yourself on fire
+ /obj/item/rig_module/device/rcd,
+ /obj/item/rig_module/grenade_launcher/metalfoam
+ )
+
+/obj/item/clothing/head/helmet/space/rig/focalpoint
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "techno_rig"
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/suit/space/rig/focalpoint
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "techno_rig"
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/shoes/magboots/rig/focalpoint
+ icon = 'icons/inventory/feet/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/feet/mob_vr.dmi'
+ icon_state = "techno_rig"
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/gloves/gauntlets/rig/focalpoint
+ icon = 'icons/inventory/hands/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/hands/mob_vr.dmi'
+ icon_state = "techno_rig"
+ siemens_coefficient = 0
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+// 'Ironhammer' hardsuit
+/obj/item/weapon/rig/hephaestus
+ name = "\improper Hephaestus hardsuit control module"
+ desc = "A high-end hardsuit produced by Hephaestus Industries, focused on destroying the competition. Literally."
+
+ icon = 'icons/obj/rig_modules_vr.dmi' // the item
+ default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob
+ icon_state = "ihs_rig"
+ suit_type = "\improper Hephaestus hardsuit"
+ cell_type = /obj/item/weapon/cell/super
+
+ armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 20)
+
+ chest_type = /obj/item/clothing/suit/space/rig/hephaestus
+ helm_type = /obj/item/clothing/head/helmet/space/rig/hephaestus
+ boot_type = /obj/item/clothing/shoes/magboots/rig/hephaestus
+ glove_type = /obj/item/clothing/gloves/gauntlets/rig/hephaestus
+
+/obj/item/weapon/rig/hephaestus/equipped
+ initial_modules = list(
+ /obj/item/rig_module/maneuvering_jets,
+ /obj/item/rig_module/grenade_launcher,
+ /obj/item/rig_module/mounted/egun,
+ /obj/item/rig_module/mounted/energy_blade
+ )
+
+/obj/item/clothing/head/helmet/space/rig/hephaestus
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "ihs_rig"
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/suit/space/rig/hephaestus
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "ihs_rig"
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/shoes/magboots/rig/hephaestus
+ icon = 'icons/inventory/feet/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/feet/mob_vr.dmi'
+ icon_state = "ihs_rig"
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/gloves/gauntlets/rig/hephaestus
+ icon = 'icons/inventory/hands/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/hands/mob_vr.dmi'
+ icon_state = "ihs_rig"
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm
index 357a8ff772..6d947ce245 100644
--- a/code/modules/clothing/spacesuits/void/event_vr.dm
+++ b/code/modules/clothing/spacesuits/void/event_vr.dm
@@ -73,4 +73,161 @@
/obj/item/clothing/suit/space/void/refurb/mercenary/talon
name = "talon mercenary's voidsuit"
- desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer mercs swear by these old things, even if new powered hardsuits have more features and better armor. The red markings indicate this as the mercenary variant. \"ITV TALON\" has been stamped onto each pauldron and the right side of the breastplate."
\ No newline at end of file
+ desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer mercs swear by these old things, even if new powered hardsuits have more features and better armor. The red markings indicate this as the mercenary variant. \"ITV TALON\" has been stamped onto each pauldron and the right side of the breastplate."
+
+// HEV Suits
+/obj/item/clothing/suit/space/void/hev
+ name = "hazardous environment suit"
+ desc = "Has a strange smell to it, but you feel like it might be an old friend."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "hev_orange"
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/suit/space/void/hev/violet
+ icon_state = "hev_violet"
+ desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
+
+/obj/item/clothing/head/helmet/space/void/hev
+ name = "hazardous environment helmet"
+ desc = "Has a strange smell to it, but you feel like it might be an old friend."
+
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "hev_orange"
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/head/helmet/space/void/hev/violet
+ icon_state = "hev_violet"
+ desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
+
+// Makeshift void suit
+/obj/item/clothing/suit/space/void/makeshift
+ name = "makeshift voidsuit"
+ desc = "This is not something you should use if you have other options, but it's better than nothing!"
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "makeshift_void"
+
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/head/helmet/space/void/makeshift
+ name = "makeshift voidsuit helmet"
+ desc = "This is not something you should use if you have other options, but it's better than nothing!"
+
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "makeshift_void"
+
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+// 'Custodian' armor
+/obj/item/clothing/suit/space/void/custodian
+ name = "custodian suit"
+ desc = "Vacuum-capable armor for a Custodian to do their duty."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "custodian"
+
+ armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/head/helmet/space/void/custodian
+ name = "custodian helmet"
+ desc = "Vacuum-capable helmet for a Custodian to do their duty."
+
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "custodian"
+
+ armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+// 'Moebius' armor
+/obj/item/clothing/suit/space/void/aether
+ name = "\improper Aether voidsuit"
+ desc = "This suit seems rather high-end for a standard voidsuit. The air in it has a hint of 'new car smell', courtesy of Aether Atmospherics."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "moebiussuit"
+
+ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/head/helmet/space/void/aether
+ name = "\improper Aether voidsuit helmet"
+ desc = "Aether Atmospherics thought that giving this helmet selectable colored lighting would improve market penetration. Very comfortable, regardless."
+
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "moebiushelm_White"
+
+ armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/head/helmet/space/void/aether/verb/select_color()
+ set name = "Helmet Color"
+ set desc = "Change the color of [src]"
+ set category = "Object"
+
+ var/choice = tgui_input_list(usr, "Select a new color:", "[src] Color", list("White", "Blue", "Purple", "Yellow", "Red", "Green"))
+ if(!choice)
+ return
+ icon_state = "moebiushelm_[choice]"
+ update_clothing_icon()
+ to_chat(usr, "[src] color changed to: [choice]")
+
+// Excelsior suit
+/obj/item/clothing/suit/space/void/excelsior
+ name = "\improper Excelsior voidsuit"
+ desc = "A space suit from a particular spaceship: Excelsior."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "excelsior"
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
+
+/obj/item/clothing/head/helmet/space/void/excelsior
+ name = "\improper Excelsior voidsuit helmet"
+ desc = "A space helmet from a particular spaceship: Excelsior."
+
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "excelsior"
+
+ // No animal people sprites for these yet, sad times
+ species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
+ sprite_sheets = list()
diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm
index 695b2e21ea..8fed317d35 100644
--- a/code/modules/clothing/suits/armor_vr.dm
+++ b/code/modules/clothing/suits/armor_vr.dm
@@ -34,12 +34,6 @@
/obj/item/clothing/suit/storage/vest/hos
armor = list(melee = 50, bullet = 40, laser = 40, energy = 25, bomb = 25, bio = 0, rad = 0)
-/obj/item/clothing/suit/storage/vest/hoscoat/jensen
- name = "armored trenchcoat"
- desc = "A trenchcoat augmented with a special alloy for some protection and style."
- icon_state = "hostrench"
- flags_inv = HIDEHOLSTER
-
// Override Polaris's "confederate" naming convention. I hate it.
/obj/item/clothing/suit/storage/vest/solgov
name = "\improper Solar Central Government" //YW EDIT: SolGov
@@ -124,3 +118,24 @@
/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
name = "modular explorer suit"
desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates."
+
+// 'Crusader' armor
+/obj/item/clothing/suit/armor/crusader
+ name = "crusader armor"
+ desc = "God will protect those who defend his faith."
+
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0)
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "crusader_suit"
+
+/obj/item/clothing/head/helmet/crusader
+ name = "crusader helmet"
+ desc = "God will protect those who defend his faith."
+
+ armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0)
+
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "crusader_head"
diff --git a/code/modules/clothing/suits/jobs_vr.dm b/code/modules/clothing/suits/jobs_vr.dm
new file mode 100644
index 0000000000..9b34c18637
--- /dev/null
+++ b/code/modules/clothing/suits/jobs_vr.dm
@@ -0,0 +1,18 @@
+// Cargotech jacket
+/obj/item/clothing/suit/storage/cargo
+ name = "cargo jacket"
+ desc = "A jacket typically assigned to cargo technicians when it's chilly in cargonia."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "cargo_jacket"
+
+// QM Coat
+/obj/item/clothing/suit/storage/qm
+ name = "\improper QM coat"
+ desc = "A coat typically assigned to quartermasters when it's chilly in cargonia."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "qm_coat"
+
\ No newline at end of file
diff --git a/code/modules/clothing/suits/labcoat_vr.dm b/code/modules/clothing/suits/labcoat_vr.dm
new file mode 100644
index 0000000000..4f82afd2e3
--- /dev/null
+++ b/code/modules/clothing/suits/labcoat_vr.dm
@@ -0,0 +1,27 @@
+// 'Modern' labcoats
+/obj/item/clothing/suit/storage/toggle/labcoat/modern
+ name = "modern labcoat"
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "labcoat_mod"
+
+/obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo
+ name = "modern cmo's labcoat"
+ desc = "A suit that protects against minor chemical spills. This one has distinct markings on the arms."
+ icon_state = "labcoat_cmo_mod"
+
+// 'Modern' biosuits
+/obj/item/clothing/suit/bio_suit/modern
+ name = "modern bio suit"
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "bio_mod"
+
+/obj/item/clothing/head/bio_hood/modern
+ name = "modern bio hood"
+
+ icon = 'icons/inventory/head/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
+ icon_state = "bio_mod"
diff --git a/code/modules/clothing/suits/miscellaneous_vr.dm b/code/modules/clothing/suits/miscellaneous_vr.dm
index 34d5d71ac9..6d4077a8ac 100644
--- a/code/modules/clothing/suits/miscellaneous_vr.dm
+++ b/code/modules/clothing/suits/miscellaneous_vr.dm
@@ -88,18 +88,24 @@
/obj/item/clothing/suit/storage/det_trench/alt
name = "sleek modern coat"
desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside."
+
icon = 'icons/inventory/suit/item_vr.dmi'
- icon_override = 'icons/inventory/suit/mob_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "cyberpunksleek"
- item_state = "cyberpunksleek"
/obj/item/clothing/suit/storage/det_trench/alt2
name = "sleek modern coat (long)"
desc = "A sleek long overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside."
+
icon = 'icons/inventory/suit/item_vr.dmi'
- icon_override = 'icons/inventory/suit/mob_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "cyberpunksleek_long"
- item_state = "cyberpunksleek_long"
+
+/obj/item/clothing/suit/storage/det_trench/alt/black
+ icon_state = "cyberpunksleek_black"
+
+/obj/item/clothing/suit/storage/det_trench/alt2/black
+ icon_state = "cyberpunksleek_long_black"
//Talon Hoodie
/obj/item/clothing/suit/storage/toggle/hoodie/talon
@@ -108,4 +114,24 @@
icon = 'icons/inventory/suit/item_vr.dmi'
icon_override = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "talonhoodie"
- item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue")
\ No newline at end of file
+ item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue")
+
+// Bladerunner coat
+/obj/item/clothing/suit/storage/bladerunner
+ name = "leather coat"
+ desc = "An old leather coat. Has probably seen things you wouldn't believe."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "bladerunner_coat"
+
+// Cyberpunk 'orange' vest
+/obj/item/clothing/suit/cyberpunk
+ name = "cyberpunk vest"
+ desc = "A red vest with golden streaks. It's made out of tough materials, and can protect fairly well against bullets. Wake the fuck up, Samurai."
+
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
+ icon_state = "cyberpunk"
+ armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)
+
\ No newline at end of file
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 744c2a55c2..87346c6741 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -122,6 +122,15 @@
rolled_sleeves = -1
/obj/item/clothing/under/rank/medical/paramedic
+ name = "paramedic uniform"
+ desc = "It's made of a special fiber that provides minor protection against biohazards. This one is the color scheme that designates a rapid first responder."
+ icon_state = "paramedic"
+ item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
+ rolled_down = -1
+ rolled_sleeves = -1
+
+/obj/item/clothing/under/rank/medical/paramedic_alt
name = "short sleeve medical jumpsuit"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel."
icon_state = "medical_short"
diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm
index 112f45f3ba..ef3c67103a 100644
--- a/code/modules/clothing/under/miscellaneous_vr.dm
+++ b/code/modules/clothing/under/miscellaneous_vr.dm
@@ -196,4 +196,32 @@
icon_override = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "talon_captain"
item_state = "talon_captain"
- rolled_sleeves = 0
\ No newline at end of file
+ rolled_sleeves = 0
+
+// Excelsior uniforms
+/obj/item/clothing/under/excelsior
+ name = "\improper Excelsior uniform"
+ desc = "A uniform from a particular spaceship: Excelsior."
+
+ icon = 'icons/inventory/uniform/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+ icon_state = "excelsior_white"
+
+/obj/item/clothing/under/excelsior/mixed
+ icon_state = "excelsior_mixed"
+/obj/item/clothing/under/excelsior/orange
+ icon_state = "excelsior_orange"
+
+// Summer dresses
+/obj/item/clothing/under/summerdress
+ name = "summer dress"
+ desc = "A nice summer dress."
+
+ icon = 'icons/inventory/uniform/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+ icon_state = "summerdress"
+
+/obj/item/clothing/under/summerdress/red
+ icon_state = "summerdress3"
+/obj/item/clothing/under/summerdress/blue
+ icon_state = "summerdress2"
diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index 7d4d9270ea..dfd693afd2 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -1156,6 +1156,7 @@
/obj/item/clothing/head/surgery/black = 5,
/obj/item/clothing/shoes/white = 5,
/obj/item/clothing/suit/storage/toggle/labcoat = 5,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern = 5,
/obj/item/clothing/mask/surgical = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 5,
/obj/item/clothing/shoes/boots/winter/medical = 5
@@ -1227,6 +1228,7 @@
/obj/item/clothing/under/rank/scientist/skirt = 5,
/obj/item/clothing/under/rank/scientist/turtleneck = 5,
/obj/item/clothing/suit/storage/toggle/labcoat = 5,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern = 5,
/obj/item/clothing/shoes/white = 5,
/obj/item/clothing/shoes/slippers = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/science = 5,
@@ -1348,6 +1350,7 @@
/obj/item/clothing/under/rank/cargotech/jeans = 5,
/obj/item/clothing/under/rank/cargotech/jeans/female = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo = 5,
+ /obj/item/clothing/suit/storage/cargo = 5,
/obj/item/clothing/shoes/boots/winter/supply = 5,
/obj/item/clothing/shoes/black = 5,
/obj/item/clothing/gloves/black = 5,
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 8e262bb69f..bf83e28bf7 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -138,7 +138,7 @@
if("[seed.get_trait(TRAIT_PRODUCT_ICON)]-leaf" in cached_icon_states('icons/obj/hydroponics_products.dmi'))
var/image/fruit_leaves = image('icons/obj/hydroponics_products.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]-leaf")
fruit_leaves.color = "[seed.get_trait(TRAIT_PLANT_COLOUR)]"
- add_overlay(fruit_leaves)
+ plant_icon.add_overlay(fruit_leaves)
SSplants.plant_icon_cache[icon_key] = plant_icon
add_overlay(plant_icon)
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 8010a2d65a..51106bc686 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -82,6 +82,30 @@ var/list/mining_overlay_cache = list()
rock_icon_state = "rock-light"
random_icon = 1
+/turf/simulated/mineral/alt
+ icon_state = "rock-alt"
+ rock_side_icon_state = "rock_side-alt"
+ sand_icon_state = "asteroid"
+ rock_icon_state = "rock-alt"
+
+/turf/simulated/mineral/icey
+ icon_state = "rock-icey"
+ rock_side_icon_state = "rock_side-icey"
+ sand_icon_state = "sand-icey" // to be replaced
+ rock_icon_state = "rock-icey"
+
+/turf/simulated/mineral/crystal
+ icon_state = "rock-crystal"
+ rock_side_icon_state = "rock_side-crystal"
+ sand_icon_state = "sand-icey" // to be replaced
+ rock_icon_state = "rock-crystal"
+
+/turf/simulated/mineral/crystal_shiny
+ icon_state = "rock-crystal-shiny"
+ rock_side_icon_state = "rock_side-crystal"
+ sand_icon_state = "sand-icey" // to be replaced
+ rock_icon_state = "rock-crystal-shiny"
+
/turf/simulated/mineral/ignore_mapgen
ignore_mapgen = 1
@@ -99,6 +123,10 @@ var/list/mining_overlay_cache = list()
icon_state = "sand-light"
sand_icon_state = "sand-light"
+/turf/simulated/mineral/floor/icey
+ icon_state = "sand-icey"
+ sand_icon_state = "sand-icey" // to be replaced
+
/turf/simulated/mineral/floor/light_border
icon_state = "sand-light-border"
sand_icon_state = "sand-light-border"
diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm
index 3c6451fc99..29b8155366 100644
--- a/code/modules/mob/living/carbon/human/human_species.dm
+++ b/code/modules/mob/living/carbon/human/human_species.dm
@@ -22,6 +22,17 @@
. = ..()
delete_inventory()
+/mob/living/carbon/human/dummy/mannequin/autoequip
+ icon = 'icons/effects/species.dmi'
+ icon_state = "lizard_f_s_full"
+
+/mob/living/carbon/human/dummy/mannequin/autoequip/Initialize()
+ icon = null
+ icon_state = ""
+ . = ..()
+ for(var/obj/item/I in loc)
+ equip_to_appropriate_slot(I)
+
/mob/living/carbon/human/skrell/Initialize(var/new_loc)
h_style = "Skrell Short Tentacles"
return ..(new_loc, SPECIES_SKRELL)
diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm
index 490ff55f0d..6232152d22 100644
--- a/code/modules/telesci/quantum_pad.dm
+++ b/code/modules/telesci/quantum_pad.dm
@@ -2,7 +2,7 @@
name = "quantum pad"
desc = "A bluespace quantum-linked telepad used for teleporting objects to other quantum pads."
icon = 'icons/obj/telescience.dmi'
- icon_state = "qpad-idle"
+ icon_state = "qpad"
anchored = TRUE
use_power = USE_POWER_IDLE
idle_power_usage = 200
@@ -26,6 +26,7 @@
connect_to_network()
if(map_pad_id)
mapped_quantum_pads[map_pad_id] = src
+ update_icon()
/obj/machinery/power/quantumpad/Destroy()
mapped_quantum_pads -= map_pad_id
@@ -61,6 +62,7 @@
if(istype(M.connectable, /obj/machinery/power/quantumpad))
linked_pad = M.connectable
to_chat(user, "You link [src] to the one in [I]'s buffer.")
+ update_icon()
return 1
if(default_part_replacement(user, I))
@@ -73,12 +75,28 @@
/obj/machinery/power/quantumpad/update_icon()
. = ..()
-
- if(inoperable() || panel_open)
- icon_state = "pad-idle-o"
+
+ cut_overlays()
+ if(panel_open)
+ add_overlay("qpad-panel")
+
+ if(inoperable() || panel_open || !powernet)
+ icon_state = "[initial(icon_state)]-o"
+ else if (!linked_pad)
+ icon_state = "[initial(icon_state)]-b"
else
icon_state = initial(icon_state)
+// Panel flips retry power cable connections so you don't have to decon the whole thing
+/obj/machinery/power/quantumpad/default_deconstruction_screwdriver(var/mob/user, var/obj/item/S)
+ if((. = ..()))
+ var/original_powernet = powernet
+ if(powernet)
+ disconnect_from_network()
+ connect_to_network()
+ if(powernet != original_powernet)
+ update_icon()
+
/obj/machinery/power/quantumpad/attack_hand(mob/user)
. = ..()
if(.)
@@ -133,57 +151,112 @@
ghost.forceMove(get_turf(linked_pad))
/obj/machinery/power/quantumpad/proc/doteleport(mob/user)
+ update_icon()
if(!linked_pad)
return
playsound(src, 'sound/weapons/flash.ogg', 25, 1)
teleporting = 1
spawn(teleport_speed)
+ // We gone
if(!src || QDELETED(src))
teleporting = 0
return
+ // Broken or whatever
if(inoperable())
to_chat(user, "[src] is nonfunctional!")
teleporting = 0
return
+ // Linked pad or not, we can always re-scatter people
+ if(!can_traverse_gateway())
+ teleporting = 0
+ last_teleport = world.time
+ gateway_scatter(user)
+ return
+ // Nothing to teleport to
if(!linked_pad || QDELETED(linked_pad) || linked_pad.inoperable())
to_chat(user, "Linked pad is not responding to ping. Teleport aborted.")
teleporting = 0
return
+ // Insufficient power
+ if(!use_teleport_power())
+ to_chat(user, "Power is not sufficient to complete a teleport. Teleport aborted.")
+ teleporting = 0
+ return
teleporting = 0
last_teleport = world.time
- // use a lot of power
- var/power_to_use = 10000 / power_efficiency
- if(draw_power(power_to_use) != power_to_use)
- to_chat(user, "Power is not sufficient to complete a teleport. Teleport aborted.")
- return
sparks()
linked_pad.sparks()
- flick("qpad-beam", src)
+ flick("qpad-beam-out", src)
playsound(src, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
- flick("qpad-beam", linked_pad)
+ flick("qpad-beam-in", linked_pad)
playsound(linked_pad, 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
- for(var/atom/movable/ROI in get_turf(src))
- // if is anchored, don't let through
- if(ROI.anchored)
- if(isliving(ROI))
- var/mob/living/L = ROI
- if(L.buckled)
- // TP people on office chairs
- if(L.buckled.anchored)
- continue
- else
- continue
- else if(!isobserver(ROI))
- continue
- do_teleport(ROI, get_turf(linked_pad), local = FALSE)
+
+ transport_objects(get_turf(linked_pad))
/obj/machinery/power/quantumpad/proc/initMappedLink()
. = FALSE
var/obj/machinery/power/quantumpad/link = mapped_quantum_pads[map_pad_link_id]
if(link)
linked_pad = link
+ update_icon()
. = TRUE
+
+/obj/machinery/power/quantumpad/proc/use_teleport_power()
+ var/area/A = get_area(src)
+ // Well, I guess you can do it!
+ if(!A?.requires_power)
+ return TRUE
+
+ // Otherwise we'll need a powernet
+ var/power_to_use = 10000 / power_efficiency
+ if(draw_power(power_to_use) != power_to_use)
+ return FALSE
+ return TRUE
+
+/obj/machinery/power/quantumpad/proc/transport_objects(turf/destination)
+ for(var/atom/movable/ROI in get_turf(src))
+ // if is anchored, don't let through
+ if(ROI.anchored)
+ if(isliving(ROI))
+ var/mob/living/L = ROI
+ if(L.buckled)
+ // TP people on office chairs
+ if(L.buckled.anchored)
+ continue
+ else
+ continue
+ else if(!isobserver(ROI))
+ continue
+ do_teleport(ROI, destination, local = FALSE)
+
+/obj/machinery/power/quantumpad/proc/can_traverse_gateway()
+ // Well, if there's no gateway map we're definitely not on it
+ if(!GLOB.gateway_away)
+ return TRUE
+
+ // Traverse!
+ if(GLOB.gateway_away.calibrated)
+ return TRUE
+
+ var/list/gateway_zs = GetConnectedZlevels(GLOB.gateway_away.z)
+ if(z in gateway_zs)
+ return FALSE // It's not calibrated and we're in a connected z
+
+/obj/machinery/power/quantumpad/proc/gateway_scatter(mob/user)
+ var/obj/effect/landmark/dest = pick(awaydestinations)
+ if(!dest)
+ to_chat(user, "Nothing happens... maybe there's no signal to the remote pad?")
+ return
+ // Insufficient power
+ if(!use_teleport_power())
+ to_chat(user, "Power is not sufficient to complete a teleport. Teleport aborted.")
+ return
+
+ sparks()
+ to_chat(user, "You feel yourself pulled in different directions, before ending up not far from where you started.")
+ flick("qpad-beam-out", src)
+ transport_objects(get_turf(dest))
diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm
index 9abd0adce7..ce30eb2f45 100644
--- a/code/modules/tgui/external.dm
+++ b/code/modules/tgui/external.dm
@@ -224,7 +224,9 @@
if(window_id)
window = usr.client.tgui_windows[window_id]
if(!window)
+ // #ifdef TGUI_DEBUGGING // Always going to log these
log_tgui(usr, "Error: Couldn't find the window datum, force closing.")
+ // #endif
SStgui.force_close_window(usr, window_id)
return FALSE
// Decode payload
diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm
index f27a08eda9..b9288457e5 100644
--- a/code/modules/tgui/modules/ntos-only/uav.dm
+++ b/code/modules/tgui/modules/ntos-only/uav.dm
@@ -13,11 +13,11 @@
if(current_uav)
if(QDELETED(current_uav))
- set_current(null)
+ clear_current()
else if(signal_test_counter-- <= 0)
signal_strength = get_signal_to(current_uav)
if(!signal_strength)
- set_current(null)
+ clear_current()
else // Don't reset counter until we find a UAV that's actually in range we can stay connected to
signal_test_counter = 20
@@ -95,16 +95,33 @@
signal_strength = 0
current_uav = U
+ RegisterSignal(U, COMSIG_MOVABLE_Z_CHANGED, .proc/current_uav_changed_z)
if(LAZYLEN(viewers))
for(var/weakref/W in viewers)
var/M = W.resolve()
if(M)
- if(current_uav)
- to_chat(M, "You're disconnected from the UAV's camera!")
- unlook(M)
- else
- look(M)
+ look(M)
+
+/datum/tgui_module/uav/proc/clear_current()
+ if(!current_uav)
+ return
+
+ UnregisterSignal(current_uav, COMSIG_MOVABLE_Z_CHANGED)
+ signal_strength = 0
+ current_uav = null
+
+ if(LAZYLEN(viewers))
+ for(var/weakref/W in viewers)
+ var/M = W.resolve()
+ if(M)
+ to_chat(M, "You're disconnected from the UAV's camera!")
+ unlook(M)
+
+/datum/tgui_module/uav/proc/current_uav_changed_z(old_z, new_z)
+ signal_strength = get_signal_to(current_uav)
+ if(!signal_strength)
+ clear_current()
////
//// Finding signal strength between us and the UAV
@@ -130,6 +147,7 @@
var/list/zlevels_in_range = using_map.get_map_levels(their_z, FALSE)
var/list/zlevels_in_long_range = using_map.get_map_levels(their_z, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range
var/their_signal = 0
+ // Measure z-distance between the AM passed in and the nearest relay
for(var/relay in ntnet_global.relays)
var/obj/machinery/ntnet_relay/R = relay
if(!R.operable())
@@ -144,7 +162,8 @@
their_signal = 1
break
- if(!their_signal) //They have no NTnet at all
+ // AM passed in has no NTnet at all
+ if(!their_signal)
if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range))
return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs
else
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 5b62af468b..5f95ab7db2 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -257,12 +257,14 @@
return
// Validate ping
if(!initialized && world.time - opened_at > TGUI_PING_TIMEOUT)
+ // #ifdef TGUI_DEBUGGING // Always log zombie windows
log_tgui(user, \
"Error: Zombie window detected, killing it with fire.\n" \
+ "window_id: [window.id]\n" \
+ "opened_at: [opened_at]\n" \
+ "world.time: [world.time]")
close(can_be_suspended = FALSE)
+ // #endif
return
// Update through a normal call to ui_interact
if(status != STATUS_DISABLED && (autoupdate || force))
@@ -288,9 +290,6 @@
status = min(status, parent_ui.status)
return prev_status != status
-/datum/tgui/proc/log_message(message)
- log_tgui("[user] ([user.ckey]) using \"[title]\":\n[message]")
-
/datum/tgui/proc/set_map_z_level(nz)
map_z_level = nz
@@ -305,7 +304,9 @@
// Pass act type messages to tgui_act
if(type && copytext(type, 1, 5) == "act/")
var/act_type = copytext(type, 5)
+ #ifdef TGUI_DEBUGGING
log_tgui(user, "Action: [act_type] [href_list["payload"]], Window: [window.id], Source: [src_object]")
+ #endif
process_status()
if(src_object.tgui_act(act_type, payload, src, state))
SStgui.update_uis(src_object)
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
index 55a08f8808..cc8a63ef27 100644
--- a/code/modules/tgui/tgui_window.dm
+++ b/code/modules/tgui/tgui_window.dm
@@ -53,7 +53,9 @@
inline_assets = list(),
inline_html = "",
fancy = FALSE)
+ #ifdef TGUI_DEBUGGING
log_tgui(client, "[id]/initiailize ([src])")
+ #endif
if(!client)
return
src.inline_assets = inline_assets
@@ -177,7 +179,9 @@
if(!client)
return
if(can_be_suspended && can_be_suspended())
+ #ifdef TGUI_DEBUGGING
log_tgui(client, "[id]/close: suspending")
+ #endif
status = TGUI_WINDOW_READY
send_message("suspend")
// You would think that BYOND would null out client or make it stop passing istypes or, y'know, ANYTHING during
@@ -187,7 +191,9 @@
if(!logout && client)
winset(client, null, "mapwindow.map.focus=true")
return
+ #ifdef TGUI_DEBUGGING
log_tgui(client, "[id]/close")
+ #endif
release_lock()
status = TGUI_WINDOW_CLOSED
message_queue = null
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index 29727c16ec..fb7a3de2f0 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -197,7 +197,7 @@
item_state = "brittrenchcoat"
//For general use
-/obj/item/clothing/suit/storage/vest/hoscoat/axis_greatcoat
+/obj/item/clothing/suit/storage/vest/hoscoat/nazi_greatcoat
name = "Greatcoat"
desc = "Perfect attire for kicking down the doors of suspected dissidents; this coat gives off an imposing look, while offering a luxuriously plush fur liner."
@@ -786,7 +786,7 @@
var/mob/living/carbon/human/H = user
if(H.head == src)
H.update_inv_head()
-/*
+
/obj/item/weapon/rig/light/hacker/fluff/aronai
name = "KHI-99-AAR suit module"
suit_type = "nano"
@@ -803,8 +803,6 @@
/obj/item/rig_module/teleporter
)
-No. With a teleporter? Just *no*. - Hawk, YW
-*/
//Viveret:Keturah
/obj/item/clothing/under/dress/maid
name = "Maid Outfit"
@@ -882,81 +880,63 @@ No. With a teleporter? Just *no*. - Hawk, YW
desc = "ROW ROW, FIGHT THE POWER."
flash_prot = 1 //Why not.
-//Kitsuhana Uniforms - Despite the fact that we removed KHI, we're keeping these. -YW
+//Kitsuhana Uniforms
/obj/item/clothing/under/rank/khi
name = "Delete Me"
desc = "Why did you spawn this one? Dork."
- //catalogue_data = list(/datum/category_item/catalogue/information/organization/khi)
+ catalogue_data = list(/datum/category_item/catalogue/information/organization/khi)
sensor_mode = 3
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_state = "khi_uniform_i"
-
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- item_state = ""
+ icon = 'icons/inventory/uniform/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
+ icon_state = "khi_uniform"
/obj/item/clothing/under/rank/khi/cmd //Command version
name = "KHI command suit"
- desc = "An outdated command uniform, branded with the logo of a defunct spacer organization"
- icon_state = "khi_uniform_cmd_i"
- item_state = "khi_uniform_cmd"
- worn_state = "khi_uniform_cmd"
+ desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
+ icon_state = "khi_uniform_cmd"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/sec //Security version
name = "KHI security suit"
- desc = "An outdated security uniform, branded with the logo of a defunct spacer organization"
- icon_state = "khi_uniform_sec_i"
- item_state = "khi_uniform_sec"
- worn_state = "khi_uniform_sec"
+ desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style."
+ icon_state = "khi_uniform_sec"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/med //Medical version
name = "KHI medical suit"
- desc = "An outdated medical uniform, branded with the logo of a defunct spacer organization"
- icon_state = "khi_uniform_med_i"
- item_state = "khi_uniform_med"
- worn_state = "khi_uniform_med"
+ desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?"
+ icon_state = "khi_uniform_med"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/khi/eng //Engineering version
name = "KHI engineering suit"
- desc = "An outdated engineer uniform, branded with the logo of a defunct spacer organization."
- icon_state = "khi_uniform_eng_i"
- item_state = "khi_uniform_eng"
- worn_state = "khi_uniform_eng"
+ desc = "Kitsuhana Heavy Industries uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time."
+ icon_state = "khi_uniform_eng"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
/obj/item/clothing/under/rank/khi/sci //Science version
name = "KHI science suit"
- desc = "An outdated science uniform, branded with the logo of a defunct spacer organization"
- icon_state = "khi_uniform_sci_i"
- item_state = "khi_uniform_sci"
- worn_state = "khi_uniform_sci"
+ desc = "Kitsuhana Heavy Industries uniform. For performing science in, based on the color! Only SCIENCE can save us now."
+ icon_state = "khi_uniform_sci"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/crg //Cargo version
name = "KHI cargo suit"
desc = "Kitsuhana Heavy Industries uniform. Looks like it's in supply and cargo division colors. Even post-scarcity societies need things moved and mined sometimes."
- icon_state = "khi_uniform_crg_i"
- item_state = "khi_uniform_crg"
- worn_state = "khi_uniform_crg"
+ icon_state = "khi_uniform_crg"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/civ //Science version
name = "KHI civilian suit"
desc = "Kitsuhana Heavy Industries uniform. Snazzy silver trim marks this is as the general civilian branch. Smells like paperwork and bureaucracy."
- icon_state = "khi_uniform_civ_i"
- item_state = "khi_uniform_civ"
- worn_state = "khi_uniform_civ"
+ icon_state = "khi_uniform_civ"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/fluff/aronai //Aro fluff version
name = "KHI meditech suit"
- desc = "An outdated uniform of some sort. You get the sense that whoever wore this must've been very full of themselves"
- icon_state = "khi_uniform_aro_i"
- item_state = "khi_uniform_aro"
- worn_state = "khi_uniform_aro"
+ desc = "Kitsuhana Heavy Industries uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top."
+ icon_state = "khi_uniform_aro"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
//jacobdragon:Earthen Breath
@@ -1189,30 +1169,26 @@ Departamental Swimsuits, for general use
/obj/item/clothing/under/rank/trek
name = "Section 31 Uniform"
desc = "Oooh... right."
- icon = 'icons/vore/custom_clothes_vr.dmi'
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
- item_state = ""
+ icon = 'icons/inventory/uniform/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
//TOS
/obj/item/clothing/under/rank/trek/command
name = "Command Uniform"
desc = "The uniform worn by command officers in the mid 2260s."
icon_state = "trek_command"
- item_state = "trek_command"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Considering only staff heads get to pick it
/obj/item/clothing/under/rank/trek/engsec
name = "Operations Uniform"
desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..."
icon_state = "trek_engsec"
- item_state = "trek_engsec"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // since they're shared between jobs and kinda moot.
/obj/item/clothing/under/rank/trek/medsci
name = "MedSci Uniform"
desc = "The uniform worn by medsci officers in the mid 2260s."
icon_state = "trek_medsci"
- item_state = "trek_medsci"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) // basically a copy of vanilla sci/med
@@ -1220,59 +1196,48 @@ Departamental Swimsuits, for general use
/obj/item/clothing/under/rank/trek/command/next
desc = "The uniform worn by command officers. This one's from the mid 2360s."
icon_state = "trek_next_command"
- item_state = "trek_next_command"
/obj/item/clothing/under/rank/trek/engsec/next
desc = "The uniform worn by operation officers. This one's from the mid 2360s."
icon_state = "trek_next_engsec"
- item_state = "trek_next_engsec"
/obj/item/clothing/under/rank/trek/medsci/next
desc = "The uniform worn by medsci officers. This one's from the mid 2360s."
icon_state = "trek_next_medsci"
- item_state = "trek_next_medsci"
//ENT
/obj/item/clothing/under/rank/trek/command/ent
desc = "The uniform worn by command officers of the 2140s."
icon_state = "trek_ent_command"
- item_state = "trek_ent_command"
/obj/item/clothing/under/rank/trek/engsec/ent
desc = "The uniform worn by operations officers of the 2140s."
icon_state = "trek_ent_engsec"
- item_state = "trek_ent_engsec"
/obj/item/clothing/under/rank/trek/medsci/ent
desc = "The uniform worn by medsci officers of the 2140s."
icon_state = "trek_ent_medsci"
- item_state = "trek_ent_medsci"
//VOY
/obj/item/clothing/under/rank/trek/command/voy
desc = "The uniform worn by command officers of the 2370s."
icon_state = "trek_voy_command"
- item_state = "trek_voy_command"
/obj/item/clothing/under/rank/trek/engsec/voy
desc = "The uniform worn by operations officers of the 2370s."
icon_state = "trek_voy_engsec"
- item_state = "trek_voy_engsec"
/obj/item/clothing/under/rank/trek/medsci/voy
desc = "The uniform worn by medsci officers of the 2370s."
icon_state = "trek_voy_medsci"
- item_state = "trek_voy_medsci"
//DS9
-
/obj/item/clothing/suit/storage/trek/ds9
name = "Padded Overcoat"
desc = "The overcoat worn by all officers of the 2380s."
+ icon = 'icons/inventory/suit/item_vr.dmi'
+ default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "trek_ds9_coat"
- icon = 'icons/vore/custom_clothes_vr.dmi'
- item_state = "trek_ds9_coat_mob"
- icon_override = 'icons/vore/custom_clothes_vr.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
permeability_coefficient = 0.50
allowed = list(
@@ -1289,23 +1254,21 @@ Departamental Swimsuits, for general use
name = "Admiral Overcoat"
desc = "Admirality specialty coat to keep flag officers fashionable and protected."
icon_state = "trek_ds9_coat_adm"
- item_state = "trek_ds9_coat_adm_mob"
armor = list(melee = 45, bullet = 35, laser = 35, energy = 20, bomb = 0, bio = 40, rad = 55)
-
/obj/item/clothing/under/rank/trek/command/ds9
desc = "The uniform worn by command officers of the 2380s."
- icon_state = "trek_command"
+ icon_state = "trek_command" // no unique state for this one
item_state = "trek_ds9_command"
/obj/item/clothing/under/rank/trek/engsec/ds9
desc = "The uniform worn by operations officers of the 2380s."
- icon_state = "trek_engsec"
+ icon_state = "trek_engsec" // no unique state for this one
item_state = "trek_ds9_engsec"
/obj/item/clothing/under/rank/trek/medsci/ds9
desc = "The uniform undershit worn by medsci officers of the 2380s."
- icon_state = "trek_medsci"
+ icon_state = "trek_medsci" // no unique state for this one
item_state = "trek_ds9_medsci"
//For general use maybe
@@ -1941,7 +1904,7 @@ Departamental Swimsuits, for general use
item_icons = list()
default_worn_icon = 'icons/vore/custom_clothes_vr.dmi'
color = COLOR_NAVY
- sprite_sheets = null
+ sprite_sheets = list()
//SweetBlueSylveon:Pip Shyner
/obj/item/clothing/accessory/poncho/roles/cloak/hop/fluff/pip
diff --git a/code/modules/vore/smoleworld/smoleworld_vr.dm b/code/modules/vore/smoleworld/smoleworld_vr.dm
index 50dbacfe1f..ca6a7ae828 100644
--- a/code/modules/vore/smoleworld/smoleworld_vr.dm
+++ b/code/modules/vore/smoleworld/smoleworld_vr.dm
@@ -107,6 +107,7 @@
//defineing actions
/obj/structure/smoletrack
icon = 'icons/vore/smoleworld_vr.dmi'
+ color = "#ffffff"
density = 0
/obj/structure/smoletrack/attack_hand(mob/user)
@@ -120,6 +121,7 @@
new /obj/item/stack/material/smolebricks(F)
qdel(src)
+//rotates piece
/obj/structure/smoletrack/verb/rotate_clockwise()
set name = "Rotate Road Clockwise"
set category = "Object"
@@ -128,6 +130,33 @@
return
src.set_dir(turn(src.dir, 270))
+//color roads
+/obj/structure/smoletrack/verb/colorpieces()
+ set name = "Use Color Pieces"
+ set category = "Object"
+ set src in oview(1)
+ if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
+ return
+ var/new_color = input(usr, "Please select color.", "Paint Color", color) as color|null
+ color = new_color
+ return
+
+
+// probably redundant, allows for direct way to dismantal without knowing intents
+/obj/structure/smoletrack/verb/menudismantal()
+ set name = "Take Road Apart"
+ set category = "Object"
+ set src in oview(1)
+ if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
+ return
+ playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER)
+ var/turf/simulated/floor/F = get_turf(src)
+ if(istype(F))
+ new /obj/item/stack/material/smolebricks(F)
+ qdel(src)
+ return
+
+
// Road pieces
/obj/structure/smoletrack/roadS
@@ -164,6 +193,7 @@
icon = 'icons/vore/smoleworld_vr.dmi'
density = 1
anchored = 1
+ color = "#ffffff"
var/health = 75
var/damage
//makes it so buildings can be dismaintaled or GodZilla style attacked
@@ -258,6 +288,31 @@
qdel(src)
return
+//color buildings
+/obj/structure/smolebuilding/verb/colorpieces()
+ set name = "Use Color Pieces"
+ set category = "Object"
+ set src in oview(1)
+ if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
+ return
+ var/new_color = input(usr, "Please select color.", "Paint Color", color) as color|null
+ color = new_color
+ return
+
+//probably a bit redundant but gives a more direct way to disassemble buildings without using intents
+/obj/structure/smolebuilding/verb/menudismantal()
+ set name = "Take Building Apart"
+ set category = "Object"
+ set src in oview(1)
+ if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
+ return
+ playsound(src, 'sound/items/smolesmallbuild.ogg', 50, 1, -1, volume_channel = VOLUME_CHANNEL_MASTER)
+ if(!isnull(loc))
+ new /obj/item/stack/material/smolebricks(loc)
+ new /obj/item/stack/material/smolebricks(loc)
+ qdel(src)
+ return
+
//buildings
/obj/structure/smoleruins
icon = 'icons/vore/smoleworld_vr.dmi'
@@ -268,21 +323,25 @@
name = "smole houses"
icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolehouses"
+ color = "#ffffff"
/obj/structure/smolebuilding/business
name = "smole business"
icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolebusiness"
+ color = "#ffffff"
/obj/structure/smolebuilding/warehouses
name = "smole warehouses"
icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolewarehouses"
+ color = "#ffffff"
/obj/structure/smolebuilding/museum
name = "smole museum"
icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "smolemuseum"
+ color = "#ffffff"
//
//CAR STUFF < WILL BE MESSED WITH IN A LATER UPDATE COMMENTED OUT FOR NOW
///obj/item/smolecar
@@ -312,11 +371,11 @@
//
//
//snack planets, currently just plopped out will be organized later.
-/obj/item/trash/Asteroidsmall
+/obj/item/trash/candychunk
icon = 'icons/vore/smoleworld_vr.dmi'
- icon_state = "sp_asteriodB"
- name = "asteriod"
- desc = "A solid chunk of candy crumb that looks like a asteriod."
+ icon_state = "sp_sugarchunk"
+ name = "chunk of candy"
+ desc = "A solid chunk of candy crumbs, looks like it could be messy."
/obj/item/trash/Asteroidlarge
icon = 'icons/vore/smoleworld_vr.dmi'
@@ -351,7 +410,6 @@
icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "sp_moon"
bitesize = 1
- trash = /obj/item/trash/Asteroidsmall
nutriment_amt = 2
nutriment_desc = list("sugar" = 2)
drop_sound = 'sound/items/drop/basketball.ogg'
@@ -373,7 +431,7 @@
icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "sp_phoron"
bitesize = 3
- trash = /obj/item/trash/Asteroidmulti
+ trash = /obj/item/trash/candychunk
nutriment_amt = 2
nutriment_desc = list("spicy" = 2)
drop_sound = 'sound/items/drop/basketball.ogg'
@@ -384,7 +442,7 @@
icon = 'icons/vore/smoleworld_vr.dmi'
icon_state = "sp_virgoprime"
bitesize = 3
- trash = /obj/item/trash/Asteroidmulti
+ trash = /obj/item/trash/candychunk
nutriment_amt = 2
nutriment_desc = list("salty" = 2)
drop_sound = 'sound/items/drop/basketball.ogg'
diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png
index 8258aa32bb..e1fa895cd9 100644
Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png
index 6f8f1c8892..3c49153eb6 100644
Binary files a/icons/_nanomaps/tether_nanomap_z2.png and b/icons/_nanomaps/tether_nanomap_z2.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png
index 992f0c9c37..6dd5c295e7 100644
Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ
diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi
index 21d8bbff1d..61e8c36841 100644
Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ
diff --git a/icons/inventory/belt/item.dmi b/icons/inventory/belt/item.dmi
index 4f97b40e27..9fd819307a 100644
Binary files a/icons/inventory/belt/item.dmi and b/icons/inventory/belt/item.dmi differ
diff --git a/icons/inventory/feet/item_vr.dmi b/icons/inventory/feet/item_vr.dmi
index 5b81be4b1f..cfba06c39b 100644
Binary files a/icons/inventory/feet/item_vr.dmi and b/icons/inventory/feet/item_vr.dmi differ
diff --git a/icons/inventory/feet/mob_vr.dmi b/icons/inventory/feet/mob_vr.dmi
index b1fbd831a1..c717e731fb 100644
Binary files a/icons/inventory/feet/mob_vr.dmi and b/icons/inventory/feet/mob_vr.dmi differ
diff --git a/icons/inventory/hands/item_vr.dmi b/icons/inventory/hands/item_vr.dmi
index c682016730..ba5e3bc134 100644
Binary files a/icons/inventory/hands/item_vr.dmi and b/icons/inventory/hands/item_vr.dmi differ
diff --git a/icons/inventory/hands/mob_vr.dmi b/icons/inventory/hands/mob_vr.dmi
index 36e4219289..c2a8db76f8 100644
Binary files a/icons/inventory/hands/mob_vr.dmi and b/icons/inventory/hands/mob_vr.dmi differ
diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi
index d35d62e18e..929960272b 100644
Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ
diff --git a/icons/inventory/head/mob_vr.dmi b/icons/inventory/head/mob_vr.dmi
index 417faba92c..efde8d6aa5 100644
Binary files a/icons/inventory/head/mob_vr.dmi and b/icons/inventory/head/mob_vr.dmi differ
diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi
index 31083070be..8357527923 100644
Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ
diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi
index 35f233c1c3..24d7365930 100644
Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ
diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi
index 5b7c197b03..08cc0cb815 100644
Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ
diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi
index 2e97626d06..e3242dda79 100644
Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ
diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi
index 71d8348cf6..87cee8aca9 100644
Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ
diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi
index ad363e9706..3dc58ffd2c 100644
Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ
diff --git a/icons/mob/rig_back_vr.dmi b/icons/mob/rig_back_vr.dmi
new file mode 100644
index 0000000000..aa676c0e94
Binary files /dev/null and b/icons/mob/rig_back_vr.dmi differ
diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi
index 1b6b12e465..a63fcc23a8 100644
Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ
diff --git a/icons/obj/rig_modules_vr.dmi b/icons/obj/rig_modules_vr.dmi
index 1ee2c008aa..687ea5ba78 100644
Binary files a/icons/obj/rig_modules_vr.dmi and b/icons/obj/rig_modules_vr.dmi differ
diff --git a/icons/obj/suitdispenser.dmi b/icons/obj/suitdispenser.dmi
index 09723225a4..def549b9bb 100644
Binary files a/icons/obj/suitdispenser.dmi and b/icons/obj/suitdispenser.dmi differ
diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi
index 28da1b8e73..c76b4a3c78 100644
Binary files a/icons/obj/telescience.dmi and b/icons/obj/telescience.dmi differ
diff --git a/icons/turf/flooring/asteroid.dmi b/icons/turf/flooring/asteroid.dmi
index f9c0b2cdf8..9df9089658 100644
Binary files a/icons/turf/flooring/asteroid.dmi and b/icons/turf/flooring/asteroid.dmi differ
diff --git a/icons/turf/outdoors.dmi b/icons/turf/outdoors.dmi
index f08a94a80f..5b9ee2d7a5 100644
Binary files a/icons/turf/outdoors.dmi and b/icons/turf/outdoors.dmi differ
diff --git a/icons/turf/outdoors_edge.dmi b/icons/turf/outdoors_edge.dmi
index 1c852ecaeb..764336a4f0 100644
Binary files a/icons/turf/outdoors_edge.dmi and b/icons/turf/outdoors_edge.dmi differ
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
index 52f1fa13e3..e3fc2202e9 100644
Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ
diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi
index 647e4d3f82..595ce2da40 100644
Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ
diff --git a/icons/vore/smoleworld_vr.dmi b/icons/vore/smoleworld_vr.dmi
index 213543e6c1..ae09c350c3 100644
Binary files a/icons/vore/smoleworld_vr.dmi and b/icons/vore/smoleworld_vr.dmi differ
diff --git a/maps/expedition_vr/aerostat/aerostat.dmm b/maps/expedition_vr/aerostat/aerostat.dmm
index 6f29db48bd..9e305251e0 100644
--- a/maps/expedition_vr/aerostat/aerostat.dmm
+++ b/maps/expedition_vr/aerostat/aerostat.dmm
@@ -191,16 +191,16 @@
"az" = (
/obj/machinery/atmospherics/binary/algae_farm,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
- icon_state = "intact";
- dir = 5
+ dir = 5;
+ icon_state = "intact"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"aA" = (
/obj/machinery/atmospherics/binary/algae_farm,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
- icon_state = "intact";
- dir = 9
+ dir = 9;
+ icon_state = "intact"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
@@ -219,12 +219,12 @@
"aC" = (
/obj/machinery/atmospherics/binary/algae_farm,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
- icon_state = "intact";
- dir = 5
+ dir = 5;
+ icon_state = "intact"
},
/obj/machinery/atmospherics/pipe/simple/hidden/black{
- icon_state = "intact";
- dir = 5
+ dir = 5;
+ icon_state = "intact"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
@@ -252,8 +252,8 @@
"aF" = (
/obj/machinery/atmospherics/binary/algae_farm,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
- icon_state = "intact";
- dir = 6
+ dir = 6;
+ icon_state = "intact"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
@@ -283,8 +283,8 @@
"aI" = (
/obj/machinery/atmospherics/binary/algae_farm,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
- icon_state = "intact";
- dir = 10
+ dir = 10;
+ icon_state = "intact"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
@@ -779,8 +779,8 @@
/area/tether_away/aerostat/inside)
"cg" = (
/obj/machinery/door/airlock/multi_tile/metal{
- icon_state = "door_closed";
- dir = 1
+ dir = 1;
+ icon_state = "door_closed"
},
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
@@ -799,8 +799,8 @@
"cj" = (
/obj/machinery/computer/shuttle_control/aerostat_shuttle,
/obj/machinery/light{
- icon_state = "tube1";
- dir = 1
+ dir = 1;
+ icon_state = "tube1"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/aerostat)
@@ -835,8 +835,8 @@
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/metal{
- icon_state = "door_closed";
- dir = 1
+ dir = 1;
+ icon_state = "door_closed"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
@@ -922,7 +922,7 @@
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"cD" = (
-/obj/machinery/cryopod/robot,
+/obj/structure/salvageable/server_os,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
"cE" = (
@@ -1468,8 +1468,8 @@
"dM" = (
/obj/machinery/power/smes/buildable,
/obj/structure/cable{
- icon_state = "0-2";
- d2 = 2
+ d2 = 2;
+ icon_state = "0-2"
},
/turf/simulated/floor/bluegrid/virgo2,
/area/tether_away/aerostat/inside)
@@ -1692,6 +1692,10 @@
/obj/random/firstaid,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
+"yq" = (
+/obj/structure/salvageable/machine_os,
+/turf/simulated/floor/tiled/techfloor/virgo2,
+/area/tether_away/aerostat/inside)
"yy" = (
/obj/structure/salvageable/autolathe,
/turf/simulated/floor/tiled/techfloor/virgo2,
@@ -1753,6 +1757,10 @@
/obj/structure/metal_edge,
/turf/unsimulated/floor/sky/virgo2_sky,
/area/tether_away/aerostat)
+"Lt" = (
+/obj/structure/salvageable/data_os,
+/turf/simulated/floor/tiled/techfloor/virgo2,
+/area/tether_away/aerostat/inside)
"Lw" = (
/obj/structure/table/standard,
/obj/random/powercell,
@@ -1768,8 +1776,8 @@
/area/tether_away/aerostat/inside)
"ON" = (
/obj/structure/railing{
- icon_state = "railing0";
- dir = 1
+ dir = 1;
+ icon_state = "railing0"
},
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat)
@@ -11528,7 +11536,7 @@ bv
bK
bK
cz
-cD
+yy
bv
be
be
@@ -11670,7 +11678,7 @@ bv
gX
bK
cz
-cD
+TR
bv
be
be
@@ -11704,7 +11712,7 @@ aw
bq
be
bv
-cD
+Lt
cB
bK
bK
@@ -11812,7 +11820,7 @@ bv
fH
bK
cz
-cD
+gX
bv
be
be
@@ -11846,7 +11854,7 @@ aw
bq
be
bv
-cD
+Lt
cB
bK
TR
@@ -11954,7 +11962,7 @@ bv
bK
bK
cz
-cD
+QE
bv
be
be
@@ -11988,7 +11996,7 @@ bU
bs
be
bv
-cD
+yq
cB
bK
TR
diff --git a/maps/offmap_vr/om_ships/aro3.dmm b/maps/offmap_vr/om_ships/aro3.dmm
index 6b1b61cab2..516f3d412f 100644
--- a/maps/offmap_vr/om_ships/aro3.dmm
+++ b/maps/offmap_vr/om_ships/aro3.dmm
@@ -2610,6 +2610,10 @@
/obj/structure/table/marble,
/turf/simulated/floor/tiled/eris/cafe,
/area/aro3/kitchen)
+"vP" = (
+/obj/machinery/gear_dispenser/suit_fancy/aether,
+/turf/simulated/floor/tiled/eris/steel/panels,
+/area/aro3/eva_hall)
"vQ" = (
/obj/structure/table/steel,
/obj/item/device/flashlight/lamp,
@@ -3994,7 +3998,9 @@
dir = 1;
pixel_y = -24
},
-/obj/item/device/uav/loaded,
+/obj/item/device/uav/loaded{
+ nickname = "FoxBot Beta"
+ },
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
/area/aro3/repair_bay)
"Gy" = (
@@ -16352,7 +16358,7 @@ el
el
vZ
lu
-DM
+vP
XF
XF
Nu
diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm
index d914fce7a0..53ca5f052e 100644
--- a/maps/offmap_vr/talon/talon_v2.dm
+++ b/maps/offmap_vr/talon/talon_v2.dm
@@ -336,7 +336,7 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/nurse,
/obj/item/clothing/under/rank/orderly,
- /obj/item/clothing/suit/storage/toggle/labcoat,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/device/radio/headset/talon,
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index 22dcd205d1..f607526744 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -1141,6 +1141,7 @@
/area/talon_v2/anomaly_storage)
"cZ" = (
/obj/structure/table/woodentable,
+/obj/item/device/paicard,
/turf/simulated/floor/wood,
/area/talon_v2/crew_quarters/meditation)
"da" = (
@@ -1501,6 +1502,7 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/item/device/paicard,
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/workroom)
"dV" = (
@@ -1850,6 +1852,15 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/dogbed,
+/mob/living/simple_mob/animal/passive/dog/bullterrier{
+ desc = "That's Rupert. He looks pretty important. He looks at you with an unwavering gaze of strength and power. You feel like it would be a mistake to challenge his authority.";
+ devourable = 0;
+ digestable = 0;
+ health = 200;
+ maxHealth = 200;
+ name = "Rupert"
+ },
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/bridge)
"eV" = (
@@ -2249,10 +2260,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/talon_v2/armory)
"gj" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
/obj/machinery/power/sensor{
name = "Talon Power Generation";
name_tag = "TLN-PWR-GEN"
@@ -13712,8 +13719,13 @@
/turf/simulated/wall/rshull,
/area/talon_v2/maintenance/wing_port)
"TT" = (
-/turf/simulated/wall/rshull,
-/area/space)
+/mob/living/simple_mob/animal/passive/dog/corgi/puppy{
+ desc = "That's Hendrickson, warden of the Talon's brig. No schemes can escape the watchful gleam of this corgi's deep, dark eyes.";
+ name = "Hendrickson"
+ },
+/obj/structure/dogbed,
+/turf/simulated/floor/tiled/techfloor,
+/area/talon_v2/brig)
"TW" = (
/obj/structure/cable/green{
d1 = 1;
@@ -23667,7 +23679,7 @@ hS
MT
db
ZW
-Kj
+TT
Xm
aN
qm
@@ -26199,7 +26211,7 @@ aa
aa
aa
mI
-TT
+JO
JO
qc
qI
diff --git a/maps/southern_cross/structures/closets/medical.dm b/maps/southern_cross/structures/closets/medical.dm
index f528c2a0f1..666b42d617 100644
--- a/maps/southern_cross/structures/closets/medical.dm
+++ b/maps/southern_cross/structures/closets/medical.dm
@@ -13,6 +13,7 @@
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
+ /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
diff --git a/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm b/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm
index bb029e9daa..89891b7685 100644
--- a/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm
+++ b/maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm
@@ -203,7 +203,7 @@
/area/submap/debrisfield/mining_drone_ship)
"ay" = (
/obj/machinery/door/airlock/maintenance_hatch,
-/turf/simulated/wall/rthull,
+/turf/simulated/floor/airless,
/area/submap/debrisfield/mining_drone_ship)
"az" = (
/obj/machinery/door/blast/regular/open{
diff --git a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
index 003a57a711..c641f359b8 100644
--- a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
+++ b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
@@ -1,147 +1,1518 @@
-"aa" = (/turf/template_noop,/area/template_noop)
-"ab" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"ac" = (/obj/item/clothing/head/cone,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"ad" = (/turf/simulated/shuttle/wall,/area/submap/cave/qShuttle)
-"ae" = (/obj/structure/inflatable,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"af" = (/obj/structure/inflatable/door,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"ag" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"ah" = (/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"ai" = (/obj/structure/grille,/obj/structure/shuttle/window,/obj/machinery/door/blast/regular{dir = 8; id = "QShuttlePoIDoors"; layer = 3.3; name = "Emergency Lockdown Shutters"},/obj/item/tape/medical{dir = 4; icon_state = "tape_door_0"; layer = 3.4},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"aj" = (/turf/simulated/shuttle/wall/hard_corner,/area/submap/cave/qShuttle)
-"ak" = (/obj/machinery/door/airlock/external{desc = "It opens and closes. It is stamped with the logo of Major Bill's Transportation"; frequency = 1380; icon_state = "door_locked"; id_tag = null; locked = 1; name = "MBT-540"},/obj/item/tape/medical{dir = 4; icon_state = "tape_door_0"; layer = 3.4},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"al" = (/obj/structure/sign/biohazard{dir = 1},/turf/simulated/shuttle/wall/hard_corner,/area/submap/cave/qShuttle)
-"am" = (/obj/structure/toilet{dir = 4},/obj/effect/decal/cleanable/vomit,/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor,/area/submap/cave/qShuttle)
-"an" = (/obj/machinery/door/airlock{name = "Restroom"},/turf/simulated/shuttle/wall,/area/submap/cave/qShuttle)
-"ao" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"ap" = (/obj/effect/decal/remains/human,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aq" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"ar" = (/obj/structure/bed/chair,/obj/effect/decal/remains/human,/obj/item/clothing/suit/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"as" = (/obj/machinery/vending/snack{contraband = null; products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 0, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/weapon/reagent_containers/food/snacks/chips = 0, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 0, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 0, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 0, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 0)},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"at" = (/obj/machinery/vending/cola{contraband = null; products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 0)},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"au" = (/obj/structure/closet/crate/secure/loot,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"av" = (/obj/item/weapon/pickaxe/drill,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aw" = (/obj/item/clothing/mask/breath,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"ax" = (/obj/effect/decal/cleanable/generic,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"ay" = (/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"az" = (/obj/item/trash/syndi_cakes,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aA" = (/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aB" = (/obj/item/trash/cigbutt,/obj/item/weapon/tank/emergency/oxygen,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aC" = (/obj/item/weapon/material/knife/tacknife/boot,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aD" = (/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aE" = (/obj/item/trash/sosjerky,/obj/item/weapon/storage/box/donut/empty,/obj/item/weapon/reagent_containers/food/drinks/sillycup,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"aG" = (/obj/machinery/door/airlock/glass,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"aI" = (/obj/machinery/button{name = "Cargo Hatch"},/turf/simulated/shuttle/wall,/area/submap/cave/qShuttle)
-"aJ" = (/obj/machinery/computer,/turf/simulated/shuttle/floor,/area/submap/cave/qShuttle)
-"aK" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/obj/effect/decal/cleanable/vomit,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aL" = (/obj/structure/prop/blackbox/quarantined_shuttle,/turf/simulated/shuttle/floor,/area/submap/cave/qShuttle)
-"aM" = (/obj/item/trash/cheesie,/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aN" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aO" = (/obj/structure/bed/chair{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aP" = (/obj/structure/bed/chair{dir = 1},/obj/effect/decal/remains/human,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aQ" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aR" = (/obj/structure/bed/chair{dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aS" = (/obj/effect/decal/cleanable/vomit,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aT" = (/obj/item/clothing/head/helmet/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"aU" = (/obj/machinery/door/airlock/engineering{icon_state = "door_locked"; locked = 1; name = "Cargo Bay"},/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aV" = (/obj/item/weapon/virusdish/random,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aW" = (/obj/item/weapon/material/shard,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aX" = (/obj/item/device/paicard,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aY" = (/obj/machinery/door/blast/regular{name = "Cargo Door"},/obj/item/tape/medical{dir = 4; icon_state = "tape_door_0"; layer = 3.4},/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"aZ" = (/obj/effect/decal/remains/human,/obj/item/clothing/under/mbill{desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation. This looks at least a few decades out of date."; name = "\improper old Major Bill's uniform"},/obj/item/clothing/head/soft/mbill{desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; name = "old shipping cap"},/turf/simulated/shuttle/floor,/area/submap/cave/qShuttle)
-"ba" = (/obj/item/trash/cigbutt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bb" = (/obj/machinery/door/airlock/command{icon_state = "door_locked"; locked = 1},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bc" = (/obj/item/weapon/tank/emergency/oxygen/engi,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bd" = (/obj/effect/decal/remains/human,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"be" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"bf" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"bg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; health = 1e+006},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"bh" = (/obj/item/clothing/suit/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bi" = (/obj/item/trash/candy,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bj" = (/obj/structure/table/rack,/obj/structure/loot_pile/maint/boxfort,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bk" = (/obj/structure/table/rack,/obj/item/weapon/shovel,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bl" = (/obj/structure/closet/crate/secure/science{icon_state = "scisecurecrateopen"; locked = 0; name = "Virus Samples - FRAGILE"; opened = 1},/obj/item/weapon/virusdish/random,/obj/item/weapon/virusdish/random,/obj/item/weapon/virusdish/random,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bm" = (/obj/structure/bed/chair/comfy/brown{dir = 8},/obj/effect/decal/remains/human,/obj/item/clothing/under/mbill{desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation. This looks at least a few decades out of date."; name = "\improper old Major Bill's uniform"},/obj/item/clothing/head/soft/mbill{desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; name = "old shipping cap"},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bn" = (/obj/structure/table/standard,/obj/item/device/taperecorder,/turf/simulated/shuttle/floor,/area/submap/cave/qShuttle)
-"bo" = (/obj/item/weapon/tool/crowbar/red,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bp" = (/obj/item/trash/chips,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bq" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"br" = (/obj/structure/bed/chair,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bs" = (/obj/structure/bed/chair,/obj/effect/decal/remains/human,/obj/item/clothing/mask/breath,/obj/item/clothing/head/soft/mbill{desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; name = "old shipping cap"},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bt" = (/obj/structure/bed/chair,/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bu" = (/obj/effect/decal/remains/xeno,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bv" = (/obj/item/weapon/material/shard{icon_state = "medium"},/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bw" = (/obj/effect/decal/remains/mouse,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bx" = (/obj/random/maintenance,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"by" = (/obj/item/weapon/coin/silver,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bz" = (/obj/effect/decal/remains/human,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bA" = (/obj/effect/decal/cleanable/generic,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bB" = (/obj/item/weapon/tank/emergency/oxygen/engi,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bC" = (/obj/item/trash/sosjerky,/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bD" = (/obj/effect/decal/remains/human,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"bF" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
-"bG" = (/obj/machinery/button{dir = 4; name = "Cargo Access"},/turf/simulated/shuttle/wall,/area/submap/cave/qShuttle)
-"bH" = (/obj/machinery/recharge_station,/turf/simulated/shuttle/floor,/area/submap/cave/qShuttle)
-"bI" = (/obj/machinery/door/airlock{name = "Charge Station"},/turf/simulated/shuttle/wall,/area/submap/cave/qShuttle)
-"bJ" = (/obj/item/trash/tastybread,/obj/item/weapon/material/butterfly/boxcutter,/obj/effect/decal/cleanable/dirt,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bK" = (/obj/effect/decal/cleanable/vomit,/obj/effect/decal/cleanable/mucus/mapped,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bL" = (/obj/structure/bed/chair{dir = 1},/obj/effect/decal/remains/xeno,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bM" = (/obj/structure/bed/chair{dir = 1},/obj/item/weapon/card/id/external{desc = "An identification card of some sort. Looks like this one was issued by the Vir Independent Mining Corp."; name = "VIMC identification card"; rank = "Miner"; registered_name = "Nadia Chu"},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bN" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bO" = (/obj/structure/table/rack,/obj/item/clothing/head/soft/mbill{desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; name = "old shipping cap"},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
-"bP" = (/obj/structure/ore_box,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bQ" = (/obj/item/poster,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bR" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
-"bS" = (/obj/structure/sign/biohazard,/turf/simulated/shuttle/wall/hard_corner,/area/submap/cave/qShuttle)
-"bT" = (/obj/item/tape/medical{icon_state = "tape_v_0"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"bU" = (/obj/item/taperoll/medical,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"bV" = (/obj/item/tape/medical{dir = 1; icon_state = "tape_dir_0"},/obj/item/tape/medical{dir = 4; icon_state = "tape_dir_0"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"bW" = (/obj/item/tape/medical{icon_state = "tape_h_0"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"bX" = (/obj/structure/lattice,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"bY" = (/obj/structure/sign/warning/secure_area,/turf/simulated/wall/iron,/area/submap/cave/qShuttle)
-"bZ" = (/obj/structure/sign/kiddieplaque{desc = "By order of the S.D.D.C, this site or craft is to be buried and not disturbed until such time that sterility can be confirmed. Dated: 20/12/2491 "; name = "\improper Sif Department of Disease Control notice"},/turf/simulated/wall/iron,/area/submap/cave/qShuttle)
-"ca" = (/obj/structure/sign/warning,/turf/simulated/wall/iron,/area/submap/cave/qShuttle)
-"cb" = (/obj/item/bodybag,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cc" = (/obj/structure/table/steel,/obj/item/weapon/storage/box/bodybags,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cd" = (/obj/structure/table/steel,/obj/item/clothing/suit/bio_suit,/obj/random/medical/lite,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"ce" = (/obj/structure/closet/l3closet/virology,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cf" = (/obj/item/weapon/reagent_containers/syringe/antiviral,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cg" = (/obj/structure/dispenser/oxygen,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"ch" = (/obj/structure/table/steel,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"ci" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/syringe/antiviral,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cj" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; name = "Chemistry Cleaner"},/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"ck" = (/obj/structure/table/steel,/obj/item/weapon/tool/crowbar/power,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cl" = (/obj/structure/table/rack,/obj/item/clothing/head/bio_hood,/obj/item/clothing/suit/bio_suit,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cm" = (/obj/item/weapon/weldingtool/largetank,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-"cn" = (/obj/structure/closet/crate/medical,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
-
-(1,1,1) = {"
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaabacababaaaaadadadacaa
-aaabababababaeafaeaeabaaaaabababababababadagahabaa
-aaacababadaiajakakalaiadaiadadadadadadadadadadaaaa
-aaababadadamanaoapadaqaqaradasatadauavauadagahaaaa
-aaaaadadadadadawaxayazaAaBaCaDaEadaFaGaHadaIadabaa
-aaaaaiaJaKaLadaMaNaOaPaQaQaRaSaTaUaVaAaWaXaAaYabaa
-aaabaiaZbababbbcbdadbebfbgadbhbiadbjaAbkaAblaYabaa
-aaabaiaJbmbnadbobpbqbrbsbtbqaNbuaUbvaAbwaVbxaYabaa
-aaabadadadadadaDbyaAbzaAbAbBbCbDadbEaGbFadadbGabaa
-aaababadadbHbIbJbKadbLaQbMadbNbOadbPbQbRadagahabaa
-ababacabadaiajakakbSaiadaiadadadadadadadadadadaaaa
-ababababbTabaeaeafaeababababbUabababababadagahaaaa
-aaabababbVbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWadadadaaaa
-aaaaababababababababbXbYbZcacbcbcbabcccdceabcfaaaa
-aaaaacababcgchcicjckclababcmabcbcbababababababaaaa
-aaaaaaababcnchababababababababaaaaaaaaaaababacaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-"}
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"ac" = (
+/obj/item/clothing/head/cone,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"ad" = (
+/turf/simulated/shuttle/wall,
+/area/submap/cave/qShuttle)
+"ae" = (
+/obj/structure/inflatable,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"af" = (
+/obj/structure/inflatable/door,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"ag" = (
+/obj/structure/shuttle/engine/heater{
+ dir = 4;
+ icon_state = "heater"
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"ah" = (
+/obj/structure/shuttle/engine/propulsion{
+ dir = 8;
+ icon_state = "propulsion_l"
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"ai" = (
+/obj/structure/grille,
+/obj/structure/shuttle/window,
+/obj/machinery/door/blast/regular{
+ dir = 8;
+ id = "QShuttlePoIDoors";
+ layer = 3.3;
+ name = "Emergency Lockdown Shutters"
+ },
+/obj/item/tape/medical{
+ dir = 4;
+ icon_state = "tape_door_0";
+ layer = 3.4
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"aj" = (
+/turf/simulated/shuttle/wall/hard_corner,
+/area/submap/cave/qShuttle)
+"ak" = (
+/obj/machinery/door/airlock/external{
+ desc = "It opens and closes. It is stamped with the logo of Major Bill's Transportation";
+ frequency = 1380;
+ icon_state = "door_locked";
+ id_tag = null;
+ locked = 1;
+ name = "MBT-540"
+ },
+/obj/item/tape/medical{
+ dir = 4;
+ icon_state = "tape_door_0";
+ layer = 3.4
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"al" = (
+/obj/structure/sign/biohazard{
+ dir = 1
+ },
+/turf/simulated/shuttle/wall/hard_corner,
+/area/submap/cave/qShuttle)
+"am" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/vomit,
+/obj/effect/decal/remains/human,
+/turf/simulated/shuttle/floor,
+/area/submap/cave/qShuttle)
+"an" = (
+/obj/machinery/door/airlock{
+ name = "Restroom"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"ao" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"ap" = (
+/obj/effect/decal/remains/human,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aq" = (
+/obj/structure/bed/chair,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"ar" = (
+/obj/structure/bed/chair,
+/obj/effect/decal/remains/human,
+/obj/item/clothing/suit/space/emergency,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"as" = (
+/obj/machinery/vending/snack{
+ contraband = null;
+ products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 0, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/weapon/reagent_containers/food/snacks/chips = 0, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 0, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 0, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 0, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 0)
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"at" = (
+/obj/machinery/vending/cola{
+ contraband = null;
+ products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 0)
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"au" = (
+/obj/structure/closet/crate/secure/loot,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"av" = (
+/obj/item/weapon/pickaxe/drill,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aw" = (
+/obj/item/clothing/mask/breath,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"ax" = (
+/obj/effect/decal/cleanable/generic,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"ay" = (
+/obj/effect/decal/remains/xeno,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"az" = (
+/obj/item/trash/syndi_cakes,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aA" = (
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aB" = (
+/obj/item/trash/cigbutt,
+/obj/item/weapon/tank/emergency/oxygen,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aC" = (
+/obj/item/weapon/material/knife/tacknife/boot,
+/obj/item/clothing/mask/breath,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aD" = (
+/obj/effect/decal/remains/human,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aE" = (
+/obj/item/trash/sosjerky,
+/obj/item/weapon/storage/box/donut/empty,
+/obj/item/weapon/reagent_containers/food/drinks/sillycup,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aF" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced{
+ dir = 1;
+ health = 1e+006
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"aG" = (
+/obj/machinery/door/airlock/glass,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aH" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced{
+ dir = 1;
+ health = 1e+006
+ },
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"aI" = (
+/obj/machinery/button{
+ name = "Cargo Hatch"
+ },
+/turf/simulated/shuttle/wall,
+/area/submap/cave/qShuttle)
+"aJ" = (
+/obj/machinery/computer,
+/turf/simulated/shuttle/floor,
+/area/submap/cave/qShuttle)
+"aK" = (
+/obj/structure/bed/chair/comfy/brown{
+ dir = 8
+ },
+/obj/effect/decal/cleanable/vomit,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aL" = (
+/obj/structure/prop/blackbox/quarantined_shuttle,
+/turf/simulated/shuttle/floor,
+/area/submap/cave/qShuttle)
+"aM" = (
+/obj/item/trash/cheesie,
+/obj/effect/decal/remains/human,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aN" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aO" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aP" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/effect/decal/remains/human,
+/obj/item/clothing/mask/breath,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aQ" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aR" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aS" = (
+/obj/effect/decal/cleanable/vomit,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aT" = (
+/obj/item/clothing/head/helmet/space/emergency,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"aU" = (
+/obj/machinery/door/airlock/engineering{
+ icon_state = "door_locked";
+ locked = 1;
+ name = "Cargo Bay"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aV" = (
+/obj/item/weapon/virusdish/random,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aW" = (
+/obj/item/weapon/material/shard,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aX" = (
+/obj/item/device/paicard,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aY" = (
+/obj/machinery/door/blast/regular{
+ name = "Cargo Door"
+ },
+/obj/item/tape/medical{
+ dir = 4;
+ icon_state = "tape_door_0";
+ layer = 3.4
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"aZ" = (
+/obj/effect/decal/remains/human,
+/obj/item/clothing/under/mbill{
+ desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation. This looks at least a few decades out of date.";
+ name = "\improper old Major Bill's uniform"
+ },
+/obj/item/clothing/head/soft/mbill{
+ desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date.";
+ name = "old shipping cap"
+ },
+/turf/simulated/shuttle/floor,
+/area/submap/cave/qShuttle)
+"ba" = (
+/obj/item/trash/cigbutt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bb" = (
+/obj/machinery/door/airlock/command{
+ icon_state = "door_locked";
+ locked = 1
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bc" = (
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bd" = (
+/obj/effect/decal/remains/human,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"be" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ health = 1e+006
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"bf" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1;
+ health = 1e+006
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"bg" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 1;
+ health = 1e+006
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"bh" = (
+/obj/item/clothing/suit/space/emergency,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bi" = (
+/obj/item/trash/candy,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bj" = (
+/obj/structure/table/rack,
+/obj/structure/loot_pile/maint/boxfort,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bk" = (
+/obj/structure/table/rack,
+/obj/item/weapon/shovel,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bl" = (
+/obj/structure/closet/crate/secure/science{
+ icon_state = "scisecurecrateopen";
+ locked = 0;
+ name = "Virus Samples - FRAGILE";
+ opened = 1
+ },
+/obj/item/weapon/virusdish/random,
+/obj/item/weapon/virusdish/random,
+/obj/item/weapon/virusdish/random,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bm" = (
+/obj/structure/bed/chair/comfy/brown{
+ dir = 8
+ },
+/obj/effect/decal/remains/human,
+/obj/item/clothing/under/mbill{
+ desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation. This looks at least a few decades out of date.";
+ name = "\improper old Major Bill's uniform"
+ },
+/obj/item/clothing/head/soft/mbill{
+ desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date.";
+ name = "old shipping cap"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bn" = (
+/obj/structure/table/standard,
+/obj/item/device/taperecorder,
+/turf/simulated/shuttle/floor,
+/area/submap/cave/qShuttle)
+"bo" = (
+/obj/item/weapon/tool/crowbar/red,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bp" = (
+/obj/item/trash/chips,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bq" = (
+/obj/structure/bed/chair,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"br" = (
+/obj/structure/bed/chair,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bs" = (
+/obj/structure/bed/chair,
+/obj/effect/decal/remains/human,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/head/soft/mbill{
+ desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date.";
+ name = "old shipping cap"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bt" = (
+/obj/structure/bed/chair,
+/obj/effect/decal/remains/human,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bu" = (
+/obj/effect/decal/remains/xeno,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bv" = (
+/obj/item/weapon/material/shard{
+ icon_state = "medium"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bw" = (
+/obj/effect/decal/remains/mouse,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bx" = (
+/obj/random/maintenance,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"by" = (
+/obj/item/weapon/coin/silver,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bz" = (
+/obj/effect/decal/remains/human,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bA" = (
+/obj/effect/decal/cleanable/generic,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bB" = (
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bC" = (
+/obj/item/trash/sosjerky,
+/obj/effect/decal/remains/human,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bD" = (
+/obj/effect/decal/remains/human,
+/obj/item/clothing/mask/breath,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bE" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"bF" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/simulated/shuttle/plating,
+/area/submap/cave/qShuttle)
+"bG" = (
+/obj/machinery/button{
+ dir = 4;
+ name = "Cargo Access"
+ },
+/turf/simulated/shuttle/wall,
+/area/submap/cave/qShuttle)
+"bH" = (
+/obj/machinery/recharge_station,
+/turf/simulated/shuttle/floor,
+/area/submap/cave/qShuttle)
+"bI" = (
+/obj/machinery/door/airlock{
+ name = "Charge Station"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bJ" = (
+/obj/item/trash/tastybread,
+/obj/item/weapon/material/butterfly/boxcutter,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bK" = (
+/obj/effect/decal/cleanable/vomit,
+/obj/effect/decal/cleanable/mucus/mapped,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bL" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/effect/decal/remains/xeno,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bM" = (
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/item/weapon/card/id/external{
+ desc = "An identification card of some sort. Looks like this one was issued by the Vir Independent Mining Corp.";
+ name = "VIMC identification card";
+ rank = "Miner";
+ registered_name = "Nadia Chu"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bN" = (
+/obj/structure/table/rack,
+/obj/item/weapon/storage/toolbox/emergency,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bO" = (
+/obj/structure/table/rack,
+/obj/item/clothing/head/soft/mbill{
+ desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date.";
+ name = "old shipping cap"
+ },
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_white"
+ },
+/area/submap/cave/qShuttle)
+"bP" = (
+/obj/structure/ore_box,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bQ" = (
+/obj/item/poster,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bR" = (
+/obj/structure/loot_pile/maint/technical,
+/turf/simulated/shuttle/floor{
+ icon_state = "floor_yellow"
+ },
+/area/submap/cave/qShuttle)
+"bS" = (
+/obj/structure/sign/biohazard,
+/turf/simulated/shuttle/wall/hard_corner,
+/area/submap/cave/qShuttle)
+"bT" = (
+/obj/item/tape/medical{
+ icon_state = "tape_v_0"
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"bU" = (
+/obj/item/taperoll/medical,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"bV" = (
+/obj/item/tape/medical{
+ dir = 1;
+ icon_state = "tape_dir_0"
+ },
+/obj/item/tape/medical{
+ dir = 4;
+ icon_state = "tape_dir_0"
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"bW" = (
+/obj/item/tape/medical{
+ icon_state = "tape_h_0"
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"bX" = (
+/obj/structure/lattice,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"bY" = (
+/obj/structure/sign/warning/secure_area,
+/turf/simulated/wall/iron,
+/area/submap/cave/qShuttle)
+"bZ" = (
+/obj/structure/sign/kiddieplaque{
+ desc = "By order of the S.D.D.C, this site or craft is to be buried and not disturbed until such time that sterility can be confirmed. Dated: 20/12/2491 ";
+ name = "\improper Sif Department of Disease Control notice"
+ },
+/turf/simulated/wall/iron,
+/area/submap/cave/qShuttle)
+"ca" = (
+/obj/structure/sign/warning,
+/turf/simulated/wall/iron,
+/area/submap/cave/qShuttle)
+"cb" = (
+/obj/item/bodybag,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cc" = (
+/obj/structure/table/steel,
+/obj/item/weapon/storage/box/bodybags,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cd" = (
+/obj/structure/table/steel,
+/obj/item/clothing/suit/bio_suit,
+/obj/random/medical/lite,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"ce" = (
+/obj/structure/closet/l3closet/virology,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cf" = (
+/obj/item/weapon/reagent_containers/syringe/antiviral,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cg" = (
+/obj/structure/dispenser/oxygen,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"ch" = (
+/obj/structure/table/steel,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"ci" = (
+/obj/structure/table/steel,
+/obj/item/weapon/reagent_containers/syringe/antiviral,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cj" = (
+/obj/structure/table/steel,
+/obj/item/weapon/reagent_containers/spray/cleaner{
+ desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'";
+ name = "Chemistry Cleaner"
+ },
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"ck" = (
+/obj/structure/table/steel,
+/obj/item/weapon/tool/crowbar/power,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cl" = (
+/obj/structure/table/rack,
+/obj/item/clothing/head/bio_hood,
+/obj/item/clothing/suit/bio_suit,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cm" = (
+/obj/item/weapon/weldingtool/largetank,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+"cn" = (
+/obj/structure/closet/crate/medical,
+/turf/simulated/mineral/floor/ignore_mapgen,
+/area/submap/cave/qShuttle)
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ac
+ab
+aa
+aa
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(3,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ab
+ad
+ai
+ai
+ai
+ad
+ab
+ac
+ab
+ab
+ab
+ac
+aa
+aa
+aa
+aa
+aa
+"}
+(4,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ad
+ad
+aJ
+aZ
+aJ
+ad
+ad
+ab
+ab
+ab
+ab
+ab
+ab
+aa
+aa
+aa
+aa
+"}
+(5,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ad
+ad
+ad
+aK
+ba
+bm
+ad
+ad
+ad
+bT
+bV
+ab
+ab
+ab
+aa
+aa
+aa
+aa
+"}
+(6,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ai
+am
+ad
+aL
+ba
+bn
+ad
+bH
+ai
+ab
+bW
+ab
+cg
+cn
+aa
+aa
+aa
+aa
+"}
+(7,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ae
+aj
+an
+ad
+ad
+bb
+ad
+ad
+bI
+aj
+ae
+bW
+ab
+ch
+ch
+aa
+aa
+aa
+aa
+"}
+(8,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+af
+ak
+ao
+aw
+aM
+bc
+bo
+aD
+bJ
+ak
+ae
+bW
+ab
+ci
+ab
+aa
+aa
+aa
+aa
+"}
+(9,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ae
+ak
+ap
+ax
+aN
+bd
+bp
+by
+bK
+ak
+af
+bW
+ab
+cj
+ab
+aa
+aa
+aa
+aa
+"}
+(10,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ae
+al
+ad
+ay
+aO
+ad
+bq
+aA
+ad
+bS
+ae
+bW
+ab
+ck
+ab
+aa
+aa
+aa
+aa
+"}
+(11,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ai
+aq
+az
+aP
+be
+br
+bz
+bL
+ai
+ab
+bW
+bX
+cl
+ab
+aa
+aa
+aa
+aa
+"}
+(12,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ad
+aq
+aA
+aQ
+bf
+bs
+aA
+aQ
+ad
+ab
+bW
+bY
+ab
+ab
+aa
+aa
+aa
+aa
+"}
+(13,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ai
+ar
+aB
+aQ
+bg
+bt
+bA
+bM
+ai
+ab
+bW
+bZ
+ab
+ab
+aa
+aa
+aa
+aa
+"}
+(14,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ad
+ad
+aC
+aR
+ad
+bq
+bB
+ad
+ad
+ab
+bW
+ca
+cm
+ab
+aa
+aa
+aa
+aa
+"}
+(15,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ad
+as
+aD
+aS
+bh
+aN
+bC
+bN
+ad
+bU
+bW
+cb
+ab
+ab
+aa
+aa
+aa
+aa
+"}
+(16,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ac
+ab
+ad
+at
+aE
+aT
+bi
+bu
+bD
+bO
+ad
+ab
+bW
+cb
+cb
+aa
+aa
+aa
+aa
+aa
+"}
+(17,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ad
+ad
+ad
+aU
+ad
+aU
+ad
+ad
+ad
+ab
+bW
+cb
+cb
+aa
+aa
+aa
+aa
+aa
+"}
+(18,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ad
+au
+aF
+aV
+bj
+bv
+bE
+bP
+ad
+ab
+bW
+ab
+ab
+aa
+aa
+aa
+aa
+aa
+"}
+(19,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ad
+av
+aG
+aA
+aA
+aA
+aG
+bQ
+ad
+ab
+bW
+cc
+ab
+aa
+aa
+aa
+aa
+aa
+"}
+(20,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ad
+au
+aH
+aW
+bk
+bw
+bF
+bR
+ad
+ab
+bW
+cd
+ab
+aa
+aa
+aa
+aa
+aa
+"}
+(21,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ad
+ad
+ad
+ad
+ad
+aX
+aA
+aV
+ad
+ad
+ad
+ad
+ad
+ce
+ab
+ab
+aa
+aa
+aa
+aa
+"}
+(22,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+ad
+ag
+ad
+ag
+aI
+aA
+bl
+bx
+ad
+ag
+ad
+ag
+ad
+ab
+ab
+ab
+aa
+aa
+aa
+aa
+"}
+(23,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ad
+ah
+ad
+ah
+ad
+aY
+aY
+aY
+bG
+ah
+ad
+ah
+ad
+cf
+ab
+ac
+aa
+aa
+aa
+aa
+"}
+(24,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ac
+ab
+aa
+aa
+ab
+ab
+ab
+ab
+ab
+ab
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(25,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
+"}
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index f877a475d8..998734b07a 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -537,15 +537,12 @@
/area/tether/surfacebase/medical/paramed)
"aaT" = (
/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/machinery/alarm{
- pixel_y = 22
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/tether/surfacebase/outside/outside1)
"aaU" = (
/turf/simulated/wall,
/area/maintenance/lower/trash_pit)
@@ -937,10 +934,8 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/tether/surfacebase/outside/outside1)
"abC" = (
/obj/effect/floor_decal/rust,
/obj/structure/closet/crate,
@@ -6294,7 +6289,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/public_garden_maintenence)
"akK" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall,
/area/tether/surfacebase/lowernortheva/external)
"akL" = (
/turf/simulated/floor/reinforced{
@@ -7690,6 +7685,7 @@
pixel_x = 32
},
/obj/structure/table/standard,
+/obj/item/device/paicard,
/turf/simulated/floor/tiled,
/area/storage/primary)
"amW" = (
@@ -8965,6 +8961,11 @@
locked = 1
},
/obj/effect/map_helper/airlock/door/ext_door,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled/steel_grid,
/area/storage/surface_eva/external)
"aoX" = (
@@ -8977,6 +8978,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/storage/surface_eva/external)
"aoY" = (
@@ -8989,6 +8995,11 @@
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/manifold/hidden,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/storage/surface_eva/external)
"aoZ" = (
@@ -10818,11 +10829,6 @@
name = "Locker Room Maintenance"
},
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating,
/area/crew_quarters/locker)
"asj" = (
@@ -12985,11 +12991,6 @@
/area/hallway/lower/first_west)
"avK" = (
/obj/structure/catwalk,
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
@@ -13744,13 +13745,12 @@
/area/rnd/hallway)
"awU" = (
/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/storage/surface_eva/external)
"awV" = (
/obj/effect/landmark{
name = "lightsout"
@@ -14288,11 +14288,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
@@ -14311,11 +14306,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -14337,16 +14327,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/xenoflora)
-"axD" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
"axE" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -14838,29 +14818,13 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
"ayr" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/mauve/border{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 6
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 5
- },
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/turf/simulated/floor/tiled,
-/area/rnd/hallway)
+/turf/simulated/floor/tiled/steel_dirty/virgo3b,
+/area/tether/surfacebase/outside/outside1)
"ays" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -15559,8 +15523,17 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
"azs" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/lower/solars)
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/cable/heavyduty{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/virgo3b,
+/area/tether/surfacebase/outside/outside1)
"azt" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -15574,11 +15547,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/machinery/light{
dir = 8
},
@@ -16161,11 +16129,6 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralstairwell)
"aAj" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/maintenance/rnd{
name = "Science Maintenance"
},
@@ -16175,21 +16138,16 @@
/area/maintenance/lower/solars)
"aAk" = (
/obj/effect/floor_decal/rust,
-/obj/structure/cable{
- icon_state = "1-8"
- },
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/solars)
"aAl" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/cable,
+/obj/structure/cable/heavyduty{
+ icon_state = "0-8"
},
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
+/turf/simulated/floor/virgo3b,
+/area/tether/surfacebase/outside/outside1)
"aAm" = (
/obj/random/junk,
/obj/machinery/light/small{
@@ -16230,13 +16188,19 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"aAs" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+/obj/structure/cable/heavyduty{
+ icon_state = "1-2"
},
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/virgo3b_indoors,
/area/maintenance/lower/solars)
"aAt" = (
/obj/structure/cable{
@@ -16251,12 +16215,22 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"aAu" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/structure/cable/heavyduty{
+ icon_state = "1-2"
},
-/turf/simulated/floor/plating,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/virgo3b_indoors,
/area/maintenance/lower/solars)
"aAv" = (
/obj/structure/cable{
@@ -16293,17 +16267,18 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"aAx" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
+/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/maintenance/rnd{
- name = "Science Maintenance"
+/obj/structure/railing{
+ dir = 1
},
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/virgo3b_indoors,
+/area/tether/surfacebase/outside/outside1)
"aAy" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -16317,9 +16292,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
-/obj/structure/cable{
- icon_state = "1-8"
- },
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"aAz" = (
@@ -16852,14 +16824,17 @@
/area/maintenance/lower/research)
"aBu" = (
/obj/structure/cable/heavyduty{
- icon_state = "0-2"
+ icon_state = "1-8"
},
-/obj/structure/cable,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
-"aBv" = (
-/turf/simulated/wall,
-/area/rnd/miscellaneous_lab)
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/virgo3b_indoors,
+/area/tether/surfacebase/outside/outside1)
"aBw" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -17211,12 +17186,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
-"aCc" = (
-/obj/structure/cable/heavyduty{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
"aCd" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -18642,20 +18611,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
-"aEQ" = (
-/obj/structure/sign/electricshock,
-/turf/simulated/wall,
-/area/maintenance/lower/solars)
-"aER" = (
-/obj/structure/cable/heavyduty{
- icon_state = "1-2"
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced/full,
-/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/solars)
"aES" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -19791,7 +19746,7 @@
dir = 1
},
/obj/structure/railing,
-/turf/simulated/floor/virgo3b,
+/turf/simulated/floor/virgo3b_indoors,
/area/tether/surfacebase/outside/outside1)
"aGE" = (
/obj/structure/cable/heavyduty{
@@ -19803,45 +19758,13 @@
/obj/structure/railing,
/turf/simulated/floor/virgo3b,
/area/tether/surfacebase/outside/outside1)
-"aGF" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/cable/heavyduty{
- icon_state = "4-8"
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/virgo3b,
-/area/tether/surfacebase/outside/outside1)
"aGG" = (
/obj/effect/floor_decal/rust,
/obj/structure/cable/heavyduty{
icon_state = "4-8"
},
/obj/structure/catwalk,
-/turf/simulated/floor/virgo3b,
-/area/tether/surfacebase/outside/outside1)
-"aGH" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/cable/heavyduty{
- icon_state = "4-8"
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/virgo3b,
-/area/tether/surfacebase/outside/outside1)
-"aGI" = (
-/obj/structure/cable/heavyduty{
- icon_state = "1-8"
- },
-/obj/structure/railing,
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/virgo3b,
+/turf/simulated/floor/virgo3b_indoors,
/area/tether/surfacebase/outside/outside1)
"aGJ" = (
/obj/structure/table/glass,
@@ -28737,6 +28660,7 @@
dir = 8
},
/obj/structure/table/standard,
+/obj/item/device/paicard,
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_laundry)
"aWW" = (
@@ -32556,9 +32480,6 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
/turf/simulated/floor/plating,
/area/tether/surfacebase/security/brig)
"eQz" = (
@@ -32879,7 +32800,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/orange{
d1 = 1;
d2 = 2;
@@ -32890,6 +32810,9 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
"ghr" = (
@@ -33598,6 +33521,18 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/mining_eva)
+"hTk" = (
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/item/device/paicard,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/locker)
"hTw" = (
/obj/structure/cable/green{
d1 = 1;
@@ -33635,10 +33570,6 @@
/area/tether/surfacebase/surface_one_hall)
"hTQ" = (
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -33799,6 +33730,18 @@
dir = 1
},
/area/looking_glass/lg_1)
+"iwg" = (
+/obj/structure/cable/heavyduty{
+ icon_state = "1-2"
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/virgo3b_indoors,
+/area/tether/surfacebase/outside/outside1)
"iwE" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -34513,6 +34456,9 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"kGQ" = (
+/turf/simulated/floor/virgo3b_indoors,
+/area/tether/surfacebase/outside/outside1)
"kKl" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -38717,6 +38663,16 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
+"yiS" = (
+/obj/structure/cable/heavyduty{
+ icon_state = "4-8"
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing,
+/turf/simulated/floor/virgo3b_indoors,
+/area/tether/surfacebase/outside/outside1)
"ylH" = (
/obj/machinery/fitness/punching_bag/clown,
/turf/simulated/floor/carpet/gaycarpet,
@@ -38907,40 +38863,40 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aGD
aaa
aHL
@@ -39050,40 +39006,40 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGE
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+yiS
aaa
aHL
aHL
@@ -39196,36 +39152,36 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGE
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+yiS
aHo
aad
aad
@@ -39340,35 +39296,35 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGE
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+yiS
+aah
aad
aad
aad
@@ -39466,6 +39422,8 @@ aad
aad
aad
aad
+aah
+aah
aad
aad
aad
@@ -39482,35 +39440,33 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGF
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+yiS
+aah
aad
aad
aad
@@ -39605,6 +39561,14 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -39619,41 +39583,33 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGG
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+yiS
+aah
+aah
aad
aad
aad
@@ -39747,6 +39703,15 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -39760,42 +39725,33 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGG
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+yiS
+aah
+aah
aad
aad
aad
@@ -39888,6 +39844,16 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -39902,42 +39868,32 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGG
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+baU
+baU
+baU
+baU
+baU
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+yiS
+aah
+aah
aad
aad
aad
@@ -40030,16 +39986,16 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
bcV
aad
@@ -40054,33 +40010,33 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGG
-aad
-aad
-aad
+baU
+baU
+aah
+baU
+ano
+aah
+baU
+aah
+ano
+baU
+baU
+baU
+ano
+baU
+baU
+baU
+ano
+baU
+baU
+aah
+ano
+aah
+aah
+aAx
+aah
+baU
+baU
aad
aad
aad
@@ -40172,6 +40128,17 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -40186,43 +40153,32 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
aGG
-aad
-aad
-aad
+baU
+baU
+baU
aad
aad
aad
@@ -40314,6 +40270,17 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -40328,43 +40295,32 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
aGG
-aad
-aad
-aad
+baU
+baU
+baU
aad
aad
aad
@@ -40456,6 +40412,18 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -40470,43 +40438,31 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGH
-aad
-aad
-aad
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+aGG
+baU
+baU
+baU
aad
aad
aad
@@ -40598,6 +40554,19 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -40610,6 +40579,32 @@ aad
aad
aad
aad
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+aGG
+baU
+baU
+baU
aad
aad
aad
@@ -40623,52 +40618,13 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGE
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -40741,6 +40697,18 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -40753,6 +40721,33 @@ aad
aad
aad
aad
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+baU
+kGQ
+baU
+baU
+aGG
+baU
+baU
+baU
+baU
aad
aad
aad
@@ -40763,56 +40758,17 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGE
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -40883,19 +40839,19 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
ajK
@@ -40903,59 +40859,59 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aGE
-aad
-aad
-aad
-aad
+azs
+aib
+aib
+aib
+aib
+iwg
+iwg
+aAu
+iwg
+iwg
+iwg
+aAs
+iwg
+iwg
+iwg
+aAs
+iwg
+iwg
+iwg
+aAs
+iwg
+iwg
+iwg
+aAs
+iwg
+iwg
+aBu
+baU
+baU
+baU
+baU
aad
ajK
aad
aad
aad
+aah
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41026,45 +40982,19 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41074,31 +41004,57 @@ aad
aGE
aad
aad
+baU
+baU
+aah
+aah
+ano
+aah
+baU
+baU
+ano
+baU
+baU
+baU
+ano
+baU
+baU
+baU
+ano
+baU
+aah
+aah
+ano
+baU
+baU
+baU
+aah
+aah
+aah
+aah
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41169,44 +41125,18 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41216,31 +41146,57 @@ aad
aGE
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+baU
+baU
+baU
+baU
+baU
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41317,39 +41273,13 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+baU
+baU
+aah
+aah
aad
aad
aad
@@ -41357,33 +41287,59 @@ aad
aad
aGE
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+baU
+baU
+baU
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41460,73 +41416,73 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aah
-aah
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+baU
+baU
+baU
+baU
+baU
aad
aad
aad
aad
aad
aGE
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41602,73 +41558,73 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aad
+baU
+baU
+baU
+baU
+baU
+baU
aad
aad
aad
aad
aad
aGE
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41755,62 +41711,62 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-auK
-auK
-auK
-auK
-auK
-auK
-auK
-aEQ
-aad
-aad
aGE
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -41897,7 +41853,41 @@ aad
aad
aad
aad
-aad
+aGE
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -41913,46 +41903,12 @@ aah
aah
aah
aah
-auK
-aAs
-aBu
-aCc
-aCc
-aCc
-aCc
-aER
-aib
-aib
-aGI
-aad
-aad
aah
aah
aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
aad
aad
aad
@@ -42036,33 +41992,53 @@ aah
aah
aah
aoq
-aoq
-aoq
-aoq
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-auK
aaT
-auK
-auK
-auK
-auK
-auK
-auK
+ayr
+ayr
+aAl
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -42075,26 +42051,6 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
aad
aad
aad
@@ -42178,28 +42134,9 @@ aah
aah
aah
aoq
+abB
aoq
aoq
-aoq
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-auK
-aAu
-auK
aah
aah
aah
@@ -42220,21 +42157,40 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -42320,7 +42276,7 @@ aah
aah
aah
aor
-aoV
+awU
aoV
aqm
aci
@@ -42339,9 +42295,6 @@ aah
aah
aah
aah
-auK
-aAu
-auK
aah
aah
aah
@@ -42362,21 +42315,24 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -42481,9 +42437,6 @@ aah
aah
aah
aah
-auK
-abB
-auK
aah
aah
aah
@@ -42504,20 +42457,23 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -42623,9 +42579,6 @@ aah
aah
aah
aah
-auK
-aAu
-auK
aah
aah
aah
@@ -42646,16 +42599,19 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -42765,9 +42721,6 @@ aah
aah
aah
aah
-auK
-aAl
-auK
aah
aah
aah
@@ -42789,14 +42742,17 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -42907,9 +42863,16 @@ agv
agv
agv
agv
-azs
-aAu
-auK
+agv
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -42931,13 +42894,6 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
aad
aad
aad
@@ -43002,7 +42958,7 @@ aad
aad
aad
aad
-aad
+aah
ajO
akL
akL
@@ -43049,9 +43005,15 @@ ahH
adV
aip
aiJ
-azs
-aaT
-auK
+agv
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -43073,12 +43035,6 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
aad
aad
aad
@@ -43143,7 +43099,7 @@ aad
aad
aad
aad
-aad
+aah
aah
ajO
akO
@@ -43191,9 +43147,15 @@ ahO
aij
ais
aiK
-azs
-aAu
-auK
+agv
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -43215,12 +43177,6 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
aad
aad
aad
@@ -43284,8 +43240,8 @@ aad
aad
aad
aad
-aad
-aad
+aah
+aah
aah
ajO
ajO
@@ -43333,9 +43289,14 @@ ahP
ahP
aiH
aiL
-azs
-aAu
-auK
+agv
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -43357,11 +43318,6 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
aad
aad
aad
@@ -43424,10 +43380,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aah
aah
ajO
@@ -43475,9 +43431,13 @@ ahQ
ain
aiI
aiM
-azs
-aAu
-auK
+agv
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -43499,10 +43459,6 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
aad
aad
aad
@@ -43565,10 +43521,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -43617,18 +43573,21 @@ agv
agv
agv
agv
-azs
-aAx
-auK
-aBv
-aBv
-aBv
-aBv
-aBv
-aBv
-aBv
-aBv
-aBv
+agv
+awn
+awn
+awn
+awn
+awn
+awn
+awn
+awn
+awn
+awn
+awn
+aah
+aah
+aah
aah
aah
aah
@@ -43641,9 +43600,6 @@ aah
aah
aah
aah
-aad
-aad
-aad
aad
aad
aad
@@ -43705,11 +43661,11 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -43758,7 +43714,7 @@ avE
awl
awS
axA
-ayr
+akg
azt
aAy
aBw
@@ -43770,7 +43726,9 @@ aES
ajB
aFY
aGd
-aBv
+awn
+aah
+aah
aah
aah
aah
@@ -43783,8 +43741,6 @@ aah
aah
aah
aah
-aad
-aad
aad
aad
aad
@@ -43845,13 +43801,13 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -43912,7 +43868,7 @@ aET
aCe
cdO
glH
-aBv
+awn
aah
aah
aah
@@ -43925,7 +43881,7 @@ aah
aah
aah
aah
-aad
+aah
aad
aad
aad
@@ -43986,13 +43942,13 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -44054,7 +44010,7 @@ abN
abN
ygY
aGX
-aBv
+awn
aah
aah
aah
@@ -44066,7 +44022,7 @@ aKL
aah
aah
aah
-aad
+aah
aad
aad
aad
@@ -44126,16 +44082,16 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -44183,7 +44139,7 @@ ava
avH
awn
auK
-avh
+aws
abN
aeR
aeR
@@ -44196,7 +44152,7 @@ aio
abN
xgQ
ofS
-aBv
+awn
aah
aah
aah
@@ -44267,16 +44223,16 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -44325,7 +44281,7 @@ avb
avI
ahl
rJv
-avh
+aws
abN
aeR
aeR
@@ -44338,11 +44294,11 @@ aiB
abN
lMf
aGX
-aBv
-aBv
-aBv
-aBv
-aBv
+awn
+awn
+awn
+awn
+awn
aKL
aLo
bbo
@@ -44409,16 +44365,16 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -44467,7 +44423,7 @@ anx
acJ
ahl
rJv
-avh
+aws
abN
aeR
aeR
@@ -44551,13 +44507,13 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -44609,7 +44565,7 @@ avc
avJ
ahl
rJv
-avh
+aws
abN
aeR
aeR
@@ -44692,13 +44648,13 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -44751,7 +44707,7 @@ auK
auK
auK
rJv
-axD
+aAk
abN
aeR
aeR
@@ -44834,12 +44790,12 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
akB
@@ -44891,8 +44847,8 @@ aul
auH
axI
avK
-axI
-awU
+aws
+aws
aAk
abN
akT
@@ -44917,7 +44873,7 @@ aMd
aKL
aah
aah
-aad
+aah
aad
aad
aad
@@ -44976,12 +44932,12 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
akB
@@ -45059,8 +45015,8 @@ auW
aKL
aah
aah
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -45118,12 +45074,12 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
akB
@@ -45201,10 +45157,10 @@ aKL
aKL
aah
aah
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -45260,12 +45216,12 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
akB
@@ -45344,6 +45300,10 @@ aah
aah
aah
aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -45353,14 +45313,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -45402,12 +45358,12 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
akB
@@ -45487,25 +45443,25 @@ aah
aah
aah
aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -45545,11 +45501,11 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
aah
aah
akB
@@ -45629,28 +45585,28 @@ adn
adn
aah
aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -45688,10 +45644,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aah
aah
akB
@@ -45772,28 +45728,28 @@ adn
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -45830,10 +45786,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -45914,29 +45870,29 @@ adn
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
baq
@@ -45973,10 +45929,10 @@ aad
aad
aad
aad
+aah
+aah
aad
-aad
-aad
-aad
+aah
aah
aah
aah
@@ -46057,29 +46013,29 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46115,8 +46071,8 @@ aad
aad
aad
aad
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -46199,6 +46155,17 @@ aah
aah
aah
aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46206,22 +46173,11 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46258,12 +46214,12 @@ aad
aad
aad
aad
+aah
aad
aad
aad
aad
-aad
-aad
+aah
aah
aah
aah
@@ -46341,6 +46297,15 @@ aah
aah
aah
aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46350,21 +46315,12 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46405,8 +46361,8 @@ aad
aad
aad
aad
-aad
-aad
+aah
+aah
aah
aah
gCa
@@ -46502,12 +46458,12 @@ aTW
aTW
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46543,14 +46499,14 @@ aad
aad
aad
aad
-bcV
-aad
aad
aad
aad
aad
aad
aah
+aah
+aah
gCa
jTQ
nBT
@@ -46644,12 +46600,12 @@ aUy
aTW
aTW
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46690,9 +46646,9 @@ aad
aad
aad
aad
-aad
-aad
-aad
+aah
+aah
+aah
gCa
gCa
ucv
@@ -46786,12 +46742,12 @@ aUR
aUy
aTW
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46833,8 +46789,8 @@ aad
aad
aad
aad
-aad
-aad
+aah
+aah
gCa
iWx
qsl
@@ -46929,10 +46885,10 @@ aXd
aTW
aad
aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -46975,8 +46931,8 @@ aad
aad
aad
aad
-aad
-aad
+aah
+aah
gCa
kwN
lLD
@@ -47071,19 +47027,19 @@ aXd
aTW
aad
aad
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -47118,7 +47074,7 @@ aad
aad
aad
aad
-aad
+aah
gCa
wwm
jio
@@ -47212,21 +47168,21 @@ aUR
aUx
aTW
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
aad
aad
aad
@@ -47252,7 +47208,7 @@ aad
aad
aad
aad
-aad
+bcV
aad
aad
aad
@@ -47357,20 +47313,20 @@ aah
aah
aah
aah
+aah
+aah
+aah
+aah
aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -47401,7 +47357,7 @@ aad
aad
aad
aad
-adK
+ano
aad
aad
aad
@@ -47499,21 +47455,21 @@ aah
aah
aah
aah
+aah
+aah
+aah
+aah
+aah
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -47641,21 +47597,21 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -47784,21 +47740,21 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -47926,21 +47882,21 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -48071,18 +48027,18 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -48214,18 +48170,18 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -48358,16 +48314,16 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -48500,16 +48456,16 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -48642,15 +48598,15 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -48785,14 +48741,14 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -48926,14 +48882,14 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -49068,14 +49024,14 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -49104,8 +49060,8 @@ aad
aad
aad
aad
-adK
-adK
+ano
+ano
aad
aad
aad
@@ -49208,9 +49164,9 @@ aah
aah
aah
aah
-aad
-aad
-aad
+aah
+aah
+aah
aad
aad
aad
@@ -49349,8 +49305,8 @@ aVn
aah
aah
aah
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -49490,8 +49446,8 @@ aVn
aVn
aYd
aYd
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -51233,8 +51189,8 @@ aad
aad
aad
aad
-adK
-adK
+ano
+ano
aad
aad
aad
@@ -51375,8 +51331,8 @@ aad
aad
aad
aad
-adK
-adK
+ano
+ano
aad
aad
aad
@@ -52084,7 +52040,7 @@ aad
aad
aad
aad
-aad
+ano
aad
aad
aan
@@ -52651,7 +52607,7 @@ aad
aad
aad
aad
-adK
+aad
aad
aad
aar
@@ -53361,9 +53317,9 @@ aad
aad
aad
aad
-adK
aad
aad
+aah
aan
aan
abX
@@ -53405,7 +53361,7 @@ apF
ash
asx
asU
-atp
+hTk
atT
aux
auR
@@ -53504,9 +53460,9 @@ aad
aad
aad
aad
-aad
-aad
-aad
+aah
+aah
+aah
aan
acc
acI
@@ -53639,16 +53595,16 @@ aad
aad
aad
aad
+aah
+aah
aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aan
ace
acK
@@ -53753,7 +53709,7 @@ aYi
aYi
aYi
aah
-aad
+aah
aad
aad
aad
@@ -53780,17 +53736,17 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
aan
aan
aan
@@ -53895,8 +53851,8 @@ aah
aah
aah
aah
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -53922,20 +53878,20 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aff
@@ -54037,11 +53993,11 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -54064,21 +54020,21 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aeE
afm
afm
@@ -54178,15 +54134,15 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -54206,21 +54162,21 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aeE
afn
avk
@@ -54320,15 +54276,15 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -54348,21 +54304,21 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aeE
afx
avl
@@ -54461,16 +54417,16 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -54492,19 +54448,19 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aeE
afB
avQ
@@ -54603,16 +54559,16 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -54635,18 +54591,18 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aeE
afD
avl
@@ -54745,17 +54701,17 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -54777,17 +54733,17 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aeE
afL
@@ -54878,7 +54834,6 @@ qKk
aUm
baU
baU
-baU
aah
aah
aah
@@ -54886,18 +54841,19 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -54919,18 +54875,18 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+ano
+ano
+ano
+ano
aeE
agq
avS
@@ -55021,25 +54977,25 @@ aWn
baU
baU
baU
-baU
aah
aah
aah
-aad
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55059,17 +55015,17 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+ano
ack
acM
acM
@@ -55147,10 +55103,10 @@ aah
aah
aah
aah
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
aUm
lei
wVm
@@ -55164,23 +55120,23 @@ aad
baU
baU
baU
-baU
aah
aah
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55201,20 +55157,20 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
aah
aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+ano
+ano
+ano
+ano
aeE
aeE
aeE
@@ -55280,8 +55236,28 @@ aad
aad
aad
aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aUm
+aUm
+kcv
+kcv
+kcv
+kcv
+kcv
+aUm
+aUm
aad
aad
aad
@@ -55289,40 +55265,20 @@ aad
aah
aah
aah
-aad
-aad
-aad
-aad
-aUm
-aUm
-kcv
-kcv
-kcv
-kcv
-kcv
-aUm
-aUm
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55342,19 +55298,19 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
naC
@@ -55423,6 +55379,18 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55436,35 +55404,23 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55484,19 +55440,19 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
naC
@@ -55518,18 +55474,18 @@ gWO
fWT
aah
aah
-aad
-aad
-aad
-aad
-aad
aah
-aad
-aad
aah
aah
aah
aah
+baU
+baU
+baU
+baU
+aah
+aah
+aah
aty
atx
atx
@@ -55565,6 +55521,17 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55579,33 +55546,22 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55626,19 +55582,19 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
naC
@@ -55658,20 +55614,20 @@ fWT
fWT
fWT
fWT
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
aah
aah
aah
aah
+aah
+aah
+baU
+baU
+baU
+baU
+baU
+aah
+aah
+aah
auD
atz
atz
@@ -55707,6 +55663,16 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55722,29 +55688,19 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55767,21 +55723,21 @@ aaa
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-ajK
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
naC
aAC
@@ -55796,22 +55752,22 @@ aah
aah
aah
aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+aah
aah
aah
auD
@@ -55849,6 +55805,15 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55864,26 +55829,17 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55909,22 +55865,22 @@ aaa
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
naC
naC
naC
@@ -55936,6 +55892,15 @@ naC
aah
aah
aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -55943,19 +55908,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+baU
+aah
+aah
auD
aud
aud
@@ -55992,6 +55948,14 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56007,24 +55971,16 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56051,24 +56007,35 @@ aaa
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aah
aah
aah
@@ -56083,21 +56050,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+baU
+aah
+aah
auD
afH
afH
@@ -56135,6 +56091,13 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56150,22 +56113,15 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56194,6 +56150,39 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56203,43 +56192,10 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+baU
+aah
+aah
auD
aud
aud
@@ -56278,6 +56234,10 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56295,19 +56255,15 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56336,6 +56292,37 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56348,40 +56335,9 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+aah
+aah
auD
aud
aud
@@ -56421,6 +56377,10 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56438,17 +56398,13 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56480,6 +56436,34 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56494,36 +56478,8 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+baU
+aah
auD
aud
aud
@@ -56564,6 +56520,9 @@ aad
aad
aad
aad
+aah
+aah
+aah
aad
aad
aad
@@ -56582,14 +56541,11 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56625,6 +56581,30 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56641,31 +56621,7 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
auD
aud
aud
@@ -56707,8 +56663,8 @@ aad
aad
aad
aad
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -56768,6 +56724,28 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56785,29 +56763,7 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
auD
aud
aud
@@ -56911,6 +56867,26 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -56929,27 +56905,7 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
auD
afH
afH
@@ -57054,23 +57010,23 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -57091,7 +57047,7 @@ aad
aad
aad
aad
-aad
+aah
auD
aud
aud
@@ -57197,21 +57153,21 @@ aad
aad
aad
aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
aad
aad
aad
@@ -57341,15 +57297,15 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -57484,12 +57440,12 @@ aad
aad
aad
aad
-aad
-aad
-aad
-aad
-aad
-aad
+aah
+aah
+aah
+aah
+aah
+aah
aad
aad
aad
@@ -57613,7 +57569,7 @@ aaa
aad
aad
aad
-aad
+ajK
aad
aad
aad
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index e8fb87c222..60bdcc9087 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -1032,10 +1032,6 @@
/obj/structure/bed/chair{
dir = 4
},
-/obj/structure/cable/green{
- d2 = 4;
- icon_state = "0-4"
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
@@ -1993,9 +1989,6 @@
/area/tether/surfacebase/medical/resleeving)
"acY" = (
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -3141,6 +3134,7 @@
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 4
},
+/obj/machinery/vending/fitness,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"aeS" = (
@@ -3153,9 +3147,7 @@
/obj/effect/floor_decal/corner/red/border{
dir = 5
},
-/obj/machinery/vending/coffee{
- dir = 8
- },
+/obj/machinery/vending/coffee,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"aeT" = (
@@ -3676,9 +3668,6 @@
/obj/effect/floor_decal/corner/red/border{
dir = 4
},
-/obj/machinery/vending/fitness{
- dir = 4
- },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"afH" = (
@@ -3779,7 +3768,6 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/outfitting)
"afL" = (
-/obj/structure/closet/wardrobe/red,
/obj/effect/floor_decal/borderfloorblack{
dir = 1
},
@@ -3791,6 +3779,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/vending/wardrobe/detdrobe,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/outfitting)
"afM" = (
@@ -3800,7 +3789,6 @@
/obj/effect/floor_decal/corner/red/border{
dir = 5
},
-/obj/structure/closet/wardrobe/red,
/obj/machinery/camera/network/security,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/effect/floor_decal/borderfloorblack/corner2{
@@ -3809,6 +3797,7 @@
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 5
},
+/obj/machinery/vending/wardrobe/secdrobe,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/outfitting)
"afN" = (
@@ -4202,6 +4191,7 @@
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
+/obj/structure/table/bench/steel,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"agy" = (
@@ -4214,9 +4204,7 @@
/obj/effect/floor_decal/corner/red/border{
dir = 6
},
-/obj/machinery/vending/snack{
- dir = 8
- },
+/obj/structure/table/bench/steel,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"agz" = (
@@ -4301,9 +4289,6 @@
name = "Equipment Storage";
req_access = newlist()
},
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/machinery/door/firedoor,
/obj/structure/cable/green{
d1 = 4;
@@ -5669,9 +5654,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 8
},
@@ -5681,6 +5663,9 @@
dir = 8
},
/obj/structure/sign/poster,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"aiO" = (
@@ -6723,7 +6708,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/machinery/vending/coffee,
+/obj/machinery/vending/sol,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"akB" = (
@@ -6739,7 +6724,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/obj/machinery/vending/sol,
+/obj/machinery/vending/wardrobe/virodrobe,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"akC" = (
@@ -6749,6 +6734,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/vending/wardrobe/medidrobe,
+/obj/effect/floor_decal/corner/paleblue{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/paleblue{
+ dir = 6
+ },
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"akD" = (
@@ -6762,6 +6754,13 @@
dir = 1;
pixel_y = 32
},
+/obj/machinery/vending/wardrobe/chemdrobe,
+/obj/effect/floor_decal/corner/paleblue{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/paleblue{
+ dir = 6
+ },
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"akE" = (
@@ -7387,11 +7386,6 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/armory)
"alv" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/valve/digital{
dir = 4;
name = "scrubber isolation valve"
@@ -10036,9 +10030,6 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -10048,6 +10039,9 @@
/obj/effect/floor_decal/corner/red/bordercorner{
dir = 8
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"apI" = (
@@ -12639,6 +12633,10 @@
/obj/effect/floor_decal/corner/lime/border{
dir = 10
},
+/obj/structure/sink/kitchen{
+ dir = 8;
+ pixel_x = -11
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_two)
"auj" = (
@@ -13187,6 +13185,7 @@
/obj/machinery/recharger,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/random/drinkbottle,
+/obj/item/device/paicard,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/bar)
"avg" = (
@@ -20630,11 +20629,6 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/public_garden_maintenence/upper)
"aKk" = (
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
req_one_access = list(11,24,47)
@@ -21339,11 +21333,6 @@
/turf/simulated/floor,
/area/maintenance/substation/research)
"aLE" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
req_one_access = list(11,24,47)
@@ -21517,10 +21506,6 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
@@ -22087,10 +22072,10 @@
/area/rnd/lockers)
"aMZ" = (
/obj/effect/floor_decal/industrial/outline,
-/obj/structure/closet/wardrobe/science_white,
/obj/machinery/light{
dir = 1
},
+/obj/machinery/vending/wardrobe/robodrobe,
/turf/simulated/floor/tiled/dark,
/area/rnd/lockers)
"aNa" = (
@@ -24701,8 +24686,8 @@
/obj/effect/floor_decal/corner/yellow/border{
dir = 9
},
-/obj/structure/closet/secure_closet/atmos_personal,
/obj/machinery/camera/network/engineering,
+/obj/machinery/vending/wardrobe/atmosdrobe,
/turf/simulated/floor/tiled,
/area/engineering/lower/atmos_lockers)
"aRV" = (
@@ -26101,9 +26086,6 @@
/obj/effect/floor_decal/corner/purple{
dir = 5
},
-/obj/structure/mopbucket,
-/obj/item/weapon/mop,
-/obj/item/weapon/reagent_containers/glass/bucket,
/obj/effect/floor_decal/borderfloor/shifted{
dir = 1
},
@@ -26111,6 +26093,7 @@
dir = 1
},
/obj/machinery/camera/network/civilian,
+/obj/structure/closet/jcloset,
/turf/simulated/floor/tiled,
/area/janitor)
"aUM" = (
@@ -26126,9 +26109,7 @@
/obj/effect/floor_decal/corner/purple{
dir = 5
},
-/obj/structure/mopbucket,
-/obj/item/weapon/mop,
-/obj/item/weapon/reagent_containers/glass/bucket,
+/obj/machinery/vending/wardrobe/janidrobe,
/turf/simulated/floor/tiled,
/area/janitor)
"aUN" = (
@@ -26150,9 +26131,6 @@
/obj/effect/floor_decal/corner/purple{
dir = 5
},
-/obj/structure/mopbucket,
-/obj/item/weapon/mop,
-/obj/item/weapon/reagent_containers/glass/bucket,
/turf/simulated/floor/tiled,
/area/janitor)
"aUO" = (
@@ -27824,6 +27802,9 @@
/obj/item/weapon/reagent_containers/spray/cleaner,
/obj/item/weapon/reagent_containers/spray/cleaner,
/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/soap/nanotrasen,
+/obj/item/weapon/soap/nanotrasen,
+/obj/item/weapon/soap/nanotrasen,
/turf/simulated/floor/tiled,
/area/janitor)
"aXT" = (
@@ -28129,23 +28110,26 @@
/obj/effect/floor_decal/corner/purple/bordercorner2{
dir = 8
},
-/obj/structure/closet/jcloset,
-/obj/item/weapon/soap/nanotrasen,
+/obj/structure/mopbucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/reagent_containers/glass/bucket,
/turf/simulated/floor/tiled,
/area/janitor)
"aYA" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
-/obj/structure/closet/jcloset,
-/obj/item/weapon/soap/nanotrasen,
/obj/machinery/light,
+/obj/structure/mopbucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/reagent_containers/glass/bucket,
/turf/simulated/floor/tiled,
/area/janitor)
"aYB" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
-/obj/structure/closet/jcloset,
-/obj/item/weapon/soap/nanotrasen,
+/obj/structure/mopbucket,
+/obj/item/weapon/mop,
+/obj/item/weapon/reagent_containers/glass/bucket,
/turf/simulated/floor/tiled,
/area/janitor)
"aYC" = (
@@ -29434,11 +29418,10 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/atmos)
"bda" = (
-/obj/structure/catwalk,
/obj/structure/cable{
- icon_state = "2-4"
+ icon_state = "0-4"
},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/south)
"bdb" = (
/obj/structure/cable{
@@ -29649,11 +29632,6 @@
dir = 4
},
/obj/random/junk,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"bdw" = (
@@ -29670,11 +29648,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"bdx" = (
@@ -29688,11 +29661,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"bdy" = (
@@ -29719,11 +29687,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 4
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
/turf/simulated/floor/plating,
/area/maintenance/lower/south)
"bdA" = (
@@ -29932,8 +29895,7 @@
/area/rnd/outpost/xenobiology/outpost_slimepens)
"bem" = (
/obj/structure/sink/kitchen{
- name = "sink";
- pixel_y = 32
+ pixel_y = 20
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_slimepens)
@@ -31016,6 +30978,7 @@
/obj/structure/sign/painting/public{
pixel_x = -30
},
+/obj/item/device/paicard,
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
"biK" = (
@@ -31586,6 +31549,7 @@
pixel_x = -23
},
/obj/random/junk,
+/obj/item/device/paicard,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"bkE" = (
@@ -33925,10 +33889,6 @@
nightshift_setting = 2;
pixel_y = 28
},
-/obj/structure/cable/cyan{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/structure/cable/cyan{
d2 = 4;
icon_state = "0-4"
@@ -34082,6 +34042,11 @@
"qSJ" = (
/turf/simulated/floor/tiled/techmaint,
/area/ai)
+"qUf" = (
+/obj/effect/floor_decal/industrial/outline,
+/obj/machinery/vending/wardrobe/scidrobe,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/lockers)
"rbq" = (
/obj/structure/disposalpipe/segment,
/obj/structure/sign/painting/chapel_secure{
@@ -34137,6 +34102,10 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_cyborg_station)
+"rAv" = (
+/obj/machinery/vending/wardrobe/chapdrobe,
+/turf/simulated/floor/lino,
+/area/chapel/office)
"rJc" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/effect/landmark/start{
@@ -35139,41 +35108,41 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35282,40 +35251,40 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35428,36 +35397,36 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35572,35 +35541,35 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35698,6 +35667,8 @@ aab
aab
aab
aab
+adt
+adt
aab
aab
aab
@@ -35714,35 +35685,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35837,6 +35806,14 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35851,41 +35828,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35979,6 +35948,15 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -35992,42 +35970,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36120,6 +36089,16 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36134,42 +36113,32 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36262,6 +36231,16 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36276,43 +36255,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36404,6 +36373,17 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36418,43 +36398,32 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36546,6 +36515,17 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36560,43 +36540,32 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36688,6 +36657,18 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36702,43 +36683,31 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36830,6 +36799,19 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36842,6 +36824,32 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36855,52 +36863,13 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36973,6 +36942,18 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36985,6 +36966,33 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -36995,56 +37003,17 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37115,6 +37084,19 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37125,69 +37107,56 @@ aab
aab
aab
aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
aab
aab
+adt
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37258,79 +37227,79 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+aab
+aab
+aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37401,78 +37370,78 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37549,73 +37518,73 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37692,37 +37661,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
adt
adt
-aab
adt
adt
-aab
-aab
-aab
-aab
-aab
adt
adt
aab
@@ -37731,34 +37673,61 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37834,21 +37803,12 @@ arj
arj
arj
aab
-aab
-aab
-aab
-aab
-aab
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37869,38 +37829,47 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -37987,11 +37956,6 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
adt
adt
adt
@@ -38013,36 +37977,41 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -38129,7 +38098,6 @@ adt
adt
adt
adt
-aab
adt
adt
adt
@@ -38155,8 +38123,6 @@ adt
adt
adt
adt
-aab
-aab
adt
adt
adt
@@ -38164,27 +38130,30 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -38307,26 +38276,26 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -38452,21 +38421,21 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -38594,21 +38563,21 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -38736,20 +38705,20 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -38878,16 +38847,16 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -39021,14 +38990,14 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -39163,13 +39132,13 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -39234,7 +39203,7 @@ aab
aab
aab
aab
-aab
+adt
adt
adt
adt
@@ -39305,12 +39274,12 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -39375,7 +39344,7 @@ aab
aab
aab
aab
-aab
+adt
adt
adt
adt
@@ -39447,12 +39416,12 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -39516,8 +39485,8 @@ aab
aab
aab
aab
-aab
-aab
+adt
+adt
adt
adt
adt
@@ -39589,11 +39558,11 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -39656,10 +39625,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -39731,10 +39700,10 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -39797,11 +39766,11 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-abn
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -39873,9 +39842,9 @@ adt
adt
adt
adt
-aab
-aab
-aab
+adt
+adt
+adt
aab
aab
aab
@@ -39937,12 +39906,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
abn
+abn
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -40015,8 +39984,8 @@ adt
adt
adt
adt
-aab
-aab
+adt
+adt
aab
aab
aab
@@ -40077,15 +40046,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -40157,7 +40126,7 @@ adt
adt
adt
adt
-aab
+adt
aab
aab
aab
@@ -40218,15 +40187,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -40358,17 +40327,17 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -40499,18 +40468,18 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -40641,16 +40610,6 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
abn
abn
@@ -40663,6 +40622,16 @@ adt
adt
adt
adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
akX
akX
aoi
@@ -40783,16 +40752,6 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-abn
-abn
-abn
abn
abn
abn
@@ -40806,6 +40765,16 @@ adt
adt
adt
adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
akX
akX
apu
@@ -40924,18 +40893,6 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-abn
-abn
-abn
-abn
-abn
abn
abn
adt
@@ -40949,6 +40906,18 @@ adt
adt
adt
adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
akX
akX
aqB
@@ -41066,18 +41035,6 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-abn
-abn
-abn
-abn
-abn
-abn
abn
abn
adt
@@ -41087,6 +41044,18 @@ adt
adt
adt
adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
ajV
ajV
ajV
@@ -41149,7 +41118,7 @@ adt
adt
adt
adt
-aab
+adt
aab
aab
aab
@@ -41208,15 +41177,11 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-abn
-abn
-abn
+abn
+abn
+abn
+adt
+adt
abn
abn
abn
@@ -41229,6 +41194,10 @@ adt
adt
adt
adt
+adt
+adt
+adt
+adt
ajV
akZ
ame
@@ -41291,8 +41260,8 @@ adt
adt
adt
adt
-aab
-aab
+adt
+adt
aab
aab
aab
@@ -41350,12 +41319,6 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
abn
abn
@@ -41363,6 +41326,12 @@ abn
abn
abn
abn
+abn
+abn
+abn
+abn
+adt
+adt
adt
adt
adt
@@ -41433,10 +41402,10 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -41492,12 +41461,6 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
abn
abn
@@ -41505,6 +41468,12 @@ abn
abn
abn
abn
+abn
+abn
+abn
+abn
+abn
+adt
adt
adt
adt
@@ -41576,9 +41545,9 @@ adt
adt
adt
adt
-aab
-aab
-aab
+adt
+adt
+adt
aab
aab
aab
@@ -41634,12 +41603,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
abn
abn
abn
@@ -41719,9 +41688,9 @@ adt
adt
adt
adt
-aab
-aab
-aab
+adt
+adt
+abn
aab
aab
aab
@@ -41777,11 +41746,11 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
abn
abn
abn
@@ -41861,11 +41830,11 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -41920,10 +41889,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
abn
abn
abn
@@ -42003,28 +41972,28 @@ adt
adt
adt
adt
-adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42062,10 +42031,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
abn
abn
abn
@@ -42146,28 +42115,28 @@ aHE
adt
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42205,10 +42174,10 @@ aab
aab
aab
aab
+abn
+abn
aab
-aab
-aab
-aab
+abn
abn
abn
abn
@@ -42289,6 +42258,17 @@ adt
abn
abn
abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42296,21 +42276,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42347,8 +42316,8 @@ aab
aab
aab
aab
-aab
-aab
+abn
+abn
aab
aab
aab
@@ -42431,6 +42400,15 @@ adt
abn
abn
abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42441,18 +42419,9 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
aab
aab
aab
@@ -42490,12 +42459,12 @@ aab
aab
aab
aab
+abn
aab
aab
aab
aab
-aab
-aab
+abn
abn
acn
acQ
@@ -42573,6 +42542,13 @@ adt
abn
abn
abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42586,16 +42562,9 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
aab
aab
aab
@@ -42637,8 +42606,8 @@ aab
aab
aab
aab
-aab
-aab
+abn
+abn
acn
acR
adA
@@ -42721,10 +42690,6 @@ aHE
adt
adt
adt
-adt
-aab
-aab
-aab
aab
aab
aab
@@ -42739,6 +42704,10 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42780,7 +42749,7 @@ aab
aab
aab
aab
-aab
+abn
acm
acm
acm
@@ -42877,10 +42846,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -42922,7 +42891,7 @@ aab
aab
aab
aab
-aab
+abn
aco
acS
adB
@@ -43020,9 +42989,9 @@ aab
aab
aab
aab
-aab
-aab
-aab
+abn
+abn
+abn
aab
aab
aab
@@ -43116,7 +43085,7 @@ aKi
aKV
aLC
aMo
-aMY
+qUf
aNx
aOn
aMo
@@ -43162,9 +43131,9 @@ aab
aab
aab
aab
-aab
-aab
-aab
+abn
+abn
+abn
aab
aab
aab
@@ -43303,19 +43272,19 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
aab
aab
aab
@@ -43444,21 +43413,21 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
aab
aab
aab
@@ -43589,20 +43558,20 @@ adt
adt
abn
abn
+abn
+abn
+abn
+abn
aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+adt
+adt
aab
aab
aab
@@ -43731,21 +43700,21 @@ adt
adt
abn
abn
+abn
+abn
+abn
+abn
+abn
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -43873,21 +43842,21 @@ adt
adt
adt
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -44016,21 +43985,21 @@ adt
adt
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -44161,18 +44130,18 @@ baz
bkU
bkU
baz
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -44303,18 +44272,18 @@ aNp
baW
blu
blR
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -44445,19 +44414,19 @@ baW
baW
blu
blR
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
aab
aab
aab
@@ -44587,19 +44556,19 @@ baz
baW
aNq
baz
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
aab
aab
aab
@@ -44732,16 +44701,16 @@ baz
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -44874,15 +44843,15 @@ baz
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -45017,14 +44986,14 @@ adt
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -45158,14 +45127,14 @@ baz
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -45300,14 +45269,14 @@ baz
adt
adt
adt
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
aab
aab
aab
@@ -45336,8 +45305,8 @@ aab
aab
aab
aab
-aac
-aac
+ael
+ael
aab
aab
ael
@@ -45441,8 +45410,8 @@ baW
baz
adt
adt
-aab
-aab
+adt
+adt
aab
aab
aab
@@ -45478,8 +45447,8 @@ aab
aab
aab
aab
-aac
-aac
+ael
+ael
aab
aab
ael
@@ -45583,7 +45552,7 @@ baW
baz
adt
adt
-adt
+aab
aab
aab
aab
@@ -45724,8 +45693,8 @@ bgx
bgx
baz
adt
-adt
-adt
+aab
+aab
aab
aab
aab
@@ -48401,7 +48370,7 @@ aLY
adt
adt
aLY
-bdy
+awg
aLY
aLY
adt
@@ -48543,7 +48512,7 @@ aLY
aLY
aLY
aLY
-bdy
+awg
aLY
adt
adt
@@ -48684,7 +48653,7 @@ aLY
aLY
bcy
bcK
-bda
+aLX
bdz
aLY
adt
@@ -48826,7 +48795,7 @@ aLX
baZ
aLX
aIl
-bdb
+bda
bdA
aLY
adt
@@ -48884,10 +48853,10 @@ aab
aab
aab
aab
+aab
+aab
aeG
aeG
-aeG
-abn
adf
adN
aev
@@ -49027,9 +48996,9 @@ aab
aab
aab
aab
+aab
+aeG
aeG
-abn
-abn
adf
adO
aew
@@ -49169,9 +49138,9 @@ aab
aab
aab
aab
+aab
+aeG
aeG
-abn
-abn
adf
adP
aex
@@ -49311,9 +49280,9 @@ aab
aab
aab
aab
+aab
aeG
aeG
-abn
aeZ
aeZ
aeZ
@@ -49453,9 +49422,9 @@ aab
aab
aab
aab
+aab
aeG
aeG
-abn
adg
adQ
aey
@@ -49595,9 +49564,9 @@ aab
aab
aab
aab
+abn
+aeG
aeG
-abn
-abn
adg
adR
aez
@@ -49736,10 +49705,10 @@ aab
aab
aab
aab
-aab
-aeG
-aeG
abn
+abn
+abn
+aeG
adg
adS
aeA
@@ -49871,17 +49840,17 @@ aab
aab
aab
aab
+abn
+abn
aab
aab
aab
aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
aeG
-abn
-abn
acC
acC
acC
@@ -49927,7 +49896,7 @@ sVf
aIA
aGR
aJw
-aJU
+rAv
aJU
aLo
aLV
@@ -49985,7 +49954,7 @@ kEg
pBU
adt
adt
-aab
+adt
aab
aab
aab
@@ -50012,18 +49981,18 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aeG
-aeG
abn
+abn
+abn
+abn
+abn
+aab
+abn
+abn
+abn
+abn
+abn
+aeG
adm
adp
aec
@@ -50127,8 +50096,8 @@ kAa
pBU
adt
adt
-aab
-aab
+adt
+adt
aab
aab
aab
@@ -50154,17 +50123,17 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aeG
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aeG
adm
adq
@@ -50269,10 +50238,10 @@ pBU
pBU
adt
adt
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+abn
aab
aab
aab
@@ -50296,17 +50265,17 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aeG
adm
adT
@@ -50410,13 +50379,13 @@ blh
blh
blh
blh
+adt
+adt
+adt
+abn
+abn
+abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
aab
aab
aab
@@ -50438,18 +50407,18 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
adi
adi
adi
@@ -50552,14 +50521,14 @@ blh
aBU
aBU
blh
+adt
+adt
+abn
+abn
+abn
+abn
+abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
aab
aab
aab
@@ -50580,18 +50549,18 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
ado
adU
aeC
@@ -50695,14 +50664,14 @@ blG
blG
blh
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -50724,16 +50693,16 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
ado
aav
aeD
@@ -50836,15 +50805,15 @@ bli
blG
blG
bmb
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -50867,15 +50836,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
ado
aaw
aeE
@@ -50978,15 +50947,15 @@ blj
blH
blS
bmb
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51009,15 +50978,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
ado
aak
aaA
@@ -51097,7 +51066,7 @@ adt
adt
adt
adt
-adt
+abn
abn
abn
abn
@@ -51120,16 +51089,16 @@ blk
blG
blT
bmb
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51151,15 +51120,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
adi
adi
adi
@@ -51226,9 +51195,8 @@ adt
adt
adt
adt
-adt
-adt
-adt
+abn
+abn
adt
adt
adt
@@ -51242,7 +51210,8 @@ adt
abn
abn
abn
-adt
+abn
+abn
adt
abn
abn
@@ -51262,15 +51231,15 @@ blh
blI
blh
blh
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51291,22 +51260,22 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-adt
-adt
-adt
-adt
+aeG
+abn
ahN
aiD
ajA
@@ -51369,6 +51338,8 @@ adt
abn
abn
abn
+abn
+abn
adt
adt
adt
@@ -51378,10 +51349,8 @@ adt
adt
adt
adt
-adt
-aab
-aab
-aab
+abn
+abn
abn
abn
abn
@@ -51403,16 +51372,16 @@ bgU
abn
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51433,22 +51402,22 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-adt
-adt
-adt
-adt
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aeG
+aeG
+aeG
+aeG
+aeG
+abn
ahN
aiD
ajB
@@ -51514,17 +51483,17 @@ abn
abn
abn
abn
-abn
-abn
-abn
-aab
adt
adt
adt
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
aeG
aeG
aeG
@@ -51544,16 +51513,16 @@ bil
bgU
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51574,23 +51543,23 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+adt
+adt
+abn
+abn
adt
adt
adt
adt
+abn
+abn
+abn
+abn
+abn
+adt
ahN
alH
ajD
@@ -51657,16 +51626,16 @@ aab
aab
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51686,16 +51655,16 @@ bjj
bgU
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51716,19 +51685,19 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -51751,8 +51720,8 @@ avg
avP
awv
ard
-aab
-aab
+abn
+abn
abn
abn
abn
@@ -51797,17 +51766,17 @@ abn
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+adt
+adt
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51827,16 +51796,16 @@ abn
abn
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51858,19 +51827,19 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -51893,9 +51862,9 @@ atq
atq
ard
ard
-aab
-aab
-aab
+abn
+abn
+abn
abn
abn
abn
@@ -51939,16 +51908,16 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51965,17 +51934,17 @@ abn
abn
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -51999,21 +51968,21 @@ aaa
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -52028,15 +51997,15 @@ ahN
ahN
ahN
ahN
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52081,6 +52050,15 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52096,25 +52074,16 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52141,23 +52110,31 @@ aaa
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
adt
adt
adt
@@ -52168,15 +52145,7 @@ abn
abn
abn
abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
aab
aab
aab
@@ -52224,6 +52193,14 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52239,23 +52216,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52283,54 +52252,56 @@ aaa
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-abn
-abn
-abn
-abn
-abn
-abn
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
abn
abn
abn
adt
adt
adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+abn
+abn
+abn
+abn
+abn
+aeG
+abn
+abn
abn
abn
abn
@@ -52339,8 +52310,6 @@ abn
abn
abn
abn
-aac
-aac
abn
abn
abn
@@ -52367,6 +52336,13 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52382,22 +52358,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52426,39 +52395,39 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52481,8 +52450,8 @@ abn
abn
abn
abn
-aac
-aac
+abn
+abn
abn
abn
abn
@@ -52510,6 +52479,10 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52528,17 +52501,13 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52568,37 +52537,37 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52653,6 +52622,10 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52671,15 +52644,11 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52712,34 +52681,34 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52796,6 +52765,9 @@ aab
aab
aab
aab
+abn
+abn
+abn
aab
aab
aab
@@ -52816,10 +52788,7 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+abn
aab
aab
aab
@@ -52857,30 +52826,30 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -52939,8 +52908,8 @@ aab
aab
aab
aab
-aab
-aab
+abn
+abn
aab
aab
aab
@@ -53000,28 +52969,28 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -53143,26 +53112,26 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -53286,23 +53255,23 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+adt
+adt
+adt
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -53429,21 +53398,21 @@ aab
aab
aab
aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
aab
aab
aab
@@ -53573,15 +53542,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
@@ -53716,12 +53685,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+abn
+abn
+abn
+abn
+abn
+abn
aab
aab
aab
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index b5524c756a..b6eab2fc16 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -726,15 +726,15 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
"abf" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/triage)
"abg" = (
@@ -2965,6 +2965,7 @@
/obj/effect/floor_decal/corner/red/border{
dir = 1
},
+/obj/machinery/vending/wardrobe/lawdrobe,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/iaa/officecommon)
"aes" = (
@@ -8324,6 +8325,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/item/device/paicard,
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
"anb" = (
@@ -9779,6 +9781,7 @@
/obj/random/maintenance/medical,
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
+/obj/item/device/paicard,
/turf/simulated/floor/plating,
/area/tether/surfacebase/surface_three_hall)
"apA" = (
@@ -19614,7 +19617,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/obj/structure/closet/crate,
+/obj/machinery/vending/wardrobe/bardrobe,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/servicebackroom)
"aGf" = (
@@ -22282,7 +22285,6 @@
req_one_access = list(5,47)
},
/obj/machinery/door/firedoor,
-/obj/structure/disposalpipe/segment,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -23213,14 +23215,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/button/remote/blast_door{
- id = "mechbay-inner";
- name = "Mech Bay";
- pixel_x = 26;
- pixel_y = -26;
- req_access = list(29,47);
- req_one_access = list(47)
- },
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/robotics)
"aMv" = (
@@ -23232,6 +23226,24 @@
id = "mechbay-inner";
name = "Mech Bay"
},
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ id = "mechbay";
+ name = "Mech Bay";
+ pixel_x = 5;
+ pixel_y = -29;
+ req_access = list(29,47);
+ req_one_access = list(47)
+ },
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "mechbay-inner";
+ name = "Mech Bay";
+ pixel_x = -5;
+ pixel_y = -28;
+ req_access = list(29,47);
+ req_one_access = list(47)
+ },
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/robotics/mechbay)
"aMw" = (
@@ -23257,14 +23269,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/obj/machinery/button/remote/blast_door{
- id = "mechbay-inner";
- name = "Mech Bay";
- pixel_x = -26;
- pixel_y = -26;
- req_access = list(29,47);
- req_one_access = list(47)
- },
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/robotics/mechbay)
"aMy" = (
@@ -26724,7 +26728,7 @@
id = "hop_office"
},
/obj/structure/cable/green{
- dir = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/crew_quarters/heads/hop)
@@ -26740,7 +26744,7 @@
},
/obj/structure/cable/green,
/obj/structure/cable/green{
- dir = 1
+ icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/crew_quarters/heads/hop)
@@ -28783,9 +28787,6 @@
dir = 4;
pixel_x = -30
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
@@ -28800,6 +28801,9 @@
id = "surfsurgery2";
pixel_x = -22
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/surgery2)
"aXd" = (
@@ -30729,6 +30733,11 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/hop)
"bap" = (
@@ -31445,6 +31454,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
+/obj/machinery/vending/wardrobe/chefdrobe,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/servicebackroom)
"bbC" = (
@@ -38289,10 +38299,11 @@
req_one_access = list(47)
},
/obj/machinery/button/remote/blast_door{
+ dir = 1;
id = "mechbay";
name = "Mech Bay";
- pixel_x = 27;
- pixel_y = 6;
+ pixel_x = 28;
+ pixel_y = 5;
req_access = list(29,47);
req_one_access = list(47)
},
@@ -38403,6 +38414,12 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/cafeteria)
+"dAe" = (
+/obj/machinery/door/firedoor/glass/hidden/steel{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
"dDQ" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39047,6 +39064,12 @@
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
+"gCV" = (
+/obj/machinery/door/firedoor/glass/hidden/steel{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
"gHh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 10
@@ -39311,6 +39334,17 @@
},
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
+"hHL" = (
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/glass/hidden/steel{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
"hId" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
@@ -40219,6 +40253,16 @@
/obj/machinery/light/bigfloorlamp,
/turf/simulated/floor/grass,
/area/tether/surfacebase/public_garden_three)
+"kPC" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lime/border{
+ dir = 1
+ },
+/obj/machinery/vending/wardrobe/hydrobe,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/botanystorage)
"kQb" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -40410,6 +40454,13 @@
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/crew_quarters/recreation_area)
+"ltu" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing,
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/tether/surfacebase/outside/outside3)
"lvH" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/mauve/border,
@@ -40490,6 +40541,11 @@
},
/turf/simulated/floor/carpet,
/area/tether/surfacebase/security/hos)
+"lHr" = (
+/obj/structure/table/woodentable,
+/obj/item/device/paicard,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/entertainment)
"lIe" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -41670,6 +41726,17 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/southhall)
+"qcV" = (
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/glass/hidden/steel{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
"qda" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/structure/bed/chair{
@@ -41827,6 +41894,12 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
+"qAB" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/tether/surfacebase/outside/outside3)
"qDF" = (
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
@@ -44152,41 +44225,41 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -44295,40 +44368,40 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -44441,36 +44514,36 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -44585,35 +44658,35 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -44711,6 +44784,8 @@ aab
aab
aab
aab
+aac
+aac
aab
aab
aab
@@ -44727,35 +44802,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -44850,6 +44923,14 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -44864,41 +44945,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -44992,6 +45065,15 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45005,42 +45087,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45133,6 +45206,16 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45147,42 +45230,32 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45275,6 +45348,16 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45289,43 +45372,33 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45417,6 +45490,17 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45431,43 +45515,32 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45559,6 +45632,17 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45573,43 +45657,32 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45701,6 +45774,18 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45715,43 +45800,31 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45843,6 +45916,19 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45855,6 +45941,32 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45868,52 +45980,13 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45986,6 +46059,18 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -45998,6 +46083,33 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46008,56 +46120,17 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46128,6 +46201,19 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46138,69 +46224,56 @@ aab
aab
aab
aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
aab
aab
+aac
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46271,79 +46344,79 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aab
+aab
+aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46414,78 +46487,78 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46562,73 +46635,73 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aab
+aab
+aab
+aab
+aab
+aab
+aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46705,37 +46778,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
aac
aac
-aab
aac
aac
-aab
-aab
-aab
-aab
-aab
aac
aac
aab
@@ -46744,34 +46790,61 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46847,21 +46920,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -46882,38 +46946,47 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -47000,11 +47073,6 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
aac
aac
aac
@@ -47026,36 +47094,41 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -47142,7 +47215,6 @@ aac
aac
aac
aac
-aab
aac
aac
aac
@@ -47168,8 +47240,6 @@ aac
aac
aac
aac
-aab
-aab
aac
aac
aac
@@ -47177,27 +47247,30 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -47320,26 +47393,26 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -47465,21 +47538,21 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -47607,21 +47680,21 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -47749,20 +47822,20 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -47891,16 +47964,16 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -48034,14 +48107,14 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -48176,13 +48249,13 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aMG
@@ -48318,12 +48391,12 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aOm
@@ -48460,12 +48533,12 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aOm
@@ -48602,11 +48675,11 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -48669,7 +48742,7 @@ aab
aab
aab
aab
-aab
+aac
aac
aac
aac
@@ -48744,10 +48817,10 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -48810,8 +48883,8 @@ aab
aab
aab
aab
-aab
-aab
+aac
+aac
aac
aac
aac
@@ -48886,9 +48959,9 @@ aac
aac
aac
aac
-aab
-aab
-aab
+aac
+aac
+aac
aab
aab
aab
@@ -48952,8 +49025,8 @@ aab
aab
aab
aab
-aab
-aab
+aac
+aac
aac
aac
aac
@@ -49028,8 +49101,8 @@ aac
aac
aac
aac
-aMG
-aMG
+aac
+aac
aMG
aMG
aMG
@@ -49093,9 +49166,9 @@ aab
aab
aab
aab
-aab
-aab
-aab
+aac
+aac
+aac
aac
aac
aac
@@ -49170,8 +49243,8 @@ aac
aac
aac
aaq
-adG
-adG
+aac
+aaq
adG
adG
adG
@@ -49234,10 +49307,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -49375,11 +49448,11 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -49516,12 +49589,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -49657,13 +49730,13 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -49799,13 +49872,13 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -49939,15 +50012,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -50081,15 +50154,15 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -50224,14 +50297,14 @@ aab
aab
aab
aab
+aac
+aac
aab
aab
aab
aab
aab
-aab
-aab
-aab
+aac
aac
aac
aac
@@ -52614,8 +52687,8 @@ aab
aab
aab
aab
-aab
-aab
+aac
+aac
aab
aab
aab
@@ -52755,10 +52828,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -52897,10 +52970,10 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -53038,12 +53111,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -53180,12 +53253,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -53322,12 +53395,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -53458,19 +53531,19 @@ aac
aac
aac
aac
+aab
+aab
+aab
+aab
+aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
aab
aab
aab
@@ -53600,19 +53673,19 @@ aac
aac
aac
aac
+aab
+aab
+aab
+aab
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
aab
aab
aab
@@ -53745,16 +53818,16 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -53887,15 +53960,15 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -54030,14 +54103,14 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -54171,14 +54244,14 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -54313,14 +54386,14 @@ aac
aac
aac
aac
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -54454,8 +54527,8 @@ aac
aac
aac
aac
-aab
-aab
+aac
+aac
aab
aab
aab
@@ -54596,7 +54669,7 @@ aac
aac
aac
aac
-aac
+aab
aab
aab
aab
@@ -54737,8 +54810,8 @@ aac
aac
aac
aac
-aac
-aac
+aab
+aab
aab
aab
aab
@@ -55446,10 +55519,10 @@ bip
biz
bhE
aac
-aac
aab
aMG
aMG
+aMG
aab
aab
aab
@@ -56556,8 +56629,8 @@ aKj
aKj
aKj
aKf
-aKg
-cdv
+gCV
+hHL
aKf
aNX
aKj
@@ -57124,8 +57197,8 @@ aKj
aKj
aNj
aKf
-cdv
-aKg
+qcV
+dAe
aKf
aKj
aKj
@@ -57392,7 +57465,7 @@ bdq
bbk
bbk
beS
-beX
+lHr
beX
bcM
bco
@@ -57614,7 +57687,7 @@ aab
aab
aab
aaq
-aaU
+bow
ajG
ajG
aar
@@ -57756,8 +57829,8 @@ aab
aab
aab
aaq
-aac
-aaU
+aaq
+bow
ajG
aaq
uWw
@@ -57896,10 +57969,10 @@ aab
aab
aab
aab
-aaq
-aaq
-aac
-abn
+aab
+aab
+aab
+aOm
ajG
aaq
acy
@@ -58038,10 +58111,10 @@ aab
aab
aab
aab
-aaq
-aaq
-aaq
-abn
+aab
+aab
+aab
+aOm
ajG
aaq
acy
@@ -58180,10 +58253,10 @@ aab
aab
aab
aab
-aaq
-aac
-aaq
-abn
+aab
+aab
+aab
+aOm
ajG
aaq
uWw
@@ -58322,10 +58395,10 @@ aab
aab
aab
aab
-aaq
-aac
-aac
-abn
+aab
+aab
+aab
+aOm
ajG
aaq
uWw
@@ -58464,10 +58537,10 @@ aab
aab
aab
aab
-aaq
-aac
-aac
-bou
+aab
+aab
+aab
+aOm
ajG
oJw
acy
@@ -58606,10 +58679,10 @@ aab
aab
aab
aab
-aaq
-aaq
-aac
-abn
+aab
+aab
+aab
+aOm
ajG
aaz
aaB
@@ -58750,8 +58823,8 @@ aab
aab
aab
aab
-aac
-abn
+aab
+aOm
ajG
iUu
aaC
@@ -58893,7 +58966,7 @@ aab
aab
aab
aab
-abn
+aOm
ajG
aaz
aaD
@@ -60590,14 +60663,14 @@ aab
aab
aab
aab
+aac
+aac
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
aab
aab
aac
@@ -60731,17 +60804,17 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aaq
@@ -60873,17 +60946,17 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -60936,7 +61009,7 @@ aUh
aoJ
aGe
aGJ
-aAb
+aFM
aJt
aVC
aXN
@@ -61014,19 +61087,19 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
aac
aac
@@ -61078,7 +61151,7 @@ aoJ
aoJ
bbv
bcC
-aAb
+aFM
aJt
aJt
aJt
@@ -61156,21 +61229,21 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aac
abn
ajG
@@ -61299,26 +61372,26 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aOm
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+abn
+ajG
+ajG
+ajG
ajG
-adG
-adG
-adG
ajG
afS
aje
@@ -61442,25 +61515,25 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aNM
-aNM
-aNM
-aNW
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+qAB
+qAB
+qAB
+ltu
ajG
afS
afS
@@ -61587,22 +61660,22 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aOm
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+abn
ajG
ajG
ajG
@@ -61626,7 +61699,7 @@ aAH
aBm
aBM
ayg
-aAK
+kPC
aEm
aEF
aFg
@@ -61730,24 +61803,24 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aNM
-aNM
-aNW
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+qAB
+qAB
+ltu
amt
anO
aoR
@@ -61874,21 +61947,21 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aOm
ajG
ajG
@@ -62018,18 +62091,18 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aNM
@@ -62161,12 +62234,12 @@ aab
aab
aab
aab
-aab
-aab
-aab
-aab
-aab
-aab
+aac
+aac
+aac
+aac
+aac
+aac
aab
aab
aab
@@ -62304,9 +62377,9 @@ aab
aab
aab
aab
-aab
-aab
-aab
+aac
+aac
+aac
aab
aab
aab
diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm
index c0222796c1..bb4701048b 100644
--- a/maps/tether/tether-04-transit.dmm
+++ b/maps/tether/tether-04-transit.dmm
@@ -673,6 +673,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/midpoint)
+"Ud" = (
+/obj/structure/table/woodentable,
+/obj/item/device/paicard,
+/turf/simulated/floor/midpoint_glass/reinf,
+/area/tether/midpoint)
"Ui" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -8631,7 +8636,7 @@ fI
pK
mT
ag
-tM
+Ud
dc
mT
ag
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index 0ac3f3b9de..c0c97a0ff8 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -1111,6 +1111,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/item/device/paicard,
/turf/simulated/floor/tiled,
/area/teleporter/departing)
"acc" = (
@@ -1119,12 +1120,12 @@
/obj/structure/window/reinforced/polarized/full{
id = "ce_office"
},
-/obj/structure/cable/green{
- dir = 1
- },
/obj/structure/window/reinforced{
dir = 1
},
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
/turf/simulated/floor,
/area/storage/tech)
"acd" = (
@@ -2719,11 +2720,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -6099,11 +6095,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/engineering/hallway)
@@ -6118,11 +6109,6 @@
dir = 4
},
/obj/machinery/light,
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
@@ -6138,11 +6124,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -8036,7 +8017,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/structure/closet/secure_closet/atmos_personal,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"asn" = (
@@ -8435,6 +8415,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
+/obj/machinery/vending/wardrobe/engidrobe,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"atB" = (
@@ -9251,7 +9232,6 @@
dir = 8;
pixel_x = 30
},
-/obj/structure/closet/secure_closet/atmos_personal,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"awC" = (
@@ -9409,12 +9389,10 @@
/obj/machinery/light{
dir = 1
},
-/obj/structure/closet/secure_closet/cargotech,
-/obj/item/weapon/stamp/cargo,
-/obj/item/weapon/storage/backpack/dufflebag,
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/machinery/vending/wardrobe/cargodrobe,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"awW" = (
@@ -9803,8 +9781,8 @@
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"ayg" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
@@ -10181,7 +10159,6 @@
},
/obj/effect/floor_decal/industrial/warning,
/obj/effect/floor_decal/rust,
-/obj/structure/cable,
/obj/machinery/light/small{
dir = 1
},
@@ -16102,15 +16079,14 @@
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
"coR" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
},
/turf/simulated/floor/tiled,
-/area/hallway/station/atrium)
+/area/quartermaster/belterdock)
"cpK" = (
/turf/simulated/wall/r_wall,
/area/maintenance/substation/tcomms)
@@ -16513,6 +16489,12 @@
"cHV" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"cIa" = (
@@ -16782,6 +16764,8 @@
d2 = 4;
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"cWq" = (
@@ -17463,8 +17447,12 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"dzT" = (
@@ -17715,12 +17703,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"dPx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/effect/floor_decal/borderfloor{
dir = 4
},
@@ -19858,12 +19840,6 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
@@ -22143,9 +22119,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/office)
-"isj" = (
-/turf/simulated/wall/r_wall,
-/area/engineering/locker_room)
"isr" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25395,11 +25368,6 @@
/area/tether/exploration/crew)
"lzt" = (
/obj/machinery/door/firedoor/border_only,
-/obj/structure/cable/blue{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -25936,6 +25904,7 @@
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
/obj/random/junk,
+/obj/item/device/paicard,
/turf/simulated/floor,
/area/maintenance/station/exploration)
"lVJ" = (
@@ -26399,10 +26368,6 @@
/obj/random/tech_supply,
/obj/random/tech_supply,
/obj/random/tech_supply,
-/obj/structure/cable/green{
- d2 = 2;
- icon_state = "0-2"
- },
/obj/random/tech_supply,
/turf/simulated/floor/tiled,
/area/storage/tools)
@@ -27652,6 +27617,7 @@
layer = 2.9
},
/obj/random/junk,
+/obj/item/device/paicard,
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
"nCS" = (
@@ -28744,6 +28710,12 @@
"oTk" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/brown/bordercorner,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"oTn" = (
@@ -28784,9 +28756,6 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/pathfinder_office)
"oUP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -28799,11 +28768,6 @@
req_one_access = list()
},
/obj/machinery/door/firedoor/border_only,
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/delivery)
"oWk" = (
@@ -29342,6 +29306,12 @@
/obj/machinery/hologram/holopad,
/turf/simulated/floor/wood,
/area/quartermaster/qm)
+"pJT" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/belterdock)
"pKC" = (
/turf/simulated/wall,
/area/janitor)
@@ -31191,28 +31161,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
-"rQf" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/quartermaster/foyer)
"rQq" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -31667,6 +31615,12 @@
pixel_x = -13;
pixel_y = -30
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"sqz" = (
@@ -32554,11 +32508,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/cable/green{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -32868,6 +32817,12 @@
},
/turf/simulated/floor/tiled/eris/white,
/area/shuttle/medivac/general)
+"tIc" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/belterdock)
"tIs" = (
/obj/structure/disposalpipe/segment,
/obj/effect/landmark/start{
@@ -32959,6 +32914,9 @@
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"tNG" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"tOn" = (
@@ -42478,9 +42436,9 @@ abq
aiM
aiM
aac
-isj
-isj
-isj
+acz
+acz
+acz
aoy
alM
amf
@@ -46236,7 +46194,7 @@ xIp
bYr
hed
tNG
-tNG
+tIc
tts
bGw
usX
@@ -46377,8 +46335,8 @@ cqk
bYr
bYr
jEs
-tNG
-tNG
+coR
+pJT
tts
ofV
seR
@@ -46474,7 +46432,7 @@ wbY
lhz
gLU
yje
-coR
+yje
yje
yje
yje
@@ -47905,7 +47863,7 @@ abS
acj
aaD
kPM
-rQf
+kVK
tne
aBM
sYe
diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm
index 45d61b7c0d..3a7361dc8f 100644
--- a/maps/tether/tether-07-solars.dmm
+++ b/maps/tether/tether-07-solars.dmm
@@ -22433,9 +22433,9 @@ bF
bF
bF
bF
-ad
-ad
-ad
+bF
+bF
+bF
bF
bF
bF
@@ -22570,14 +22570,6 @@ bF
bF
bF
bF
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
bF
bF
bF
@@ -22591,8 +22583,16 @@ bF
bF
bF
bF
-ad
-ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
bF
bF
bF
@@ -22712,17 +22712,6 @@ bF
bF
bF
bF
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
bF
bF
bF
@@ -22733,11 +22722,22 @@ bF
bF
bF
bF
-ad
-ad
-ad
-ad
-ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
bF
bF
bF
@@ -22854,17 +22854,6 @@ bF
bF
bF
bF
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
bF
bF
bF
@@ -22875,11 +22864,22 @@ bF
bF
bF
bF
-ad
-ad
-ad
-ad
-ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
bF
bF
bF
@@ -22990,25 +22990,28 @@ ad
ad
ad
ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
bF
bF
bF
@@ -23019,10 +23022,7 @@ bF
ad
ad
ad
-ad
-ad
-ad
-ad
+bF
bF
bF
bF
@@ -23132,18 +23132,32 @@ ad
ad
ad
ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
ad
ad
ad
@@ -23167,20 +23181,6 @@ ad
ad
ad
ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
cf
cx
cU
@@ -23273,6 +23273,30 @@ ad
ad
ad
ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+ad
+ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
ad
ad
ad
@@ -23285,35 +23309,11 @@ 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
-ad
-ad
-ad
+bF
+bF
+bF
+bF
+bF
ad
ad
ad
@@ -23415,6 +23415,29 @@ ad
ad
ad
ad
+bF
+bF
+bF
+bF
+bF
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+ad
+bF
+bF
+bF
+bF
+bF
+bF
+bF
+bF
ad
ad
ad
@@ -23430,32 +23453,9 @@ 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
+bF
+bF
+bF
ad
ad
ad
@@ -23574,11 +23574,11 @@ ad
ad
ad
ad
-ad
-ad
-ad
-ad
-ad
+bF
+bF
+bF
+bF
+bF
ad
ad
ad
@@ -24405,6 +24405,7 @@ ad
ad
ad
ad
+bG
ad
ad
ad
@@ -24428,8 +24429,7 @@ ad
ad
ad
ad
-ad
-ad
+bG
bQ
bj
ad
@@ -24547,6 +24547,15 @@ ad
ad
ad
ad
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
ad
ad
ad
@@ -24555,23 +24564,14 @@ ad
ad
ad
ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
bj
@@ -24687,33 +24687,33 @@ 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
-ad
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bU
bR
bS
@@ -24829,33 +24829,33 @@ 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
-ad
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ad
@@ -24970,34 +24970,34 @@ 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
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -25111,35 +25111,35 @@ ab
ad
ad
ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ab
-ab
-ab
-ab
-ab
-ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -25253,35 +25253,35 @@ ad
ad
ad
ab
-ab
-ab
-ab
-ad
-ad
-ad
-ad
-ad
-ad
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ad
-ad
-ad
-ad
-ad
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -25393,37 +25393,37 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -25534,38 +25534,38 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
bj
@@ -25675,39 +25675,39 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-aw
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
bj
@@ -25815,41 +25815,41 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -25956,42 +25956,42 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -26096,44 +26096,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
bj
@@ -26238,44 +26238,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
bj
@@ -26380,44 +26380,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
bj
@@ -26522,44 +26522,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -26664,44 +26664,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
ab
@@ -26806,44 +26806,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
bj
bj
@@ -26948,44 +26948,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
bj
@@ -27090,44 +27090,44 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
ab
@@ -27233,43 +27233,43 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
ab
bj
@@ -27376,42 +27376,42 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
bQ
aa
ab
@@ -27518,42 +27518,42 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
cm
aa
bj
@@ -27662,40 +27662,40 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
+bG
dd
aa
bj
diff --git a/maps/virgo_minitest/virgo_minitest_defines.dm b/maps/virgo_minitest/virgo_minitest_defines.dm
index abee28169d..716815b7b3 100644
--- a/maps/virgo_minitest/virgo_minitest_defines.dm
+++ b/maps/virgo_minitest/virgo_minitest_defines.dm
@@ -60,6 +60,10 @@
allowed_spawns = list("Arrivals Shuttle","Gateway","Cryogenic Storage","Cyborg Storage")
+/datum/map/virgo_minitest/New()
+ ..()
+ SSticker.start_immediately = TRUE
+
/datum/map_z_level/minitest/station
z = Z_LEVEL_MAIN_VIRGO_TESTING
name = "Station Level"
diff --git a/tgui/packages/common/string.js b/tgui/packages/common/string.js
index 461f975b3a..4278a1fb3e 100644
--- a/tgui/packages/common/string.js
+++ b/tgui/packages/common/string.js
@@ -78,13 +78,21 @@ export const createSearch = (searchText, stringifier) => {
};
};
+export const isUppercase = chr => {
+ return chr.toUpperCase() === chr;
+};
+
export const capitalize = str => {
// Handle array
if (Array.isArray(str)) {
return str.map(capitalize);
}
// Handle string
- return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+ let chr = str.charAt(0);
+ if (isUppercase(chr)) {
+ return str; // Already caps, might be an acronym, so don't mess it up by lowercasing the rest
+ }
+ return chr.toUpperCase() + str.slice(1).toLowerCase();
};
export const toTitleCase = str => {
diff --git a/tgui/public/tgui-common.bundle.js b/tgui/public/tgui-common.bundle.js
index ef99c73dae..d363cbd6bb 100644
--- a/tgui/public/tgui-common.bundle.js
+++ b/tgui/public/tgui-common.bundle.js
@@ -1 +1 @@
-(self.webpackChunktgui_workspace=self.webpackChunktgui_workspace||[]).push([[962],{33407:function(e,t,n){"use strict";t.__esModule=!0,t.popperGenerator=v,t.createPopper=void 0;var r=d(n(98825)),o=d(n(52089)),i=d(n(66469)),a=d(n(54484)),u=(d(n(82020)),d(n(7183))),c=d(n(16936)),s=(d(n(11026)),d(n(20675)),d(n(78044)),d(n(5495))),l=d(n(45073));t.detectOverflow=l["default"];var f=n(31966);n(54945);function d(e){return e&&e.__esModule?e:{"default":e}}var p={placement:"bottom",modifiers:[],strategy:"absolute"};function h(){for(var e=arguments.length,t=new Array(e),n=0;n=0&&(0,l.isHTMLElement)(e)?(0,u["default"])(e):e;if(!(0,l.isElement)(n))return[];return t.filter((function(e){return(0,l.isElement)(e)&&(0,p["default"])(e,n)&&"body"!==(0,h["default"])(e)}))}(e):[].concat(t),o=[].concat(r,[n]),i=o[0],c=o.reduce((function(t,n){var r=y(e,n);return t.top=(0,m.max)(r.top,t.top),t.right=(0,m.min)(r.right,t.right),t.bottom=(0,m.min)(r.bottom,t.bottom),t.left=(0,m.max)(r.left,t.left),t}),y(e,i));return c.width=c.right-c.left,c.height=c.bottom-c.top,c.x=c.left,c.y=c.top,c};var r=n(54945),o=g(n(17488)),i=g(n(27175)),a=g(n(66469)),u=g(n(54484)),c=g(n(36e3)),s=g(n(82020)),l=n(31966),f=g(n(87916)),d=g(n(23470)),p=g(n(41858)),h=g(n(38012)),v=g(n(77276)),m=n(52209);function g(e){return e&&e.__esModule?e:{"default":e}}function y(e,t){return t===r.viewport?(0,v["default"])((0,o["default"])(e)):(0,l.isHTMLElement)(t)?function(e){var t=(0,f["default"])(e);return t.top=t.top+e.clientTop,t.left=t.left+e.clientLeft,t.bottom=t.top+e.clientHeight,t.right=t.left+e.clientWidth,t.width=e.clientWidth,t.height=e.clientHeight,t.x=t.left,t.y=t.top,t}(t):(0,v["default"])((0,i["default"])((0,c["default"])(e)))}},98825:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t,n){void 0===n&&(n=!1);var l=(0,c["default"])(t),f=(0,r["default"])(e),d=(0,a.isHTMLElement)(t),p={scrollLeft:0,scrollTop:0},h={x:0,y:0};(d||!d&&!n)&&(("body"!==(0,i["default"])(t)||(0,s["default"])(l))&&(p=(0,o["default"])(t)),(0,a.isHTMLElement)(t)?((h=(0,r["default"])(t)).x+=t.clientLeft,h.y+=t.clientTop):l&&(h.x=(0,u["default"])(l)));return{x:f.left+p.scrollLeft-h.x,y:f.top+p.scrollTop-h.y,width:f.width,height:f.height}};var r=l(n(87916)),o=l(n(38015)),i=l(n(38012)),a=n(31966),u=l(n(25880)),c=l(n(36e3)),s=l(n(42156));function l(e){return e&&e.__esModule?e:{"default":e}}},82020:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return(0,o["default"])(e).getComputedStyle(e)};var r,o=(r=n(89778))&&r.__esModule?r:{"default":r}},36e3:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return(((0,r.isElement)(e)?e.ownerDocument:e.document)||window.document).documentElement};var r=n(31966)},27175:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t,n=(0,r["default"])(e),c=(0,a["default"])(e),s=null==(t=e.ownerDocument)?void 0:t.body,l=(0,u.max)(n.scrollWidth,n.clientWidth,s?s.scrollWidth:0,s?s.clientWidth:0),f=(0,u.max)(n.scrollHeight,n.clientHeight,s?s.scrollHeight:0,s?s.clientHeight:0),d=-c.scrollLeft+(0,i["default"])(e),p=-c.scrollTop;"rtl"===(0,o["default"])(s||n).direction&&(d+=(0,u.max)(n.clientWidth,s?s.clientWidth:0)-l);return{width:l,height:f,x:d,y:p}};var r=c(n(36e3)),o=c(n(82020)),i=c(n(25880)),a=c(n(31348)),u=n(52209);function c(e){return e&&e.__esModule?e:{"default":e}}},13339:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return{scrollLeft:e.scrollLeft,scrollTop:e.scrollTop}}},52089:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,o["default"])(e),n=e.offsetWidth,r=e.offsetHeight;Math.abs(t.width-n)<=1&&(n=t.width);Math.abs(t.height-r)<=1&&(r=t.height);return{x:e.offsetLeft,y:e.offsetTop,width:n,height:r}};var r,o=(r=n(87916))&&r.__esModule?r:{"default":r}},38012:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e?(e.nodeName||"").toLowerCase():null}},38015:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return e!==(0,o["default"])(e)&&(0,i.isHTMLElement)(e)?(0,a["default"])(e):(0,r["default"])(e)};var r=u(n(31348)),o=u(n(89778)),i=n(31966),a=u(n(13339));function u(e){return e&&e.__esModule?e:{"default":e}}},54484:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,r["default"])(e),n=l(e);for(;n&&(0,u["default"])(n)&&"static"===(0,i["default"])(n).position;)n=l(n);if(n&&("html"===(0,o["default"])(n)||"body"===(0,o["default"])(n)&&"static"===(0,i["default"])(n).position))return t;return n||function(e){var t=-1!==navigator.userAgent.toLowerCase().indexOf("firefox");if(-1!==navigator.userAgent.indexOf("Trident")&&(0,a.isHTMLElement)(e)){if("fixed"===(0,i["default"])(e).position)return null}var n=(0,c["default"])(e);for(;(0,a.isHTMLElement)(n)&&["html","body"].indexOf((0,o["default"])(n))<0;){var r=(0,i["default"])(n);if("none"!==r.transform||"none"!==r.perspective||"paint"===r.contain||-1!==["transform","perspective"].indexOf(r.willChange)||t&&"filter"===r.willChange||t&&r.filter&&"none"!==r.filter)return n;n=n.parentNode}return null}(e)||t};var r=s(n(89778)),o=s(n(38012)),i=s(n(82020)),a=n(31966),u=s(n(69183)),c=s(n(23470));function s(e){return e&&e.__esModule?e:{"default":e}}function l(e){return(0,a.isHTMLElement)(e)&&"fixed"!==(0,i["default"])(e).position?e.offsetParent:null}},23470:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){if("html"===(0,r["default"])(e))return e;return e.assignedSlot||e.parentNode||((0,i.isShadowRoot)(e)?e.host:null)||(0,o["default"])(e)};var r=a(n(38012)),o=a(n(36e3)),i=n(31966);function a(e){return e&&e.__esModule?e:{"default":e}}},92098:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function c(e){if(["html","body","#document"].indexOf((0,i["default"])(e))>=0)return e.ownerDocument.body;if((0,a.isHTMLElement)(e)&&(0,o["default"])(e))return e;return c((0,r["default"])(e))};var r=u(n(23470)),o=u(n(42156)),i=u(n(38012)),a=n(31966);function u(e){return e&&e.__esModule?e:{"default":e}}},17488:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,r["default"])(e),n=(0,o["default"])(e),a=t.visualViewport,u=n.clientWidth,c=n.clientHeight,s=0,l=0;a&&(u=a.width,c=a.height,/^((?!chrome|android).)*safari/i.test(navigator.userAgent)||(s=a.offsetLeft,l=a.offsetTop));return{width:u,height:c,x:s+(0,i["default"])(e),y:l}};var r=a(n(89778)),o=a(n(36e3)),i=a(n(25880));function a(e){return e&&e.__esModule?e:{"default":e}}},89778:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){if(null==e)return window;if("[object Window]"!==e.toString()){var t=e.ownerDocument;return t&&t.defaultView||window}return e}},31348:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,o["default"])(e),n=t.pageXOffset,r=t.pageYOffset;return{scrollLeft:n,scrollTop:r}};var r,o=(r=n(89778))&&r.__esModule?r:{"default":r}},25880:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return(0,r["default"])((0,o["default"])(e)).left+(0,i["default"])(e).scrollLeft};var r=a(n(87916)),o=a(n(36e3)),i=a(n(31348));function a(e){return e&&e.__esModule?e:{"default":e}}},31966:function(e,t,n){"use strict";t.__esModule=!0,t.isElement=function(e){var t=(0,o["default"])(e).Element;return e instanceof t||e instanceof Element},t.isHTMLElement=function(e){var t=(0,o["default"])(e).HTMLElement;return e instanceof t||e instanceof HTMLElement},t.isShadowRoot=function(e){if("undefined"==typeof ShadowRoot)return!1;var t=(0,o["default"])(e).ShadowRoot;return e instanceof t||e instanceof ShadowRoot};var r,o=(r=n(89778))&&r.__esModule?r:{"default":r}},42156:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=(0,o["default"])(e),n=t.overflow,r=t.overflowX,i=t.overflowY;return/auto|scroll|overlay|hidden/.test(n+i+r)};var r,o=(r=n(82020))&&r.__esModule?r:{"default":r}},69183:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return["table","td","th"].indexOf((0,o["default"])(e))>=0};var r,o=(r=n(38012))&&r.__esModule?r:{"default":r}},66469:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function c(e,t){var n;void 0===t&&(t=[]);var u=(0,r["default"])(e),s=u===(null==(n=e.ownerDocument)?void 0:n.body),l=(0,i["default"])(u),f=s?[l].concat(l.visualViewport||[],(0,a["default"])(u)?u:[]):u,d=t.concat(f);return s?d:d.concat(c((0,o["default"])(f)))};var r=u(n(92098)),o=u(n(23470)),i=u(n(89778)),a=u(n(42156));function u(e){return e&&e.__esModule?e:{"default":e}}},54945:function(e,t){"use strict";t.__esModule=!0,t.modifierPhases=t.afterWrite=t.write=t.beforeWrite=t.afterMain=t.main=t.beforeMain=t.afterRead=t.read=t.beforeRead=t.placements=t.variationPlacements=t.reference=t.popper=t.viewport=t.clippingParents=t.end=t.start=t.basePlacements=t.auto=t.left=t.right=t.bottom=t.top=void 0;t.top="top";var n="bottom";t.bottom=n;var r="right";t.right=r;var o="left";t.left=o;var i="auto";t.auto=i;var a=["top",n,r,o];t.basePlacements=a;var u="start";t.start=u;var c="end";t.end=c;t.clippingParents="clippingParents";t.viewport="viewport";t.popper="popper";t.reference="reference";var s=a.reduce((function(e,t){return e.concat([t+"-"+u,t+"-"+c])}),[]);t.variationPlacements=s;var l=[].concat(a,[i]).reduce((function(e,t){return e.concat([t,t+"-"+u,t+"-"+c])}),[]);t.placements=l;var f="beforeRead";t.beforeRead=f;var d="read";t.read=d;var p="afterRead";t.afterRead=p;var h="beforeMain";t.beforeMain=h;var v="main";t.main=v;var m="afterMain";t.afterMain=m;var g="beforeWrite";t.beforeWrite=g;var y="write";t.write=y;var b="afterWrite";t.afterWrite=b;var _=[f,d,p,h,v,m,g,y,b];t.modifierPhases=_},11613:function(e,t,n){"use strict";t.__esModule=!0;var r={popperGenerator:!0,detectOverflow:!0,createPopperBase:!0,createPopper:!0,createPopperLite:!0};t.createPopperLite=t.createPopper=t.createPopperBase=t.detectOverflow=t.popperGenerator=void 0;var o=n(54945);Object.keys(o).forEach((function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(r,e)||e in t&&t[e]===o[e]||(t[e]=o[e]))}));var i=n(15461);Object.keys(i).forEach((function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(r,e)||e in t&&t[e]===i[e]||(t[e]=i[e]))}));var a=n(33407);t.popperGenerator=a.popperGenerator,t.detectOverflow=a.detectOverflow,t.createPopperBase=a.createPopper;var u=n(15172);t.createPopper=u.createPopper;var c=n(15327);t.createPopperLite=c.createPopper},1803:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=(r=n(38012))&&r.__esModule?r:{"default":r},i=n(31966);var a={name:"applyStyles",enabled:!0,phase:"write",fn:function(e){var t=e.state;Object.keys(t.elements).forEach((function(e){var n=t.styles[e]||{},r=t.attributes[e]||{},a=t.elements[e];(0,i.isHTMLElement)(a)&&(0,o["default"])(a)&&(Object.assign(a.style,n),Object.keys(r).forEach((function(e){var t=r[e];!1===t?a.removeAttribute(e):a.setAttribute(e,!0===t?"":t)})))}))},effect:function(e){var t=e.state,n={popper:{position:t.options.strategy,left:"0",top:"0",margin:"0"},arrow:{position:"absolute"},reference:{}};return Object.assign(t.elements.popper.style,n.popper),t.styles=n,t.elements.arrow&&Object.assign(t.elements.arrow.style,n.arrow),function(){Object.keys(t.elements).forEach((function(e){var r=t.elements[e],a=t.attributes[e]||{},u=Object.keys(t.styles.hasOwnProperty(e)?t.styles[e]:n[e]).reduce((function(e,t){return e[t]="",e}),{});(0,i.isHTMLElement)(r)&&(0,o["default"])(r)&&(Object.assign(r.style,u),Object.keys(a).forEach((function(e){r.removeAttribute(e)})))}))}},requires:["computeStyles"]};t["default"]=a},35838:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r=d(n(78044)),o=d(n(52089)),i=d(n(41858)),a=d(n(54484)),u=d(n(99840)),c=d(n(51520)),s=d(n(72882)),l=d(n(8415)),f=n(54945);n(31966);function d(e){return e&&e.__esModule?e:{"default":e}}var p=function(e,t){return e="function"==typeof e?e(Object.assign({},t.rects,{placement:t.placement})):e,(0,s["default"])("number"!=typeof e?e:(0,l["default"])(e,f.basePlacements))};var h={name:"arrow",enabled:!0,phase:"main",fn:function(e){var t,n=e.state,i=e.name,s=e.options,l=n.elements.arrow,d=n.modifiersData.popperOffsets,h=(0,r["default"])(n.placement),v=(0,u["default"])(h),m=[f.left,f.right].indexOf(h)>=0?"height":"width";if(l&&d){var g=p(s.padding,n),y=(0,o["default"])(l),b="y"===v?f.top:f.left,_="y"===v?f.bottom:f.right,w=n.rects.reference[m]+n.rects.reference[v]-d[v]-n.rects.popper[m],x=d[v]-n.rects.reference[v],E=(0,a["default"])(l),S=E?"y"===v?E.clientHeight||0:E.clientWidth||0:0,C=w/2-x/2,N=g[b],O=S-y[m]-g[_],k=S/2-y[m]/2+C,M=(0,c["default"])(N,k,O),A=v;n.modifiersData[i]=((t={})[A]=M,t.centerOffset=M-k,t)}},effect:function(e){var t=e.state,n=e.options.element,r=void 0===n?"[data-popper-arrow]":n;null!=r&&("string"!=typeof r||(r=t.elements.popper.querySelector(r)))&&(0,i["default"])(t.elements.popper,r)&&(t.elements.arrow=r)},requires:["popperOffsets"],requiresIfExists:["preventOverflow"]};t["default"]=h},42569:function(e,t,n){"use strict";t.__esModule=!0,t.mapToStyles=d,t["default"]=void 0;var r=n(54945),o=l(n(54484)),i=l(n(89778)),a=l(n(36e3)),u=l(n(82020)),c=l(n(78044)),s=n(52209);function l(e){return e&&e.__esModule?e:{"default":e}}var f={top:"auto",right:"auto",bottom:"auto",left:"auto"};function d(e){var t,n=e.popper,c=e.popperRect,l=e.placement,d=e.offsets,p=e.position,h=e.gpuAcceleration,v=e.adaptive,m=e.roundOffsets,g=!0===m?function(e){var t=e.x,n=e.y,r=window.devicePixelRatio||1;return{x:(0,s.round)((0,s.round)(t*r)/r)||0,y:(0,s.round)((0,s.round)(n*r)/r)||0}}(d):"function"==typeof m?m(d):d,y=g.x,b=void 0===y?0:y,_=g.y,w=void 0===_?0:_,x=d.hasOwnProperty("x"),E=d.hasOwnProperty("y"),S=r.left,C=r.top,N=window;if(v){var O=(0,o["default"])(n),k="clientHeight",M="clientWidth";O===(0,i["default"])(n)&&(O=(0,a["default"])(n),"static"!==(0,u["default"])(O).position&&(k="scrollHeight",M="scrollWidth")),O=O,l===r.top&&(C=r.bottom,w-=O[k]-c.height,w*=h?1:-1),l===r.left&&(S=r.right,b-=O[M]-c.width,b*=h?1:-1)}var A,T=Object.assign({position:p},v&&f);return h?Object.assign({},T,((A={})[C]=E?"0":"",A[S]=x?"0":"",A.transform=(N.devicePixelRatio||1)<2?"translate("+b+"px, "+w+"px)":"translate3d("+b+"px, "+w+"px, 0)",A)):Object.assign({},T,((t={})[C]=E?w+"px":"",t[S]=x?b+"px":"",t.transform="",t))}var p={name:"computeStyles",enabled:!0,phase:"beforeWrite",fn:function(e){var t=e.state,n=e.options,r=n.gpuAcceleration,o=void 0===r||r,i=n.adaptive,a=void 0===i||i,u=n.roundOffsets,s=void 0===u||u,l={placement:(0,c["default"])(t.placement),popper:t.elements.popper,popperRect:t.rects.popper,gpuAcceleration:o};null!=t.modifiersData.popperOffsets&&(t.styles.popper=Object.assign({},t.styles.popper,d(Object.assign({},l,{offsets:t.modifiersData.popperOffsets,position:t.options.strategy,adaptive:a,roundOffsets:s})))),null!=t.modifiersData.arrow&&(t.styles.arrow=Object.assign({},t.styles.arrow,d(Object.assign({},l,{offsets:t.modifiersData.arrow,position:"absolute",adaptive:!1,roundOffsets:s})))),t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-placement":t.placement})},data:{}};t["default"]=p},84886:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=(r=n(89778))&&r.__esModule?r:{"default":r};var i={passive:!0};var a={name:"eventListeners",enabled:!0,phase:"write",fn:function(){},effect:function(e){var t=e.state,n=e.instance,r=e.options,a=r.scroll,u=void 0===a||a,c=r.resize,s=void 0===c||c,l=(0,o["default"])(t.elements.popper),f=[].concat(t.scrollParents.reference,t.scrollParents.popper);return u&&f.forEach((function(e){e.addEventListener("scroll",n.update,i)})),s&&l.addEventListener("resize",n.update,i),function(){u&&f.forEach((function(e){e.removeEventListener("scroll",n.update,i)})),s&&l.removeEventListener("resize",n.update,i)}},data:{}};t["default"]=a},75306:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r=l(n(21784)),o=l(n(78044)),i=l(n(10333)),a=l(n(45073)),u=l(n(9118)),c=n(54945),s=l(n(7938));function l(e){return e&&e.__esModule?e:{"default":e}}var f={name:"flip",enabled:!0,phase:"main",fn:function(e){var t=e.state,n=e.options,l=e.name;if(!t.modifiersData[l]._skip){for(var f=n.mainAxis,d=void 0===f||f,p=n.altAxis,h=void 0===p||p,v=n.fallbackPlacements,m=n.padding,g=n.boundary,y=n.rootBoundary,b=n.altBoundary,_=n.flipVariations,w=void 0===_||_,x=n.allowedAutoPlacements,E=t.options.placement,S=(0,o["default"])(E),C=v||(S===E||!w?[(0,r["default"])(E)]:function(e){if((0,o["default"])(e)===c.auto)return[];var t=(0,r["default"])(e);return[(0,i["default"])(e),t,(0,i["default"])(t)]}(E)),N=[E].concat(C).reduce((function(e,n){return e.concat((0,o["default"])(n)===c.auto?(0,u["default"])(t,{placement:n,boundary:g,rootBoundary:y,padding:m,flipVariations:w,allowedAutoPlacements:x}):n)}),[]),O=t.rects.reference,k=t.rects.popper,M=new Map,A=!0,T=N[0],I=0;I=0,j=B?"width":"height",R=(0,a["default"])(t,{placement:P,boundary:g,rootBoundary:y,altBoundary:b,padding:m}),D=B?L?c.right:c.left:L?c.bottom:c.top;O[j]>k[j]&&(D=(0,r["default"])(D));var F=(0,r["default"])(D),K=[];if(d&&K.push(R[V]<=0),h&&K.push(R[D]<=0,R[F]<=0),K.every((function(e){return e}))){T=P,A=!1;break}M.set(P,K)}if(A)for(var z=function(e){var t=N.find((function(t){var n=M.get(t);if(n)return n.slice(0,e).every((function(e){return e}))}));if(t)return T=t,"break"},Y=w?3:1;Y>0;Y--){if("break"===z(Y))break}t.placement!==T&&(t.modifiersData[l]._skip=!0,t.placement=T,t.reset=!0)}},requiresIfExists:["offset"],data:{_skip:!1}};t["default"]=f},91263:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=n(54945),i=(r=n(45073))&&r.__esModule?r:{"default":r};function a(e,t,n){return void 0===n&&(n={x:0,y:0}),{top:e.top-t.height-n.y,right:e.right-t.width+n.x,bottom:e.bottom-t.height+n.y,left:e.left-t.width-n.x}}function u(e){return[o.top,o.right,o.bottom,o.left].some((function(t){return e[t]>=0}))}var c={name:"hide",enabled:!0,phase:"main",requiresIfExists:["preventOverflow"],fn:function(e){var t=e.state,n=e.name,r=t.rects.reference,o=t.rects.popper,c=t.modifiersData.preventOverflow,s=(0,i["default"])(t,{elementContext:"reference"}),l=(0,i["default"])(t,{altBoundary:!0}),f=a(s,r),d=a(l,o,c),p=u(f),h=u(d);t.modifiersData[n]={referenceClippingOffsets:f,popperEscapeOffsets:d,isReferenceHidden:p,hasPopperEscaped:h},t.attributes.popper=Object.assign({},t.attributes.popper,{"data-popper-reference-hidden":p,"data-popper-escaped":h})}};t["default"]=c},15461:function(e,t,n){"use strict";t.__esModule=!0,t.preventOverflow=t.popperOffsets=t.offset=t.hide=t.flip=t.eventListeners=t.computeStyles=t.arrow=t.applyStyles=void 0;var r=d(n(1803));t.applyStyles=r["default"];var o=d(n(35838));t.arrow=o["default"];var i=d(n(42569));t.computeStyles=i["default"];var a=d(n(84886));t.eventListeners=a["default"];var u=d(n(75306));t.flip=u["default"];var c=d(n(91263));t.hide=c["default"];var s=d(n(36777));t.offset=s["default"];var l=d(n(19860));t.popperOffsets=l["default"];var f=d(n(90992));function d(e){return e&&e.__esModule?e:{"default":e}}t.preventOverflow=f["default"]},36777:function(e,t,n){"use strict";t.__esModule=!0,t.distanceAndSkiddingToXY=a,t["default"]=void 0;var r,o=(r=n(78044))&&r.__esModule?r:{"default":r},i=n(54945);function a(e,t,n){var r=(0,o["default"])(e),a=[i.left,i.top].indexOf(r)>=0?-1:1,u="function"==typeof n?n(Object.assign({},t,{placement:e})):n,c=u[0],s=u[1];return c=c||0,s=(s||0)*a,[i.left,i.right].indexOf(r)>=0?{x:s,y:c}:{x:c,y:s}}var u={name:"offset",enabled:!0,phase:"main",requires:["popperOffsets"],fn:function(e){var t=e.state,n=e.options,r=e.name,o=n.offset,u=void 0===o?[0,0]:o,c=i.placements.reduce((function(e,n){return e[n]=a(n,t.rects,u),e}),{}),s=c[t.placement],l=s.x,f=s.y;null!=t.modifiersData.popperOffsets&&(t.modifiersData.popperOffsets.x+=l,t.modifiersData.popperOffsets.y+=f),t.modifiersData[r]=c}};t["default"]=u},19860:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r,o=(r=n(89731))&&r.__esModule?r:{"default":r};var i={name:"popperOffsets",enabled:!0,phase:"read",fn:function(e){var t=e.state,n=e.name;t.modifiersData[n]=(0,o["default"])({reference:t.rects.reference,element:t.rects.popper,strategy:"absolute",placement:t.placement})},data:{}};t["default"]=i},90992:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=void 0;var r=n(54945),o=h(n(78044)),i=h(n(99840)),a=h(n(80776)),u=h(n(51520)),c=h(n(52089)),s=h(n(54484)),l=h(n(45073)),f=h(n(7938)),d=h(n(9775)),p=n(52209);function h(e){return e&&e.__esModule?e:{"default":e}}var v={name:"preventOverflow",enabled:!0,phase:"main",fn:function(e){var t=e.state,n=e.options,h=e.name,v=n.mainAxis,m=void 0===v||v,g=n.altAxis,y=void 0!==g&&g,b=n.boundary,_=n.rootBoundary,w=n.altBoundary,x=n.padding,E=n.tether,S=void 0===E||E,C=n.tetherOffset,N=void 0===C?0:C,O=(0,l["default"])(t,{boundary:b,rootBoundary:_,padding:x,altBoundary:w}),k=(0,o["default"])(t.placement),M=(0,f["default"])(t.placement),A=!M,T=(0,i["default"])(k),I=(0,a["default"])(T),P=t.modifiersData.popperOffsets,V=t.rects.reference,L=t.rects.popper,B="function"==typeof N?N(Object.assign({},t.rects,{placement:t.placement})):N,j={x:0,y:0};if(P){if(m||y){var R="y"===T?r.top:r.left,D="y"===T?r.bottom:r.right,F="y"===T?"height":"width",K=P[T],z=P[T]+O[R],Y=P[T]-O[D],U=S?-L[F]/2:0,H=M===r.start?V[F]:L[F],W=M===r.start?-L[F]:-V[F],$=t.elements.arrow,G=S&&$?(0,c["default"])($):{width:0,height:0},q=t.modifiersData["arrow#persistent"]?t.modifiersData["arrow#persistent"].padding:(0,d["default"])(),X=q[R],Q=q[D],Z=(0,u["default"])(0,V[F],G[F]),J=A?V[F]/2-U-Z-X-B:H-Z-X-B,ee=A?-V[F]/2+U+Z+Q+B:W+Z+Q+B,te=t.elements.arrow&&(0,s["default"])(t.elements.arrow),ne=te?"y"===T?te.clientTop||0:te.clientLeft||0:0,re=t.modifiersData.offset?t.modifiersData.offset[t.placement][T]:0,oe=P[T]+J-re-ne,ie=P[T]+ee-re;if(m){var ae=(0,u["default"])(S?(0,p.min)(z,oe):z,K,S?(0,p.max)(Y,ie):Y);P[T]=ae,j[T]=ae-K}if(y){var ue="x"===T?r.top:r.left,ce="x"===T?r.bottom:r.right,se=P[I],le=se+O[ue],fe=se-O[ce],de=(0,u["default"])(S?(0,p.min)(le,oe):le,se,S?(0,p.max)(fe,ie):fe);P[I]=de,j[I]=de-se}}t.modifiersData[h]=j}},requiresIfExists:["offset"]};t["default"]=v},15327:function(e,t,n){"use strict";t.__esModule=!0,t.defaultModifiers=t.createPopper=void 0;var r=n(33407);t.popperGenerator=r.popperGenerator,t.detectOverflow=r.detectOverflow;var o=c(n(84886)),i=c(n(19860)),a=c(n(42569)),u=c(n(1803));function c(e){return e&&e.__esModule?e:{"default":e}}var s=[o["default"],i["default"],a["default"],u["default"]];t.defaultModifiers=s;var l=(0,r.popperGenerator)({defaultModifiers:s});t.createPopper=l},15172:function(e,t,n){"use strict";t.__esModule=!0;var r={createPopper:!0,createPopperLite:!0,defaultModifiers:!0,popperGenerator:!0,detectOverflow:!0};t.defaultModifiers=t.createPopperLite=t.createPopper=void 0;var o=n(33407);t.popperGenerator=o.popperGenerator,t.detectOverflow=o.detectOverflow;var i=m(n(84886)),a=m(n(19860)),u=m(n(42569)),c=m(n(1803)),s=m(n(36777)),l=m(n(75306)),f=m(n(90992)),d=m(n(35838)),p=m(n(91263)),h=n(15327);t.createPopperLite=h.createPopper;var v=n(15461);function m(e){return e&&e.__esModule?e:{"default":e}}Object.keys(v).forEach((function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(r,e)||e in t&&t[e]===v[e]||(t[e]=v[e]))}));var g=[i["default"],a["default"],u["default"],c["default"],s["default"],l["default"],f["default"],d["default"],p["default"]];t.defaultModifiers=g;var y=(0,o.popperGenerator)({defaultModifiers:g});t.createPopperLite=t.createPopper=y},9118:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t){void 0===t&&(t={});var n=t,u=n.placement,c=n.boundary,s=n.rootBoundary,l=n.padding,f=n.flipVariations,d=n.allowedAutoPlacements,p=void 0===d?o.placements:d,h=(0,r["default"])(u),v=h?f?o.variationPlacements:o.variationPlacements.filter((function(e){return(0,r["default"])(e)===h})):o.basePlacements,m=v.filter((function(e){return p.indexOf(e)>=0}));0===m.length&&(m=v);var g=m.reduce((function(t,n){return t[n]=(0,i["default"])(e,{placement:n,boundary:c,rootBoundary:s,padding:l})[(0,a["default"])(n)],t}),{});return Object.keys(g).sort((function(e,t){return g[e]-g[t]}))};var r=u(n(7938)),o=n(54945),i=u(n(45073)),a=u(n(78044));function u(e){return e&&e.__esModule?e:{"default":e}}},89731:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t,n=e.reference,u=e.element,c=e.placement,s=c?(0,r["default"])(c):null,l=c?(0,o["default"])(c):null,f=n.x+n.width/2-u.width/2,d=n.y+n.height/2-u.height/2;switch(s){case a.top:t={x:f,y:n.y-u.height};break;case a.bottom:t={x:f,y:n.y+n.height};break;case a.right:t={x:n.x+n.width,y:d};break;case a.left:t={x:n.x-u.width,y:d};break;default:t={x:n.x,y:n.y}}var p=s?(0,i["default"])(s):null;if(null!=p){var h="y"===p?"height":"width";switch(l){case a.start:t[p]=t[p]-(n[h]/2-u[h]/2);break;case a.end:t[p]=t[p]+(n[h]/2-u[h]/2)}}return t};var r=u(n(78044)),o=u(n(7938)),i=u(n(99840)),a=n(54945);function u(e){return e&&e.__esModule?e:{"default":e}}},16936:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){var t;return function(){return t||(t=new Promise((function(n){Promise.resolve().then((function(){t=undefined,n(e())}))}))),t}}},45073:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t){void 0===t&&(t={});var n=t,d=n.placement,p=void 0===d?e.placement:d,h=n.boundary,v=void 0===h?c.clippingParents:h,m=n.rootBoundary,g=void 0===m?c.viewport:m,y=n.elementContext,b=void 0===y?c.popper:y,_=n.altBoundary,w=void 0!==_&&_,x=n.padding,E=void 0===x?0:x,S=(0,l["default"])("number"!=typeof E?E:(0,f["default"])(E,c.basePlacements)),C=b===c.popper?c.reference:c.popper,N=e.elements.reference,O=e.rects.popper,k=e.elements[w?C:b],M=(0,o["default"])((0,s.isElement)(k)?k:k.contextElement||(0,i["default"])(e.elements.popper),v,g),A=(0,r["default"])(N),T=(0,a["default"])({reference:A,element:O,strategy:"absolute",placement:p}),I=(0,u["default"])(Object.assign({},O,T)),P=b===c.popper?I:A,V={top:M.top-P.top+S.top,bottom:P.bottom-M.bottom+S.bottom,left:M.left-P.left+S.left,right:P.right-M.right+S.right},L=e.modifiersData.offset;if(b===c.popper&&L){var B=L[p];Object.keys(V).forEach((function(e){var t=[c.right,c.bottom].indexOf(e)>=0?1:-1,n=[c.top,c.bottom].indexOf(e)>=0?"y":"x";V[e]+=B[n]*t}))}return V};var r=d(n(87916)),o=d(n(70846)),i=d(n(36e3)),a=d(n(89731)),u=d(n(77276)),c=n(54945),s=n(31966),l=d(n(72882)),f=d(n(8415));function d(e){return e&&e.__esModule?e:{"default":e}}},8415:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e,t){return t.reduce((function(t,n){return t[n]=e,t}),{})}},50121:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r=0?"x":"y"}},21784:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e.replace(/left|right|bottom|top/g,(function(e){return n[e]}))};var n={left:"right",right:"left",bottom:"top",top:"bottom"}},10333:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e.replace(/start|end/g,(function(e){return n[e]}))};var n={start:"end",end:"start"}},7938:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return e.split("-")[1]}},52209:function(e,t){"use strict";t.__esModule=!0,t.round=t.min=t.max=void 0;var n=Math.max;t.max=n;var r=Math.min;t.min=r;var o=Math.round;t.round=o},5495:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){var t=e.reduce((function(e,t){var n=e[t.name];return e[t.name]=n?Object.assign({},n,t,{options:Object.assign({},n.options,t.options),data:Object.assign({},n.data,t.data)}):t,e}),{});return Object.keys(t).map((function(e){return t[e]}))}},72882:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){return Object.assign({},(0,o["default"])(),e)};var r,o=(r=n(9775))&&r.__esModule?r:{"default":r}},7183:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){var t=function(e){var t=new Map,n=new Set,r=[];function o(e){n.add(e.name),[].concat(e.requires||[],e.requiresIfExists||[]).forEach((function(e){if(!n.has(e)){var r=t.get(e);r&&o(r)}})),r.push(e)}return e.forEach((function(e){t.set(e.name,e)})),e.forEach((function(e){n.has(e.name)||o(e)})),r}(e);return r.modifierPhases.reduce((function(e,n){return e.concat(t.filter((function(e){return e.phase===n})))}),[])};var r=n(54945)},77276:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e){return Object.assign({},e,{left:e.x,top:e.y,right:e.x+e.width,bottom:e.y+e.height})}},20675:function(e,t){"use strict";t.__esModule=!0,t["default"]=function(e,t){var n=new Set;return e.filter((function(e){var r=t(e);if(!n.has(r))return n.add(r),!0}))}},11026:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e){e.forEach((function(t){Object.keys(t).forEach((function(n){switch(n){case"name":t.name;break;case"enabled":t.enabled;case"phase":o.modifierPhases.indexOf(t.phase);break;case"fn":t.fn;break;case"effect":t.effect;break;case"requires":Array.isArray(t.requires);break;case"requiresIfExists":Array.isArray(t.requiresIfExists)}t.requires&&t.requires.forEach((function(t){e.find((function(e){return e.name===t}))}))}))}))};(r=n(50121))&&r.__esModule;var r,o=n(54945)},51520:function(e,t,n){"use strict";t.__esModule=!0,t["default"]=function(e,t,n){return(0,r.max)(e,(0,r.min)(t,n))};var r=n(52209)},13686:function(e){"use strict";e.exports=function(e){if("function"!=typeof e)throw TypeError(String(e)+" is not a function");return e}},85369:function(e,t,n){"use strict";var r=n(88711);e.exports=function(e){if(!r(e)&&null!==e)throw TypeError("Can't set "+String(e)+" as a prototype");return e}},14281:function(e,t,n){"use strict";var r=n(53414),o=n(96093),i=n(96452),a=r("unscopables"),u=Array.prototype;u[a]==undefined&&i.f(u,a,{configurable:!0,value:o(null)}),e.exports=function(e){u[a][e]=!0}},47103:function(e,t,n){"use strict";var r=n(34444).charAt;e.exports=function(e,t,n){return t+(n?r(e,t).length:1)}},2273:function(e){"use strict";e.exports=function(e,t,n){if(!(e instanceof t))throw TypeError("Incorrect "+(n?n+" ":"")+"invocation");return e}},14860:function(e,t,n){"use strict";var r=n(88711);e.exports=function(e){if(!r(e))throw TypeError(String(e)+" is not an object");return e}},17811:function(e){"use strict";e.exports="undefined"!=typeof ArrayBuffer&&"undefined"!=typeof DataView},73203:function(e,t,n){"use strict";var r,o=n(17811),i=n(67738),a=n(179),u=n(88711),c=n(18632),s=n(54781),l=n(21413),f=n(77219),d=n(96452).f,p=n(92608),h=n(77715),v=n(53414),m=n(88340),g=a.Int8Array,y=g&&g.prototype,b=a.Uint8ClampedArray,_=b&&b.prototype,w=g&&p(g),x=y&&p(y),E=Object.prototype,S=E.isPrototypeOf,C=v("toStringTag"),N=m("TYPED_ARRAY_TAG"),O=o&&!!h&&"Opera"!==s(a.opera),k=!1,M={Int8Array:1,Uint8Array:1,Uint8ClampedArray:1,Int16Array:2,Uint16Array:2,Int32Array:4,Uint32Array:4,Float32Array:4,Float64Array:8},A={BigInt64Array:8,BigUint64Array:8},T=function(e){if(!u(e))return!1;var t=s(e);return"DataView"===t||c(M,t)||c(A,t)},I=function(e){if(!u(e))return!1;var t=s(e);return c(M,t)||c(A,t)};for(r in M)a[r]||(O=!1);if((!O||"function"!=typeof w||w===Function.prototype)&&(w=function(){throw TypeError("Incorrect invocation")},O))for(r in M)a[r]&&h(a[r],w);if((!O||!x||x===E)&&(x=w.prototype,O))for(r in M)a[r]&&h(a[r].prototype,x);if(O&&p(_)!==x&&h(_,x),i&&!c(x,C))for(r in k=!0,d(x,C,{get:function(){return u(this)?this[N]:undefined}}),M)a[r]&&l(a[r],N,r);e.exports={NATIVE_ARRAY_BUFFER_VIEWS:O,TYPED_ARRAY_TAG:k&&N,aTypedArray:function(e){if(I(e))return e;throw TypeError("Target is not a typed array")},aTypedArrayConstructor:function(e){if(h){if(S.call(w,e))return e}else for(var t in M)if(c(M,r)){var n=a[t];if(n&&(e===n||S.call(n,e)))return e}throw TypeError("Target is not a typed array constructor")},exportTypedArrayMethod:function(e,t,n){if(i){if(n)for(var r in M){var o=a[r];o&&c(o.prototype,e)&&delete o.prototype[e]}x[e]&&!n||f(x,e,n?t:O&&y[e]||t)}},exportTypedArrayStaticMethod:function(e,t,n){var r,o;if(i){if(h){if(n)for(r in M)(o=a[r])&&c(o,e)&&delete o[e];if(w[e]&&!n)return;try{return f(w,e,n?t:O&&g[e]||t)}catch(u){}}for(r in M)!(o=a[r])||o[e]&&!n||f(o,e,t)}},isView:T,isTypedArray:I,TypedArray:w,TypedArrayPrototype:x}},93071:function(e,t,n){"use strict";var r=n(179),o=n(67738),i=n(17811),a=n(21413),u=n(5289),c=n(84921),s=n(2273),l=n(44028),f=n(27842),d=n(66659),p=n(63408),h=n(92608),v=n(77715),m=n(75604).f,g=n(96452).f,y=n(24115),b=n(81978),_=n(28076),w=_.get,x=_.set,E="ArrayBuffer",S="DataView",C="Wrong index",N=r.ArrayBuffer,O=N,k=r.DataView,M=k&&k.prototype,A=Object.prototype,T=r.RangeError,I=p.pack,P=p.unpack,V=function(e){return[255&e]},L=function(e){return[255&e,e>>8&255]},B=function(e){return[255&e,e>>8&255,e>>16&255,e>>24&255]},j=function(e){return e[3]<<24|e[2]<<16|e[1]<<8|e[0]},R=function(e){return I(e,23,4)},D=function(e){return I(e,52,8)},F=function(e,t){g(e.prototype,t,{get:function(){return w(this)[t]}})},K=function(e,t,n,r){var o=d(n),i=w(e);if(o+t>i.byteLength)throw T(C);var a=w(i.buffer).bytes,u=o+i.byteOffset,c=a.slice(u,u+t);return r?c:c.reverse()},z=function(e,t,n,r,o,i){var a=d(n),u=w(e);if(a+t>u.byteLength)throw T(C);for(var c=w(u.buffer).bytes,s=a+u.byteOffset,l=r(+o),f=0;fW;)(Y=H[W++])in O||a(O,Y,N[Y]);U.constructor=O}v&&h(M)!==A&&v(M,A);var $=new k(new O(2)),G=M.setInt8;$.setInt8(0,2147483648),$.setInt8(1,2147483649),!$.getInt8(0)&&$.getInt8(1)||u(M,{setInt8:function(e,t){G.call(this,e,t<<24>>24)},setUint8:function(e,t){G.call(this,e,t<<24>>24)}},{unsafe:!0})}else O=function(e){s(this,O,E);var t=d(e);x(this,{bytes:y.call(new Array(t),0),byteLength:t}),o||(this.byteLength=t)},k=function(e,t,n){s(this,k,S),s(e,O,S);var r=w(e).byteLength,i=l(t);if(i<0||i>r)throw T("Wrong offset");if(i+(n=n===undefined?r-i:f(n))>r)throw T("Wrong length");x(this,{buffer:e,byteLength:n,byteOffset:i}),o||(this.buffer=e,this.byteLength=n,this.byteOffset=i)},o&&(F(O,"byteLength"),F(k,"buffer"),F(k,"byteLength"),F(k,"byteOffset")),u(k.prototype,{getInt8:function(e){return K(this,1,e)[0]<<24>>24},getUint8:function(e){return K(this,1,e)[0]},getInt16:function(e){var t=K(this,2,e,arguments.length>1?arguments[1]:undefined);return(t[1]<<8|t[0])<<16>>16},getUint16:function(e){var t=K(this,2,e,arguments.length>1?arguments[1]:undefined);return t[1]<<8|t[0]},getInt32:function(e){return j(K(this,4,e,arguments.length>1?arguments[1]:undefined))},getUint32:function(e){return j(K(this,4,e,arguments.length>1?arguments[1]:undefined))>>>0},getFloat32:function(e){return P(K(this,4,e,arguments.length>1?arguments[1]:undefined),23)},getFloat64:function(e){return P(K(this,8,e,arguments.length>1?arguments[1]:undefined),52)},setInt8:function(e,t){z(this,1,e,V,t)},setUint8:function(e,t){z(this,1,e,V,t)},setInt16:function(e,t){z(this,2,e,L,t,arguments.length>2?arguments[2]:undefined)},setUint16:function(e,t){z(this,2,e,L,t,arguments.length>2?arguments[2]:undefined)},setInt32:function(e,t){z(this,4,e,B,t,arguments.length>2?arguments[2]:undefined)},setUint32:function(e,t){z(this,4,e,B,t,arguments.length>2?arguments[2]:undefined)},setFloat32:function(e,t){z(this,4,e,R,t,arguments.length>2?arguments[2]:undefined)},setFloat64:function(e,t){z(this,8,e,D,t,arguments.length>2?arguments[2]:undefined)}});b(O,E),b(k,S),e.exports={ArrayBuffer:O,DataView:k}},92475:function(e,t,n){"use strict";var r=n(6289),o=n(13292),i=n(27842),a=Math.min;e.exports=[].copyWithin||function(e,t){var n=r(this),u=i(n.length),c=o(e,u),s=o(t,u),l=arguments.length>2?arguments[2]:undefined,f=a((l===undefined?u:o(l,u))-s,u-c),d=1;for(s0;)s in n?n[c]=n[s]:delete n[c],c+=d,s+=d;return n}},24115:function(e,t,n){"use strict";var r=n(6289),o=n(13292),i=n(27842);e.exports=function(e){for(var t=r(this),n=i(t.length),a=arguments.length,u=o(a>1?arguments[1]:undefined,n),c=a>2?arguments[2]:undefined,s=c===undefined?n:o(c,n);s>u;)t[u++]=e;return t}},70091:function(e,t,n){"use strict";var r=n(77118).forEach,o=n(45944)("forEach");e.exports=o?[].forEach:function(e){return r(this,e,arguments.length>1?arguments[1]:undefined)}},75372:function(e,t,n){"use strict";var r=n(57386),o=n(6289),i=n(36288),a=n(76774),u=n(27842),c=n(79651),s=n(29863);e.exports=function(e){var t,n,l,f,d,p,h=o(e),v="function"==typeof this?this:Array,m=arguments.length,g=m>1?arguments[1]:undefined,y=g!==undefined,b=s(h),_=0;if(y&&(g=r(g,m>2?arguments[2]:undefined,2)),b==undefined||v==Array&&a(b))for(n=new v(t=u(h.length));t>_;_++)p=y?g(h[_],_):h[_],c(n,_,p);else for(d=(f=b.call(h)).next,n=new v;!(l=d.call(f)).done;_++)p=y?i(f,g,[l.value,_],!0):l.value,c(n,_,p);return n.length=_,n}},53454:function(e,t,n){"use strict";var r=n(94789),o=n(27842),i=n(13292),a=function(e){return function(t,n,a){var u,c=r(t),s=o(c.length),l=i(a,s);if(e&&n!=n){for(;s>l;)if((u=c[l++])!=u)return!0}else for(;s>l;l++)if((e||l in c)&&c[l]===n)return e||l||0;return!e&&-1}};e.exports={includes:a(!0),indexOf:a(!1)}},77118:function(e,t,n){"use strict";var r=n(57386),o=n(46317),i=n(6289),a=n(27842),u=n(12384),c=[].push,s=function(e){var t=1==e,n=2==e,s=3==e,l=4==e,f=6==e,d=7==e,p=5==e||f;return function(h,v,m,g){for(var y,b,_=i(h),w=o(_),x=r(v,m,3),E=a(w.length),S=0,C=g||u,N=t?C(h,E):n||d?C(h,0):undefined;E>S;S++)if((p||S in w)&&(b=x(y=w[S],S,_),e))if(t)N[S]=b;else if(b)switch(e){case 3:return!0;case 5:return y;case 6:return S;case 2:c.call(N,y)}else switch(e){case 4:return!1;case 7:c.call(N,y)}return f?-1:s||l?l:N}};e.exports={forEach:s(0),map:s(1),filter:s(2),some:s(3),every:s(4),find:s(5),findIndex:s(6),filterOut:s(7)}},9819:function(e,t,n){"use strict";var r=n(94789),o=n(44028),i=n(27842),a=n(45944),u=Math.min,c=[].lastIndexOf,s=!!c&&1/[1].lastIndexOf(1,-0)<0,l=a("lastIndexOf"),f=s||!l;e.exports=f?function(e){if(s)return c.apply(this,arguments)||0;var t=r(this),n=i(t.length),a=n-1;for(arguments.length>1&&(a=u(a,o(arguments[1]))),a<0&&(a=n+a);a>=0;a--)if(a in t&&t[a]===e)return a||0;return-1}:c},16684:function(e,t,n){"use strict";var r=n(84921),o=n(53414),i=n(32728),a=o("species");e.exports=function(e){return i>=51||!r((function(){var t=[];return(t.constructor={})[a]=function(){return{foo:1}},1!==t[e](Boolean).foo}))}},45944:function(e,t,n){"use strict";var r=n(84921);e.exports=function(e,t){var n=[][e];return!!n&&r((function(){n.call(null,t||function(){throw 1},1)}))}},59878:function(e,t,n){"use strict";var r=n(13686),o=n(6289),i=n(46317),a=n(27842),u=function(e){return function(t,n,u,c){r(n);var s=o(t),l=i(s),f=a(s.length),d=e?f-1:0,p=e?-1:1;if(u<2)for(;;){if(d in l){c=l[d],d+=p;break}if(d+=p,e?d<0:f<=d)throw TypeError("Reduce of empty array with no initial value")}for(;e?d>=0:f>d;d+=p)d in l&&(c=n(c,l[d],d,s));return c}};e.exports={left:u(!1),right:u(!0)}},12384:function(e,t,n){"use strict";var r=n(88711),o=n(1897),i=n(53414)("species");e.exports=function(e,t){var n;return o(e)&&("function"!=typeof(n=e.constructor)||n!==Array&&!o(n.prototype)?r(n)&&null===(n=n[i])&&(n=undefined):n=undefined),new(n===undefined?Array:n)(0===t?0:t)}},36288:function(e,t,n){"use strict";var r=n(14860),o=n(16284);e.exports=function(e,t,n,i){try{return i?t(r(n)[0],n[1]):t(n)}catch(a){throw o(e),a}}},33652:function(e,t,n){"use strict";var r=n(53414)("iterator"),o=!1;try{var i=0,a={next:function(){return{done:!!i++}},"return":function(){o=!0}};a[r]=function(){return this},Array.from(a,(function(){throw 2}))}catch(u){}e.exports=function(e,t){if(!t&&!o)return!1;var n=!1;try{var i={};i[r]=function(){return{next:function(){return{done:n=!0}}}},e(i)}catch(u){}return n}},90726:function(e){"use strict";var t={}.toString;e.exports=function(e){return t.call(e).slice(8,-1)}},54781:function(e,t,n){"use strict";var r=n(97099),o=n(90726),i=n(53414)("toStringTag"),a="Arguments"==o(function(){return arguments}());e.exports=r?o:function(e){var t,n,r;return e===undefined?"Undefined":null===e?"Null":"string"==typeof(n=function(e,t){try{return e[t]}catch(n){}}(t=Object(e),i))?n:a?o(t):"Object"==(r=o(t))&&"function"==typeof t.callee?"Arguments":r}},4721:function(e,t,n){"use strict";var r=n(96452).f,o=n(96093),i=n(5289),a=n(57386),u=n(2273),c=n(8362),s=n(54981),l=n(40548),f=n(67738),d=n(21419).fastKey,p=n(28076),h=p.set,v=p.getterFor;e.exports={getConstructor:function(e,t,n,s){var l=e((function(e,r){u(e,l,t),h(e,{type:t,index:o(null),first:undefined,last:undefined,size:0}),f||(e.size=0),r!=undefined&&c(r,e[s],{that:e,AS_ENTRIES:n})})),p=v(t),m=function(e,t,n){var r,o,i=p(e),a=g(e,t);return a?a.value=n:(i.last=a={index:o=d(t,!0),key:t,value:n,previous:r=i.last,next:undefined,removed:!1},i.first||(i.first=a),r&&(r.next=a),f?i.size++:e.size++,"F"!==o&&(i.index[o]=a)),e},g=function(e,t){var n,r=p(e),o=d(t);if("F"!==o)return r.index[o];for(n=r.first;n;n=n.next)if(n.key==t)return n};return i(l.prototype,{clear:function(){for(var e=p(this),t=e.index,n=e.first;n;)n.removed=!0,n.previous&&(n.previous=n.previous.next=undefined),delete t[n.index],n=n.next;e.first=e.last=undefined,f?e.size=0:this.size=0},"delete":function(e){var t=this,n=p(t),r=g(t,e);if(r){var o=r.next,i=r.previous;delete n.index[r.index],r.removed=!0,i&&(i.next=o),o&&(o.previous=i),n.first==r&&(n.first=o),n.last==r&&(n.last=i),f?n.size--:t.size--}return!!r},forEach:function(e){for(var t,n=p(this),r=a(e,arguments.length>1?arguments[1]:undefined,3);t=t?t.next:n.first;)for(r(t.value,t.key,this);t&&t.removed;)t=t.previous},has:function(e){return!!g(this,e)}}),i(l.prototype,n?{get:function(e){var t=g(this,e);return t&&t.value},set:function(e,t){return m(this,0===e?0:e,t)}}:{add:function(e){return m(this,e=0===e?0:e,e)}}),f&&r(l.prototype,"size",{get:function(){return p(this).size}}),l},setStrong:function(e,t,n){var r=t+" Iterator",o=v(t),i=v(r);s(e,t,(function(e,t){h(this,{type:r,target:e,state:o(e),kind:t,last:undefined})}),(function(){for(var e=i(this),t=e.kind,n=e.last;n&&n.removed;)n=n.previous;return e.target&&(e.last=n=n?n.next:e.state.first)?"keys"==t?{value:n.key,done:!1}:"values"==t?{value:n.value,done:!1}:{value:[n.key,n.value],done:!1}:(e.target=undefined,{value:undefined,done:!0})}),n?"entries":"values",!n,!0),l(t)}}},76568:function(e,t,n){"use strict";var r=n(5289),o=n(21419).getWeakData,i=n(14860),a=n(88711),u=n(2273),c=n(8362),s=n(77118),l=n(18632),f=n(28076),d=f.set,p=f.getterFor,h=s.find,v=s.findIndex,m=0,g=function(e){return e.frozen||(e.frozen=new y)},y=function(){this.entries=[]},b=function(e,t){return h(e.entries,(function(e){return e[0]===t}))};y.prototype={get:function(e){var t=b(this,e);if(t)return t[1]},has:function(e){return!!b(this,e)},set:function(e,t){var n=b(this,e);n?n[1]=t:this.entries.push([e,t])},"delete":function(e){var t=v(this.entries,(function(t){return t[0]===e}));return~t&&this.entries.splice(t,1),!!~t}},e.exports={getConstructor:function(e,t,n,s){var f=e((function(e,r){u(e,f,t),d(e,{type:t,id:m++,frozen:undefined}),r!=undefined&&c(r,e[s],{that:e,AS_ENTRIES:n})})),h=p(t),v=function(e,t,n){var r=h(e),a=o(i(t),!0);return!0===a?g(r).set(t,n):a[r.id]=n,e};return r(f.prototype,{"delete":function(e){var t=h(this);if(!a(e))return!1;var n=o(e);return!0===n?g(t)["delete"](e):n&&l(n,t.id)&&delete n[t.id]},has:function(e){var t=h(this);if(!a(e))return!1;var n=o(e);return!0===n?g(t).has(e):n&&l(n,t.id)}}),r(f.prototype,n?{get:function(e){var t=h(this);if(a(e)){var n=o(e);return!0===n?g(t).get(e):n?n[t.id]:undefined}},set:function(e,t){return v(this,e,t)}}:{add:function(e){return v(this,e,!0)}}),f}}},20991:function(e,t,n){"use strict";var r=n(99592),o=n(179),i=n(61287),a=n(77219),u=n(21419),c=n(8362),s=n(2273),l=n(88711),f=n(84921),d=n(33652),p=n(81978),h=n(69262);e.exports=function(e,t,n){var v=-1!==e.indexOf("Map"),m=-1!==e.indexOf("Weak"),g=v?"set":"add",y=o[e],b=y&&y.prototype,_=y,w={},x=function(e){var t=b[e];a(b,e,"add"==e?function(e){return t.call(this,0===e?0:e),this}:"delete"==e?function(e){return!(m&&!l(e))&&t.call(this,0===e?0:e)}:"get"==e?function(e){return m&&!l(e)?undefined:t.call(this,0===e?0:e)}:"has"==e?function(e){return!(m&&!l(e))&&t.call(this,0===e?0:e)}:function(e,n){return t.call(this,0===e?0:e,n),this})};if(i(e,"function"!=typeof y||!(m||b.forEach&&!f((function(){(new y).entries().next()})))))_=n.getConstructor(t,e,v,g),u.REQUIRED=!0;else if(i(e,!0)){var E=new _,S=E[g](m?{}:-0,1)!=E,C=f((function(){E.has(1)})),N=d((function(e){new y(e)})),O=!m&&f((function(){for(var e=new y,t=5;t--;)e[g](t,t);return!e.has(-0)}));N||((_=t((function(t,n){s(t,_,e);var r=h(new y,t,_);return n!=undefined&&c(n,r[g],{that:r,AS_ENTRIES:v}),r}))).prototype=b,b.constructor=_),(C||O)&&(x("delete"),x("has"),v&&x("get")),(O||S)&&x(g),m&&b.clear&&delete b.clear}return w[e]=_,r({global:!0,forced:_!=y},w),p(_,e),m||n.setStrong(_,e,v),_}},44121:function(e,t,n){"use strict";var r=n(18632),o=n(1051),i=n(8740),a=n(96452);e.exports=function(e,t){for(var n=o(t),u=a.f,c=i.f,s=0;s"+a+""}},97993:function(e,t,n){"use strict";var r=n(9392).IteratorPrototype,o=n(96093),i=n(28804),a=n(81978),u=n(36617),c=function(){return this};e.exports=function(e,t,n){var s=t+" Iterator";return e.prototype=o(r,{next:i(1,n)}),a(e,s,!1,!0),u[s]=c,e}},21413:function(e,t,n){"use strict";var r=n(67738),o=n(96452),i=n(28804);e.exports=r?function(e,t,n){return o.f(e,t,i(1,n))}:function(e,t,n){return e[t]=n,e}},28804:function(e){"use strict";e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},79651:function(e,t,n){"use strict";var r=n(79165),o=n(96452),i=n(28804);e.exports=function(e,t,n){var a=r(t);a in e?o.f(e,a,i(0,n)):e[a]=n}},27051:function(e,t,n){"use strict";var r=n(84921),o=n(61514).start,i=Math.abs,a=Date.prototype,u=a.getTime,c=a.toISOString;e.exports=r((function(){return"0385-07-25T07:06:39.999Z"!=c.call(new Date(-50000000000001))}))||!r((function(){c.call(new Date(NaN))}))?function(){if(!isFinite(u.call(this)))throw RangeError("Invalid time value");var e=this,t=e.getUTCFullYear(),n=e.getUTCMilliseconds(),r=t<0?"-":t>9999?"+":"";return r+o(i(t),r?6:4,0)+"-"+o(e.getUTCMonth()+1,2,0)+"-"+o(e.getUTCDate(),2,0)+"T"+o(e.getUTCHours(),2,0)+":"+o(e.getUTCMinutes(),2,0)+":"+o(e.getUTCSeconds(),2,0)+"."+o(n,3,0)+"Z"}:c},92880:function(e,t,n){"use strict";var r=n(14860),o=n(79165);e.exports=function(e){if("string"!==e&&"number"!==e&&"default"!==e)throw TypeError("Incorrect hint");return o(r(this),"number"!==e)}},54981:function(e,t,n){"use strict";var r=n(99592),o=n(97993),i=n(92608),a=n(77715),u=n(81978),c=n(21413),s=n(77219),l=n(53414),f=n(51684),d=n(36617),p=n(9392),h=p.IteratorPrototype,v=p.BUGGY_SAFARI_ITERATORS,m=l("iterator"),g="keys",y="values",b="entries",_=function(){return this};e.exports=function(e,t,n,l,p,w,x){o(n,t,l);var E,S,C,N=function(e){if(e===p&&T)return T;if(!v&&e in M)return M[e];switch(e){case g:case y:case b:return function(){return new n(this,e)}}return function(){return new n(this)}},O=t+" Iterator",k=!1,M=e.prototype,A=M[m]||M["@@iterator"]||p&&M[p],T=!v&&A||N(p),I="Array"==t&&M.entries||A;if(I&&(E=i(I.call(new e)),h!==Object.prototype&&E.next&&(f||i(E)===h||(a?a(E,h):"function"!=typeof E[m]&&c(E,m,_)),u(E,O,!0,!0),f&&(d[O]=_))),p==y&&A&&A.name!==y&&(k=!0,T=function(){return A.call(this)}),f&&!x||M[m]===T||c(M,m,T),d[t]=T,p)if(S={values:N(y),keys:w?T:N(g),entries:N(b)},x)for(C in S)(v||k||!(C in M))&&s(M,C,S[C]);else r({target:t,proto:!0,forced:v||k},S);return S}},90209:function(e,t,n){"use strict";var r=n(91996),o=n(18632),i=n(42571),a=n(96452).f;e.exports=function(e){var t=r.Symbol||(r.Symbol={});o(t,e)||a(t,e,{value:i.f(e)})}},67738:function(e,t,n){"use strict";var r=n(84921);e.exports=!r((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},27383:function(e,t,n){"use strict";var r=n(179),o=n(88711),i=r.document,a=o(i)&&o(i.createElement);e.exports=function(e){return a?i.createElement(e):{}}},13745:function(e,t,n){"use strict";var r=n(97285);e.exports=/(?:iphone|ipod|ipad).*applewebkit/i.test(r)},23043:function(e,t,n){"use strict";var r=n(90726),o=n(179);e.exports="process"==r(o.process)},59137:function(e,t,n){"use strict";var r=n(97285);e.exports=/web0s(?!.*chrome)/i.test(r)},97285:function(e,t,n){"use strict";var r=n(44417);e.exports=r("navigator","userAgent")||""},32728:function(e,t,n){"use strict";var r,o,i=n(179),a=n(97285),u=i.process,c=u&&u.versions,s=c&&c.v8;s?o=(r=s.split("."))[0]+r[1]:a&&(!(r=a.match(/Edge\/(\d+)/))||r[1]>=74)&&(r=a.match(/Chrome\/(\d+)/))&&(o=r[1]),e.exports=o&&+o},89807:function(e){"use strict";e.exports=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"]},99592:function(e,t,n){"use strict";var r=n(179),o=n(8740).f,i=n(21413),a=n(77219),u=n(53753),c=n(44121),s=n(61287);e.exports=function(e,t){var n,l,f,d,p,h=e.target,v=e.global,m=e.stat;if(n=v?r:m?r[h]||u(h,{}):(r[h]||{}).prototype)for(l in t){if(d=t[l],f=e.noTargetGet?(p=o(n,l))&&p.value:n[l],!s(v?l:h+(m?".":"#")+l,e.forced)&&f!==undefined){if(typeof d==typeof f)continue;c(d,f)}(e.sham||f&&f.sham)&&i(d,"sham",!0),a(n,l,d,e)}}},84921:function(e){"use strict";e.exports=function(e){try{return!!e()}catch(t){return!0}}},27167:function(e,t,n){"use strict";n(30660);var r=n(77219),o=n(84921),i=n(53414),a=n(21413),u=i("species"),c=!o((function(){var e=/./;return e.exec=function(){var e=[];return e.groups={a:"7"},e},"7"!=="".replace(e,"$")})),s="$0"==="a".replace(/./,"$0"),l=i("replace"),f=!!/./[l]&&""===/./[l]("a","$0"),d=!o((function(){var e=/(?:)/,t=e.exec;e.exec=function(){return t.apply(this,arguments)};var n="ab".split(e);return 2!==n.length||"a"!==n[0]||"b"!==n[1]}));e.exports=function(e,t,n,l){var p=i(e),h=!o((function(){var t={};return t[p]=function(){return 7},7!=""[e](t)})),v=h&&!o((function(){var t=!1,n=/a/;return"split"===e&&((n={}).constructor={},n.constructor[u]=function(){return n},n.flags="",n[p]=/./[p]),n.exec=function(){return t=!0,null},n[p](""),!t}));if(!h||!v||"replace"===e&&(!c||!s||f)||"split"===e&&!d){var m=/./[p],g=n(p,""[e],(function(e,t,n,r,o){return t.exec===RegExp.prototype.exec?h&&!o?{done:!0,value:m.call(t,n,r)}:{done:!0,value:e.call(n,t,r)}:{done:!1}}),{REPLACE_KEEPS_$0:s,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:f}),y=g[0],b=g[1];r(String.prototype,e,y),r(RegExp.prototype,p,2==t?function(e,t){return b.call(e,this,t)}:function(e){return b.call(e,this)})}l&&a(RegExp.prototype[p],"sham",!0)}},83632:function(e,t,n){"use strict";var r=n(1897),o=n(27842),i=n(57386);e.exports=function a(e,t,n,u,c,s,l,f){for(var d,p=c,h=0,v=!!l&&i(l,f,3);h0&&r(d))p=a(e,t,d,o(d.length),p,s-1)-1;else{if(p>=9007199254740991)throw TypeError("Exceed the acceptable array length");e[p]=d}p++}h++}return p}},41e3:function(e,t,n){"use strict";var r=n(84921);e.exports=!r((function(){return Object.isExtensible(Object.preventExtensions({}))}))},57386:function(e,t,n){"use strict";var r=n(13686);e.exports=function(e,t,n){if(r(e),t===undefined)return e;switch(n){case 0:return function(){return e.call(t)};case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,o){return e.call(t,n,r,o)}}return function(){return e.apply(t,arguments)}}},27314:function(e,t,n){"use strict";var r=n(13686),o=n(88711),i=[].slice,a={},u=function(e,t,n){if(!(t in a)){for(var r=[],o=0;o]*>)/g,u=/\$([$&'`]|\d{1,2})/g;e.exports=function(e,t,n,c,s,l){var f=n+e.length,d=c.length,p=u;return s!==undefined&&(s=r(s),p=a),i.call(l,p,(function(r,i){var a;switch(i.charAt(0)){case"$":return"$";case"&":return e;case"`":return t.slice(0,n);case"'":return t.slice(f);case"<":a=s[i.slice(1,-1)];break;default:var u=+i;if(0===u)return r;if(u>d){var l=o(u/10);return 0===l?r:l<=d?c[l-1]===undefined?i.charAt(1):c[l-1]+i.charAt(1):r}a=c[u-1]}return a===undefined?"":a}))}},179:function(e,t,n){"use strict";var r=function(e){return e&&e.Math==Math&&e};e.exports=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n.g&&n.g)||function(){return this}()||Function("return this")()},18632:function(e){"use strict";var t={}.hasOwnProperty;e.exports=function(e,n){return t.call(e,n)}},58825:function(e){"use strict";e.exports={}},63380:function(e,t,n){"use strict";var r=n(179);e.exports=function(e,t){var n=r.console;n&&n.error&&(1===arguments.length?n.error(e):n.error(e,t))}},55780:function(e,t,n){"use strict";var r=n(44417);e.exports=r("document","documentElement")},59807:function(e,t,n){"use strict";var r=n(67738),o=n(84921),i=n(27383);e.exports=!r&&!o((function(){return 7!=Object.defineProperty(i("div"),"a",{get:function(){return 7}}).a}))},63408:function(e){"use strict";var t=Math.abs,n=Math.pow,r=Math.floor,o=Math.log,i=Math.LN2;e.exports={pack:function(e,a,u){var c,s,l,f=new Array(u),d=8*u-a-1,p=(1<>1,v=23===a?n(2,-24)-n(2,-77):0,m=e<0||0===e&&1/e<0?1:0,g=0;for((e=t(e))!=e||e===Infinity?(s=e!=e?1:0,c=p):(c=r(o(e)/i),e*(l=n(2,-c))<1&&(c--,l*=2),(e+=c+h>=1?v/l:v*n(2,1-h))*l>=2&&(c++,l/=2),c+h>=p?(s=0,c=p):c+h>=1?(s=(e*l-1)*n(2,a),c+=h):(s=e*n(2,h-1)*n(2,a),c=0));a>=8;f[g++]=255&s,s/=256,a-=8);for(c=c<0;f[g++]=255&c,c/=256,d-=8);return f[--g]|=128*m,f},unpack:function(e,t){var r,o=e.length,i=8*o-t-1,a=(1<>1,c=i-7,s=o-1,l=e[s--],f=127&l;for(l>>=7;c>0;f=256*f+e[s],s--,c-=8);for(r=f&(1<<-c)-1,f>>=-c,c+=t;c>0;r=256*r+e[s],s--,c-=8);if(0===f)f=1-u;else{if(f===a)return r?NaN:l?-Infinity:Infinity;r+=n(2,t),f-=u}return(l?-1:1)*r*n(2,f-t)}}},46317:function(e,t,n){"use strict";var r=n(84921),o=n(90726),i="".split;e.exports=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(e){return"String"==o(e)?i.call(e,""):Object(e)}:Object},69262:function(e,t,n){"use strict";var r=n(88711),o=n(77715);e.exports=function(e,t,n){var i,a;return o&&"function"==typeof(i=t.constructor)&&i!==n&&r(a=i.prototype)&&a!==n.prototype&&o(e,a),e}},1306:function(e,t,n){"use strict";var r=n(53252),o=Function.toString;"function"!=typeof r.inspectSource&&(r.inspectSource=function(e){return o.call(e)}),e.exports=r.inspectSource},21419:function(e,t,n){"use strict";var r=n(58825),o=n(88711),i=n(18632),a=n(96452).f,u=n(88340),c=n(41e3),s=u("meta"),l=0,f=Object.isExtensible||function(){return!0},d=function(e){a(e,s,{value:{objectID:"O"+ ++l,weakData:{}}})},p=e.exports={REQUIRED:!1,fastKey:function(e,t){if(!o(e))return"symbol"==typeof e?e:("string"==typeof e?"S":"P")+e;if(!i(e,s)){if(!f(e))return"F";if(!t)return"E";d(e)}return e[s].objectID},getWeakData:function(e,t){if(!i(e,s)){if(!f(e))return!0;if(!t)return!1;d(e)}return e[s].weakData},onFreeze:function(e){return c&&p.REQUIRED&&f(e)&&!i(e,s)&&d(e),e}};r[s]=!0},28076:function(e,t,n){"use strict";var r,o,i,a=n(2900),u=n(179),c=n(88711),s=n(21413),l=n(18632),f=n(53252),d=n(6839),p=n(58825),h=u.WeakMap;if(a){var v=f.state||(f.state=new h),m=v.get,g=v.has,y=v.set;r=function(e,t){return t.facade=e,y.call(v,e,t),t},o=function(e){return m.call(v,e)||{}},i=function(e){return g.call(v,e)}}else{var b=d("state");p[b]=!0,r=function(e,t){return t.facade=e,s(e,b,t),t},o=function(e){return l(e,b)?e[b]:{}},i=function(e){return l(e,b)}}e.exports={set:r,get:o,has:i,enforce:function(e){return i(e)?o(e):r(e,{})},getterFor:function(e){return function(t){var n;if(!c(t)||(n=o(t)).type!==e)throw TypeError("Incompatible receiver, "+e+" required");return n}}}},76774:function(e,t,n){"use strict";var r=n(53414),o=n(36617),i=r("iterator"),a=Array.prototype;e.exports=function(e){return e!==undefined&&(o.Array===e||a[i]===e)}},1897:function(e,t,n){"use strict";var r=n(90726);e.exports=Array.isArray||function(e){return"Array"==r(e)}},61287:function(e,t,n){"use strict";var r=n(84921),o=/#|\.prototype\./,i=function(e,t){var n=u[a(e)];return n==s||n!=c&&("function"==typeof t?r(t):!!t)},a=i.normalize=function(e){return String(e).replace(o,".").toLowerCase()},u=i.data={},c=i.NATIVE="N",s=i.POLYFILL="P";e.exports=i},44616:function(e,t,n){"use strict";var r=n(88711),o=Math.floor;e.exports=function(e){return!r(e)&&isFinite(e)&&o(e)===e}},88711:function(e){"use strict";e.exports=function(e){return"object"==typeof e?null!==e:"function"==typeof e}},51684:function(e){"use strict";e.exports=!1},45025:function(e,t,n){"use strict";var r=n(88711),o=n(90726),i=n(53414)("match");e.exports=function(e){var t;return r(e)&&((t=e[i])!==undefined?!!t:"RegExp"==o(e))}},8362:function(e,t,n){"use strict";var r=n(14860),o=n(76774),i=n(27842),a=n(57386),u=n(29863),c=n(16284),s=function(e,t){this.stopped=e,this.result=t};e.exports=function(e,t,n){var l,f,d,p,h,v,m,g=n&&n.that,y=!(!n||!n.AS_ENTRIES),b=!(!n||!n.IS_ITERATOR),_=!(!n||!n.INTERRUPTED),w=a(t,g,1+y+_),x=function(e){return l&&c(l),new s(!0,e)},E=function(e){return y?(r(e),_?w(e[0],e[1],x):w(e[0],e[1])):_?w(e,x):w(e)};if(b)l=e;else{if("function"!=typeof(f=u(e)))throw TypeError("Target is not iterable");if(o(f)){for(d=0,p=i(e.length);p>d;d++)if((h=E(e[d]))&&h instanceof s)return h;return new s(!1)}l=f.call(e)}for(v=l.next;!(m=v.call(l)).done;){try{h=E(m.value)}catch(S){throw c(l),S}if("object"==typeof h&&h&&h instanceof s)return h}return new s(!1)}},16284:function(e,t,n){"use strict";var r=n(14860);e.exports=function(e){var t=e["return"];if(t!==undefined)return r(t.call(e)).value}},9392:function(e,t,n){"use strict";var r,o,i,a=n(84921),u=n(92608),c=n(21413),s=n(18632),l=n(53414),f=n(51684),d=l("iterator"),p=!1;[].keys&&("next"in(i=[].keys())?(o=u(u(i)))!==Object.prototype&&(r=o):p=!0);var h=r==undefined||a((function(){var e={};return r[d].call(e)!==e}));h&&(r={}),f&&!h||s(r,d)||c(r,d,(function(){return this})),e.exports={IteratorPrototype:r,BUGGY_SAFARI_ITERATORS:p}},36617:function(e){"use strict";e.exports={}},64674:function(e){"use strict";var t=Math.expm1,n=Math.exp;e.exports=!t||t(10)>22025.465794806718||t(10)<22025.465794806718||-2e-17!=t(-2e-17)?function(e){return 0==(e=+e)?e:e>-1e-6&&e<1e-6?e+e*e/2:n(e)-1}:t},90702:function(e,t,n){"use strict";var r=n(53188),o=Math.abs,i=Math.pow,a=i(2,-52),u=i(2,-23),c=i(2,127)*(2-u),s=i(2,-126);e.exports=Math.fround||function(e){var t,n,i=o(e),l=r(e);return ic||n!=n?l*Infinity:l*n}},36535:function(e){"use strict";var t=Math.log;e.exports=Math.log1p||function(e){return(e=+e)>-1e-8&&e<1e-8?e-e*e/2:t(1+e)}},53188:function(e){"use strict";e.exports=Math.sign||function(e){return 0==(e=+e)||e!=e?e:e<0?-1:1}},63785:function(e,t,n){"use strict";var r,o,i,a,u,c,s,l,f=n(179),d=n(8740).f,p=n(3350).set,h=n(13745),v=n(59137),m=n(23043),g=f.MutationObserver||f.WebKitMutationObserver,y=f.document,b=f.process,_=f.Promise,w=d(f,"queueMicrotask"),x=w&&w.value;x||(r=function(){var e,t;for(m&&(e=b.domain)&&e.exit();o;){t=o.fn,o=o.next;try{t()}catch(n){throw o?a():i=undefined,n}}i=undefined,e&&e.enter()},h||m||v||!g||!y?_&&_.resolve?(s=_.resolve(undefined),l=s.then,a=function(){l.call(s,r)}):a=m?function(){b.nextTick(r)}:function(){p.call(f,r)}:(u=!0,c=y.createTextNode(""),new g(r).observe(c,{characterData:!0}),a=function(){c.data=u=!u})),e.exports=x||function(e){var t={fn:e,next:undefined};i&&(i.next=t),o||(o=t,a()),i=t}},23287:function(e,t,n){"use strict";var r=n(179);e.exports=r.Promise},72974:function(e,t,n){"use strict";var r=n(23043),o=n(32728),i=n(84921);e.exports=!!Object.getOwnPropertySymbols&&!i((function(){return!Symbol.sham&&(r?38===o:o>37&&o<41)}))},2900:function(e,t,n){"use strict";var r=n(179),o=n(1306),i=r.WeakMap;e.exports="function"==typeof i&&/native code/.test(o(i))},15115:function(e,t,n){"use strict";var r=n(13686),o=function(e){var t,n;this.promise=new e((function(e,r){if(t!==undefined||n!==undefined)throw TypeError("Bad Promise constructor");t=e,n=r})),this.resolve=r(t),this.reject=r(n)};e.exports.f=function(e){return new o(e)}},42386:function(e,t,n){"use strict";var r=n(45025);e.exports=function(e){if(r(e))throw TypeError("The method doesn't accept regular expressions");return e}},87419:function(e,t,n){"use strict";var r=n(179).isFinite;e.exports=Number.isFinite||function(e){return"number"==typeof e&&r(e)}},86710:function(e,t,n){"use strict";var r=n(179),o=n(20017).trim,i=n(65094),a=r.parseFloat,u=1/a(i+"-0")!=-Infinity;e.exports=u?function(e){var t=o(String(e)),n=a(t);return 0===n&&"-"==t.charAt(0)?-0:n}:a},42619:function(e,t,n){"use strict";var r=n(179),o=n(20017).trim,i=n(65094),a=r.parseInt,u=/^[+-]?0[Xx]/,c=8!==a(i+"08")||22!==a(i+"0x16");e.exports=c?function(e,t){var n=o(String(e));return a(n,t>>>0||(u.test(n)?16:10))}:a},18174:function(e,t,n){"use strict";var r=n(67738),o=n(84921),i=n(75224),a=n(32645),u=n(32163),c=n(6289),s=n(46317),l=Object.assign,f=Object.defineProperty;e.exports=!l||o((function(){if(r&&1!==l({b:1},l(f({},"a",{enumerable:!0,get:function(){f(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var e={},t={},n=Symbol(),o="abcdefghijklmnopqrst";return e[n]=7,o.split("").forEach((function(e){t[e]=e})),7!=l({},e)[n]||i(l({},t)).join("")!=o}))?function(e,t){for(var n=c(e),o=arguments.length,l=1,f=a.f,d=u.f;o>l;)for(var p,h=s(arguments[l++]),v=f?i(h).concat(f(h)):i(h),m=v.length,g=0;m>g;)p=v[g++],r&&!d.call(h,p)||(n[p]=h[p]);return n}:l},96093:function(e,t,n){"use strict";var r,o=n(14860),i=n(79227),a=n(89807),u=n(58825),c=n(55780),s=n(27383),l=n(6839),f=l("IE_PROTO"),d=function(){},p=function(e){return"