diff --git a/citadel.dme b/citadel.dme
index 08ea92e3cc8d..97f80de0530a 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -967,6 +967,7 @@
#include "code\game\area\ss13_deprecated_areas.dm"
#include "code\game\area\Tether_areas.dm"
#include "code\game\area\station\exporation.dm"
+#include "code\game\area\station\security_areas.dm"
#include "code\game\atoms\action_feedback.dm"
#include "code\game\atoms\appearance.dm"
#include "code\game\atoms\atom.dm"
@@ -3138,6 +3139,7 @@
#include "code\modules\mapping\map.dm"
#include "code\modules\mapping\map_level.dm"
#include "code\modules\mapping\map_template.dm"
+#include "code\modules\mapping\merge_conflicts.dm"
#include "code\modules\mapping\minimaps.dm"
#include "code\modules\mapping\shuttle.dm"
#include "code\modules\mapping\submap.dm"
@@ -3338,6 +3340,8 @@
#include "code\modules\mining\vertibore.dm"
#include "code\modules\mining\drilling\drill.dm"
#include "code\modules\mining\drilling\scanner.dm"
+#include "code\modules\mining\machinery\sheet_silo.dm"
+#include "code\modules\mining\machinery\sheet_silo_loader.dm"
#include "code\modules\mining\ore_redemption_machine\construction.dm"
#include "code\modules\mining\ore_redemption_machine\engineering_points_vendor.dm"
#include "code\modules\mining\ore_redemption_machine\equipment_vendor.dm"
diff --git a/code/__DEFINES/controllers/persistence.dm b/code/__DEFINES/controllers/persistence.dm
index 75e648047036..4f234acbb3d3 100644
--- a/code/__DEFINES/controllers/persistence.dm
+++ b/code/__DEFINES/controllers/persistence.dm
@@ -9,6 +9,9 @@
#define OBJ_HAS_PERSISTENCE_ENABLED(OBJ) (OBJ.persist_static_id || OBJ.persist_dynamic_id)
/// check if an /obj is eligible at all for mass persistence
#define OBJ_MASS_PERSIST_SANITY_CHECK(OBJ) (OBJ_HAS_PERSIST_ENABLED(OBJ) && !(OBJ.obj_persist_status & (OBJ_PERSIST_STATUS_NO_THANK_YOU)))
+/// sentinel id; set this if you want something to persist but generate its own dynamic id
+/// instead of setting one manually
+#define PERSISTENCE_DYNAMIC_ID_AUTOSET "!autoset"
//* /obj - obj_persist_status *//
@@ -22,6 +25,8 @@
#define OBJ_PERSIST_STATUS_FIRST_GENERATION (1<<2)
/// do not persist
#define OBJ_PERSIST_STATUS_NO_THANK_YOU (1<<3)
+/// do not show persistent status on examine
+#define OBJ_PERSIST_STATUS_NO_EXAMINE (1<<4)
//* /obj - obj_persist_dynamic_status *//
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 7447ca482eef..469155b777ba 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -2,6 +2,19 @@
#define in_range(source, user) (get_dist(source, user) <= 1 && (get_step(source, 0)?:z) == (get_step(user, 0)?:z))
+//* Datatypes *//
+
+/**
+ * used to filter nans and non-numbers from player input
+ */
+#if DM_VERSION < 515
+#define is_safe_number(N) (isnum(N) && (N == N))
+#else
+#define is_safe_number(N) (isnum(N) && !isnan(N))
+#endif
+
+//* Typepaths *//
+
#define isatom(A) (isloc(A))
#define isdatum(D) (istype(D, /datum))
diff --git a/code/__DEFINES/materials/flags.dm b/code/__DEFINES/materials/flags.dm
index 4bfd28a8d66f..a22e4c3388f6 100644
--- a/code/__DEFINES/materials/flags.dm
+++ b/code/__DEFINES/materials/flags.dm
@@ -7,10 +7,14 @@
#define MATERIAL_FLAG_VULNERABLE_MOB_ARMOR (1<<0)
/// utterly immune to melting, thermite or otherwise
#define MATERIAL_FLAG_UNMELTABLE (1<<1)
+/// too dangerous to persist
+/// this is a somewhat awful flag so we'll keep it until we need to get rid of it
+#define MATERIAL_FLAG_CONSIDERED_OVERPOWERED (1<<2)
DEFINE_BITFIELD(material_flags, list(
BITFIELD(MATERIAL_FLAG_VULNERABLE_MOB_ARMOR),
BITFIELD(MATERIAL_FLAG_UNMELTABLE),
+ BITFIELD(MATERIAL_FLAG_CONSIDERED_OVERPOWERED),
))
//* /datum/material material_constraints
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index de8546485869..f5c83ecf306f 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -94,7 +94,8 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
#define MAX_BOOK_MESSAGE_LEN 24576
#define MAX_RECORD_LENGTH 24576
#define MAX_LNAME_LEN 64
-#define MAX_NAME_LEN 52
+#define MAX_NAME_LEN 64
+
/// 512GQ file
#define MAX_TEXTFILE_LENGTH 128000
// Event defines.
diff --git a/code/controllers/subsystem/persistence/modules/level_objects.dm b/code/controllers/subsystem/persistence/modules/level_objects.dm
index 84f6bee8a567..43072527d789 100644
--- a/code/controllers/subsystem/persistence/modules/level_objects.dm
+++ b/code/controllers/subsystem/persistence/modules/level_objects.dm
@@ -27,19 +27,19 @@
"generation" = generation,
"object_id" = entity.obj_persist_static_id,
"level_id" = entity.obj_persist_static_bound_id || level_id,
- "data" = entity.serialize(),
+ "data" = safe_json_encode(entity.serialize()),
),
)
if(OBJ_PERSIST_STATIC_MODE_MAP)
query = SSdbcore.NewQuery(
- "INSERT INTO [format_table_name("persistence_static_mapl_objects")] (generation, object_id, map_id, data) \
+ "INSERT INTO [format_table_name("persistence_static_map_objects")] (generation, object_id, map_id, data) \
VALUES (:generation, :object_id, :map_id, :data) ON DUPLICATE KEY UPDATE \
data = VALUES(data)",
list(
"generation" = generation,
"object_id" = entity.obj_persist_static_id,
"map_id" = entity.obj_persist_static_bound_id || map_id,
- "data" = entity.serialize(),
+ "data" = safe_json_encode(entity.serialize()),
),
)
if(OBJ_PERSIST_STATIC_MODE_GLOBAL)
@@ -50,7 +50,7 @@
list(
"generation" = generation,
"object_id" = entity.obj_persist_static_id,
- "data" = entity.serialize(),
+ "data" = safe_json_encode(entity.serialize()),
),
)
else
@@ -77,7 +77,7 @@
for(var/obj/entity as anything in entities)
var/datum/db_query/query
- if(entity.obj_persist_dynamic_id)
+ if(entity.obj_persist_dynamic_id != PERSISTENCE_DYNAMIC_ID_AUTOSET)
query = SSdbcore.NewQuery(
"INSERT INTO [format_table_name("persistence_dynamic_objects")] (id, generation, status, data, prototype_id, level_id, x, y) \
VALUES (:status, :data, :prototype, :level, :x, :y) ON DUPLICATE KEY UPDATE \
@@ -87,7 +87,7 @@
"id" = entity.obj_persist_dynamic_id,
"generation" = generation,
"status" = entity.obj_persist_dynamic_status,
- "data" = entity.serialize(),
+ "data" = safe_json_encode(entity.serialize()),
"prototype" = "[entity.type]",
"level" = level_id,
"x" = entity.x,
@@ -101,7 +101,7 @@
VALUES (:status, :data, :prototype, :level, :x, :y)",
list(
"status" = entity.obj_persist_dynamic_status,
- "data" = entity.serialize(),
+ "data" = safe_json_encode(entity.serialize()),
"prototype" = "[entity.type]",
"level" = level_id,
"x" = entity.x,
@@ -197,7 +197,7 @@
for(var/obj/entity as anything in entities)
var/datum/db_query/query
var/bind_id
- switch(entity.obj_persist_dynamic_status)
+ switch(entity.obj_persist_static_mode)
if(OBJ_PERSIST_STATIC_MODE_GLOBAL)
query = SSdbcore.NewQuery(
"SELECT data FROM [format_table_name("persistence_static_global_objects")] \
diff --git a/code/controllers/subsystem/persistence/modules/spatial_metadata.dm b/code/controllers/subsystem/persistence/modules/spatial_metadata.dm
index dce020f3d31b..6f6355ff490b 100644
--- a/code/controllers/subsystem/persistence/modules/spatial_metadata.dm
+++ b/code/controllers/subsystem/persistence/modules/spatial_metadata.dm
@@ -100,7 +100,7 @@
src.generation = generation
src.hours_since_saved = 0
src.rounds_since_saved = 0
- src.round_id_saved = GLOB.round_id
+ src.round_id_saved = GLOB.round_number
SSdbcore.RunQuery(
"INSERT INTO [format_table_name("persistence_level_metadata")] (saved, saved_round_id, level_id, data, generation) \
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 885cf5541cca..5dea5d4896ea 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -22,6 +22,22 @@ SUBSYSTEM_DEF(vote)
var/list/voting = list()
/// Anonymous votes
var/secret = FALSE
+ /// Ghost_weight on votes in %
+ var/ghost_weight_percent = 25
+
+
+/datum/config_entry/number/ghost_weight
+ default = 25
+
+/datum/config_entry/flag/transfer_vote_obfuscation
+ default = FALSE
+
+/datum/config_entry/string/default_on_transfer_tie
+ default = "Extend the Shift"
+
+/datum/controller/subsystem/vote/Initialize(start_timeofday)
+ . = ..()
+ ghost_weight_percent = CONFIG_GET(number/ghost_weight)
/datum/controller/subsystem/vote/fire(resumed)
if(mode)
@@ -66,6 +82,8 @@ SUBSYSTEM_DEF(vote)
choices.Cut()
votes_by_choice.Cut()
current_votes.Cut()
+ secret = FALSE
+ ghost_weight_percent = CONFIG_GET(number/ghost_weight)
/datum/controller/subsystem/vote/proc/get_result() // Get the highest number of votes
var/greatest_votes = 0
@@ -89,16 +107,18 @@ SUBSYSTEM_DEF(vote)
/datum/controller/subsystem/vote/proc/announce_result()
var/list/winners = get_result()
var/text
+ if(mode == VOTE_CREW_TRANSFER)
+ switch(LAZYLEN(winners))
+ if(0)
+ . = "Initiate Crew Transfer"
+ if(2)
+ . = CONFIG_GET(string/default_on_transfer_tie)
if(LAZYLEN(winners) > 0)
. = pick(winners)
-
- if(SSticker.hide_mode == 0) // Announce Extended gamemode, but not other gamemodes
- text += "Vote Result: [.]"
- else
- text += "The vote has ended."
-
+ text += "Vote Result: [.]"
else
text += "Vote Result: Inconclusive - No Votes!"
+
for(var/option in choices)
text += SPAN_NOTICE("\n[option] - [votes_by_choice[option] || 0]")
log_vote(text)
@@ -125,20 +145,23 @@ SUBSYSTEM_DEF(vote)
log_game("Rebooting due to restart vote")
world.Reboot()
-/datum/controller/subsystem/vote/proc/submit_vote(ckey, newVote)
-
+/datum/controller/subsystem/vote/proc/submit_vote(user, ckey, newVote)
+ //if they are a observer or a newplayer(in lobby) use ghost weight, otherwise use 1
+ var/weight = (isobserver(user) || isnewplayer(user)) ? ghost_weight_percent / 100 : 1
if(mode)
- if(config_legacy.vote_no_dead && usr.stat == DEAD && !usr.client.holder)
+ if(weight == 0)
return
if(newVote)
if(current_votes[ckey])
- votes_by_choice[current_votes[ckey]]--
- current_votes[ckey] = choices[newVote]
- votes_by_choice[choices[newVote]]++
+ votes_by_choice[current_votes[ckey][2]] -= current_votes[ckey][1]
+ current_votes[ckey] = list(weight, choices[newVote])
+ votes_by_choice[current_votes[ckey][2]] += current_votes[ckey][1]
else
- votes_by_choice[current_votes[ckey]]--
+ votes_by_choice[current_votes[ckey][2]] -= current_votes[ckey][1]
current_votes[ckey] = null
+
+
/datum/controller/subsystem/vote/proc/initiate_vote(vote_type, initiator_key, automatic = FALSE, time = config_legacy.vote_period)
if(!mode)
if(started_time != null && !(check_rights(R_ADMIN) || automatic))
@@ -146,7 +169,7 @@ SUBSYSTEM_DEF(vote)
if(next_allowed_time > world.time)
return 0
- reset()
+ //reset()
switch(vote_type)
if(VOTE_RESTART)
@@ -158,6 +181,7 @@ SUBSYSTEM_DEF(vote)
choices.Add("Initiate Crew Transfer", "Extend the Shift")
votes_by_choice["Initiate Crew Transfer"] = 0
votes_by_choice["Extend the Shift"] = 0
+ secret = CONFIG_GET(flag/transfer_vote_obfuscation)
if(VOTE_CUSTOM)
question = sanitizeSafe(input(usr, "What is the vote for?") as text|null)
if(!question)
@@ -180,7 +204,8 @@ SUBSYSTEM_DEF(vote)
var/text = "[capitalize(mode)] vote started by [initiator]."
if(mode == VOTE_CUSTOM)
text += "\n[question]"
-
+ if(ghost_weight_percent <= 0)
+ text += SPAN_NOTICE("\nGhosts are excluded from the vote.")
log_vote(text)
to_chat(world, "[text]\nType vote or click here to place your votes.\nYou have [config_legacy.vote_period / 10] seconds to vote.")
@@ -212,7 +237,7 @@ SUBSYSTEM_DEF(vote)
// Tracks who is voting
if(!(user.client?.ckey in voting))
voting += user.client?.ckey
- current_votes[user.client?.ckey] = null
+ //current_votes[user.client?.ckey] = null
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "Vote")
@@ -222,12 +247,14 @@ SUBSYSTEM_DEF(vote)
var/list/data = list(
"choices" = list(),
"question" = question,
- "selected_choice" = LAZYACCESS(current_votes,user.key) ? LAZYACCESS(current_votes,user.key) : "",
+ "selected_choice" = LAZYACCESS(current_votes,user.key) ? LAZYACCESS(current_votes,user.key)[2] : "",
"time_remaining" = time_remaining,
"admin" = check_rights_for(user.client, R_ADMIN),
"vote_happening" = !!choices.len,
"secret" = secret,
+ "ghost_weight" = ghost_weight_percent,
+ "ghost" = isobserver(user) || isnewplayer(user),
)
for(var/key in choices)
@@ -265,10 +292,16 @@ SUBSYSTEM_DEF(vote)
initiate_vote(VOTE_CUSTOM, usr.key)
if("vote")
//current_votes[usr.client.ckey] = round(text2num(params["index"]))
- submit_vote(usr.key,params["index"])
+ submit_vote(usr, usr.key,params["index"])
if("unvote")
- submit_vote(usr.key, null)
+ submit_vote(usr, usr.key, null)
if("hide")
- secret = !secret
- log_and_message_admins("[usr] made the individual vote numbers [(secret ? "invisibile" : "visible")].")
+ if(admin)
+ secret = !secret
+ log_and_message_admins("[usr] made the individual vote numbers [(secret ? "invisibile" : "visible")].")
+ if("ghost_weight")
+ if(admin)
+ ghost_weight_percent = params["ghost_weight"] ? max(0, text2num(params["ghost_weight"])) : ghost_weight_percent
+ log_and_message_admins("[usr] changed the ghost vote weight to [ghost_weight_percent].")
+
return TRUE
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index ecbdbba3da60..e8548a27acc8 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -161,6 +161,17 @@
SEND_SIGNAL(source, COMSIG_CD_RESET(index), S_TIMER_COOLDOWN_TIMELEFT(source, index))
TIMER_COOLDOWN_END(source, index)
+//* Duplication *//
+
+/**
+ * makes a clone of this datum
+ *
+ * @params
+ * * include_contents - include semantic contents; ergo 'what we are hosting' vs 'what we are'
+ */
+/datum/proc/clone(include_contents)
+ return new type
+
//* Serialization *//
/**
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index ad5ff4ef9b59..1571fb01b9e9 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -2412,235 +2412,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
name = "\improper Psych Ward"
icon_state = "psych_ward"
-//Security
-
-/area/security
- nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
-/area/security/main
- name = "\improper Security Office"
- icon_state = "security"
- nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
-
-/area/security/lobby
- name = "\improper Security Lobby"
- icon_state = "security"
- nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS
-
-/area/security/brig
- name = "\improper Security - Brig"
- icon_state = "brig"
-
-/area/security/brig/prison_break()
- for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
- temp_closet.locked = 0
- temp_closet.icon_state = temp_closet.icon_closed
- for(var/obj/machinery/door_timer/temp_timer in src)
- temp_timer.timer_duration = 1
- ..()
-
-/area/security/prison
- name = "\improper Security - Prison Wing"
- icon_state = "sec_prison"
-
-/area/security/prison/prison_break()
- for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
- temp_closet.locked = 0
- temp_closet.icon_state = temp_closet.icon_closed
- for(var/obj/machinery/door_timer/temp_timer in src)
- temp_timer.timer_duration = 1
- ..()
-
-/area/security/warden
- name = "\improper Security - Warden's Office"
- icon_state = "Warden"
-
-/area/security/armoury
- name = "\improper Security - Armory"
- icon_state = "armory"
- ambience = AMBIENCE_HIGHSEC
- area_flags = AREA_FLAG_BLUE_SHIELDED
- nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE
-
-/area/security/briefing_room
- name = "\improper Security - Briefing Room"
- icon_state = "brig"
-
-/area/security/evidence_storage
- name = "\improper Security - Equipment Storage"
- icon_state = "security_equipment_storage"
-
-/area/security/evidence_storage
- name = "\improper Security - Evidence Storage"
- icon_state = "evidence_storage"
-
-/area/security/interrogation
- name = "\improper Security - Interrogation"
- icon_state = "interrogation"
-
-/area/security/riot_control
- name = "\improper Security - Riot Control"
- icon_state = "riot_control"
- nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE
-
-/area/security/detectives_office
- name = "\improper Security - Forensic Office"
- icon_state = "detective"
- sound_env = MEDIUM_SOFTFLOOR
-
-/area/security/range
- name = "\improper Security - Firing Range"
- icon_state = "firingrange"
-
-/area/security/security_aid_station
- name = "\improper Security - Security Aid Station"
- icon_state = "security_aid_station"
-
-/area/security/security_bathroom
- name = "\improper Security - Restroom"
- icon_state = "security_bathroom"
- sound_env = SMALL_ENCLOSED
-
-/area/security/security_cell_hallway
- name = "\improper Security - Cell Hallway"
- icon_state = "security_cell_hallway"
-
-/area/security/security_equiptment_storage
- name = "\improper Security - Equipment Storage"
- icon_state = "security_equip_storage"
-
-/area/security/security_lockerroom
- name = "\improper Security - Locker Room"
- icon_state = "security_lockerroom"
-
-/area/security/security_processing
- name = "\improper Security - Security Processing"
- icon_state = "security_processing"
-
-/area/security/tactical
- name = "\improper Security - Tactical Equipment"
- icon_state = "Tactical"
- ambience = AMBIENCE_HIGHSEC
- area_flags = AREA_FLAG_BLUE_SHIELDED
-
-/area/security/hallway
- name = "\improper Security Hallway"
- icon_state = "security"
-
-/area/security/hallwayaux
- name = "\improper Security Armory Hallway"
- icon_state = "security"
-
-/area/security/forensics
- name = "\improper Forensics Lab"
- icon_state = "security"
-
-/area/security/breakroom
- name = "\improper Security Breakroom"
- icon_state = "security"
- nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE
-
-/area/security/brig/visitation
- name = "\improper Visitation"
- icon_state = "security"
-
-/area/security/brig/bathroom
- name = "\improper Brig Bathroom"
- icon_state = "security"
-
-/area/security/armory/blue
- name = "\improper Armory - Blue"
- icon_state = "armory"
-
-/area/security/armory/red
- name = "\improper Armory - Red"
- icon_state = "red2"
-
-/area/security/observation
- name = "\improper Brig Observation"
- icon_state = "riot_control"
-
-/area/security/eva
- name = "\improper Security EVA"
- icon_state = "security_equip_storage"
-
-/area/security/recstorage
- name = "\improper Brig Recreation Storage"
- icon_state = "brig"
-
-/area/security/training
- name = "\improper Training & Briefing Room"
- icon_state = "security"
-
-/area/security/hanger
- name = "\improper Security Hanger"
- icon_state = "security_equip_storage"
-
-/area/security/visitor
- name = "\improper Security Visitor Room"
- icon_state = "security"
- nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS
-
-/*
- New()
- ..()
-
- spawn(10) //let objects set up first
- for(var/turf/turfToGrayscale in src)
- if(turfToGrayscale.icon)
- var/icon/newIcon = icon(turfToGrayscale.icon)
- newIcon.GrayScale()
- turfToGrayscale.icon = newIcon
- for(var/obj/objectToGrayscale in turfToGrayscale) //1 level deep, means tables, apcs, locker, etc, but not locker contents
- if(objectToGrayscale.icon)
- var/icon/newIcon = icon(objectToGrayscale.icon)
- newIcon.GrayScale()
- objectToGrayscale.icon = newIcon
-*/
-
-/area/security/nuke_storage
- name = "\improper Vault"
- icon_state = "nuke_storage"
- ambience = AMBIENCE_HIGHSEC
- area_flags = AREA_FLAG_BLUE_SHIELDED
-
-/area/security/checkpoint
- name = "\improper Security Checkpoint"
- icon_state = "checkpoint1"
-
-/area/security/checkpoint2
- name = "\improper Security - Arrival Checkpoint"
- icon_state = "security"
- ambience = AMBIENCE_ARRIVALS
-
-/area/security/checkpoint/supply
- name = "Security Post - Cargo Bay"
- icon_state = "checkpoint1"
-
-/area/security/checkpoint/engineering
- name = "Security Post - Engineering"
- icon_state = "checkpoint1"
-
-/area/security/checkpoint/medical
- name = "Security Post - Medbay"
- icon_state = "checkpoint1"
-
-/area/security/checkpoint/science
- name = "Security Post - Science"
- icon_state = "checkpoint1"
-
-/area/security/vacantoffice
- name = "\improper Vacant Office"
- icon_state = "security"
-
-/area/security/vacantoffice2
- name = "\improper Vacant Office"
- icon_state = "security"
-
-/area/security/hammerhead_bay
- name = "\improper Hammerhead Barge Hangar"
- icon_state = "hangar"
-
/area/janitor/
name = "\improper Custodial Closet"
icon_state = "janitor"
diff --git a/code/game/area/station/security_areas.dm b/code/game/area/station/security_areas.dm
new file mode 100644
index 000000000000..18c36fdcd449
--- /dev/null
+++ b/code/game/area/station/security_areas.dm
@@ -0,0 +1,236 @@
+//Security
+
+/area/security
+ nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/security/main
+ name = "\improper Security Office"
+ icon_state = "security"
+ nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_FACILITIES
+
+/area/security/lobby
+ name = "\improper Security Lobby"
+ icon_state = "security"
+ nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS
+
+/area/security/brig
+ name = "\improper Security - Brig"
+ icon_state = "brig"
+
+/area/security/brig/prison_break()
+ for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
+ temp_closet.locked = 0
+ temp_closet.icon_state = temp_closet.icon_closed
+ for(var/obj/machinery/door_timer/temp_timer in src)
+ temp_timer.timer_duration = 1
+ ..()
+
+/area/security/prison
+ name = "\improper Security - Prison Wing"
+ icon_state = "sec_prison"
+
+/area/security/prison/prison_break()
+ for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
+ temp_closet.locked = 0
+ temp_closet.icon_state = temp_closet.icon_closed
+ for(var/obj/machinery/door_timer/temp_timer in src)
+ temp_timer.timer_duration = 1
+ ..()
+
+/area/security/prison/upper
+ name = "\improper Security - Upper Prison Wing"
+ icon_state = "sec_prison"
+
+/area/security/prison/lower
+ name = "\improper Security - Lower Prison Wing"
+ icon_state = "sec_prison"
+
+/area/security/warden
+ name = "\improper Security - Warden's Office"
+ icon_state = "Warden"
+
+/area/security/armoury
+ name = "\improper Security - Armory"
+ icon_state = "armory"
+ ambience = AMBIENCE_HIGHSEC
+ area_flags = AREA_FLAG_BLUE_SHIELDED
+ nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE
+
+/area/security/briefing_room
+ name = "\improper Security - Briefing Room"
+ icon_state = "brig"
+
+/area/security/evidence_storage
+ name = "\improper Security - Equipment Storage"
+ icon_state = "security_equipment_storage"
+
+/area/security/evidence_storage
+ name = "\improper Security - Evidence Storage"
+ icon_state = "evidence_storage"
+
+/area/security/interrogation
+ name = "\improper Security - Interrogation"
+ icon_state = "interrogation"
+
+/area/security/riot_control
+ name = "\improper Security - Riot Control"
+ icon_state = "riot_control"
+ nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_SENSITIVE
+
+/area/security/detectives_office
+ name = "\improper Security - Forensic Office"
+ icon_state = "detective"
+ sound_env = MEDIUM_SOFTFLOOR
+
+/area/security/range
+ name = "\improper Security - Firing Range"
+ icon_state = "firingrange"
+
+/area/security/security_aid_station
+ name = "\improper Security - Security Aid Station"
+ icon_state = "security_aid_station"
+
+/area/security/security_bathroom
+ name = "\improper Security - Restroom"
+ icon_state = "security_bathroom"
+ sound_env = SMALL_ENCLOSED
+
+/area/security/security_cell_hallway
+ name = "\improper Security - Cell Hallway"
+ icon_state = "security_cell_hallway"
+
+/area/security/security_equiptment_storage
+ name = "\improper Security - Equipment Storage"
+ icon_state = "security_equip_storage"
+
+/area/security/security_lockerroom
+ name = "\improper Security - Locker Room"
+ icon_state = "security_lockerroom"
+
+/area/security/security_processing
+ name = "\improper Security - Security Processing"
+ icon_state = "security_processing"
+
+/area/security/tactical
+ name = "\improper Security - Tactical Equipment"
+ icon_state = "Tactical"
+ ambience = AMBIENCE_HIGHSEC
+ area_flags = AREA_FLAG_BLUE_SHIELDED
+
+/area/security/hallway
+ name = "\improper Security Hallway"
+ icon_state = "security"
+
+/area/security/hallwayaux
+ name = "\improper Security Armory Hallway"
+ icon_state = "security"
+
+/area/security/forensics
+ name = "\improper Forensics Lab"
+ icon_state = "security"
+
+/area/security/breakroom
+ name = "\improper Security Breakroom"
+ icon_state = "security"
+ nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_LEISURE
+
+/area/security/brig/visitation
+ name = "\improper Visitation"
+ icon_state = "security"
+
+/area/security/brig/bathroom
+ name = "\improper Brig Bathroom"
+ icon_state = "security"
+
+/area/security/armory/blue
+ name = "\improper Armory - Blue"
+ icon_state = "armory"
+
+/area/security/armory/red
+ name = "\improper Armory - Red"
+ icon_state = "red2"
+
+/area/security/observation
+ name = "\improper Brig Observation"
+ icon_state = "riot_control"
+
+/area/security/eva
+ name = "\improper Security EVA"
+ icon_state = "security_equip_storage"
+
+/area/security/recstorage
+ name = "\improper Brig Recreation Storage"
+ icon_state = "brig"
+
+/area/security/training
+ name = "\improper Training & Briefing Room"
+ icon_state = "security"
+
+/area/security/hanger
+ name = "\improper Security Hanger"
+ icon_state = "security_equip_storage"
+
+/area/security/visitor
+ name = "\improper Security Visitor Room"
+ icon_state = "security"
+ nightshift_level = NIGHTSHIFT_LEVEL_DEPARTMENT_HALLWAYS
+
+/*
+ New()
+ ..()
+
+ spawn(10) //let objects set up first
+ for(var/turf/turfToGrayscale in src)
+ if(turfToGrayscale.icon)
+ var/icon/newIcon = icon(turfToGrayscale.icon)
+ newIcon.GrayScale()
+ turfToGrayscale.icon = newIcon
+ for(var/obj/objectToGrayscale in turfToGrayscale) //1 level deep, means tables, apcs, locker, etc, but not locker contents
+ if(objectToGrayscale.icon)
+ var/icon/newIcon = icon(objectToGrayscale.icon)
+ newIcon.GrayScale()
+ objectToGrayscale.icon = newIcon
+*/
+
+/area/security/nuke_storage
+ name = "\improper Vault"
+ icon_state = "nuke_storage"
+ ambience = AMBIENCE_HIGHSEC
+ area_flags = AREA_FLAG_BLUE_SHIELDED
+
+/area/security/checkpoint
+ name = "\improper Security Checkpoint"
+ icon_state = "checkpoint1"
+
+/area/security/checkpoint2
+ name = "\improper Security - Arrival Checkpoint"
+ icon_state = "security"
+ ambience = AMBIENCE_ARRIVALS
+
+/area/security/checkpoint/supply
+ name = "Security Post - Cargo Bay"
+ icon_state = "checkpoint1"
+
+/area/security/checkpoint/engineering
+ name = "Security Post - Engineering"
+ icon_state = "checkpoint1"
+
+/area/security/checkpoint/medical
+ name = "Security Post - Medbay"
+ icon_state = "checkpoint1"
+
+/area/security/checkpoint/science
+ name = "Security Post - Science"
+ icon_state = "checkpoint1"
+
+/area/security/vacantoffice
+ name = "\improper Vacant Office"
+ icon_state = "security"
+
+/area/security/vacantoffice2
+ name = "\improper Vacant Office"
+ icon_state = "security"
+
+/area/security/hammerhead_bay
+ name = "\improper Hammerhead Barge Hangar"
+ icon_state = "hangar"
diff --git a/code/game/atoms/atom.dm b/code/game/atoms/atom.dm
index b40bab69778a..8b2ce9012b33 100644
--- a/code/game/atoms/atom.dm
+++ b/code/game/atoms/atom.dm
@@ -45,7 +45,8 @@
//? Context
/// open context menus by mob
- var/list/context_menus
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/list/context_menus
//? Economy
// todo: move all this to obj level, you aren't going to sell a fucking turf.
@@ -143,16 +144,24 @@
//? Materials
/// combined material trait flags
/// this list is at /atom level but are only used/implemented on /obj generically; anything else, e.g. walls, should implement manually for efficiency.
- var/material_trait_flags = NONE
+ /// * this variable is a cache variable and is generated from the materials on an entity.
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/material_trait_flags = NONE
/// material traits on us, associated to metadata
/// this list is at /atom level but are only used/implemented on /obj generically; anything else, e.g. walls, should implement manually for efficiency.
- var/list/datum/material_trait/material_traits
+ /// * this variable is a cache variable and is generated from the materials on an entity.
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/list/datum/material_trait/material_traits
/// material trait metadata when [material_traits] is a single trait. null otherwise.
- var/material_traits_data
+ /// * this variable is a cache variable and is generated from the materials on an entity.
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/material_traits_data
/// 'stacks' of ticking
/// this synchronizes the system so removing one ticking material trait doesn't fully de-tick the entity
//! DO NOT FUCK WITH THIS UNLESS YOU KNOW WHAT YOU ARE DOING
- var/material_ticking_counter = 0
+ /// * this variable is a cache variable and is generated from the materials on an entity.
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/material_ticking_counter = 0
/// material trait relative strength
/// applies to all traits globally as opposed to just one material parts,
/// because this is at /atom level.
@@ -170,13 +179,16 @@
/// sorted priority list of datums for handling shieldcalls with
/// we use this instead of signals so we can enforce priorities
/// this is horrifying.
- var/list/datum/shieldcall/shieldcalls
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/list/datum/shieldcall/shieldcalls
//? Overlays
/// vis overlays managed by SSvis_overlays to automaticaly turn them like other overlays.
- var/list/managed_vis_overlays
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/list/managed_vis_overlays
/// overlays managed by [update_overlays][/atom/proc/update_overlays] to prevent removing overlays that weren't added by the same proc. Single items are stored on their own, not in a list.
- var/list/managed_overlays
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/list/managed_overlays
//? Layers
/// Base layer - defaults to layer.
diff --git a/code/game/atoms/movable/movable.dm b/code/game/atoms/movable/movable.dm
index a489d59d2e6c..120758bc1614 100644
--- a/code/game/atoms/movable/movable.dm
+++ b/code/game/atoms/movable/movable.dm
@@ -28,26 +28,36 @@
//? Movement
/// Whatever we're pulling.
- var/atom/movable/pulling
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/atom/movable/pulling
/// Who's currently pulling us
- var/atom/movable/pulledby
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/atom/movable/pulledby
/// If false makes [CanPass][/atom/proc/CanPass] call [CanPassThrough][/atom/movable/proc/CanPassThrough] on this type instead of using default behaviour
- var/generic_canpass = TRUE
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/generic_canpass = TRUE
/// Pass flags.
var/pass_flags = NONE
/// movement calls we're in
- var/in_move = 0
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/in_move = 0
/// a direction, or null
- var/moving_diagonally = NOT_IN_DIAG_STEP
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/moving_diagonally = NOT_IN_DIAG_STEP
/// attempt to resume grab after moving instead of before. This is what atom/movable is pulling us during move-from-pulling.
- var/atom/movable/moving_from_pull
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/atom/movable/moving_from_pull
/// Direction of our last move.
- var/last_move_dir = NONE
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/last_move_dir = NONE
/// Our default glide_size. Null to use global default.
var/default_glide_size
/// Movement types, see [code/__DEFINES/flags/movement.dm]
/// Do *not* manually edit this variable in most cases. Use the helpers in [code/game/atoms/atoms_movement.dm].
- var/movement_type = MOVEMENT_GROUND
+ /// todo: is there a better way to do this? what if we want to force something to be a movement type on map editor?
+ /// * this variable is a cache variable generated from movement type traits.
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/movement_type = MOVEMENT_GROUND
//? Spacedrift
/// Which direction we're drifting
@@ -63,7 +73,8 @@
//? Perspectives
/// our default perspective - if none, a temporary one will be generated when a mob requires it
- var/datum/perspective/self_perspective
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/datum/perspective/self_perspective
//? Buckling
/// do we support the buckling system - if not, none of the default interactions will work, but comsigs will still fire!
@@ -77,7 +88,8 @@
/// direction to set buckled mobs to. null to not do that.
var/buckle_dir
/// buckled mobs, associated to their semantic mode if necessary
- var/list/mob/buckled_mobs
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/list/mob/buckled_mobs
/// restrained default unbuckle time (NOT TIME TO UN-RESTRAIN, this is time to UNBUCKLE from us)
var/buckle_restrained_resist_time = 2 MINUTES
@@ -134,9 +146,11 @@
/// Either FALSE, [EMISSIVE_BLOCK_GENERIC], or [EMISSIVE_BLOCK_UNIQUE]
var/blocks_emissive = FALSE
/// Internal holder for emissive blocker object, do not use directly use; use blocks_emissive
- var/atom/movable/emissive_blocker/em_block
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/atom/movable/emissive_blocker/em_block
/// Internal holder for emissives. Definitely don't directly use, this is absolutely an insane Citadel Moment(tm).
- var/atom/movable/emissive_render/em_render
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/atom/movable/emissive_render/em_render
//? Icon Scale
/// Used to scale icons up or down horizonally in update_transform().
@@ -433,6 +447,18 @@
/atom/movable/proc/is_avoiding_ground()
return ((movement_type & MOVEMENT_TYPES) != MOVEMENT_GROUND) || throwing
+//* Duplication *//
+
+/**
+ * makes a clone of this movable
+ *
+ * @params
+ * * location - where to clone us
+ * * include_contents - include semantic contents; ergo 'what we are hosting' vs 'what we are'
+ */
+/atom/movable/clone(atom/location, include_contents)
+ return ..(include_contents)
+
//? Perspectives
/**
* get perspective to use when shifting eye to us,
diff --git a/code/game/objects/effects/debris/cleanable/blood.dm b/code/game/objects/effects/debris/cleanable/blood.dm
index 34a13789bf54..f87cbc9d5348 100644
--- a/code/game/objects/effects/debris/cleanable/blood.dm
+++ b/code/game/objects/effects/debris/cleanable/blood.dm
@@ -184,6 +184,9 @@ var/global/list/image/splatter_cache=list()
if(random_icon_states.len)
for(var/obj/effect/debris/cleanable/blood/writing/W in loc)
random_icon_states.Remove(W.icon_state)
+ if(!LAZYLEN(random_icon_states))//If all iconstates are already in used by someone else on our tile, delete yourself
+ qdel(src)
+ return
icon_state = pick(random_icon_states)
else
icon_state = "writing1"
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 1b61869d85d2..dec2d74f8d80 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -100,12 +100,16 @@
var/obj_persist_static_mode = OBJ_PERSIST_STATIC_MODE_MAP
/// on static map/level bind mode, this is to determine which level/map we're bound to
/// once bound, even if we go to another level, we are treated as this level.
- var/obj_persist_static_bound_id
+ /// binding is done during load.
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/obj_persist_static_bound_id
/// if set, we are currently dynamically persisting. this is our ID and must be unique for a given map level.
/// this id will not collide with static id.
- var/obj_persist_dynamic_id
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/obj_persist_dynamic_id
/// dynamic persistence state flags
- var/obj_persist_dynamic_status = NONE
+ /// * this variable is not visible and should not be edited in the map editor.
+ var/tmp/obj_persist_dynamic_status = NONE
//? Sounds
/// volume when breaking out using resist process
@@ -644,6 +648,8 @@
if(isnull(mat)) // 'none' option
continue
. += "Its [key] is made out of [mat.display_name]"
+ if((obj_persist_dynamic_id || obj_persist_static_id) && !(obj_persist_status & OBJ_PERSIST_STATUS_NO_EXAMINE))
+ . += SPAN_BOLDNOTICE("This entity is a persistent entity; it may be preserved into future rounds.")
/obj/proc/examine_integrity(mob/user)
. = list()
diff --git a/code/game/objects/random/mob.dm b/code/game/objects/random/mob.dm
index 5149dd3cc2f8..c1ffe9d51d80 100644
--- a/code/game/objects/random/mob.dm
+++ b/code/game/objects/random/mob.dm
@@ -41,7 +41,8 @@
var/build_path = item_to_spawn()
var/mob/living/simple_mob/M = new build_path(src.loc)
- ASSERT(istype(M))
+ if(!istype(M))
+ return
if(M.has_AI())
var/datum/ai_holder/AI = M.ai_holder
AI.go_sleep() //Don't fight eachother while we're still setting up!
@@ -170,7 +171,9 @@
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion,
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,
- prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong)
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong,
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/suppressor,
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/kiting)
/obj/random/mob/robotic/hivebot
name = "Random Hivebot"
@@ -181,12 +184,16 @@
/obj/random/mob/robotic/hivebot/item_to_spawn()
return pick(prob(10);/mob/living/simple_mob/mechanical/hivebot,
- prob(15);/mob/living/simple_mob/mechanical/hivebot/swarm,
+ prob(10);/mob/living/simple_mob/mechanical/hivebot/surveyor,
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/swarm,
prob(10);/mob/living/simple_mob/mechanical/hivebot/ranged_damage,
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion,
prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,
- prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong)
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong,
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/suppressor,
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/kiting,
+ prob(5);/mob/living/simple_mob/mechanical/hivebot/ranged_damage/scorcher)
//Mice
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index f5fc14112969..6ab9bf3a6095 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -54,6 +54,10 @@
name = "black curtain"
color = "#222222"
+/obj/structure/curtain/open/black
+ name = "black curtain"
+ color = "#222222"
+
/obj/structure/curtain/medical
name = "plastic curtain"
color = "#B8F5E3"
diff --git a/code/modules/admin/verbs/debug/reestablish_db_connection.dm b/code/modules/admin/verbs/debug/reestablish_db_connection.dm
index 33f0e9d85245..4b9fe03c5a6f 100644
--- a/code/modules/admin/verbs/debug/reestablish_db_connection.dm
+++ b/code/modules/admin/verbs/debug/reestablish_db_connection.dm
@@ -31,3 +31,7 @@
message_admins("Reloading client database data...")
for(var/client/C in GLOB.clients)
C.player?.load()
+ message_admins("Asserting round ID set...")
+ if(!isnum(text2num(GLOB.round_id)))
+ SSdbcore.SetRoundID()
+ message_admins("Round ID was not set and has now been re-set. Things might be weird this round.")
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index d973fc727077..33f98bf01aa4 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -734,3 +734,10 @@
desc = "A simple wedge cap with red accents, highly popular within Tri-Star Compact space."
icon_state = "eulrhat"
body_cover_flags = 0
+
+/obj/item/clothing/head/onestar
+ name = "one star hat"
+ desc = "It's a maroon-ish hat with an odd logo.."
+ icon = 'icons/clothing/head/onestar.dmi'
+ icon_state = "os_cap"
+ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
diff --git a/code/modules/clothing/under/misc.dm b/code/modules/clothing/under/misc.dm
index adbda32c1a25..7fad7786c70a 100644
--- a/code/modules/clothing/under/misc.dm
+++ b/code/modules/clothing/under/misc.dm
@@ -23,3 +23,10 @@
name = "special ops fatigues"
desc = "These worn fatigues match the pattern known to be used by JSDF Marine Corps special forces."
icon_state = "russobluecamo"
+
+/obj/item/clothing/under/onestar
+ name = "one star jumpsuit"
+ desc = "A jumpsuit in One Star colours."
+ icon = 'icons/clothing/uniform/misc/onestar.dmi'
+ icon_state = "os_jumpsuit"
+ worn_render_flags = WORN_RENDER_SLOT_ONE_FOR_ALL
diff --git a/code/modules/loadout/loadout_head.dm b/code/modules/loadout/loadout_head.dm
index 2f89a4d06cc2..2c3b4d60c1e6 100644
--- a/code/modules/loadout/loadout_head.dm
+++ b/code/modules/loadout/loadout_head.dm
@@ -262,6 +262,11 @@
var/obj/item/clothing/head/beret/orion/orion = orion_style
orions[initial(orion.name)] = orion
tweaks += new/datum/loadout_tweak/path(tim_sort(orions, GLOBAL_PROC_REF(cmp_text_asc)))
+
+/datum/loadout_entry/head/onestar
+ name = "One Star Cap"
+ path = /obj/item/clothing/head/onestar
+
/datum/loadout_entry/head/surgery
name = "Surgical Cap Selection"
description = "Choose from a number of rings of different Caps."
diff --git a/code/modules/loadout/loadout_uniform.dm b/code/modules/loadout/loadout_uniform.dm
index 8a4f61e64deb..997bdb8d79fd 100644
--- a/code/modules/loadout/loadout_uniform.dm
+++ b/code/modules/loadout/loadout_uniform.dm
@@ -310,6 +310,10 @@
brandjumpsuit_selection[initial(brandjumpsuit_type.name)] = brandjumpsuit_type
tweaks += new/datum/loadout_tweak/path(tim_sort(brandjumpsuit_selection, GLOBAL_PROC_REF(cmp_text_asc)))
+/datum/loadout_entry/uniform/onestar
+ name = "One Star Jumpsuit"
+ path = /obj/item/clothing/under/onestar
+
/datum/loadout_entry/uniform/yogapants
name = "Yoga Pants"
path = /obj/item/clothing/under/pants/yogapants
diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm
new file mode 100644
index 000000000000..ce3cd1fcc602
--- /dev/null
+++ b/code/modules/mapping/merge_conflicts.dm
@@ -0,0 +1,18 @@
+// Used by mapmerge2 to denote the existence of a merge conflict (or when it has to complete a "best intent" merge where it dumps the movable contents of an old key and a new key on the same tile).
+// We define it explicitly here to ensure that it shows up on the highest possible plane (while giving off a verbose icon) to aide mappers in resolving these conflicts.
+// DO NOT USE THIS IN NORMAL MAPPING!!! Linters WILL fail.
+
+/obj/merge_conflict_marker
+ name = "Merge Conflict Marker - DO NOT USE"
+ icon = 'icons/effects/mapping_helpers.dmi'
+ icon_state = "merge_conflict_marker"
+ desc = "If you are seeing this in-game: someone REALLY, REALLY, REALLY fucked up. They physically mapped in a fucking Merge Conflict Marker. What the shit."
+ plane = ABOVE_PLANE
+
+///We REALLY do not want un-addressed merge conflicts in maps for an inexhaustible list of reasons. This should help ensure that this will not be missed in case linters fail to catch it for any reason what-so-ever.
+/obj/merge_conflict_marker/Initialize(mapload)
+ . = ..()
+ var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(src)]! Please manually address all potential merge conflicts!!!"
+ log_mapping(msg)
+ to_chat(world, SPAN_BOLDANNOUNCE("[msg]"))
+ warning(msg)
diff --git a/code/modules/mapping/submaps_legacy.dm b/code/modules/mapping/submaps_legacy.dm
index e4b1e43cf9f3..da7b7554e26c 100644
--- a/code/modules/mapping/submaps_legacy.dm
+++ b/code/modules/mapping/submaps_legacy.dm
@@ -83,7 +83,10 @@
// to_chat(world, "Invalid due to overlapping with area [new_area.type] at ([check.x], [check.y], [check.z]), when attempting to place at ([T.x], [T.y], [T.z]).")
break
CHECK_TICK
-
+ if(LAZYLEN(check.contents))//The default space tile has no contents, so if there is something there, we shouldnt overwrite it
+ valid = FALSE
+ break
+ CHECK_TICK
CHECK_TICK
if(!valid)
diff --git a/code/modules/maps/overmap/space/debrisfield.dm b/code/modules/maps/overmap/space/debrisfield.dm
index f061cb34316a..0cc48e009998 100644
--- a/code/modules/maps/overmap/space/debrisfield.dm
+++ b/code/modules/maps/overmap/space/debrisfield.dm
@@ -170,23 +170,31 @@
. = ..()
/obj/overmap/entity/visitable/ship/landable/tinycarrier
- scanner_name = "TBD"
- scanner_desc = "TBD"
+ scanner_name = "SDF Birdcage"
+ scanner_desc = {"\[i\]Registration\[/i\]: SDV Birdcage
+\[i\]Class\[/i\]: Light Escort Carrier
+\[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal
+\[b\]Notice\[/b\]: Registration Expired"}
vessel_mass = 12000
vessel_size = SHIP_SIZE_SMALL
shuttle = "Debris Carrier"
fore_dir = WEST
+/*
/obj/overmap/entity/visitable/ship/landable/tinycarrier/Initialize(mapload)
. = ..()
var/datum/lore/organization/O = SSlegacy_lore.organizations[/datum/lore/organization/other/sysdef]
var/newname = "SDV [pick(O.ship_names)]"
- scanner_name = newname
- scanner_desc = {"\[i\]Registration\[/i\]: [newname]
+ scanner_name = "SDF Birdcage
+ scanner_desc = {"\[i\]Registration\[/i\]: SDV Birdcage
\[i\]Class\[/i\]: Light Escort Carrier
\[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal
\[b\]Notice\[/b\]: Registration Expired"}
- rename_areas(newname)
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/overmap/entity/visitable/ship/landable/tinycarrier/LateInitialize()
+ . = ..()
+ rename_areas(scanner_name)
/obj/overmap/entity/visitable/ship/landable/tinycarrier/proc/rename_areas(newname)
var/datum/shuttle/S = SSshuttle.shuttles[shuttle]
@@ -196,12 +204,12 @@
A.apc.name = "[A.name] APC"
for(var/obj/machinery/air_alarm/AA in A)
AA.name = "[A.name] Air Alarm"
+*/
/obj/machinery/computer/shuttle_control/explore/tinycarrier
shuttle_tag = "Debris Carrier"
req_one_access = list()
-
/obj/mecha/combat/fighter/baron/loaded/busted
/*
starting_components = list(
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index c155b3546067..af02717eb6d7 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -6,7 +6,7 @@
/obj/machinery/mineral/processing_unit_console
name = "production machine console"
- icon = 'icons/obj/machines/mining_machines_vr.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = TRUE
anchored = TRUE
@@ -136,7 +136,7 @@
/obj/machinery/mineral/processing_unit
name = "material processor" //This isn't actually a goddamn furnace, we're in space and it's processing platinum and flammable phoron...
- icon = 'icons/obj/machines/mining_machines_vr.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "furnace"
density = TRUE
anchored = TRUE
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 4b85b8ff2b19..8f93efbe270c 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -2,7 +2,7 @@
/obj/machinery/mineral/stacking_unit_console
name = "stacking machine console"
- icon = 'icons/obj/machines/mining_machines_vr.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
density = 1
anchored = 1
@@ -72,7 +72,7 @@
/obj/machinery/mineral/stacking_machine
name = "stacking machine"
- icon = 'icons/obj/machines/mining_machines_vr.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "stacker"
density = 1
anchored = 1.0
diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm
index 59dea20d6b2b..0f281c96052c 100644
--- a/code/modules/mining/machine_unloading.dm
+++ b/code/modules/mining/machine_unloading.dm
@@ -2,7 +2,7 @@
/obj/machinery/mineral/unloading_machine
name = "unloading machine"
- icon = 'icons/obj/machines/mining_machines_vr.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "unloader"
density = 1
anchored = 1.0
diff --git a/code/modules/mining/machinery/sheet_silo.dm b/code/modules/mining/machinery/sheet_silo.dm
new file mode 100644
index 000000000000..a8e964ac6390
--- /dev/null
+++ b/code/modules/mining/machinery/sheet_silo.dm
@@ -0,0 +1,129 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/**
+ * persistence allowed storage system
+ *
+ * notes:
+ * * bluespace ore silo/sheet delivery is explicitly not to be made. any prs attempting to do so will be closed. ~silicons
+ */
+/obj/machinery/sheet_silo
+ name = "materials silo"
+ desc = "A reinforced materials storage silo. Inserted sheets are protected via stasis field."
+ icon = 'icons/modules/mining/machinery/sheet_silo.dmi'
+ icon_state = "silo"
+ density = TRUE
+ anchored = TRUE
+ integrity_flags = INTEGRITY_INDESTRUCTIBLE
+
+ /// material id to **sheets**
+ var/list/sheets_by_material = list()
+ /// how much to multiply all ores by
+ var/persistence_decay_factor = 0.35
+ /// how much to subtract from all ores after factor
+ var/persistence_decay_constant = 10
+ /// ignore overpowered ore filter
+ var/persistence_allow_overpowered = FALSE
+
+/obj/machinery/sheet_silo/decay_persisted(rounds_since_saved, hours_since_saved)
+ . = ..()
+ for(var/id in sheets_by_material)
+ // this isn't technically mathematically accurate but honestly
+ // i don't care
+ sheets_by_material[id] = max(0, round(sheets_by_material[id] * (persistence_decay_factor ** rounds_since_saved) - persistence_decay_constant * rounds_since_saved))
+ if(!sheets_by_material[id])
+ sheets_by_material -= id
+
+/obj/machinery/sheet_silo/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier)
+ if(istype(I, /obj/item/stack/material))
+ var/obj/item/stack/material/sheets = I
+ if(!user.transfer_item_to_loc(sheets, src))
+ to_chat(user, SPAN_WARNING("You fail to insert [sheets] into [src]."))
+ return CLICKCHAIN_DO_NOT_PROPAGATE
+ var/inserted = take_sheets(sheets)
+ user.visible_message(
+ SPAN_NOTICE("[user] inserts [I] into [src]."),
+ SPAN_NOTICE("You insert [inserted] sheets of [I] into [src]."),
+ range = MESSAGE_RANGE_INVENTORY_SOFT,
+ )
+ return CLICKCHAIN_DO_NOT_PROPAGATE | CLICKCHAIN_DID_SOMETHING
+ return ..()
+
+/obj/machinery/sheet_silo/proc/take_sheets(obj/item/stack/material/sheets)
+ if(sheets.uses_charge)
+ return 0
+ var/mat_id = sheets.material.id
+ var/mat_amount = sheets.amount
+ . = mat_amount
+ sheets.use(mat_amount)
+ sheets_by_material[mat_id] += mat_amount
+
+/obj/machinery/sheet_silo/clone(atom/location, include_contents)
+ var/obj/machinery/sheet_silo/clone = ..()
+ clone.sheets_by_material = sheets_by_material.Copy()
+ return clone
+
+/obj/machinery/sheet_silo/serialize()
+ . = ..()
+ var/list/transformed_sheets = list()
+ for(var/id in sheets_by_material)
+ var/datum/material/mat = SSmaterials.resolve_material(id)
+ if(isnull(mat))
+ continue
+ if(!persistence_allow_overpowered && (mat.material_flags & MATERIAL_FLAG_CONSIDERED_OVERPOWERED))
+ continue
+ var/amount = sheets_by_material[id]
+ transformed_sheets[id] = amount
+ .["stored"] = transformed_sheets
+
+/obj/machinery/sheet_silo/deserialize(list/data)
+ . = ..()
+ sheets_by_material = data["stored"]
+
+/obj/machinery/sheet_silo/ui_assets(mob/user)
+ . = ..()
+ . += get_asset_datum(/datum/asset/spritesheet/materials)
+
+/obj/machinery/sheet_silo/ui_data(mob/user, datum/tgui/ui)
+ . = ..()
+ .["stored"] = sheets_by_material
+
+/obj/machinery/sheet_silo/ui_static_data(mob/user, datum/tgui/ui)
+ . = ..()
+ .["materialContext"] = SSmaterials.tgui_materials_context()
+
+/obj/machinery/sheet_silo/ui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "SheetSilo")
+ ui.open()
+
+/obj/machinery/sheet_silo/ui_act(action, list/params, datum/tgui/ui)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("eject")
+ var/amount = params["amount"]
+ var/id = params["id"]
+ if(!is_safe_number(amount))
+ return TRUE
+ amount = clamp(amount, 0, sheets_by_material[id])
+ if(!amount)
+ return TRUE
+ var/datum/material/dropping = SSmaterials.resolve_material(id)
+ if(isnull(dropping))
+ return TRUE
+ // todo: ughh
+ var/obj/item/stack/material/casted = dropping.stack_type
+ amount = min(amount, initial(casted.max_amount))
+ if(!amount)
+ return TRUE
+ sheets_by_material[id] -= amount
+ if(sheets_by_material[id] <= 0)
+ sheets_by_material -= id
+ var/obj/item/stack/material/dropped = dropping.place_sheet(get_turf(src), amount)
+ if(usr)
+ usr.put_in_hands(dropped)
+ usr.visible_message(SPAN_NOTICE("[usr] retrieves [amount] sheets of [dropping] from [src]."), range = MESSAGE_RANGE_INVENTORY_SOFT)
+ return TRUE
diff --git a/code/modules/mining/machinery/sheet_silo_loader.dm b/code/modules/mining/machinery/sheet_silo_loader.dm
new file mode 100644
index 000000000000..d5d21ca63f71
--- /dev/null
+++ b/code/modules/mining/machinery/sheet_silo_loader.dm
@@ -0,0 +1,26 @@
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2024 silicons *//
+
+/**
+ * auto-loads sheets into sheet silos
+ */
+/obj/machinery/sheet_silo_loader
+ name = "materials silo loader"
+ desc = "An autoloader for a materials silo."
+ icon = 'icons/modules/mining/machinery/sheet_silo_loader.dmi'
+ icon_state = "loader"
+ anchored = TRUE
+ integrity_flags = INTEGRITY_INDESTRUCTIBLE
+
+/obj/machinery/sheet_silo_loader/process(delta_time)
+ // todo: lazy-ticking
+ var/list/obj/item/stack/material/stacks = list()
+ for(var/obj/item/stack/material/matstack in loc)
+ stacks += matstack
+ if(!length(stacks))
+ return
+ var/obj/machinery/sheet_silo/silo = locate() in get_step(src, dir)
+ if(isnull(silo))
+ return
+ for(var/obj/item/stack/material/matstack as anything in stacks)
+ silo.take_sheets(matstack)
diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm
index 1683c98b6bcc..f6e2675dc7d8 100644
--- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm
+++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm
@@ -1,7 +1,7 @@
/obj/machinery/mineral/equipment_vendor/survey
name = "exploration equipment vendor"
desc = "An equipment vendor for explorers, points collected with a survey scanner can be spent here."
- icon = 'icons/obj/machines/mining_machines_vr.dmi'
+ icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "exploration"
density = TRUE
anchored = TRUE
diff --git a/code/modules/mob/characteristics/holder.dm b/code/modules/mob/characteristics/holder.dm
index 9ce0b73f00a6..aa1dfca4d947 100644
--- a/code/modules/mob/characteristics/holder.dm
+++ b/code/modules/mob/characteristics/holder.dm
@@ -134,9 +134,9 @@
/**
* clones
*/
-/datum/characteristics_holder/proc/clone()
+/datum/characteristics_holder/clone(include_contents)
RETURN_TYPE(/datum/characteristics_holder)
- var/datum/characteristics_holder/cloning = new
+ var/datum/characteristics_holder/cloning = ..()
cloning.skills = skills.Copy()
cloning.stats = stats.Copy()
cloning.talents = talents.Copy()
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
index 78056574cca1..aa258e951eb4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
@@ -109,3 +109,26 @@
attack_armor_pen = 50
attack_sharp = 1
attack_edge = 1
+
+
+/datum/category_item/catalogue/technology/drone/hivebot/surveyor
+ name = "Enigmatic Salvager Surveyor"
+ desc = "The most basic unit of the Enigmatic Salvagers- a surveyor. Made up of cheap parts that appear to be hastily put together. \
+ They lack a standardized pattern, suggesting an amount of en-situ construction - machines that create machines that create machines that create machines. \
+ What are they looking for, besides the standard salvage and wreckages?"
+ value = CATALOGUER_REWARD_EASY
+
+//bit faster than the default bot, weaker, basically a reskin for flavor
+/mob/living/simple_mob/mechanical/hivebot/surveyor
+ name = "hivebot surveyor"
+ desc = "An unsteadily-built, willow-limbed bot of mismatched parts and absent technology. Has some kind of expedition pick repurposed as a blade."
+ icon_state = "surveyor"
+ icon_living = "surveyor"
+
+ movement_cooldown = 0.6 SECONDS
+
+ legacy_melee_damage_lower = 15
+ legacy_melee_damage_upper = 15
+
+ catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/surveyor)
+
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
index a73424aae370..aa66abb8f4d2 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm
@@ -203,3 +203,67 @@
base_attack_cooldown = 60
projectiletype = /obj/projectile/arc/fragmentation/mortar
+
+
+//kiting hivebot, punishes indecisive behavior and overly-reliant melee, extremely weak to staying on their butt. not too stronk
+//relatively weak bullets, but high armor pen for consistent damage. do not use in large quantities
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/kiting
+ name = "hivebot lurker"
+ desc = "A hivebot with an attached plasma gun, and what seems to be mild cloaking-technology that reflects visible-wavelength."
+ icon_state = "lurker"
+ icon_living = "lurker"
+ alpha = 200
+ movement_cooldown = 0.7 SECONDS
+
+ projectiletype = /obj/projectile/beam/xray
+ ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/sniper
+
+ icon_scale_x = 1.4
+ icon_scale_y = 1.4
+ catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/lurker)
+
+
+
+//faster-moving hivebot that would love to get to know you more personal-like. causes light damage and also halloss, no armor pen. sorta-miniboss, more a 'hey, look at me RIGHT NOW' type of deal
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/suppressor
+ name = "hivebot suppressor"
+ desc = "A hivebot with two weak, but rapid-fire shock-guns that fire painful bolts. Less-lethal, but rapid-firing."
+ icon_living = "suppressor"
+ icon_state = "suppressor"
+ base_attack_cooldown = 6
+ movement_cooldown = 0.5 SECONDS
+ projectiletype = /obj/projectile/beam/smalllaser/hivebot
+
+ maxHealth = 4 LASERS_TO_KILL
+ health = 4 LASERS_TO_KILL
+
+ catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/suppressor)
+
+
+/obj/projectile/beam/smalllaser/hivebot
+ damage = 25
+ agony = 20
+ muzzle_type = /obj/effect/projectile/muzzle/lightning
+ tracer_type = /obj/effect/projectile/tracer/lightning
+ impact_type = /obj/effect/projectile/impact/lightning
+
+
+// stronker hivey, rare but very visible
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/scorcher
+ name = "hivebot scorcher"
+ desc = "A hivebot with a vicious-looking, strange weapon attached to its arm."
+
+ icon_state = "scorcher"
+ icon_living = "scorcher"
+
+ maxHealth = 3 LASERS_TO_KILL
+ health = 3 LASERS_TO_KILL
+
+ projectiletype = /obj/projectile/beam/cyan/hivebot
+
+ catalogue_data = list(/datum/category_item/catalogue/technology/drone/hivebot/scorcher)
+
+
+/obj/projectile/beam/cyan/hivebot
+ damage = 45
+ armor_penetration = 15
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
index 709ef583d1f9..4958e9f9b6b1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
@@ -70,3 +70,22 @@
armor piercing flechettes of the piercer can penetrate even the most protective armors. It is suggested that the Piercer was \
first developed as the hivebot's answer to Unathi breacher RiGs and it has been a fitting answer indeed."
value = CATALOGUER_REWARD_HARD
+
+/datum/category_item/catalogue/technology/drone/hivebot/suppressor
+ name = "Hizzori Clan Suppressor"
+ desc = "A Hizzori-clan hivebot. The Supressor is a fast, bulky hivebot with two weak, but fast-firing, taser guns. Oddly enough, the tasers appear \
+ to be similar in design to those used by corporate security forces. Its programming also appears to heavily encourage aggreesive \
+ behavior, causing...unpleasant close-range confrontations. Thankfully, each individual strike is not terribly powerful."
+
+/datum/category_item/catalogue/technology/drone/hivebot/scorcher
+ name = "Enigmatic Salvager Scorcher"
+ desc = "... firing mechanism, causing the weapon on its arm to be self-powered by some kind of paracausal loop that uses relative spacetime to charge the ..."
+
+/datum/category_item/catalogue/technology/drone/hivebot/lurker
+ name = "Enigmatic Salvager Lurker"
+ desc = "An Enigmatic Salvager- but it's so much more than that. Almost every race considered sapient on the General Intellegence Scale has a fear of \
+ the dark. It's a deep fear, from when it was evolutionarily advantageous to huddle in close to the fire, in the light, to avoid the unknown. \
+ A field that bends visible light, that interferes with thermal and scanners, cloaks this Lurker, swathing it in its own darkness. A single shot from the distant dark, \
+ and it will scuttle away, content to wait for you to try to hide near your campfire again."
+
+
diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm
index ef886b871ed7..51c1206bf1a1 100644
--- a/code/modules/modular_computers/file_system/computer_file.dm
+++ b/code/modules/modular_computers/file_system/computer_file.dm
@@ -26,15 +26,12 @@ var/global/file_uid = 0
return ..()
// Returns independent copy of this file.
-/datum/computer_file/proc/clone(var/rename = 0)
- var/datum/computer_file/temp = new type
+/datum/computer_file/clone(include_contents)
+ var/datum/computer_file/temp = ..()
temp.unsendable = unsendable
temp.undeletable = undeletable
temp.size = size
- if(rename)
- temp.filename = filename + "(Copy)"
- else
- temp.filename = filename
+ temp.filename = filename
temp.filetype = filetype
return temp
diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
index 4d5782179774..295f4aabf992 100644
--- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm
@@ -46,7 +46,8 @@
var/datum/computer_file/F = HDD.find_file_by_name(params["name"])
if(!F || !istype(F))
return
- var/datum/computer_file/C = F.clone(1)
+ var/datum/computer_file/C = F.clone()
+ C.filename = F.filename + "(Copy)"
HDD.store_file(C)
return TRUE
if("PRG_edit")
diff --git a/code/modules/species/species.dm b/code/modules/species/species.dm
index f49084ac8169..483aa2255e5d 100644
--- a/code/modules/species/species.dm
+++ b/code/modules/species/species.dm
@@ -875,9 +875,10 @@ GLOBAL_LIST_INIT(species_oxygen_tank_by_gas, list(
/**
* clones us into a new datum
*/
-/datum/species/proc/clone()
+/datum/species/clone(include_contents)
var/datum/species/created = new type
created.copy_from(src)
+ return created
/**
* completely clones us from another species, updating the provided human in the process
diff --git a/config/config.txt b/config/config.txt
index 5576218d316b..c04021d58e91 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -15,3 +15,4 @@ $include entries/resources.txt
$include entries/security.txt
$include entries/skills.txt
$include entries/urls.txt
+$include entries/vote.txt
diff --git a/config/entries/vote.txt b/config/entries/vote.txt
new file mode 100644
index 000000000000..72bf54369b2b
--- /dev/null
+++ b/config/entries/vote.txt
@@ -0,0 +1,7 @@
+### ghost weight on votes
+GHOST_WEIGHT 25
+### Should the transfer vote be obfuscated?
+TRANSFER_VOTE_OBFUSCATION 1
+### What should a tie in transfer vote default to
+DEFAULT_ON_TRANSFER_TIE Extend the Shift
+
diff --git a/icons/clothing/head/onestar.dmi b/icons/clothing/head/onestar.dmi
new file mode 100644
index 000000000000..7fdafb6becfb
Binary files /dev/null and b/icons/clothing/head/onestar.dmi differ
diff --git a/icons/clothing/uniform/misc/onestar.dmi b/icons/clothing/uniform/misc/onestar.dmi
new file mode 100644
index 000000000000..17ef99fa079c
Binary files /dev/null and b/icons/clothing/uniform/misc/onestar.dmi differ
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
new file mode 100644
index 000000000000..351bb5f00c4a
Binary files /dev/null and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/mob/hivebot.dmi b/icons/mob/hivebot.dmi
index db2705793a6e..4ae92edbb502 100644
Binary files a/icons/mob/hivebot.dmi and b/icons/mob/hivebot.dmi differ
diff --git a/icons/modules/mining/machinery/sheet_silo.dmi b/icons/modules/mining/machinery/sheet_silo.dmi
new file mode 100644
index 000000000000..e06d0fe2d328
Binary files /dev/null and b/icons/modules/mining/machinery/sheet_silo.dmi differ
diff --git a/icons/modules/mining/machinery/sheet_silo_loader.dmi b/icons/modules/mining/machinery/sheet_silo_loader.dmi
new file mode 100644
index 000000000000..17d0f1fa360d
Binary files /dev/null and b/icons/modules/mining/machinery/sheet_silo_loader.dmi differ
diff --git a/icons/obj/machines/mining_machines.dmi b/icons/obj/machines/mining_machines.dmi
index f57418fbfc53..b3a682b88827 100644
Binary files a/icons/obj/machines/mining_machines.dmi and b/icons/obj/machines/mining_machines.dmi differ
diff --git a/icons/obj/machines/mining_machines_vr.dmi b/icons/obj/machines/mining_machines_vr.dmi
deleted file mode 100644
index 6a9d772f9e05..000000000000
Binary files a/icons/obj/machines/mining_machines_vr.dmi and /dev/null differ
diff --git a/maps/minitest/levels/minitest.dmm b/maps/minitest/levels/minitest.dmm
index cbfdc62ae3a1..76784b0fd08c 100644
--- a/maps/minitest/levels/minitest.dmm
+++ b/maps/minitest/levels/minitest.dmm
@@ -2938,6 +2938,15 @@
/obj/structure/shuttle,
/turf/simulated/shuttle/wall/voidcraft/green,
/area/shuttle/overmapdemo)
+"lg" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/sheet_silo{
+ obj_persist_static_id = "sheet-silo-1"
+ },
+/turf/simulated/floor/tiled,
+/area/bridge)
"lm" = (
/obj/machinery/light,
/obj/structure/cable{
@@ -3531,6 +3540,12 @@
},
/turf/simulated/shuttle/floor,
/area/shuttle/webdemo)
+"LZ" = (
+/obj/machinery/sheet_silo_loader{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/bridge)
"Mz" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -6047,8 +6062,8 @@ aa
aa
aa
fY
-gk
-gf
+lg
+LZ
gr
gf
gB
diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm
index d86851608d7b..ef3d3d91bed4 100644
--- a/maps/rift/levels/rift-02-underground2.dmm
+++ b/maps/rift/levels/rift-02-underground2.dmm
@@ -99,6 +99,7 @@
dir = 9
},
/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"ar" = (
@@ -270,6 +271,7 @@
dir = 1
},
/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"aR" = (
@@ -1115,6 +1117,7 @@
dir = 4
},
/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"dQ" = (
@@ -1498,7 +1501,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
},
-/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_core)
"eM" = (
@@ -2548,7 +2550,6 @@
id = "SupermatterPort";
name = "Reactor Blast Door"
},
-/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_core)
"it" = (
@@ -3754,7 +3755,6 @@
icon_state = "1-8"
},
/obj/structure/catwalk,
-/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
"lI" = (
@@ -8787,6 +8787,9 @@
/area/rnd/secure_storage/critical/vault1)
"De" = (
/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/sheet_silo{
+ obj_persist_static_id = "sheet-silo-surt-mining-transport"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"Df" = (
@@ -9062,6 +9065,9 @@
/obj/structure/sign/warning/moving_parts{
pixel_y = -32
},
+/obj/machinery/sheet_silo_loader{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"Ea" = (
@@ -9268,8 +9274,6 @@
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"ET" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/palebottlegreen,
/turf/simulated/floor/plating,
@@ -9777,8 +9781,6 @@
/turf/simulated/floor,
/area/engineering/engine_room)
"Ha" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/palebottlegreen,
/turf/simulated/floor/plating,
@@ -11967,7 +11969,6 @@
/obj/machinery/door/airlock/multi_tile/metal{
dir = 4
},
-/obj/structure/catwalk,
/obj/machinery/door/firedoor/glass{
dir = 8
},
diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm
index fe79cb808537..34b62814ecc2 100644
--- a/maps/rift/levels/rift-03-underground1.dmm
+++ b/maps/rift/levels/rift-03-underground1.dmm
@@ -228,10 +228,23 @@
/turf/simulated/wall/prepainted,
/area/maintenance/engineering/upper)
"aH" = (
-/obj/structure/fans/tiny,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/security/prison)
+/obj/structure/table/reinforced,
+/obj/random/soap{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/random/soap{
+ pixel_x = 4
+ },
+/obj/random/soap{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monowhite,
+/area/security/prison/lower)
"aI" = (
/obj/structure/closet/firecloset/full,
/obj/structure/railing{
@@ -569,6 +582,18 @@
"bA" = (
/turf/simulated/wall/prepainted/engineering/atmos,
/area/hallway/primary/underone)
+"bB" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"bC" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -1577,6 +1602,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
+"dA" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"dB" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -1602,6 +1633,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"dD" = (
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"dE" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/obj/structure/window/reinforced,
@@ -1660,6 +1694,13 @@
/obj/structure/curtain/open/privacy,
/turf/simulated/floor/tiled/kafel_full/white,
/area/crew_quarters/pool)
+"dJ" = (
+/obj/structure/extinguisher_cabinet{
+ dir = 4;
+ pixel_x = -30
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"dK" = (
/obj/machinery/atmospherics/pipe/simple/visible/black,
/obj/machinery/meter,
@@ -1813,6 +1854,12 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
+"ei" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ej" = (
/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/door/firedoor/glass,
@@ -1828,10 +1875,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
-"eo" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/elevator)
"ep" = (
/turf/simulated/floor/concrete/rng/indoors,
/area/rift/station/fighter_bay/transport_tunnel_garage)
@@ -1860,6 +1903,18 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
+"eu" = (
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_y = -5
+ },
+/obj/machinery/reagentgrinder{
+ pixel_y = 9
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ey" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -1960,6 +2015,10 @@
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor,
/area/storage/tech)
+"eH" = (
+/obj/machinery/vending/cigarette,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"eI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2175,6 +2234,12 @@
/obj/item/pen/blue,
/turf/simulated/floor/tiled/monotile,
/area/engineering/atmos/hallway)
+"fv" = (
+/obj/machinery/camera/network/security{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"fw" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
/obj/structure/catwalk,
@@ -2196,6 +2261,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
+"fB" = (
+/obj/random/trash_pile,
+/obj/effect/floor_decal/rust,
+/obj/structure/railing,
+/turf/simulated/floor,
+/area/security/prison/lower)
"fC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
@@ -2282,6 +2353,15 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"fN" = (
+/obj/structure/table/marble,
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "prison_kitchen";
+ name = "Prison Kitchen"
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"fO" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/borderfloor/corner2,
@@ -2421,6 +2501,20 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/primary/underone)
+"gn" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/machinery/reagentgrinder{
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_y = -18
+ },
+/obj/item/reagent_containers/dropper{
+ pixel_y = -12
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"go" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -2441,6 +2535,13 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"gq" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/random/trash_pile,
+/turf/simulated/floor,
+/area/security/prison/lower)
"gr" = (
/obj/machinery/door/window/brigdoor/eastright{
req_access = list(47)
@@ -2693,6 +2794,11 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
+"hj" = (
+/obj/structure/metal_edge,
+/obj/structure/railing,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"hk" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -2789,6 +2895,31 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"hy" = (
+/obj/structure/table/reinforced,
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random,
+/obj/item/towel/random,
+/obj/item/towel/random,
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"hz" = (
/obj/machinery/atmospherics/portables_connector,
/obj/machinery/atmospherics/pipe/simple/visible/red{
@@ -2796,6 +2927,10 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"hA" = (
+/obj/machinery/light/flamp/noshade,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"hB" = (
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
@@ -2812,7 +2947,7 @@
"hD" = (
/obj/effect/blocker,
/turf/simulated/open/lythios43c/indoors,
-/area/security/prison)
+/area/rift/surfacebase/underground/under1)
"hF" = (
/obj/effect/floor_decal/techfloor{
dir = 5
@@ -2830,6 +2965,14 @@
/obj/spawner/window/low_wall/full/nogrille/firelocks,
/turf/simulated/floor/plating,
/area/crew_quarters/pool)
+"hM" = (
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 4
+ },
+/obj/structure/railing/grey,
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"hN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/meter{
@@ -2839,9 +2982,6 @@
/obj/effect/paint/pipecyan,
/turf/simulated/floor/plating,
/area/engineering/atmos)
-"hO" = (
-/turf/simulated/floor/plating,
-/area/maintenance/elevator)
"hP" = (
/obj/structure/railing{
dir = 4
@@ -3024,6 +3164,10 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
+"iA" = (
+/obj/machinery/smartfridge/food,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/lower)
"iB" = (
/obj/structure/window/basic,
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -3055,6 +3199,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"iK" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"iL" = (
/obj/machinery/door/window/brigdoor/westleft{
req_access = list(47)
@@ -3066,6 +3216,14 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
+"iM" = (
+/obj/machinery/door/blast/shutters{
+ dir = 4;
+ id = "prison_hydroponics";
+ name = "Prison Hydroponics"
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"iO" = (
/obj/machinery/atmospherics/component/unary/outlet_injector{
dir = 4;
@@ -3257,6 +3415,14 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"jw" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/machinery/chemical_dispenser/catering/bar_soft{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"jx" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
dir = 8
@@ -3305,6 +3471,16 @@
"jE" = (
/turf/simulated/mineral/ignore_cavegen/geothermal,
/area/rift/surfacebase/underground/under1)
+"jF" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "prison_spectators";
+ name = "Prison Spectating Booth"
+ },
+/turf/simulated/floor/plating,
+/area/security/prison/lower)
"jG" = (
/obj/machinery/door/airlock/maintenance/engi{
name = "Pump Station Access"
@@ -3317,6 +3493,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
+"jH" = (
+/obj/structure/kitchenspike,
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"jI" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
@@ -3629,6 +3809,10 @@
/obj/structure/barricade,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"kM" = (
+/obj/structure/metal_edge,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"kN" = (
/obj/item/flame/candle/small{
pixel_x = -8;
@@ -3636,6 +3820,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"kO" = (
+/obj/machinery/vending/hydronutrients,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"kP" = (
/obj/machinery/atmospherics/pipe/manifold/visible/purple,
/obj/machinery/meter,
@@ -3704,6 +3892,13 @@
},
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"le" = (
+/obj/structure/metal_edge,
+/obj/machinery/camera/network/security{
+ dir = 6
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"lg" = (
/obj/structure/cable/green{
icon_state = "0-8"
@@ -3744,6 +3939,10 @@
},
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"lm" = (
+/obj/machinery/door/window/northleft,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"lo" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -3787,6 +3986,13 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
+"lt" = (
+/obj/item/radio/intercom/department/security{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"lu" = (
/obj/machinery/atmospherics/component/quaternary/mixer,
/turf/simulated/floor/plating,
@@ -3818,6 +4024,11 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
+"lB" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/appliance/cooker/fryer,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"lC" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -3837,6 +4048,13 @@
/obj/machinery/fire_alarm/north_mount,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"lE" = (
+/obj/machinery/light/flamp/noshade{
+ pixel_x = -12;
+ pixel_y = -8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"lF" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -3872,6 +4090,16 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
+"lK" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "prison_kitchen";
+ name = "Prison Kitchen"
+ },
+/turf/simulated/floor/plating,
+/area/security/prison/lower)
"lL" = (
/obj/machinery/door/window/brigdoor/eastright{
req_access = list(47)
@@ -4124,6 +4352,17 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"mv" = (
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "prison_spectators";
+ name = "Prison Spectating Booth"
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"mw" = (
/obj/structure/window/basic{
dir = 4
@@ -4228,6 +4467,31 @@
"mQ" = (
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
+"mR" = (
+/obj/structure/table/reinforced,
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random,
+/obj/item/towel/random,
+/obj/item/towel/random,
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"mU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
@@ -4257,6 +4521,10 @@
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"ng" = (
+/obj/item/beach_ball/holoball,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"nh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue,
/obj/machinery/door/airlock/glass/atmos{
@@ -4311,6 +4579,11 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"nr" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"ns" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
@@ -4433,6 +4706,12 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"nM" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/machinery/microwave,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"nN" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -4535,6 +4814,12 @@
"ol" = (
/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/engineering)
+"om" = (
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"on" = (
/obj/machinery/atmospherics/component/binary/pump{
dir = 4;
@@ -4563,12 +4848,29 @@
"oq" = (
/turf/simulated/wall/r_wall/prepainted,
/area/engineering/drone_fabrication)
+"or" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"os" = (
/obj/structure/window/basic{
dir = 4
},
/turf/simulated/floor/tiled/kafel_full/beige,
/area/crew_quarters/pool)
+"ot" = (
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/obj/item/storage/box/syringes,
+/obj/item/reagent_scanner{
+ pixel_x = 7
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ou" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
@@ -4577,6 +4879,18 @@
/obj/effect/paint/pipecyan,
/turf/simulated/floor/plating,
/area/engineering/atmos)
+"ov" = (
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 4
+ },
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"ow" = (
/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/atmospherics/pipe/simple/hidden/red,
@@ -4689,6 +5003,26 @@
},
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/secure_storage/upper)
+"oQ" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing,
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
+/obj/structure/cable/green{
+ icon_state = "16-0"
+ },
+/turf/simulated/floor/plating,
+/area/security/prison/lower)
"oS" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -4784,6 +5118,10 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
+"pg" = (
+/obj/machinery/portable_atmospherics/hydroponics,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ph" = (
/turf/simulated/wall/r_wall/prepainted,
/area/turbolift/rhammerhead/underground)
@@ -5130,6 +5468,10 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"qu" = (
+/obj/structure/closet/crate/freezer,
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"qy" = (
/obj/structure/cable/green{
icon_state = "0-4"
@@ -5173,6 +5515,17 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"qF" = (
+/obj/machinery/door/airlock/maintenance/sec{
+ req_one_access = null
+ },
+/obj/machinery/door/blast/shutters{
+ dir = 4;
+ id = "prison_spectators";
+ name = "Prison Spectating Booth"
+ },
+/turf/simulated/floor,
+/area/security/prison/lower)
"qH" = (
/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
@@ -5187,12 +5540,51 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"qL" = (
+/obj/structure/table/reinforced,
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random{
+ pixel_y = -4
+ },
+/obj/item/towel/random,
+/obj/item/towel/random,
+/obj/item/towel/random,
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/obj/item/towel/random{
+ pixel_y = 4
+ },
+/turf/simulated/floor/tiled/monowhite,
+/area/security/prison/lower)
"qQ" = (
/obj/structure/holohoop{
dir = 1
},
/turf/simulated/floor/water/pool,
/area/crew_quarters/pool)
+"qR" = (
+/obj/structure/curtain/open/black,
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monowhite,
+/area/security/prison/lower)
+"qS" = (
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc/north_mount,
+/turf/simulated/floor,
+/area/security/prison/lower)
"qT" = (
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
@@ -5338,6 +5730,9 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
+"rs" = (
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"rt" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/steel_dirty,
@@ -5450,6 +5845,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/public_bunker)
+"rI" = (
+/obj/machinery/fitness/heavy/lifter,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"rJ" = (
/obj/structure/ladder{
pixel_y = 10
@@ -5490,6 +5889,10 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"rQ" = (
+/obj/structure/mirror/long/right,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/lower)
"rS" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/concrete/rng/indoors,
@@ -5533,6 +5936,13 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"rZ" = (
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/turf/simulated/floor/tiled/monowhite,
+/area/security/prison/lower)
"sa" = (
/turf/simulated/wall/prepainted,
/area/maintenance/engineering)
@@ -5540,10 +5950,6 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
-"se" = (
-/obj/item/pickaxe/hand,
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/security/prison)
"sf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -5566,9 +5972,6 @@
/obj/effect/floor_decal/plaque,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
-"sj" = (
-/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
-/area/security/prison)
"sk" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/monotile,
@@ -5638,9 +6041,6 @@
/obj/random/tool,
/turf/simulated/floor,
/area/storage/tech)
-"sL" = (
-/turf/simulated/floor/plating,
-/area/maintenance/engineering/upper)
"sM" = (
/obj/machinery/light{
dir = 4
@@ -5656,6 +6056,16 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"sO" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/machinery/appliance/mixer/candy,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
+"sP" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"sQ" = (
/obj/effect/floor_decal/techfloor{
dir = 9
@@ -5667,9 +6077,6 @@
"sR" = (
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"sS" = (
-/turf/simulated/floor/plating,
-/area/maintenance/engineering)
"sT" = (
/obj/machinery/light/small{
dir = 4
@@ -5971,6 +6378,11 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
+"tL" = (
+/obj/machinery/camera/network/security,
+/obj/machinery/biogenerator,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"tO" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -6038,6 +6450,9 @@
"tZ" = (
/turf/simulated/wall/r_wall/prepainted,
/area/rnd/secure_storage/upper)
+"ua" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/lower)
"ub" = (
/obj/machinery/crystal/ice,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
@@ -6100,13 +6515,14 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/station/protean_nanite_room)
-"un" = (
-/obj/effect/floor_decal/industrial/halfstair{
- dir = 4
+"uo" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/sink/kitchen{
+ dir = 8;
+ pixel_x = 13
},
-/obj/structure/railing,
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"uq" = (
/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/atmospherics/pipe/simple/hidden/blue,
@@ -6177,6 +6593,15 @@
/obj/structure/plasticflaps/mining,
/turf/simulated/floor/plating,
/area/hallway/primary/underone)
+"uG" = (
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"uH" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/tiled/steel_dirty,
@@ -6191,9 +6616,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
-"uJ" = (
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/underground/under1)
"uM" = (
/obj/machinery/atmospherics/pipe/simple/visible/blue{
dir = 9
@@ -6304,6 +6726,10 @@
},
/turf/simulated/floor/reinforced/phoron,
/area/engineering/atmos)
+"vc" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor,
+/area/security/prison/lower)
"vd" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -6414,6 +6840,18 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
+"vs" = (
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 8
+ },
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"vt" = (
/obj/machinery/door/window/brigdoor/eastright{
req_access = list(47)
@@ -6486,11 +6924,6 @@
},
/turf/simulated/floor/concrete/rng/lythios43c,
/area/rift/station/fighter_bay/transport_tunnel)
-"vE" = (
-/obj/item/storage/excavation,
-/obj/structure/table/bench/wooden,
-/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
-/area/security/prison)
"vG" = (
/obj/machinery/computer/general_air_control/large_tank_control{
dir = 4;
@@ -6505,6 +6938,10 @@
/obj/machinery/telecomms/server/presets/science,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
+"vI" = (
+/obj/structure/fitness/punchingbag,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"vJ" = (
/obj/machinery/telecomms/bus/preset_four,
/turf/simulated/floor/tiled/dark,
@@ -6637,6 +7074,10 @@
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/crew_quarters/pool)
+"wj" = (
+/obj/machinery/light,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"wk" = (
/obj/structure/bed/chair/bay,
/turf/simulated/floor/plating,
@@ -6843,6 +7284,19 @@
/obj/machinery/telecomms/hub/preset/rift,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
+"wS" = (
+/obj/machinery/camera/network/security{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
+"wT" = (
+/obj/machinery/camera/network/security{
+ dir = 10
+ },
+/obj/structure/reagent_dispensers/watertank/high,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"wW" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -7272,6 +7726,35 @@
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/underground/under1)
+"yc" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/item/reagent_containers/food/condiment/small/saltshaker{
+ pixel_x = -9
+ },
+/obj/item/reagent_containers/food/condiment/small/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/condiment/small/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/food/condiment/small/peppermill{
+ pixel_x = 9
+ },
+/obj/item/reagent_containers/food/condiment/coldsauce{
+ pixel_x = 8;
+ pixel_y = 16
+ },
+/obj/item/reagent_containers/food/condiment/spacespice{
+ pixel_x = -8;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/food/condiment/enzyme{
+ layer = 5;
+ pixel_y = 16
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"ye" = (
/obj/machinery/atmospherics/portables_connector,
/turf/simulated/floor/tiled,
@@ -7284,6 +7767,12 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
+"yg" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"yh" = (
/obj/structure/table/rack{
dir = 8;
@@ -7343,6 +7832,13 @@
/obj/machinery/telecomms/broadcaster/preset_right/rift,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
+"yq" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12
+ },
+/turf/simulated/floor/tiled/monowhite,
+/area/security/prison/lower)
"ys" = (
/turf/simulated/floor/concrete/rng/indoors,
/area/rift/station/fighter_bay/transport_tunnel)
@@ -7416,6 +7912,12 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
+"yC" = (
+/obj/machinery/door/airlock/maintenance/sec{
+ req_one_access = null
+ },
+/turf/simulated/floor,
+/area/security/prison/lower)
"yD" = (
/obj/machinery/light{
dir = 4
@@ -7428,6 +7930,19 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"yF" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/item/storage/box/glasses/meta{
+ pixel_x = -5;
+ pixel_y = 4
+ },
+/obj/item/storage/box/glasses/meta{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"yG" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
@@ -7446,6 +7961,12 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
+"yJ" = (
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"yM" = (
/obj/effect/floor_decal/rust,
/obj/structure/cable/green{
@@ -7479,6 +8000,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
+"yY" = (
+/obj/effect/floor_decal/industrial/halfstair,
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"yZ" = (
/obj/machinery/status_display{
pixel_x = 32
@@ -7828,6 +8359,13 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"Ad" = (
+/obj/structure/toilet{
+ dir = 1
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Af" = (
/obj/structure/fans/tiny,
/obj/machinery/door/blast/regular{
@@ -7843,6 +8381,10 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/engineering)
+"Ai" = (
+/obj/structure/table/reinforced,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Aj" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/concrete/rng/lythios43c,
@@ -7894,6 +8436,15 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
+"Aq" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/machinery/appliance/mixer/cereal,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Ar" = (
/obj/machinery/portable_atmospherics/canister/phoron,
/obj/structure/window/reinforced,
@@ -7920,10 +8471,6 @@
},
/turf/simulated/floor/plating,
/area/rift/trade_shop)
-"Av" = (
-/obj/structure/stairs/spawner/south,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"Aw" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -7942,6 +8489,21 @@
/obj/machinery/holoplant,
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
+"Ay" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
+"Az" = (
+/obj/machinery/door/window/westleft,
+/obj/machinery/door/blast/shutters{
+ dir = 4;
+ id = "prison_kitchen";
+ name = "Prison Kitchen"
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"AA" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/door/blast/regular{
@@ -7955,11 +8517,26 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"AC" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/vending/dinnerware{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"AD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"AE" = (
+/obj/structure/metal_edge,
+/obj/structure/railing,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"AF" = (
/obj/structure/table/rack/steel,
/obj/item/stock_parts/manipulator,
@@ -7992,10 +8569,11 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay)
-"AL" = (
-/obj/structure/catwalk/plank,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/underground/under1)
+"AK" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/railing,
+/turf/simulated/floor,
+/area/security/prison/lower)
"AN" = (
/obj/machinery/atmospherics/pipe/simple/visible/blue,
/turf/simulated/floor/tiled,
@@ -8058,6 +8636,14 @@
},
/turf/simulated/floor/plating,
/area/storage/tech)
+"AY" = (
+/obj/machinery/fire_alarm/west_mount,
+/obj/machinery/honey_extractor,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"AZ" = (
/obj/effect/floor_decal/rust,
/obj/structure/sign/mining{
@@ -8161,9 +8747,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
-"By" = (
-/turf/simulated/mineral/icerock/lythios43c,
-/area/space)
"Bz" = (
/obj/structure/railing/grey,
/obj/structure/window/basic,
@@ -8192,6 +8775,9 @@
/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"BH" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/prison/lower)
"BI" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8
@@ -8221,9 +8807,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
-"BP" = (
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"BQ" = (
/obj/structure/railing{
dir = 4
@@ -8294,6 +8877,21 @@
},
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/hangar)
+"Cf" = (
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "prison_hydroponics";
+ name = "Hydroponics Shutter Control";
+ pixel_x = 26;
+ pixel_y = 5;
+ req_one_access = list(1,2,4,38)
+ },
+/obj/machinery/light,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Cg" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8
@@ -8315,6 +8913,14 @@
/obj/structure/ladder/updown,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/elevator)
+"Ck" = (
+/obj/structure/fans/tiny,
+/obj/machinery/door/airlock/freezer{
+ name = "Prison Kitchen Freezer";
+ req_access = null
+ },
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"Cl" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -8466,6 +9072,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"CL" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"CM" = (
/obj/machinery/atmospherics/component/quaternary/atmos_filter{
name = "Waste CO2 Filter";
@@ -8506,6 +9118,12 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
+"CR" = (
+/obj/structure/holohoop{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"CS" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
@@ -8654,6 +9272,17 @@
/obj/effect/floor_decal/borderfloor,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"Dy" = (
+/obj/structure/table/reinforced,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/radio/intercom/department/security{
+ dir = 1;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/monowhite,
+/area/security/prison/lower)
"DC" = (
/obj/machinery/door/airlock/glass_external{
req_one_access = list(47)
@@ -8692,6 +9321,15 @@
},
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"DF" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"DG" = (
/obj/random/maintenance/clean,
/obj/structure/catwalk,
@@ -8725,6 +9363,18 @@
/obj/structure/closet/largecardboard,
/turf/simulated/floor/plating,
/area/rift/surfacebase/underground/under1)
+"DM" = (
+/obj/machinery/shower{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 5
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"DN" = (
/obj/random/maintenance/engineering,
/obj/structure/closet/crate,
@@ -8734,6 +9384,20 @@
/obj/machinery/telecomms/server/presets/command,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
+"DQ" = (
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/obj/machinery/door/blast/shutters{
+ dir = 4;
+ id = "prison_hydroponics";
+ name = "Prison Hydroponics"
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"DR" = (
/obj/effect/floor_decal/rust,
/obj/random/maintenance/engineering,
@@ -8820,6 +9484,10 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/durathread,
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay)
+"El" = (
+/obj/structure/curtain/open/black,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"En" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 8;
@@ -8878,6 +9546,21 @@
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Ez" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/obj/structure/sink{
+ pixel_y = 21
+ },
+/obj/structure/mirror/long{
+ pixel_y = 35
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"EA" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -8931,6 +9614,9 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/drone_fabrication)
+"EH" = (
+/turf/simulated/floor/tiled/monowhite,
+/area/security/prison/lower)
"EJ" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -8963,11 +9649,20 @@
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under1)
"ES" = (
-/obj/machinery/appliance/cooker/grill{
- pixel_y = 4
+/obj/machinery/smartfridge/drying_rack{
+ dir = 8
},
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ id = "prison_hydroponics";
+ name = "Hydroponics Shutter Control";
+ pixel_x = -26;
+ pixel_y = 4;
+ req_one_access = list(1,2,4,38)
+ },
+/obj/machinery/light,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ET" = (
/obj/structure/closet/athletic_mixed,
/turf/simulated/floor/plating,
@@ -9032,12 +9727,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
-"Fd" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engineering/upper)
"Fe" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -9284,11 +9973,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/adherent_maintenance)
-"FM" = (
-/obj/item/pickaxe/hand,
-/obj/structure/table/bench/wooden,
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/security/prison)
"FN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -9300,6 +9984,12 @@
},
/turf/simulated/floor/wood,
/area/rift/station/fighter_bay)
+"FP" = (
+/obj/structure/reagent_dispensers/water_cooler/full{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"FQ" = (
/obj/structure/closet/medical_wall{
pixel_x = 32
@@ -9330,6 +10020,16 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"FU" = (
+/obj/structure/mirror/long/left,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/lower)
+"FW" = (
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"FX" = (
/obj/structure/table/rack/shelf,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,
@@ -9360,6 +10060,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
+"Gf" = (
+/obj/machinery/light/flamp/noshade{
+ pixel_x = 12;
+ pixel_y = -8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Gg" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
@@ -9401,9 +10108,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/storage/tech)
-"Gk" = (
-/turf/simulated/floor/plating,
-/area/rift/surfacebase/underground/under1)
"Gl" = (
/obj/structure/table/rack/shelf,
/obj/item/gun/launcher/crossbow,
@@ -9523,10 +10227,6 @@
/obj/item/clothing/mask/gas/clear,
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay)
-"GB" = (
-/obj/structure/table/bench/wooden,
-/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
-/area/security/prison)
"GC" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
@@ -9631,6 +10331,12 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/elevator)
+"GS" = (
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"GU" = (
/obj/structure/closet,
/obj/random/maintenance/engineering,
@@ -9719,6 +10425,16 @@
/obj/machinery/power/apc/east_mount,
/turf/simulated/floor/crystal,
/area/rift/station/adherent_maintenance)
+"Hk" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/chem_master/condimaster,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
+"Hm" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/appliance/cooker/grill,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Hn" = (
/turf/simulated/wall/r_wall/prepainted/engineering/atmos,
/area/engineering/atmos/hallway)
@@ -9735,6 +10451,10 @@
/obj/machinery/portable_atmospherics/canister,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"Hq" = (
+/obj/structure/bed/chair/sofa/green/right,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Hr" = (
/obj/structure/table/rack/shelf,
/obj/item/storage/toolbox/electrical{
@@ -9774,6 +10494,14 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"Hu" = (
+/obj/effect/floor_decal/rust,
+/obj/random/trash_pile,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor,
+/area/security/prison/lower)
"Hw" = (
/obj/item/circuitboard/sleeper{
pixel_x = -3;
@@ -9915,6 +10643,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
+"HS" = (
+/obj/structure/metal_edge,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"HU" = (
/obj/machinery/telecomms/server/presets/service/rift,
/obj/machinery/camera/network/command{
@@ -10051,6 +10786,12 @@
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/plating,
/area/storage/tech)
+"Ip" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Is" = (
/obj/effect/floor_decal/industrial/warning/corner,
/obj/effect/floor_decal/industrial/warning/corner{
@@ -10060,12 +10801,6 @@
/obj/structure/marker_beacon/red,
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
-"It" = (
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/underground/under1)
-"Iv" = (
-/turf/simulated/floor/tiled/steel/lythios43c,
-/area/security/prison)
"Iw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -10096,12 +10831,16 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"IA" = (
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/security/prison)
+/obj/machinery/seed_extractor,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"IC" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
+/obj/machinery/air_alarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ID" = (
/obj/structure/railing{
dir = 1
@@ -10205,6 +10944,20 @@
/obj/item/reagent_containers/spray/squirt,
/turf/simulated/floor/plating,
/area/maintenance/elevator)
+"IT" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ id = "prison_spectators";
+ name = "Spectator Shutter Control";
+ pixel_x = -25;
+ pixel_y = -5;
+ req_one_access = list(1,2,4,38)
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"IV" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -10340,6 +11093,15 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos)
+"Jo" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Jq" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -30
@@ -10372,6 +11134,16 @@
},
/turf/simulated/floor/reinforced/n20,
/area/engineering/atmos)
+"Ju" = (
+/obj/structure/reagent_dispensers/water_cooler/full,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
+"Jw" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Jx" = (
/obj/machinery/atmospherics/pipe/simple/visible/blue{
dir = 5
@@ -10379,8 +11151,14 @@
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"Jy" = (
-/turf/simulated/wall/r_wall/prepainted,
-/area/security/prison)
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"JB" = (
/obj/structure/bed/chair/bay{
dir = 1
@@ -10419,6 +11197,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"JJ" = (
+/obj/random/trash_pile,
+/turf/simulated/floor,
+/area/security/prison/lower)
"JO" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -10448,12 +11230,26 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
+"JT" = (
+/turf/simulated/floor,
+/area/security/prison/lower)
"JU" = (
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under1)
+"JV" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "prison_spectators";
+ name = "Prison Spectating Booth"
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"JW" = (
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
@@ -10626,6 +11422,22 @@
},
/turf/simulated/floor/outdoors/rocks/caves/geothermal,
/area/rift/surfacebase/underground/under1)
+"Ku" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/snacks/popcorn{
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/food/snacks/popcorn{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/reagent_containers/food/snacks/popcorn{
+ pixel_x = 2;
+ pixel_y = 4
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Kv" = (
/obj/effect/overlay/snow/floor,
/obj/item/towel/random,
@@ -10693,13 +11505,6 @@
/obj/machinery/lathe/autolathe,
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay/maintenance)
-"KK" = (
-/obj/machinery/light/small,
-/obj/structure/railing{
- dir = 8
- },
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
"KL" = (
/obj/effect/floor_decal/rust,
/obj/structure/railing,
@@ -10752,6 +11557,14 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/maintenance)
+"KV" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/closet/crate/bin,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"KW" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -10974,6 +11787,17 @@
/obj/structure/alien/weeds/node,
/turf/simulated/floor/plating,
/area/engineering/atmos/hallway)
+"Lz" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "prison_spectators";
+ name = "Spectator Shutter Control";
+ pixel_x = 8;
+ pixel_y = -24;
+ req_one_access = list(1,2,4,38)
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"LC" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -11029,9 +11853,6 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
-"LN" = (
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
"LO" = (
/obj/machinery/atmospherics/pipe/simple/visible/blue{
dir = 4
@@ -11051,6 +11872,21 @@
},
/turf/simulated/floor/concrete/rng/indoors,
/area/rift/station/fighter_bay/transport_tunnel)
+"LR" = (
+/obj/structure/table/marble,
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "prison_kitchen";
+ name = "Prison Kitchen"
+ },
+/obj/item/reagent_containers/food/condiment/small/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/condiment/small/peppermill{
+ pixel_x = 3
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"LS" = (
/obj/machinery/light{
dir = 8
@@ -11150,6 +11986,12 @@
/obj/item/arrow/rod,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Mk" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Ml" = (
/obj/structure/closet/hydrant{
pixel_y = -32
@@ -11231,10 +12073,6 @@
},
/turf/simulated/floor/concrete/rng/lythios43c,
/area/rift/station/fighter_bay/transport_tunnel)
-"My" = (
-/obj/structure/railing,
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
"Mz" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/pipe/manifold/hidden/red{
@@ -11251,6 +12089,10 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"MG" = (
+/obj/machinery/light,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"MH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11363,6 +12205,11 @@
},
/turf/simulated/floor/wood/broken,
/area/maintenance/engineering)
+"MV" = (
+/obj/machinery/recharge_station,
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"MW" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -11416,6 +12263,21 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/engineering/atmos)
+"Nd" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/obj/structure/mirror/long/right{
+ pixel_y = 35
+ },
+/obj/structure/sink{
+ pixel_y = 21
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Ne" = (
/obj/machinery/air_sensor{
frequency = 1441;
@@ -11424,16 +12286,30 @@
/turf/simulated/floor/reinforced/phoron,
/area/engineering/atmos)
"Nf" = (
-/obj/effect/floor_decal/industrial/halfstair{
- dir = 8
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
},
-/obj/structure/railing,
-/turf/simulated/floor/plating,
-/area/security/prison)
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Nh" = (
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Ni" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/obj/structure/mirror/long/left{
+ pixel_y = 35
+ },
+/obj/structure/sink{
+ pixel_y = 21
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Nk" = (
/obj/structure/transit_tube/high_velocity,
/turf/simulated/floor/tiled/monotile,
@@ -11462,6 +12338,30 @@
"No" = (
/turf/simulated/mineral/icerock/lythios43c,
/area/rift/station/fighter_bay/transport_tunnel)
+"Np" = (
+/obj/machinery/shower{
+ pixel_y = 13
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
+"Ns" = (
+/obj/structure/urinal{
+ pixel_y = 29
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Nt" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -11817,6 +12717,12 @@
/obj/machinery/telecomms/relay/preset/rift/base_high,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
+"Oo" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor,
+/area/security/prison/lower)
"Op" = (
/obj/machinery/vending/tool/adherent,
/obj/machinery/light{
@@ -11878,6 +12784,12 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/hangar)
+"Ox" = (
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor,
+/area/security/prison/lower)
"Oy" = (
/obj/effect/floor_decal/techfloor{
dir = 9
@@ -11952,9 +12864,6 @@
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/plating,
/area/storage/tech)
-"OO" = (
-/turf/simulated/floor/lythios43c/indoors,
-/area/rift/surfacebase/underground/under1)
"OQ" = (
/obj/effect/floor_decal/spline/plain{
dir = 6
@@ -11983,6 +12892,10 @@
/obj/structure/catwalk/plank,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/underground/under1)
+"OU" = (
+/obj/structure/table/reinforced,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"OW" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -12058,6 +12971,10 @@
},
/turf/simulated/floor/tiled/kafel_full/blue,
/area/crew_quarters/pool)
+"Pg" = (
+/obj/machinery/vending/snack,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Ph" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -12120,6 +13037,11 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
+"Pu" = (
+/obj/effect/floor_decal/industrial/halfstair,
+/obj/structure/curtain/open/black,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Pw" = (
/obj/structure/musician/piano/unanchored,
/turf/simulated/floor/plating,
@@ -12269,10 +13191,6 @@
/obj/machinery/telecomms/relay/preset/rift/under_deep,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
-"PY" = (
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/plating,
-/area/maintenance/engineering)
"PZ" = (
/obj/machinery/air_alarm{
pixel_y = 24
@@ -12293,13 +13211,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
-"Qc" = (
-/obj/structure/railing/grey{
- dir = 1
- },
-/obj/structure/catwalk/plank,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/underground/under1)
"Qd" = (
/obj/structure/catwalk,
/obj/machinery/light/small{
@@ -12359,7 +13270,7 @@
/area/maintenance/engineering)
"Qp" = (
/turf/simulated/open/lythios43c/indoors,
-/area/security/prison)
+/area/rift/surfacebase/underground/under1)
"Qr" = (
/obj/item/stock_parts/manipulator,
/obj/item/stock_parts/matter_bin,
@@ -12430,9 +13341,6 @@
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor,
/area/storage/tech)
-"QJ" = (
-/turf/simulated/wall/r_wall/prepainted,
-/area/rift/surfacebase/underground/under1)
"QM" = (
/obj/item/digestion_remains/skull/tajaran,
/turf/simulated/floor/plating,
@@ -12492,10 +13400,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"QZ" = (
-/obj/structure/catwalk,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/underground/under1)
"Ra" = (
/obj/structure/catwalk,
/turf/simulated/floor/plating,
@@ -12584,6 +13488,12 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/drone_fabrication)
+"Rn" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Rp" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
@@ -12626,11 +13536,6 @@
/obj/machinery/camera/network/civilian,
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay/maintenance)
-"Rx" = (
-/obj/structure/railing,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
"Rz" = (
/obj/machinery/door/blast/shutters{
dir = 2;
@@ -12731,6 +13636,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"RO" = (
+/obj/machinery/scale,
+/obj/machinery/fire_alarm/north_mount,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"RP" = (
/obj/structure/closet/crate/miningcar,
/obj/effect/floor_decal/rust,
@@ -12791,6 +13701,9 @@
},
/turf/simulated/floor/tiled/kafel_full/blue,
/area/crew_quarters/pool)
+"Sb" = (
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Se" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -12804,10 +13717,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
-"Sg" = (
-/obj/item/pickaxe/hand,
-/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
-/area/security/prison)
"Sj" = (
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
@@ -12819,6 +13728,10 @@
/obj/random/maintenance/engineering,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Sl" = (
+/obj/machinery/seed_storage/garden,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Sn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 9
@@ -12863,6 +13776,32 @@
},
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"St" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
+"Su" = (
+/obj/effect/floor_decal/industrial/halfstair,
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "prison_spectators";
+ name = "Spectator Shutter Control";
+ pixel_x = -25;
+ pixel_y = 29;
+ req_one_access = list(1,2,4,38)
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Sv" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -12919,6 +13858,13 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/primary/underone)
+"SE" = (
+/obj/machinery/portable_atmospherics/hydroponics,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"SG" = (
/obj/structure/alien/weeds,
/obj/structure/alien/resin/membrane{
@@ -12942,6 +13888,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
+"SP" = (
+/obj/structure/fitness/weightlifter,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
+"SQ" = (
+/obj/structure/holohoop{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ST" = (
/obj/machinery/floodlight,
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -12978,6 +13934,20 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/station/fighter_bay/maintenance)
+"SY" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "prison_spectators";
+ name = "Spectator Shutter Control";
+ pixel_x = 25;
+ pixel_y = -4;
+ req_one_access = list(1,2,4,38)
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor,
+/area/security/prison/lower)
"SZ" = (
/obj/machinery/door/airlock/glass_external/public{
name = "Mining Outpost Airlock"
@@ -13022,6 +13992,10 @@
/obj/machinery/pipedispenser,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"Tk" = (
+/obj/item/stool/padded,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Tl" = (
/turf/simulated/wall/r_wall/prepainted,
/area/rift/station/fighter_bay/transport_tunnel)
@@ -13115,6 +14089,13 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
+"TF" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/item/material/kitchen/rollingpin,
+/obj/item/material/knife/butch,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"TG" = (
/obj/machinery/atmospherics/pipe/manifold/visible/green,
/obj/machinery/meter,
@@ -13130,6 +14111,17 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"TK" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "prison_kitchen";
+ name = "Kitchen Shutter Control";
+ pixel_x = 7;
+ pixel_y = -24;
+ req_one_access = list(1,2,4,38)
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"TN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
@@ -13154,10 +14146,6 @@
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor,
/area/storage/tech)
-"TQ" = (
-/obj/structure/railing,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/underground/under1)
"TR" = (
/obj/machinery/atmospherics/component/binary/pump{
dir = 1;
@@ -13256,6 +14244,17 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"Uo" = (
+/obj/item/radio/intercom/department/security{
+ dir = 1;
+ pixel_y = 24
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
+"Up" = (
+/obj/machinery/fire_alarm/west_mount,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Uq" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/bluegrid{
@@ -13360,6 +14359,16 @@
"UF" = (
/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/research/xenobio)
+"UG" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/machinery/scale,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"UH" = (
/turf/simulated/floor/plating,
/area/rnd/secure_storage/upper)
@@ -13376,6 +14385,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
+"UJ" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/scale,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"UL" = (
/obj/structure/railing{
dir = 4
@@ -13427,6 +14446,16 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
+"UT" = (
+/obj/structure/stairs/spawner/north,
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"UU" = (
/obj/structure/bed/chair/bay{
dir = 8
@@ -13466,6 +14495,10 @@
"Va" = (
/turf/simulated/floor/outdoors/safeice/lythios43c,
/area/rift/surfacebase/underground/under1)
+"Vb" = (
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Vc" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
@@ -13473,9 +14506,16 @@
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
"Vd" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/plating,
-/area/maintenance/elevator)
+/obj/effect/floor_decal/rust,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/closet/firecloset,
+/turf/simulated/floor,
+/area/security/prison/lower)
"Ve" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -13490,16 +14530,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
-"Vf" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/camera/network/security{
- dir = 10
- },
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/lythios43c/indoors,
-/area/security/prison)
+"Vg" = (
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Vh" = (
/obj/machinery/door/blast/regular{
dir = 4;
@@ -13508,6 +14541,20 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
+"Vi" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/appliance/cooker/oven,
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
+"Vk" = (
+/obj/structure/table/marble,
+/obj/machinery/door/blast/shutters{
+ dir = 4;
+ id = "prison_kitchen";
+ name = "Prison Kitchen"
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Vl" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -13574,6 +14621,38 @@
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Vv" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Vw" = (
/obj/machinery/door/blast/regular{
density = 0;
@@ -13595,6 +14674,37 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
+"Vx" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/item/reagent_containers/food/condiment/small/saltshaker{
+ pixel_x = -9
+ },
+/obj/item/reagent_containers/food/condiment/small/saltshaker{
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/condiment/small/peppermill{
+ pixel_x = 3
+ },
+/obj/item/reagent_containers/food/condiment/small/peppermill{
+ pixel_x = 9
+ },
+/obj/item/reagent_containers/food/condiment/coldsauce{
+ pixel_x = 8;
+ pixel_y = 16
+ },
+/obj/item/reagent_containers/food/condiment/spacespice{
+ pixel_x = -8;
+ pixel_y = 13
+ },
+/obj/item/reagent_containers/food/condiment/hotsauce{
+ pixel_y = 16
+ },
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Vy" = (
/obj/machinery/door/airlock/multi_tile/metal/mait,
/obj/machinery/atmospherics/component/binary/passive_gate/on,
@@ -13637,6 +14747,14 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"VJ" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/closet/emcloset,
+/turf/simulated/floor,
+/area/security/prison/lower)
"VK" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -13713,13 +14831,10 @@
/obj/structure/cable/green,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
-"VV" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/trash_pit)
-"VY" = (
-/turf/simulated/floor/plating,
-/area/maintenance/elevator)
+"VX" = (
+/obj/structure/closet/secure_closet/freezer/meat,
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"VZ" = (
/obj/effect/floor_decal/techfloor{
dir = 9
@@ -13786,6 +14901,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
+"Wh" = (
+/obj/structure/bed/chair/sofa/green,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"Wj" = (
/obj/effect/blocker,
/turf/simulated/open/lythios43c,
@@ -13822,6 +14941,22 @@
},
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"Wu" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/sugar,
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"Wv" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -13968,12 +15103,6 @@
},
/turf/simulated/floor/concrete/rng/indoors,
/area/rift/station/fighter_bay/transport_tunnel)
-"WL" = (
-/turf/unsimulated/wall/planetary/lythios43c{
- desc = "Glacial permafrost, compacted harder than stone.";
- icon_state = "icerock-dark"
- },
-/area/security/prison)
"WM" = (
/obj/effect/floor_decal/spline/plain{
dir = 9
@@ -14011,6 +15140,16 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
+"WV" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/item/storage/box/beakers{
+ name = "box of measuring cups";
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"WW" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -14115,6 +15254,10 @@
"Xs" = (
/turf/simulated/wall/r_wall/prepainted/command,
/area/tcommsat/chamber)
+"Xt" = (
+/obj/machinery/door/window/northright,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Xu" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -14164,6 +15307,27 @@
},
/turf/simulated/floor/tiled/kafel_full/beige,
/area/crew_quarters/pool)
+"XD" = (
+/obj/item/material/knife/machete/hatchet,
+/obj/item/material/knife/machete/hatchet,
+/obj/item/material/minihoe,
+/obj/item/material/minihoe,
+/obj/item/shovel/spade,
+/obj/item/shovel/spade,
+/obj/item/plant_analyzer,
+/obj/item/plant_analyzer,
+/obj/item/material/knife/plastic,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/reagent_containers/glass/bucket,
+/obj/machinery/camera/network/security{
+ dir = 10
+ },
+/obj/machinery/air_alarm/south_mount,
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"XF" = (
/obj/effect/floor_decal/borderfloor,
/obj/machinery/door/firedoor/glass{
@@ -14218,6 +15382,14 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/turbolift/rhammerhead/underground)
+"XP" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/cups,
+/obj/machinery/camera/network/security{
+ dir = 6
+ },
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"XQ" = (
/turf/simulated/wall/prepainted,
/area/crew_quarters/pool)
@@ -14313,6 +15485,10 @@
/obj/machinery/camera/network/research,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"Ym" = (
+/obj/structure/mirror/long,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/lower)
"Yn" = (
/obj/structure/cable/green{
icon_state = "0-4"
@@ -14323,6 +15499,14 @@
},
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"Yo" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/structure/table/marble,
+/obj/machinery/chemical_dispenser/catering/bar_coffee{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/security/prison/lower)
"Yp" = (
/obj/machinery/vending/assist,
/turf/simulated/floor/plating,
@@ -14356,6 +15540,15 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/drone_fabrication)
+"Yw" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"Yx" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 4;
@@ -14425,6 +15618,10 @@
/obj/structure/transit_tube/high_velocity,
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"YF" = (
+/obj/machinery/fitness/punching_bag,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"YH" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
@@ -14476,6 +15673,14 @@
},
/turf/simulated/floor/plating,
/area/maintenance/elevator)
+"YT" = (
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 8
+ },
+/obj/structure/railing/grey,
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"YV" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -14590,11 +15795,20 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
+"Zg" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/turf/simulated/floor/tiled/freezer/cold,
+/area/security/prison/lower)
"Zh" = (
/obj/item/digestion_remains/skull/tajaran,
/obj/item/arrow/rod,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Zi" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/closet/crate/trashcart,
+/turf/simulated/floor,
+/area/security/prison/lower)
"Zj" = (
/obj/machinery/door/airlock/lift,
/turf/simulated/floor/tiled/techmaint,
@@ -14643,9 +15857,6 @@
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/underground/under1)
-"Zu" = (
-/turf/simulated/mineral/icerock/lythios43c,
-/area/security/prison)
"Zv" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 4;
@@ -14687,9 +15898,15 @@
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
"ZA" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/elevator)
+/obj/structure/stairs/spawner/north,
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/tile/indoors,
+/area/security/prison/lower)
"ZC" = (
/obj/structure/table/rack/shelf/steel,
/obj/random/maintenance/engineering,
@@ -14719,6 +15936,15 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
+"ZH" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/door/airlock/maintenance/sec,
+/turf/simulated/floor,
+/area/security/prison/lower)
+"ZJ" = (
+/obj/structure/bed/chair/sofa/green/left,
+/turf/simulated/floor/concrete/indoors,
+/area/security/prison/lower)
"ZK" = (
/obj/machinery/atmospherics/component/binary/pump{
dir = 1;
@@ -14858,200 +16084,6 @@
(1,1,1) = {"
Wj
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-TQ
-QZ
-QJ
-sI
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-It
-Qc
-yu
-It
-It
-It
-It
-It
-It
-It
-It
-uJ
-Wj
-"}
-(2,1,1) = {"
-Wj
td
td
td
@@ -15158,7 +16190,7 @@ td
MK
Mb
es
-OO
+sI
td
td
td
@@ -15232,7 +16264,201 @@ td
td
td
OS
-AL
+yu
+td
+td
+td
+td
+td
+td
+td
+td
+td
+Wj
+"}
+(2,1,1) = {"
+Wj
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+MK
+Mb
+es
+sI
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+td
+OS
+yu
td
td
td
@@ -15352,7 +16578,7 @@ td
MK
Mb
As
-OO
+sI
td
td
td
@@ -15426,7 +16652,7 @@ td
td
td
OS
-AL
+yu
td
td
td
@@ -15620,7 +16846,7 @@ td
td
td
OS
-AL
+yu
td
td
td
@@ -15814,7 +17040,7 @@ td
td
td
OS
-AL
+yu
td
td
td
@@ -16008,7 +17234,7 @@ td
td
td
OS
-AL
+yu
td
td
td
@@ -16125,8 +17351,8 @@ td
td
td
wG
-OO
-OO
+sI
+sI
Jg
rv
td
@@ -16202,7 +17428,7 @@ td
td
td
OS
-AL
+yu
td
td
td
@@ -16396,7 +17622,7 @@ td
td
td
OS
-AL
+yu
td
td
td
@@ -16514,8 +17740,8 @@ td
td
ut
PU
-OO
-OO
+sI
+sI
Nx
PU
td
@@ -16590,7 +17816,7 @@ td
td
td
OS
-AL
+yu
td
td
td
@@ -16708,8 +17934,8 @@ td
td
es
es
-OO
-OO
+sI
+sI
rv
es
td
@@ -16784,7 +18010,7 @@ td
td
td
OS
-AL
+yu
td
aa
aa
@@ -16902,8 +18128,8 @@ td
td
td
es
-OO
-OO
+sI
+sI
rv
es
aa
@@ -17096,8 +18322,8 @@ td
td
td
es
-OO
-OO
+sI
+sI
rv
es
aa
@@ -17291,7 +18517,7 @@ td
td
es
Gt
-OO
+sI
Cb
es
aa
@@ -17484,8 +18710,8 @@ td
td
td
Dm
-OO
-OO
+sI
+sI
rv
aa
aa
@@ -17678,8 +18904,8 @@ td
td
td
Dm
-OO
-OO
+sI
+sI
rv
aa
aa
@@ -17872,8 +19098,8 @@ td
td
td
Dm
-OO
-OO
+sI
+sI
rv
aa
aa
@@ -18067,7 +19293,7 @@ td
td
es
Gt
-OO
+sI
Cb
es
aa
@@ -18260,8 +19486,8 @@ td
td
td
aa
-OO
-OO
+sI
+sI
rv
Dm
Dm
@@ -18454,8 +19680,8 @@ td
td
td
aa
-OO
-OO
+sI
+sI
rv
Dm
Dm
@@ -18648,8 +19874,8 @@ td
td
td
aa
-OO
-OO
+sI
+sI
rv
aa
Dm
@@ -18843,7 +20069,7 @@ td
td
es
Gt
-OO
+sI
Cb
es
aa
@@ -19036,8 +20262,8 @@ td
td
td
aa
-OO
-OO
+sI
+sI
rv
aa
aa
@@ -19230,8 +20456,8 @@ td
td
td
aa
-OO
-OO
+sI
+sI
rv
aa
aa
@@ -19424,8 +20650,8 @@ td
td
aa
aa
-OO
-OO
+sI
+sI
rv
aa
aa
@@ -19619,7 +20845,7 @@ td
aa
es
Gt
-OO
+sI
Cb
es
aa
@@ -19812,8 +21038,8 @@ td
td
aa
Dm
-OO
-OO
+sI
+sI
rv
jL
jL
@@ -20006,8 +21232,8 @@ td
MK
Dm
Dm
-OO
-OO
+sI
+sI
Nx
jL
jL
@@ -20200,8 +21426,8 @@ td
MK
WR
Dm
-OO
-OO
+sI
+sI
Nx
jL
jL
@@ -20395,7 +21621,7 @@ yO
Dm
es
Gt
-OO
+sI
YE
es
jL
@@ -20588,10 +21814,10 @@ Yu
Yu
Yu
db
-OO
-OO
+sI
+sI
Wt
-OO
+sI
jL
jL
jL
@@ -20781,13 +22007,13 @@ OW
xa
WA
Yu
-OO
-OO
-OO
-OO
+sI
+sI
+sI
+sI
uj
-OO
-OO
+sI
+sI
es
jL
aa
@@ -20975,14 +22201,14 @@ WU
lz
lP
Yu
-OO
-OO
-OO
+sI
+sI
+sI
ig
-OO
+sI
uj
-OO
-OO
+sI
+sI
jL
aa
aa
@@ -21174,9 +22400,9 @@ Wc
Uh
Md
Md
-OO
+sI
Ss
-OO
+sI
jL
aa
aa
@@ -21370,7 +22596,7 @@ TW
Md
Gt
rv
-OO
+sI
aa
aa
aa
@@ -23118,7 +24344,7 @@ Vy
Vu
Ex
tG
-sS
+sR
Gr
KY
sR
@@ -23701,7 +24927,7 @@ MY
MY
MY
pT
-sS
+sR
my
sR
po
@@ -23794,9 +25020,9 @@ aa
aa
aa
aa
-Zu
-Zu
-Zu
+aa
+aa
+aa
Jl
Jl
Jl
@@ -23807,10 +25033,10 @@ Ok
Hy
Jl
Jl
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -23985,10 +25211,10 @@ aa
aa
aa
aa
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -24004,15 +25230,15 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -24173,13 +25399,13 @@ ms
aa
aa
aa
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -24206,11 +25432,11 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -24363,11 +25589,11 @@ aa
ms
"}
(50,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -24404,8 +25630,8 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
+aa
+aa
aa
aa
aa
@@ -24557,7 +25783,7 @@ aa
ms
"}
(51,1,1) = {"
-WL
+ms
Qp
Qp
Qp
@@ -24599,14 +25825,14 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -24767,18 +25993,18 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
-Zu
-Zu
-Zu
+aa
+aa
+aa
Qp
Qp
Qp
@@ -24800,8 +26026,8 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
+aa
+aa
aa
aa
aa
@@ -24867,7 +26093,7 @@ zz
zz
zz
my
-sS
+sR
sa
aa
aa
@@ -24956,24 +26182,24 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -24995,8 +26221,8 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
+aa
+aa
aa
aa
aa
@@ -25144,31 +26370,31 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+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
Qp
Qp
Qp
@@ -25190,7 +26416,7 @@ Qp
Qp
Qp
Qp
-Zu
+aa
aa
aa
aa
@@ -25333,38 +26559,38 @@ aa
ms
"}
(55,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -25384,8 +26610,8 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
+aa
+aa
aa
aa
aa
@@ -25449,7 +26675,7 @@ PH
ED
zz
my
-sS
+sR
sa
sa
LD
@@ -25527,46 +26753,46 @@ aa
ms
"}
(56,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -25579,8 +26805,8 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
+aa
+aa
aa
aa
aa
@@ -25649,7 +26875,7 @@ Nh
sR
sR
sR
-sS
+sR
sa
aa
aa
@@ -25721,51 +26947,51 @@ aa
ms
"}
(57,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -25774,9 +27000,9 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
+aa
+aa
+aa
aa
aa
aa
@@ -25843,7 +27069,7 @@ sR
sR
sR
Ps
-PY
+sZ
sa
aa
aa
@@ -25915,64 +27141,64 @@ aa
ms
"}
(58,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+aa
+aa
+aa
aa
aa
aa
@@ -26037,7 +27263,7 @@ sR
sR
Im
nu
-PY
+sZ
aa
aa
aa
@@ -26083,7 +27309,7 @@ sR
sR
ZN
Da
-Gk
+kt
Om
WR
WR
@@ -26109,53 +27335,53 @@ aa
ms
"}
(59,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -26166,12 +27392,12 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -26231,7 +27457,7 @@ sR
Im
JX
pv
-PY
+sZ
aa
WC
in
@@ -26277,7 +27503,7 @@ sR
sR
sR
Om
-Gk
+kt
Da
WR
WR
@@ -26303,54 +27529,54 @@ aa
ms
"}
(60,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -26365,10 +27591,10 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -26419,13 +27645,13 @@ sR
sR
Lf
my
-sS
+sR
sa
Nh
sR
Im
kN
-PY
+sZ
aa
lq
lq
@@ -26497,55 +27723,55 @@ aa
ms
"}
(61,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -26562,8 +27788,8 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
+aa
+aa
aa
aa
aa
@@ -26619,7 +27845,7 @@ sa
vf
sR
FH
-PY
+sZ
aa
UB
nS
@@ -26691,57 +27917,57 @@ aa
ms
"}
(62,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -26757,8 +27983,8 @@ Qp
Qp
Qp
Qp
-Zu
-Zu
+aa
+aa
aa
aa
aa
@@ -26807,7 +28033,7 @@ lC
ju
ju
my
-sS
+sR
Gr
sa
sa
@@ -26885,59 +28111,59 @@ aa
ms
"}
(63,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -26952,7 +28178,7 @@ Qp
Qp
Qp
Qp
-Zu
+aa
aa
aa
aa
@@ -27004,7 +28230,7 @@ my
sR
sR
sR
-sS
+sR
sR
my
NB
@@ -27079,64 +28305,64 @@ aa
ms
"}
(64,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Qp
Qp
Qp
@@ -27146,7 +28372,7 @@ Qp
Qp
Qp
Qp
-Zu
+aa
aa
aa
aa
@@ -27167,7 +28393,7 @@ Mq
lT
Tl
Ol
-VV
+Ra
HD
zG
Ve
@@ -27273,74 +28499,74 @@ aa
ms
"}
(65,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Qp
-Qp
-Qp
-Qp
-Qp
-Qp
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+Qp
+Qp
+Qp
+Qp
+Qp
+Qp
+aa
+aa
aa
aa
aa
@@ -27361,7 +28587,7 @@ Mq
Mq
No
Ol
-VV
+Ra
DG
yf
Cw
@@ -27372,7 +28598,7 @@ aG
jn
aG
wo
-Gk
+kt
iu
aG
bZ
@@ -27467,74 +28693,74 @@ aa
ms
"}
(66,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -27563,11 +28789,11 @@ Ol
Ol
db
iu
-Gk
+kt
db
-Gk
+kt
DL
-Gk
+kt
aG
cc
aL
@@ -27661,74 +28887,74 @@ aa
ms
"}
(67,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -27757,10 +28983,10 @@ aa
aa
db
kt
-Gk
-Gk
-Gk
-Gk
+kt
+kt
+kt
+kt
Ks
aG
Vs
@@ -27855,41 +29081,41 @@ aa
ms
"}
(68,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
Tl
Tl
@@ -27951,7 +29177,7 @@ aa
aa
db
kt
-Gk
+kt
aG
aG
aG
@@ -28049,39 +29275,39 @@ aa
ms
"}
(69,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
Tl
Tl
@@ -28145,7 +29371,7 @@ aa
aa
db
iu
-Gk
+kt
aG
bh
br
@@ -28243,38 +29469,38 @@ aa
ms
"}
(70,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
Tl
vy
@@ -28339,7 +29565,7 @@ aa
aa
db
na
-Gk
+kt
jn
aJ
bf
@@ -28437,38 +29663,38 @@ aa
ms
"}
(71,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
kw
ht
@@ -28631,37 +29857,37 @@ aa
ms
"}
(72,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
Tl
Zy
@@ -28825,37 +30051,37 @@ aa
ms
"}
(73,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
hU
pX
@@ -29019,37 +30245,37 @@ aa
ms
"}
(74,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
pX
Mq
@@ -29213,37 +30439,37 @@ aa
ms
"}
(75,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
No
Mq
Mq
@@ -29255,32 +30481,32 @@ Mq
No
No
No
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -29407,37 +30633,37 @@ aa
ms
"}
(76,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
No
Mq
Mq
@@ -29447,34 +30673,34 @@ Mq
Mq
No
No
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -29601,167 +30827,7 @@ aa
ms
"}
(77,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-No
-Mq
-Mq
-Mq
-Mq
-Mq
-Mq
-No
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aZ
-rc
-ap
-aD
-by
-cm
-aZ
-aL
-bb
-bb
-bb
-cA
-cA
-cA
-cA
-ZS
-cA
-du
-iP
-sd
-eh
-fR
-mp
-mr
-ts
-ts
-ts
-eT
-Rp
-yG
-eT
-ou
-yG
-eT
-eW
-yG
-eT
-qj
-HX
-qj
-eT
-lN
-Cs
-ih
-Nc
-mP
-qz
-gH
-gH
-gH
-ol
-sa
-sa
-sa
-YH
-sa
-sa
-sa
-sR
-tG
-my
-sR
-sa
-sR
-IW
-iE
-MU
-XN
-sa
-my
-wX
-sa
+ms
aa
aa
aa
@@ -29792,77 +30858,237 @@ aa
aa
aa
aa
-ms
-"}
-(78,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Tl
-IN
+No
+Mq
+Mq
+Mq
Mq
Mq
Mq
-lT
-Tl
No
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aZ
+rc
+ap
+aD
+by
+cm
+aZ
+aL
+bb
+bb
+bb
+cA
+cA
+cA
+cA
+ZS
+cA
+du
+iP
+sd
+eh
+fR
+mp
+mr
+ts
+ts
+ts
+eT
+Rp
+yG
+eT
+ou
+yG
+eT
+eW
+yG
+eT
+qj
+HX
+qj
+eT
+lN
+Cs
+ih
+Nc
+mP
+qz
+gH
+gH
+gH
+ol
+sa
+sa
+sa
+YH
+sa
+sa
+sa
+sR
+tG
+my
+sR
+sa
+sR
+IW
+iE
+MU
+XN
+sa
+my
+wX
+sa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ms
+"}
+(78,1,1) = {"
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+Tl
+IN
+Mq
+Mq
+Mq
+lT
+Tl
+No
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -29989,37 +31215,37 @@ aa
ms
"}
(79,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
kZ
kZ
kZ
kZ
kZ
-Zu
+aa
No
Mq
Mq
@@ -30027,36 +31253,36 @@ Mq
Mq
Mq
No
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -30183,37 +31409,37 @@ aa
ms
"}
(80,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
kZ
Yn
EA
xY
kZ
-Zu
+aa
Tl
vC
oO
@@ -30221,36 +31447,36 @@ oO
oO
bC
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -30377,37 +31603,37 @@ aa
ms
"}
(81,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
kZ
lg
pt
XJ
kZ
-Zu
+aa
Tl
Tn
Tn
@@ -30415,36 +31641,36 @@ Tn
Tn
Tn
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -30571,31 +31797,31 @@ aa
ms
"}
(82,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
kZ
kZ
kZ
@@ -30609,36 +31835,36 @@ mJ
mJ
eU
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -30765,31 +31991,31 @@ aa
ms
"}
(83,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
pM
KE
yP
@@ -30803,36 +32029,36 @@ ys
ys
ys
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Sg
-sj
-Zu
-sj
-sj
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+BH
+BH
+BH
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -30959,31 +32185,31 @@ aa
ms
"}
(84,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
pM
Ds
vL
@@ -30997,36 +32223,6 @@ ys
ys
YN
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-sj
-sj
-sj
-sj
-sj
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -31042,6 +32238,36 @@ aa
aa
aa
aa
+BH
+BH
+oQ
+BH
+BH
+aa
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -31153,31 +32379,31 @@ aa
ms
"}
(85,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
pM
KE
ep
@@ -31191,36 +32417,6 @@ ys
ys
ys
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-sj
-IC
-sj
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -31236,6 +32432,36 @@ aa
aa
aa
aa
+BH
+qS
+Ox
+Hu
+BH
+aa
+ua
+or
+dJ
+Vg
+Up
+vI
+fv
+vI
+mR
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -31347,31 +32573,31 @@ aa
ms
"}
(86,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
pM
pM
pH
@@ -31385,36 +32611,6 @@ ys
ys
FS
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-sj
-Zu
-IA
-LN
-sj
-IC
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -31430,6 +32626,36 @@ aa
aa
aa
aa
+BH
+gq
+vc
+vc
+BH
+aa
+ua
+rI
+Vg
+SP
+Vg
+Vg
+Vg
+Vg
+wj
+ua
+Np
+dA
+yg
+Vb
+DM
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -31541,31 +32767,31 @@ aa
ms
"}
(87,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ph
ph
Fq
@@ -31579,36 +32805,6 @@ ys
ys
ys
Tl
-By
-By
-By
-By
-Zu
-Zu
-sj
-GB
-GB
-sj
-IC
-Nf
-Vf
-Jy
-Jy
-Jy
-Jy
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -31624,6 +32820,36 @@ aa
aa
aa
aa
+BH
+BH
+ZH
+BH
+BH
+ua
+ua
+RO
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+YF
+ua
+Np
+dA
+FU
+Vb
+DM
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -31735,31 +32961,31 @@ aa
ms
"}
(88,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ph
XO
HM
@@ -31773,36 +32999,6 @@ ys
ys
FS
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-vE
-sj
-sj
-IC
-My
-Iv
-Iv
-aH
-BP
-Av
-Jy
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -31816,6 +33012,36 @@ aa
aa
aa
aa
+ua
+ua
+ua
+JJ
+vc
+Vd
+VJ
+ua
+ua
+rI
+Vg
+SP
+Vg
+Ai
+Ai
+Vg
+Vg
+Pu
+Jo
+dA
+Ym
+Vb
+DM
+ua
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -31929,31 +33155,31 @@ aa
ms
"}
(89,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ph
HM
HM
@@ -31967,36 +33193,6 @@ ys
ys
ys
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Sg
-GB
-sj
-ES
-sj
-Rx
-Iv
-Iv
-aH
-BP
-Av
-Jy
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -32009,6 +33205,36 @@ aa
aa
aa
aa
+ua
+ua
+Zi
+vc
+JT
+JT
+vc
+vc
+JJ
+ua
+FP
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+YF
+ua
+Np
+dA
+rQ
+Vb
+DM
+ua
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -32123,31 +33349,31 @@ aa
ms
"}
(90,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ph
HM
HM
@@ -32161,36 +33387,6 @@ ys
ys
jJ
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-sj
-sj
-sj
-sj
-IC
-un
-KK
-Jy
-Jy
-Jy
-Jy
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -32203,6 +33399,36 @@ aa
aa
aa
aa
+ua
+fB
+vc
+JT
+JT
+JJ
+Oo
+vc
+vc
+yC
+om
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+wj
+ua
+Np
+dA
+iK
+Vb
+DM
+ua
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -32216,7 +33442,7 @@ aa
aa
aa
aG
-Fd
+qd
UU
UU
gi
@@ -32317,31 +33543,31 @@ aa
ms
"}
(91,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ph
HM
HM
@@ -32355,36 +33581,6 @@ ys
ys
FS
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-FM
-sj
-sj
-IC
-sj
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -32397,6 +33593,36 @@ aa
aa
aa
aa
+ua
+AK
+JT
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+UJ
+Jy
+Ay
+Vg
+Vg
+Jy
+UG
+ua
+ua
+ua
+bB
+ua
+ua
+ua
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -32510,174 +33736,202 @@ aa
aa
ms
"}
-(92,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-ph
-HM
-HM
-HM
-HM
-Jh
-Zj
-KO
-ys
-ys
-ys
-ys
-Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-se
-sj
-Zu
-Zu
-sj
-sj
-sj
-IC
-sj
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aG
-Vq
-gi
-Vl
-aG
-aG
-aG
-aG
-aG
-aG
-ce
-Ph
-aG
-bz
-dh
-tg
-rT
-qK
-Gg
-Gg
-Gg
-Xp
-mQ
-if
-eT
-yG
-yG
-eT
-yG
-PE
-eT
-yG
-dX
-eT
-eT
-Zx
-Zx
-qT
-Zx
-Zx
-Zx
-qt
-Zx
-Hn
-Hn
-Hn
-Xp
-mO
-hX
-mO
-mO
-mO
-mO
-mO
-mO
-Zq
-Gr
-my
-sR
-sa
-XN
-kU
-lw
-Bf
-XN
-sa
-my
-wX
-sa
-aa
-aa
-aa
-aa
-aa
-aa
+(92,1,1) = {"
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ph
+HM
+HM
+HM
+HM
+Jh
+Zj
+KO
+ys
+ys
+ys
+ys
+Tl
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ua
+vc
+JT
+ua
+HS
+Vv
+IC
+dD
+wS
+lt
+dD
+dD
+dD
+dD
+ov
+hM
+dD
+hy
+ua
+ua
+aH
+EH
+yq
+ua
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aG
+Vq
+gi
+Vl
+aG
+aG
+aG
+aG
+aG
+aG
+ce
+Ph
+aG
+bz
+dh
+tg
+rT
+qK
+Gg
+Gg
+Gg
+Xp
+mQ
+if
+eT
+yG
+yG
+eT
+yG
+PE
+eT
+yG
+dX
+eT
+eT
+Zx
+Zx
+qT
+Zx
+Zx
+Zx
+qt
+Zx
+Hn
+Hn
+Hn
+Xp
+mO
+hX
+mO
+mO
+mO
+mO
+mO
+mO
+Zq
+Gr
+my
+sR
+sa
+XN
+kU
+lw
+Bf
+XN
+sa
+my
+wX
+sa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ms
+"}
+(93,1,1) = {"
+ms
aa
aa
aa
@@ -32702,34 +33956,6 @@ aa
aa
aa
aa
-ms
-"}
-(93,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
ph
HM
HM
@@ -32743,36 +33969,6 @@ ys
ys
ys
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-sj
-sj
-sj
-sj
-Zu
-sj
-sj
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -32785,6 +33981,36 @@ aa
aa
aa
aa
+ua
+JJ
+JT
+ua
+ua
+UT
+uG
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+qR
+EH
+EH
+EH
+EH
+qL
+ua
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -32899,31 +34125,31 @@ aa
ms
"}
(94,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ph
XO
HM
@@ -32937,36 +34163,6 @@ ys
ys
FS
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-sj
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -32979,6 +34175,36 @@ aa
aa
aa
aa
+ua
+SY
+JT
+ua
+ua
+ZA
+Yw
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+qR
+EH
+EH
+EH
+EH
+qL
+ua
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -33093,31 +34319,31 @@ aa
ms
"}
(95,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ph
ph
ph
@@ -33131,36 +34357,6 @@ ys
FQ
ys
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -33173,6 +34369,36 @@ aa
aa
aa
aa
+ua
+ua
+qF
+ua
+kM
+Vv
+dD
+dD
+dD
+dD
+dD
+Vg
+Vg
+dD
+Tk
+Tk
+Tk
+dD
+ua
+ua
+Dy
+EH
+rZ
+ua
+ua
+aa
+aa
+aa
+aa
+aa
aa
aa
IE
@@ -33287,37 +34513,37 @@ aa
ms
"}
(96,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
Tl
Tl
Tl
@@ -33325,36 +34551,6 @@ Tl
Tl
Tl
Tl
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -33367,6 +34563,36 @@ aa
aa
aa
aa
+ua
+IT
+dD
+ua
+le
+ei
+ei
+ei
+ei
+ei
+dD
+Vg
+Vg
+dD
+OU
+OU
+OU
+MG
+ua
+ua
+ua
+El
+ua
+ua
+ua
+aa
+aa
+aa
+aa
+aa
aa
aa
IE
@@ -33386,7 +34612,7 @@ xL
OD
UN
IE
-sL
+gi
Vl
aG
FI
@@ -33481,74 +34707,16 @@ aa
ms
"}
(97,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -33563,6 +34731,64 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ua
+ua
+Nf
+dD
+ua
+AE
+dD
+dD
+CR
+dD
+lE
+Ip
+Vg
+Vg
+dD
+Tk
+Tk
+Tk
+dD
+ua
+Ni
+DF
+Sb
+El
+Ad
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
IE
IE
Ee
@@ -33675,74 +34901,40 @@ aa
ms
"}
(98,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -33757,6 +34949,40 @@ aa
aa
aa
aa
+aa
+ua
+Pg
+dD
+Ku
+jF
+hj
+dD
+dD
+dD
+dD
+dD
+lm
+Vg
+Vg
+dD
+dD
+dD
+dD
+FW
+ua
+Ez
+dA
+Sb
+ua
+ua
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
IE
th
IF
@@ -33869,74 +35095,31 @@ aa
ms
"}
(99,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -33951,6 +35134,49 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ua
+Rn
+dD
+Hq
+jF
+hj
+dD
+dD
+dD
+dD
+dD
+Ip
+Vg
+Vg
+dD
+Tk
+Tk
+Tk
+dD
+ua
+Nd
+dA
+Sb
+El
+Ad
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
IE
uO
OE
@@ -34063,74 +35289,22 @@ aa
ms
"}
(100,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -34145,6 +35319,58 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ua
+Ju
+dD
+Wh
+jF
+hj
+dD
+dD
+dD
+dD
+dD
+Ip
+Vg
+Vg
+dD
+OU
+OU
+OU
+MG
+ua
+Ns
+dA
+Sb
+ua
+ua
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
IE
xo
Po
@@ -34257,51 +35483,13 @@ aa
ms
"}
(101,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -34338,6 +35526,44 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+ua
+XP
+dD
+Wh
+jF
+hj
+dD
+dD
+ng
+dD
+dD
+Ip
+Vg
+Vg
+dD
+Tk
+Tk
+Tk
+dD
+ua
+Ns
+St
+Sb
+El
+MV
+ua
+aa
+aa
+aa
+aa
+aa
+aa
IE
IE
IE
@@ -34451,51 +35677,28 @@ aa
ms
"}
(102,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -34523,6 +35726,131 @@ aa
aa
aa
aa
+ua
+Ai
+dD
+Wh
+jF
+hj
+dD
+dD
+dD
+dD
+dD
+Ip
+Vg
+Vg
+dD
+dD
+dD
+dD
+TK
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+IE
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+cp
+IE
+IE
+IE
+IE
+GQ
+IE
+IE
+XV
+cp
+cp
+cp
+sa
+RF
+Ya
+Ya
+XU
+Ya
+SV
+Ya
+XU
+Ya
+Ya
+RM
+sa
+sR
+sR
+sR
+sa
+wN
+sR
+sR
+sR
+sR
+YV
+sa
+aa
+aa
+aa
+aa
+aa
+Jb
+Jb
+Jb
+Ho
+Zs
+oq
+oq
+oq
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+es
+es
+jE
+jE
+lZ
+lZ
+lZ
+jE
+ol
+sa
+sa
+Fu
+sa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -34532,88 +35860,6 @@ aa
aa
aa
aa
-IE
-cp
-cp
-cp
-cp
-cp
-cp
-cp
-cp
-IE
-IE
-IE
-IE
-GQ
-IE
-IE
-XV
-cp
-cp
-cp
-sa
-RF
-Ya
-Ya
-XU
-Ya
-SV
-Ya
-XU
-Ya
-Ya
-RM
-sa
-sR
-sR
-sR
-sa
-wN
-sS
-sR
-sR
-sS
-YV
-sa
-aa
-aa
-aa
-aa
-aa
-Jb
-Jb
-Jb
-Ho
-Zs
-oq
-oq
-oq
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-es
-es
-jE
-jE
-lZ
-lZ
-lZ
-jE
-ol
-sa
-sa
-Fu
-sa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -34622,6 +35868,10 @@ aa
aa
aa
aa
+ms
+"}
+(103,1,1) = {"
+ms
aa
aa
aa
@@ -34642,54 +35892,6 @@ aa
aa
aa
aa
-ms
-"}
-(103,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
aa
aa
aa
@@ -34718,6 +35920,30 @@ aa
aa
aa
aa
+ua
+Uo
+dD
+ZJ
+jF
+hj
+dD
+dD
+dD
+dD
+dD
+Ip
+Vg
+Vg
+LR
+Vk
+Vk
+Vk
+Az
+ua
+ua
+ua
+ua
+ua
aa
aa
aa
@@ -34728,18 +35954,18 @@ aa
aa
IE
RB
-ZA
-ZA
-ZA
-ZA
-ZA
-ZA
-ZA
+bu
+bu
+bu
+bu
+bu
+bu
+bu
vK
-eo
-ZA
-eo
-ZA
+bu
+bu
+bu
+bu
XV
IE
wn
@@ -34759,7 +35985,7 @@ UP
Ya
RL
sa
-sS
+sR
sR
sR
sa
@@ -34839,51 +36065,27 @@ aa
ms
"}
(104,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -34912,6 +36114,30 @@ aa
aa
aa
aa
+ua
+Rn
+dD
+Ku
+jF
+hj
+dD
+dD
+dD
+dD
+dD
+Xt
+Vg
+Vg
+fN
+sP
+sP
+sP
+sP
+KV
+Yo
+jw
+yF
+ua
aa
aa
aa
@@ -34933,7 +36159,7 @@ IE
Tp
cp
cp
-ZA
+bu
XV
IE
wk
@@ -35033,51 +36259,21 @@ aa
ms
"}
(105,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -35112,6 +36308,36 @@ aa
aa
aa
aa
+ua
+eH
+dD
+dD
+ua
+AE
+dD
+dD
+SQ
+dD
+Gf
+Ip
+Vg
+Vg
+fN
+sP
+sP
+sP
+sP
+sP
+sP
+sP
+nr
+ua
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
IE
@@ -35127,13 +36353,13 @@ IE
IE
XV
cp
-ZA
+bu
sF
IE
yv
cp
-ZA
-hO
+bu
+cp
sa
RF
Ya
@@ -35147,13 +36373,13 @@ Jq
Ya
RL
sa
-sS
+sR
sR
sa
sR
-sS
sR
-PY
+sR
+sZ
xk
Kf
Kf
@@ -35227,51 +36453,8 @@ aa
ms
"}
(106,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
aa
aa
aa
@@ -35316,18 +36499,61 @@ aa
aa
aa
aa
+aa
+aa
+aa
+ua
+ua
+dD
+Lz
+ua
+le
+Mk
+Mk
+Mk
+Mk
+Mk
+dD
+Vg
+Vg
+fN
+sP
+sP
+sP
+sP
+sP
+sP
+sP
+WV
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
IE
KM
KM
jK
-VY
-ZA
-ZA
+cp
+bu
+bu
Ed
-ZA
-ZA
-ZA
-hO
+bu
+bu
+bu
+cp
sa
RF
Ya
@@ -35347,7 +36573,7 @@ QP
sR
sR
sz
-PY
+sZ
HW
Kf
Kf
@@ -35421,51 +36647,22 @@ aa
ms
"}
(107,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -35500,6 +36697,35 @@ aa
aa
aa
aa
+ua
+Rn
+dD
+mv
+Su
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+iA
+sP
+yc
+gn
+TF
+AC
+sP
+sP
+Vx
+ua
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -35515,13 +36741,13 @@ KM
KM
Vp
cp
-ZA
+bu
Gv
IE
pQ
cp
-ZA
-hO
+bu
+cp
sa
RF
Ya
@@ -35539,9 +36765,9 @@ wN
sR
sa
ET
-sS
+sR
Kv
-PY
+sZ
HW
Kf
Kf
@@ -35612,64 +36838,41 @@ aa
aa
aa
aa
-ms
-"}
-(108,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ms
+"}
+(108,1,1) = {"
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -35688,6 +36891,29 @@ aa
aa
aa
aa
+ua
+GS
+dD
+JV
+yY
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+lK
+sP
+sP
+sP
+sP
+sP
+sP
+sP
+Hk
+ua
aa
aa
aa
@@ -35707,14 +36933,14 @@ aa
IE
IE
IE
-Vd
+jK
cp
bu
cp
IE
IE
IE
-ZA
+bu
cp
sa
RF
@@ -35734,7 +36960,7 @@ sR
sa
ET
sR
-PY
+sZ
HW
HW
Kf
@@ -35809,51 +37035,21 @@ aa
ms
"}
(109,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -35889,6 +37085,36 @@ aa
aa
aa
aa
+ua
+ua
+ua
+ua
+kM
+dD
+dD
+Vg
+Vg
+Vg
+dD
+dD
+dD
+lK
+sP
+sP
+sP
+sP
+sP
+sP
+sP
+nr
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -35901,14 +37127,14 @@ aa
aa
IE
ZC
-hO
cp
-eo
-ZA
-ZA
-ZA
-ZA
-ZA
+cp
+bu
+bu
+bu
+bu
+bu
+bu
cp
sa
RF
@@ -35928,7 +37154,7 @@ sR
sa
sa
sR
-PY
+sZ
HW
HW
Kf
@@ -36003,51 +37229,18 @@ aa
ms
"}
(110,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36089,6 +37282,39 @@ aa
aa
aa
aa
+ua
+kM
+dD
+dD
+Vg
+Vg
+Vg
+dD
+dD
+dD
+lK
+nM
+sO
+Aq
+lB
+Vi
+Hm
+sP
+uo
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36097,11 +37323,11 @@ IE
xE
Ko
gS
-hO
+cp
MP
IR
YR
-hO
+cp
cp
XV
sa
@@ -36122,7 +37348,7 @@ sR
QP
sR
sR
-PY
+sZ
HW
xk
HW
@@ -36197,51 +37423,23 @@ aa
ms
"}
(111,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36278,6 +37476,34 @@ aa
aa
aa
aa
+ua
+HS
+dD
+hA
+vs
+yJ
+YT
+hA
+dD
+Cf
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+Ck
+ua
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36315,9 +37541,9 @@ sR
sR
sa
sR
-PY
-PY
-PY
+sZ
+sZ
+sZ
HW
HW
ub
@@ -36391,51 +37617,27 @@ aa
ms
"}
(112,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36468,6 +37670,30 @@ aa
aa
aa
aa
+ua
+ua
+DQ
+DQ
+iM
+iM
+iM
+DQ
+DQ
+ua
+ua
+aa
+aa
+aa
+aa
+ua
+jH
+rs
+jH
+ua
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36505,13 +37731,13 @@ JQ
Xs
TO
sa
-sS
+sR
sR
sa
sa
aa
-PY
-PY
+sZ
+sZ
HW
HW
HW
@@ -36585,51 +37811,12 @@ aa
ms
"}
(113,1,1) = {"
-WL
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
-Zu
+ms
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36676,6 +37863,45 @@ aa
aa
aa
aa
+ua
+ua
+AY
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+ES
+ua
+ua
+aa
+aa
+aa
+ua
+Wu
+rs
+rs
+ua
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -36831,27 +38057,27 @@ aa
aa
aa
aa
+ua
+kO
+Vg
+Vg
+pg
+pg
+Vg
+pg
+pg
+Vg
+Vg
+ot
+ua
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ua
+Zg
+rs
+qu
+ua
aa
aa
aa
@@ -36893,7 +38119,7 @@ Xs
Xs
RL
sa
-sS
+sR
Gr
sa
aa
@@ -37025,27 +38251,27 @@ aa
aa
aa
aa
+ua
+tL
+Vg
+Vg
+pg
+pg
+Vg
+pg
+pg
+Vg
+Vg
+wT
+ua
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ua
+VX
+CL
+qu
+ua
aa
aa
aa
@@ -37087,7 +38313,7 @@ TO
TO
TO
sa
-sS
+sR
aa
aa
aa
@@ -37219,27 +38445,27 @@ aa
aa
aa
aa
+ua
+Sl
+Vg
+Vg
+pg
+pg
+Vg
+pg
+pg
+Vg
+Vg
+XD
+ua
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ua
+ua
+ua
+ua
+ua
aa
aa
aa
@@ -37413,19 +38639,19 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ua
+ua
+Jw
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+Vg
+wj
+ua
+ua
aa
aa
aa
@@ -37608,17 +38834,17 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ua
+ua
+IA
+SE
+pg
+pg
+pg
+SE
+eu
+ua
+ua
aa
aa
aa
@@ -37803,15 +39029,15 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
+ua
aa
aa
aa
diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm
index 8ecf017adc17..8bb49ecfc105 100644
--- a/maps/rift/levels/rift-04-surface1.dmm
+++ b/maps/rift/levels/rift-04-surface1.dmm
@@ -35,12 +35,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/warehouse)
-"abL" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/open,
-/area/security/prison)
"abM" = (
/obj/structure/bed/padded,
/obj/item/bedsheet/green,
@@ -95,12 +89,6 @@
},
/turf/simulated/floor/plating,
/area/medical/virologymaint)
-"acE" = (
-/obj/structure/cryofeed{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"adg" = (
/turf/simulated/wall/prepainted/science,
/area/engineering/engine_eva)
@@ -365,7 +353,7 @@
/area/maintenance/research/xenobio)
"aml" = (
/turf/simulated/wall/prepainted/security,
-/area/security/security_cell_hallway)
+/area/security/prison)
"anT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -762,14 +750,6 @@
/obj/machinery/portable_atmospherics/canister/air/airlock,
/turf/simulated/floor/plating,
/area/medical/virologymaint)
-"aBy" = (
-/obj/structure/table/steel,
-/obj/item/material/kitchen/utensil/fork/plastic,
-/obj/item/material/knife/plastic{
- pixel_x = 10
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"aBz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -799,6 +779,18 @@
},
/turf/simulated/floor/tiled/steel,
/area/storage/tools)
+"aCj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"aCk" = (
/obj/structure/sign/poster{
pixel_y = 32
@@ -825,15 +817,24 @@
},
/area/server)
"aDx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
},
-/obj/structure/catwalk,
/obj/structure/cable/green{
- icon_state = "2-4"
+ icon_state = "4-8"
},
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
+/obj/structure/disposalpipe/junction{
+ dir = 8;
+ icon_state = "pipe-j2"
+ },
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"aEB" = (
/obj/machinery/door/airlock/maintenance/medical{
name = "Medical Maintenance Access";
@@ -849,10 +850,14 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/catwalk,
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"aEE" = (
@@ -878,7 +883,6 @@
/turf/simulated/floor/wood,
/area/rift/surfacebase/outside/outside1)
"aFU" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
@@ -903,6 +907,31 @@
/obj/item/deck/cah,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
+"aGe" = (
+/obj/structure/table/steel,
+/obj/item/pen/red{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/item/pen{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/machinery/requests_console/preset/security{
+ pixel_y = 30
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 9
+ },
+/obj/machinery/newscaster{
+ pixel_x = -32
+ },
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"aGK" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 8
@@ -927,27 +956,6 @@
"aIk" = (
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
-"aIo" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 10
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 10
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"aIs" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 8
@@ -1210,7 +1218,7 @@
dir = 4
},
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"aVh" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/photocopier/faxmachine{
@@ -1227,13 +1235,6 @@
"aVp" = (
/turf/simulated/floor/wood,
/area/crew_quarters/game_room)
-"aVt" = (
-/obj/structure/cryofeed{
- dir = 4
- },
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"aWl" = (
/turf/simulated/open/lythios43c/indoors,
/area/rift/surfacebase/outside/outside1)
@@ -1496,13 +1497,6 @@
},
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
-"bfj" = (
-/obj/structure/table/steel,
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/single_use/med_pouch/trauma,
-/obj/item/storage/single_use/med_pouch/trauma,
-/turf/simulated/floor/tiled/red,
-/area/security/security_cell_hallway)
"bfm" = (
/obj/structure/curtain/black,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
@@ -1762,14 +1756,6 @@
/obj/item/flashlight/lamp,
/turf/simulated/floor/carpet/bcarpet,
/area/library)
-"bmG" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/portable_atmospherics/hydroponics,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/security/prison)
"bmQ" = (
/obj/structure/railing{
dir = 8
@@ -1779,13 +1765,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"bmT" = (
-/obj/machinery/air_alarm{
- desc = " ";
- pixel_y = 24
+"bmR" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
},
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/tiled/steel,
/area/security/prison)
"bny" = (
/turf/simulated/floor/wood,
@@ -2277,6 +2263,24 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/quartermaster/hallway)
+"bBB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"bBD" = (
/obj/structure/railing{
dir = 4
@@ -2304,6 +2308,18 @@
/obj/structure/flora/ausbushes/grassybush,
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"bDe" = (
+/obj/structure/filingcabinet/chestdrawer{
+ pixel_y = 12
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"bDq" = (
/obj/machinery/light/small{
dir = 4
@@ -2348,23 +2364,6 @@
/obj/structure/table/bench/wooden,
/turf/simulated/floor/wood,
/area/rift/station/public_garden)
-"bGu" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"bGX" = (
/obj/structure/closet/secure_closet/personal/patient,
/obj/machinery/light{
@@ -2412,6 +2411,12 @@
/obj/item/barcodescanner,
/turf/simulated/floor/carpet,
/area/library/study)
+"bIy" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/turf/simulated/open,
+/area/security/prison/upper)
"bIL" = (
/obj/structure/catwalk,
/obj/structure/disposalpipe/segment,
@@ -2422,6 +2427,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"bKl" = (
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"bKE" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 8
@@ -2612,28 +2620,20 @@
},
/turf/simulated/floor/tiled/white,
/area/rift/trade_shop)
+"bPj" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"bPE" = (
/obj/structure/table/woodentable,
/obj/item/flashlight/lantern,
/turf/simulated/floor/snow,
/area/rift/surfacebase/outside/outside1)
-"bPJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
"bQq" = (
/turf/simulated/wall/r_wall/prepainted,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
-"bQs" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/darkred,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/security/security_cell_hallway)
"bQz" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/steel,
@@ -2663,6 +2663,22 @@
"bRs" = (
/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfaceeva/aa/surface_south)
+"bRw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"bRY" = (
/obj/structure/table/woodentable,
/obj/random/plushie,
@@ -3022,10 +3038,12 @@
dir = 4
},
/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/maintenance/security/lower)
"ccP" = (
@@ -3074,8 +3092,6 @@
/turf/simulated/floor/grass,
/area/hallway/primary/surfaceone)
"cdW" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/turf/simulated/floor/plating,
/area/lawoffice)
@@ -3259,9 +3275,7 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"clK" = (
-/obj/structure/grille,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/machinery/door/firedoor/glass,
/obj/effect/paint/beastybrown,
/turf/simulated/floor/plating,
/area/quartermaster/qm)
@@ -3381,14 +3395,16 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/psych_ward)
-"coC" = (
-/obj/structure/bed/padded,
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"coV" = (
/obj/structure/filingcabinet/chestdrawer,
/turf/simulated/floor/carpet,
/area/security/detectives_office)
+"cpb" = (
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/turf/simulated/open,
+/area/security/prison/upper)
"cpA" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -3496,7 +3512,6 @@
/turf/simulated/floor/carpet/blucarpet,
/area/lawoffice)
"ctO" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
@@ -3508,6 +3523,18 @@
},
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
+"cvf" = (
+/obj/structure/cryofeed{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"cvv" = (
/obj/structure/grille,
/obj/machinery/door/firedoor/glass,
@@ -3554,18 +3581,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
-"cwk" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/machinery/camera/network/security{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"cwV" = (
/obj/structure/window/reinforced/tinted/frosted{
dir = 1
@@ -3666,16 +3681,15 @@
/turf/simulated/floor/plating,
/area/medical/virologymaint)
"cyU" = (
-/obj/machinery/light{
- dir = 8;
- light_range = 12
- },
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/blue/border{
dir = 8
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop)
"cyY" = (
@@ -3699,7 +3713,6 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"czx" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
@@ -3825,18 +3838,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych)
-"cCK" = (
-/obj/structure/table/steel,
-/obj/effect/floor_decal/rust,
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/chemical_dispenser/catering/bar_soft,
-/obj/item/storage/box/glasses/meta{
- pixel_x = -14
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"cCS" = (
/obj/machinery/door/airlock/glass_external/public{
name = "Public External Airlock"
@@ -3891,10 +3892,6 @@
/obj/effect/paint/purplegray,
/turf/simulated/floor/plating,
/area/rnd/outpost/xenobiology/outpost_office)
-"cFW" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/security/lower)
"cGn" = (
/obj/item/stool/padded,
/turf/simulated/floor/wood,
@@ -3953,12 +3950,14 @@
dir = 4
},
/obj/machinery/door/airlock/maintenance/sec,
-/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/plating,
-/area/security/security_cell_hallway)
+/area/security/prison)
"cIn" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -4186,6 +4185,23 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva)
+"cQN" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"cQP" = (
/obj/machinery/fire_alarm/east_mount,
/obj/structure/cable/green{
@@ -4247,6 +4263,16 @@
},
/turf/simulated/floor/wood,
/area/lawoffice)
+"cSI" = (
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/structure/catwalk,
+/turf/simulated/open,
+/area/security/prison/upper)
"cTd" = (
/obj/item/tool/screwdriver,
/obj/item/cigbutt,
@@ -4312,6 +4338,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/library)
+"cVb" = (
+/obj/structure/metal_edge,
+/turf/simulated/open,
+/area/security/prison/upper)
"cVJ" = (
/obj/structure/grille,
/obj/structure/foamedmetal,
@@ -4764,6 +4794,14 @@
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
+"dki" = (
+/obj/structure/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"dky" = (
/obj/machinery/door/airlock{
name = "Internal Affairs";
@@ -4944,10 +4982,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
-"dob" = (
-/obj/random/cutout,
-/turf/simulated/floor/plating,
-/area/maintenance/security/lower)
"dog" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -5149,6 +5183,15 @@
/obj/machinery/light,
/turf/simulated/floor/plating,
/area/maintenance/central_heating/surface_one)
+"dtA" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/machinery/turnstile/exit{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"duq" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -5332,13 +5375,6 @@
/obj/effect/floor_decal/corner/pink/border,
/turf/simulated/floor/tiled/white,
/area/security/forensics)
-"dCR" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"dCX" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
@@ -5976,18 +6012,6 @@
},
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/tankstorage)
-"dUX" = (
-/obj/structure/bed,
-/obj/effect/floor_decal/rust,
-/obj/item/radio/intercom{
- dir = 1;
- pixel_y = 24
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/tiled/red,
-/area/prison/solitary)
"dVj" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/mauve/border,
@@ -6077,6 +6101,18 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
+"dWU" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"dXh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -6194,13 +6230,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
-"eaU" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
+"eaO" = (
+/obj/structure/table/steel,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
},
-/obj/structure/cable/green{
- icon_state = "4-8"
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
},
+/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
/area/security/prison)
"ebp" = (
@@ -6265,11 +6306,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/white,
/area/medical/psych)
-"ecn" = (
-/obj/machinery/power/apc/east_mount,
-/obj/structure/cable/green,
-/turf/simulated/floor/tiled/dark,
-/area/security/brig/bathroom)
"ecJ" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
@@ -6342,13 +6378,13 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/patient_wing)
-"ees" = (
-/obj/structure/curtain/black{
- anchored = 1;
- icon_state = "open"
+"eeH" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
+/obj/machinery/door/airlock/maintenance/sec,
+/turf/simulated/floor/plating,
+/area/security/prison/upper)
"eeN" = (
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
@@ -6425,13 +6461,16 @@
/turf/simulated/floor/tiled/dark,
/area/medical/recoveryrestroom)
"ehd" = (
-/obj/structure/catwalk,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
icon_state = "1-8"
},
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"ehf" = (
@@ -6466,9 +6505,6 @@
/obj/item/stamp/internalaffairs,
/turf/simulated/floor/carpet/blucarpet,
/area/lawoffice)
-"eir" = (
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"eit" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -6508,15 +6544,16 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/medical/mentalhealth)
-"ejq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
+"ejz" = (
+/obj/structure/railing/grey,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
-/area/security/prison)
+/area/security/prison/upper)
"ekr" = (
/obj/machinery/light/small/emergency,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -6560,14 +6597,9 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
"elP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"emq" = (
/obj/item/radio/intercom{
dir = 4;
@@ -6604,6 +6636,12 @@
},
/turf/simulated/floor/plating,
/area/rnd/outpost/xenobiology/outpost_hallway)
+"emN" = (
+/obj/structure/toilet{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"enu" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -6631,15 +6669,6 @@
/obj/item/stool/padded,
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
-"eoU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"epg" = (
/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
dir = 1
@@ -6708,7 +6737,22 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/delivery)
"erN" = (
-/turf/simulated/floor/tiled/steel,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/machinery/turnstile/entry{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
/area/security/prison)
"esp" = (
/obj/effect/floor_decal/borderfloor,
@@ -6743,13 +6787,6 @@
/obj/map_helper/airlock/sensor/chamber_sensor,
/turf/simulated/floor/plating,
/area/rift/surfaceeva/airlock/main/secondary)
-"esT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"esZ" = (
/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/delivery)
@@ -6851,31 +6888,6 @@
/obj/item/clothing/mask/smokable/pipe/cobpipe,
/turf/simulated/floor/carpet/gaycarpet,
/area/tether/surfacebase/funny/clownoffice)
-"evU" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 6
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"evV" = (
/obj/structure/railing{
dir = 4
@@ -6911,6 +6923,18 @@
/obj/machinery/meter,
/turf/simulated/floor/plating,
/area/medical/virologymaint)
+"exp" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"exH" = (
/obj/structure/flora/ausbushes/palebush,
/obj/machinery/atmospherics/component/unary/vent_pump/high_volume,
@@ -6987,6 +7011,24 @@
/obj/item/surgical/hemostat,
/turf/simulated/floor/wood/broken,
/area/maintenance/lowmedbaymaint)
+"eBk" = (
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"eBn" = (
/obj/machinery/portable_atmospherics/canister{
name = "sample overflow canister"
@@ -7083,6 +7125,20 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
+"eEY" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/maintenance/library)
"eFp" = (
/turf/simulated/wall/prepainted,
/area/maintenance/engineering/pumpstation)
@@ -7100,16 +7156,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/garage)
-"eFH" = (
-/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"eFL" = (
/obj/structure/closet/hydrant{
dir = 8;
@@ -7216,6 +7262,18 @@
},
/turf/simulated/floor/water/deep/indoors,
/area/rift/station/public_garden)
+"eIt" = (
+/obj/machinery/cryopod{
+ dir = 2
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"eIC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -7332,7 +7390,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/security/detectives_office)
"eNx" = (
@@ -7417,6 +7477,17 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
+"eTk" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"eTN" = (
/obj/machinery/door/airlock/maintenance/medical{
name = "Medical Maintenance Access";
@@ -7487,6 +7558,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
+"eWs" = (
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"eWC" = (
/obj/machinery/door/airlock/engineering{
name = "Surface Services Substation";
@@ -7520,9 +7597,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
-"eXK" = (
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"eXL" = (
/obj/machinery/washing_machine,
/obj/machinery/power/apc/east_mount,
@@ -7554,7 +7628,7 @@
"eZl" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
+/area/security/prison)
"eZK" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -7571,11 +7645,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
-"fae" = (
-/obj/machinery/cryopod,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/security/prison)
"fam" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -7588,14 +7657,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
-"fav" = (
-/obj/structure/closet/secure_closet/brig,
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/red,
-/area/security/security_cell_hallway)
"faB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -7638,20 +7699,6 @@
/obj/structure/sink/puddle,
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
-"fcI" = (
-/obj/machinery/door/airlock/security{
- name = "Confinement Storage";
- req_one_access = list(2)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"fdn" = (
/obj/machinery/papershredder,
/turf/simulated/floor/wood,
@@ -7686,6 +7733,12 @@
},
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"fed" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/open,
+/area/security/prison/upper)
"feB" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -7701,12 +7754,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint)
-"feR" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"ffb" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
@@ -7832,11 +7879,22 @@
/turf/simulated/floor/tiled/white,
/area/medical/psych)
"flS" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/mentalhealth)
+"flT" = (
+/obj/machinery/cryopod{
+ dir = 2
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"fmu" = (
/obj/machinery/bookbinder,
/obj/machinery/light/small{
@@ -8060,16 +8118,6 @@
/obj/effect/floor_decal/corner/brown/bordercorner2,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/delivery)
-"ftr" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/light{
- dir = 8
- },
-/turf/simulated/floor/tiled/red,
-/area/security/security_cell_hallway)
"ftF" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -8193,17 +8241,7 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"fxo" = (
-/obj/machinery/door/airlock/glass/security{
- name = "Confinement Processing";
- req_access = list(2)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"fxR" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/shutters{
dir = 8;
id = "warehouse";
@@ -8512,13 +8550,6 @@
/obj/machinery/computer/arcade/battle,
/turf/simulated/floor/tiled/white,
/area/medical/psych)
-"fJY" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/security/prison)
"fKW" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 8
@@ -8576,12 +8607,6 @@
},
/turf/simulated/floor/wood,
/area/rift/surfacebase/outside/outside1)
-"fLU" = (
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
-"fMu" = (
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"fMy" = (
/obj/structure/table/woodentable,
/obj/item/book/manual/standard_operating_procedure,
@@ -8789,6 +8814,11 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/patient_a)
+"fRT" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/maintenance/sec,
+/turf/simulated/floor/plating,
+/area/security/prison/upper)
"fSj" = (
/obj/structure/symbol/sa,
/turf/simulated/wall/prepainted,
@@ -8835,16 +8865,6 @@
"fUY" = (
/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/medbay_emt_bay)
-"fVb" = (
-/obj/machinery/cryopod,
-/obj/machinery/camera/network/security{
- dir = 4
- },
-/obj/machinery/computer/cryopod{
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/red,
-/area/prison/solitary)
"fVl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9059,14 +9079,41 @@
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden)
"gcn" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"gcP" = (
/obj/structure/table/woodentable,
/obj/item/flame/candle,
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
+"gcW" = (
+/turf/simulated/open,
+/area/security/prison/upper)
"gdq" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 10
@@ -9089,6 +9136,12 @@
},
/turf/simulated/floor/outdoors/beach/sand/desert/indoors,
/area/rift/station/public_garden)
+"gex" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/open,
+/area/security/prison/upper)
"geV" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -9261,14 +9314,6 @@
},
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/medical/virologytransitwest)
-"glj" = (
-/obj/structure/curtain/black{
- anchored = 1;
- icon_state = "open"
- },
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"glF" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -9331,6 +9376,18 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rnd/outpost/xenobiology/outpost_storage)
+"goO" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/obj/structure/bed/chair{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"gpn" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/wood,
@@ -9504,6 +9561,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
+"gur" = (
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"guw" = (
/obj/structure/bed/padded,
/obj/item/bedsheet/cosmos,
@@ -9537,12 +9600,6 @@
/obj/structure/table,
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
-"gvU" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"gvX" = (
/obj/item/stool/padded,
/obj/machinery/camera/network/civilian,
@@ -9633,13 +9690,6 @@
},
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"gxu" = (
-/obj/machinery/vending/hydroseeds,
-/obj/machinery/camera/network/security{
- dir = 10
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"gxR" = (
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
@@ -9650,6 +9700,17 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"gyx" = (
+/obj/structure/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"gzd" = (
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/outside/outside1)
@@ -9668,13 +9729,6 @@
},
/turf/simulated/floor/carpet/blue,
/area/tether/surfacebase/medical/mentalhealth)
-"gAz" = (
-/obj/structure/cryofeed{
- dir = 4
- },
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/red,
-/area/prison/solitary)
"gBQ" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -9731,33 +9785,17 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
-"gFi" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 9
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 9
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"gFo" = (
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
+"gFS" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 1;
+ power_rating = 45000
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"gGj" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -9779,6 +9817,27 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
+"gGC" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"gGT" = (
/obj/machinery/portable_atmospherics/hydroponics,
/obj/effect/floor_decal/spline/plain,
@@ -9947,6 +10006,9 @@
/obj/machinery/light/small{
dir = 4
},
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"gKJ" = (
@@ -9956,26 +10018,14 @@
/obj/effect/floor_decal/corner/red/border{
dir = 5
},
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 4
- },
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 5
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"gLn" = (
/obj/structure/table/standard,
/obj/item/storage/firstaid/adv{
@@ -10145,6 +10195,24 @@
},
/turf/simulated/floor/carpet,
/area/library/study)
+"gQC" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"gQQ" = (
/obj/structure/flora/ausbushes/reedbush,
/obj/structure/railing{
@@ -10238,13 +10306,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
-"gSP" = (
-/obj/structure/table/steel,
-/obj/item/duct_tape_roll,
-/obj/item/clothing/mask/muzzle,
-/obj/item/clothing/glasses/sunglasses/blindfold,
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"gTk" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -10695,6 +10756,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"hdw" = (
@@ -10709,10 +10771,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/surface_one)
-"hdy" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/security/prison)
"hdL" = (
/obj/structure/table/alien/blue{
desc = "Is this imported?";
@@ -10759,6 +10817,17 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
+"hek" = (
+/obj/structure/reagent_dispensers/water_cooler/full,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"heB" = (
/obj/machinery/portable_atmospherics/hydroponics,
/obj/effect/floor_decal/spline/plain{
@@ -10847,10 +10916,6 @@
/obj/item/folder/blue,
/turf/simulated/floor/tiled/techfloor,
/area/server)
-"hhv" = (
-/obj/item/cigbutt/cigarbutt,
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"hhC" = (
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/wood,
@@ -10885,10 +10950,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
-"him" = (
-/obj/random/trash_pile,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"hip" = (
/obj/machinery/air_alarm{
desc = " ";
@@ -10956,6 +11017,16 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/virologytransitwest)
+"hiV" = (
+/obj/machinery/button/remote/blast_door{
+ id = "cell_lock_3";
+ name = "Cell 3 Lock";
+ pixel_x = 7;
+ pixel_y = 30;
+ req_access = list(1,2,4,38)
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"hiW" = (
/obj/machinery/camera/network/civilian{
dir = 1
@@ -11098,19 +11169,6 @@
/obj/vehicle/ridden/quadbike/random,
/turf/simulated/floor/tiled/steel_ridged,
/area/quartermaster/garage)
-"hmF" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/closet/crate,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/random/contraband,
-/obj/random/maintenance/cargo,
-/turf/simulated/floor/plating,
-/area/maintenance/security/lower)
-"hmK" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall/r_wall/prepainted/security,
-/area/security/security_cell_hallway)
"hnh" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/ai_status_display{
@@ -11271,6 +11329,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/testingroom)
+"hsB" = (
+/obj/machinery/light,
+/turf/simulated/open,
+/area/security/prison/upper)
"htj" = (
/obj/machinery/camera/network/medbay{
dir = 8
@@ -11376,6 +11438,18 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
+"hyP" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 10
+ },
+/obj/machinery/computer/prisoner{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"hzB" = (
/obj/structure/filingcabinet/medical{
desc = "A large cabinet with hard copy medical records.";
@@ -11384,19 +11458,15 @@
/turf/simulated/floor/carpet/blue,
/area/tether/surfacebase/medical/mentalhealth)
"hzO" = (
-/obj/machinery/shower{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 9
+/obj/machinery/turnstile/exit{
+ dir = 8
},
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 10
+/obj/structure/curtain/open/shower/security,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
-/obj/item/soap/nanotrasen,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/dark,
-/area/security/brig/bathroom)
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"hzW" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -11479,12 +11549,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
-"hCE" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"hCL" = (
/obj/structure/catwalk,
/obj/structure/disposalpipe/segment,
@@ -11578,7 +11642,7 @@
/area/quartermaster/office)
"hFE" = (
/turf/simulated/wall/r_wall/prepainted/security,
-/area/security/security_cell_hallway)
+/area/security/prison)
"hFH" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
@@ -11602,6 +11666,17 @@
/obj/structure/filingcabinet,
/turf/simulated/floor/tiled,
/area/rnd/xenoarch_storage)
+"hGe" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"hGg" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/sec,
@@ -11929,6 +12004,24 @@
/obj/item/storage/toolbox/emergency,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
+"hPd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"hPe" = (
/turf/simulated/floor/tiled/steel_dirty,
/area/maintenance/maint_bar)
@@ -11962,10 +12055,6 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
-"hQd" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"hQy" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -12065,25 +12154,6 @@
/obj/machinery/meter,
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora/lab_atmos)
-"hTu" = (
-/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/visible/supply{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/structure/catwalk,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/security/lower)
"hTB" = (
/obj/structure/bed/chair/comfy/red{
dir = 8
@@ -12125,6 +12195,22 @@
/obj/machinery/seed_extractor,
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden)
+"hVB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 8;
+ power_rating = 45000
+ },
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"hVL" = (
/obj/machinery/vending/nifsoft_shop,
/obj/machinery/light,
@@ -12255,16 +12341,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_emt_bay)
-"hYf" = (
-/obj/structure/catwalk,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"hYm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -12334,11 +12410,6 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
-"iaf" = (
-/obj/structure/table/steel,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/security/prison)
"ial" = (
/obj/structure/table/standard,
/obj/item/storage/toolbox/electrical{
@@ -12407,6 +12478,14 @@
},
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
+"ibA" = (
+/obj/effect/floor_decal/borderfloor/corner,
+/obj/effect/floor_decal/corner/red/bordercorner,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"ibI" = (
/obj/structure/curtain/open/shower,
/obj/machinery/shower,
@@ -12450,19 +12529,6 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/patient_wing)
-"idS" = (
-/obj/machinery/shower{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 10
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 9
- },
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/dark,
-/area/security/brig/bathroom)
"ier" = (
/obj/structure/bed/chair/sofa/black/right{
dir = 8
@@ -12858,14 +12924,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/janitor)
-"irQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"irV" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/wood,
@@ -12927,10 +12985,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
-"ium" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"iuZ" = (
/turf/simulated/floor/outdoors/beach/sand/desert/indoors,
/area/rift/station/public_garden)
@@ -13011,6 +13065,20 @@
/obj/machinery/camera/network/research/xenobio,
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
+"iwn" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/bed/chair,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"iws" = (
/obj/structure/railing{
dir = 4
@@ -13021,14 +13089,6 @@
},
/turf/simulated/floor/plating,
/area/rift/trade_shop)
-"iwC" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"iwH" = (
/obj/structure/bookcase{
name = "bookcase (Religious)"
@@ -13103,11 +13163,6 @@
/obj/item/flame/candle/candelabra/everburn,
/turf/simulated/floor/carpet,
/area/maintenance/research/lower)
-"izR" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"izU" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -13300,21 +13355,6 @@
/obj/machinery/door/airlock/maintenance/command,
/turf/simulated/floor/plating,
/area/rift/surfaceeva/aa/surface_south)
-"iEy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"iEH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -13358,6 +13398,18 @@
/obj/item/bedsheet/mimedouble,
/turf/simulated/floor/carpet/bcarpet,
/area/tether/surfacebase/funny/mimeoffice)
+"iFA" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/effect/floor_decal/industrial/loading{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"iFF" = (
/obj/machinery/holopad,
/obj/structure/disposalpipe/segment{
@@ -13372,6 +13424,17 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/security/lower)
+"iFM" = (
+/obj/machinery/door/airlock/glass/security{
+ id_tag = "cell_lock_3";
+ name = "Cell 3";
+ req_one_access = null
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"iFN" = (
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/outside1)
@@ -13424,12 +13487,6 @@
/obj/item/flashlight/lamp,
/turf/simulated/floor/wood/broken,
/area/maintenance/library)
-"iHk" = (
-/obj/machinery/vending/sovietsoda{
- name = "Water Dispenser"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"iHI" = (
/obj/machinery/door/airlock/multi_tile/glass{
id_tag = "PsycheFoyer";
@@ -13472,6 +13529,14 @@
/obj/item/key/quadbike,
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/garage)
+"iIN" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"iJb" = (
/obj/structure/table/reinforced,
/obj/item/pen/red{
@@ -13659,6 +13724,15 @@
/obj/effect/floor_decal/corner/beige/border,
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
+"iOy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"iPn" = (
/obj/landmark/spawnpoint/job/assistant,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13703,19 +13777,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
-"iQT" = (
-/obj/machinery/door/airlock/glass/security{
- name = "Confinement Processing";
- req_access = list(2)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"iRn" = (
/obj/structure/railing{
dir = 1
@@ -13823,8 +13884,18 @@
/turf/simulated/floor/tiled/white,
/area/medical/patient_b)
"iTF" = (
-/turf/simulated/wall/r_wall/prepainted/security,
-/area/security/prison)
+/obj/machinery/papershredder,
+/obj/machinery/fire_alarm/west_mount{
+ pixel_x = -24
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 10
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"iUb" = (
/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_autopsy)
@@ -13854,6 +13925,25 @@
"iUi" = (
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_decon)
+"iUq" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2,
+/obj/effect/floor_decal/corner/red/bordercorner2,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"iVp" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -13878,9 +13968,6 @@
},
/turf/simulated/floor/tiled,
/area/medical/virologytransiteast)
-"iVw" = (
-/turf/simulated/floor/wood/broken,
-/area/maintenance/lowmedbaymaint)
"iVN" = (
/obj/machinery/light{
dir = 1
@@ -13888,12 +13975,6 @@
/obj/structure/table/bench/wooden,
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden)
-"iWv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"iWw" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light/small{
@@ -13934,6 +14015,19 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
+"iXO" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"iYd" = (
/obj/machinery/atmospherics/pipe/manifold/visible/black{
dir = 1
@@ -14083,17 +14177,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
-"jdg" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"jdt" = (
/obj/structure/sign/warning/caution,
/turf/simulated/wall/prepainted,
@@ -14284,18 +14367,10 @@
/obj/machinery/light/flamp/noshade,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"jhW" = (
-/turf/simulated/floor/wood,
-/area/maintenance/maint_bar)
"jiI" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/tool_storage)
-"jiM" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/camera/network/security,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"jjg" = (
/obj/structure/table/woodentable,
/obj/item/book/manual/standard_operating_procedure,
@@ -14346,26 +14421,6 @@
"jkh" = (
/turf/simulated/floor/lino,
/area/security/detectives_office)
-"jkz" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 5
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"jkB" = (
/obj/structure/bed/chair/sofa/black/left{
dir = 4
@@ -14404,9 +14459,6 @@
/obj/structure/sign/department/xenolab,
/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_decon)
-"jlF" = (
-/turf/simulated/floor/plating,
-/area/maintenance/maint_bar)
"jmJ" = (
/obj/item/radio/intercom{
dir = 4;
@@ -14514,23 +14566,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
-"jrX" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/danger{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red{
- dir = 6
- },
-/obj/machinery/door/airlock/glass/security/polarized{
- id_tint = "solitary";
- name = "Solitary Confinement";
- req_one_access = list(2)
- },
-/turf/simulated/floor/tiled/dark,
-/area/prison/solitary)
"jsL" = (
/obj/machinery/power/apc/west_mount,
/obj/structure/table/woodentable,
@@ -14636,16 +14671,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/delivery)
-"jxk" = (
-/obj/structure/sink{
- dir = 8;
- pixel_x = -12
- },
-/obj/structure/mirror{
- pixel_x = -26
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/brig/bathroom)
"jxt" = (
/obj/structure/sign/mining{
pixel_y = 32
@@ -14694,6 +14719,22 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"jya" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"jyG" = (
/obj/effect/floor_decal/corner/beige/full{
dir = 8
@@ -14707,10 +14748,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
-"jzl" = (
-/obj/effect/floor_decal/industrial/outline,
-/turf/simulated/floor/tiled/steel_ridged,
-/area/quartermaster/garage)
"jzo" = (
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/effect/paint/purplegray,
@@ -14772,14 +14809,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/security/lower)
-"jBw" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"jBE" = (
/obj/structure/toilet{
desc = "A cheap knockoff of the HT-42069 HEPHAESTUS 'Tactical' Toilet, it's durasteel applique armor poorly mimicked with slabs of porcelain, the flush buttons magnesium. It's a nice toilet, but the engravings serve no tactical advantage whatsoever.";
@@ -15012,11 +15041,29 @@
/turf/simulated/floor/tiled/techfloor,
/area/server)
"jJS" = (
-/obj/structure/cable/green{
- icon_state = "1-8"
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
},
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/holoposter{
+ pixel_x = -32
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"jJW" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
dir = 10
@@ -15520,6 +15567,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/xenoarch_storage)
+"kbG" = (
+/obj/structure/bed/chair/sofa/beige/left{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"kcb" = (
/obj/structure/railing{
dir = 4
@@ -15713,12 +15775,6 @@
},
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
-"khf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
"khg" = (
/obj/structure/catwalk,
/obj/structure/disposalpipe/segment{
@@ -15841,7 +15897,6 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"kko" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
@@ -15854,6 +15909,9 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"kkQ" = (
@@ -15968,10 +16026,6 @@
/obj/item/instrument/eguitar,
/turf/simulated/floor/wood/broken,
/area/maintenance/maint_bar)
-"koh" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
"koz" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
@@ -16133,7 +16187,6 @@
},
/obj/structure/metal_edge,
/turf/simulated/floor/plating/lythios43c,
-/turf/simulated/floor/outdoors/snow/noblend/lythios43c,
/area/rift/surfacebase/outside/outside1)
"ktI" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -16193,11 +16246,16 @@
/turf/simulated/floor/carpet/sblucarpet,
/area/crew_quarters/medbreak)
"kwn" = (
-/obj/structure/cable/green{
- icon_state = "2-4"
+/obj/machinery/door/airlock/glass/security{
+ id_tag = "cell_lock_2";
+ name = "Cell 2";
+ req_one_access = null
},
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"kwz" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
@@ -16328,9 +16386,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/janitor)
-"kzX" = (
-/turf/simulated/wall/r_wall/prepainted,
-/area/maintenance/security/lower)
"kAb" = (
/turf/simulated/wall/r_wall/prepainted,
/area/rift/trade_shop)
@@ -16371,6 +16426,12 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/security/forensics)
+"kDo" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"kDx" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/machinery/atmospherics/pipe/simple/visible/supply,
@@ -16481,26 +16542,6 @@
/obj/machinery/light_construct/small,
/turf/simulated/floor/carpet/turcarpet,
/area/maintenance/maint_bar)
-"kFR" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/effect/floor_decal/rust,
-/obj/structure/closet/emcloset,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/tank/oxygen,
-/obj/item/tank/oxygen,
-/obj/item/tank/oxygen,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/mask/gas,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"kGM" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/reagent_containers/spray/plantbgone,
@@ -16898,6 +16939,23 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden)
+"kRN" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"kSd" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -16932,8 +16990,11 @@
"kSK" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/red/bordercorner,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"kSV" = (
/obj/structure/railing{
dir = 8
@@ -16941,7 +17002,6 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
"kTn" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/regular{
dir = 4;
id = "test_chamber_blast";
@@ -17075,12 +17135,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
-"kVO" = (
-/obj/structure/table/steel,
-/obj/item/reagent_containers/food/drinks/cans/waterbottle,
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"kWq" = (
/turf/simulated/wall/wood/hardwood,
/area/tether/surfacebase/entertainment)
@@ -17227,6 +17281,19 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
+"lbY" = (
+/obj/machinery/fire_alarm/north_mount,
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"lcb" = (
/obj/machinery/librarycomp,
/obj/structure/table/wooden_reinforced,
@@ -17306,14 +17373,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
-"ley" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/table/steel,
-/obj/structure/bedsheetbin,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"leM" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/obj/structure/disposalpipe/segment{
@@ -17355,6 +17414,15 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
+"lfB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"lfK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -17419,12 +17487,24 @@
/turf/simulated/floor,
/area/maintenance/substation/medical)
"liA" = (
-/obj/machinery/light/small{
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/extinguisher_cabinet{
+ dir = 4;
+ pixel_x = -30
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"liP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -17511,8 +17591,23 @@
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
"llC" = (
-/turf/simulated/wall/r_wall/prepainted/security,
-/area/prison/solitary)
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"llZ" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/techfloor,
@@ -17729,9 +17824,16 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
-"luv" = (
-/turf/simulated/open,
-/area/security/prison)
+"luX" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"lvm" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 4
@@ -17879,10 +17981,15 @@
/obj/structure/table/standard,
/turf/simulated/floor/tiled/techfloor/grid,
/area/rnd/xenoarch_storage)
-"lBS" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/security_cell_hallway)
+"lCd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"lCg" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -18021,14 +18128,6 @@
/obj/map_helper/airlock/atmos/chamber_pump,
/turf/simulated/floor/plating,
/area/rnd/outpost/xenobiology/outpost_hallway)
-"lGQ" = (
-/obj/structure/table/steel,
-/obj/item/deck/cards,
-/obj/item/radio/intercom{
- pixel_y = -24
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"lHl" = (
/turf/simulated/wall/r_wall/prepainted,
/area/medical/virologymaint)
@@ -18041,10 +18140,6 @@
},
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/medical/virologyisolation)
-"lHI" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"lHT" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -18098,6 +18193,12 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
+"lJl" = (
+/obj/effect/floor_decal/industrial/loading{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"lJs" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -18145,9 +18246,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/surface_north)
-"lLp" = (
-/turf/simulated/wall/r_wall/prepainted/security,
-/area/security/brig/bathroom)
"lLs" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -18268,6 +18366,25 @@
/obj/machinery/vending,
/turf/simulated/floor/lino,
/area/tether/surfacebase/entertainment/backstage)
+"lPp" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/closet/hydrant{
+ dir = 4;
+ pixel_x = -32
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"lPC" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -18484,14 +18601,6 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry_lab)
-"lXV" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/bed/chair,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"lYg" = (
/obj/structure/symbol/sa,
/turf/simulated/wall/prepainted,
@@ -18543,17 +18652,6 @@
},
/turf/simulated/floor/plating/lythios43c,
/area/engineering/engine_eva)
-"maH" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/table/steel,
-/turf/simulated/floor/plating,
-/area/security/prison)
-"maP" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"maS" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -18916,50 +19014,6 @@
/obj/structure/table/steel,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
-"mmi" = (
-/obj/machinery/button/flasher{
- dir = 4;
- id = "solitary_f";
- name = "Solitary Flasher";
- pixel_x = 24;
- pixel_y = 2;
- req_one_access = list(2)
- },
-/obj/machinery/button/windowtint{
- id = "solitary";
- name = "airlock tint control";
- pixel_x = 24;
- pixel_y = -8
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 5
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 5
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 5
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"mmk" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
@@ -19335,6 +19389,26 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
+"muR" = (
+/obj/machinery/door/airlock/glass/security{
+ name = "Prison Overwatch";
+ req_access = list();
+ req_one_access = list(2,4)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"muW" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
@@ -19555,7 +19629,6 @@
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"mCK" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/regular{
dir = 4;
id = "test_chamber_blast";
@@ -19577,11 +19650,6 @@
/obj/structure/transit_tube/high_velocity,
/turf/simulated/floor/tiled/white,
/area/medical/virologytransitwest)
-"mDl" = (
-/obj/item/stack/rods,
-/obj/item/stack/rods,
-/turf/simulated/floor/plating,
-/area/maintenance/maint_bar)
"mDM" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/obj/structure/disposalpipe/segment{
@@ -19738,6 +19806,15 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
+"mIw" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"mIB" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
@@ -19749,12 +19826,6 @@
/obj/machinery/camera/network/medbay,
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
-"mIY" = (
-/obj/structure/closet/secure_closet/brig,
-/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/red,
-/area/security/security_cell_hallway)
"mJi" = (
/obj/effect/floor_decal/rust,
/obj/structure/catwalk,
@@ -19776,13 +19847,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/steel,
/area/rnd/tankstorage)
-"mJO" = (
-/obj/structure/table/steel,
-/obj/machinery/microwave,
-/obj/item/storage/box/donkpockets,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"mJU" = (
/obj/structure/bed/chair/office/light{
dir = 8
@@ -19801,30 +19865,19 @@
"mKe" = (
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
-"mKA" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"mKQ" = (
-/obj/machinery/light{
- dir = 8;
- light_range = 12
- },
/obj/machinery/fire_alarm/west_mount{
pixel_x = -24
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/white,
/area/medical/psych)
"mLf" = (
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"mMk" = (
-/obj/machinery/light/small,
-/obj/machinery/portable_atmospherics/hydroponics,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"mNj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -19839,6 +19892,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"mNo" = (
@@ -20165,7 +20219,7 @@
"mWf" = (
/obj/machinery/holopad,
/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
+/area/security/prison)
"mWg" = (
/obj/structure/lattice,
/obj/machinery/door/firedoor/glass,
@@ -20368,10 +20422,6 @@
},
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"nbp" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"nbI" = (
/obj/structure/catwalk,
/obj/effect/floor_decal/rust,
@@ -20708,20 +20758,6 @@
/obj/structure/flora/ausbushes/fullgrass,
/turf/simulated/floor/grass,
/area/medical/psych)
-"nmA" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"nmF" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -21241,6 +21277,16 @@
"nDb" = (
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/garage)
+"nDc" = (
+/obj/machinery/button/remote/blast_door{
+ id = "cell_lock_1";
+ name = "Cell 1 Lock";
+ pixel_x = 7;
+ pixel_y = 30;
+ req_access = list(1,2,4,38)
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"nDl" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -21288,12 +21334,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
-"nEg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
"nEH" = (
/obj/structure/sink/kitchen{
dir = 4;
@@ -21324,6 +21364,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/cmo)
+"nFg" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/machinery/computer/security{
+ dir = 4;
+ icon_state = "computer"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"nFk" = (
/obj/structure/table/reinforced,
/obj/random/toy,
@@ -21399,6 +21449,10 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
+"nHJ" = (
+/obj/effect/floor_decal/borderfloorblack,
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"nHP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/black,
@@ -21424,14 +21478,6 @@
/obj/structure/table/hardwoodtable,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"nIQ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"nJn" = (
/obj/structure/disposalpipe/junction,
/obj/structure/catwalk,
@@ -21740,14 +21786,6 @@
/obj/effect/floor_decal/corner/brown/bordercorner2,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
-"nRV" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/floor_decal/rust,
-/obj/structure/bed/padded,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"nRY" = (
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/surface_south)
@@ -21828,14 +21866,17 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
/obj/structure/cable/green{
icon_state = "2-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
+/area/security/prison)
"nUJ" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -21858,21 +21899,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
-"nUS" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_x = -30
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"nUU" = (
/obj/structure/curtain/open/bed,
/turf/simulated/floor/wood,
@@ -22089,6 +22115,21 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologytransitwest)
+"obG" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"obP" = (
/obj/machinery/button/remote/blast_door{
dir = 1;
@@ -22371,18 +22412,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/main/secondary)
-"oiL" = (
-/obj/machinery/flasher{
- id = "solitary_f";
- pixel_x = 26
- },
-/obj/effect/floor_decal/industrial/loading{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/monotile,
-/area/prison/solitary)
"oiO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -22445,6 +22474,15 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
+"okr" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"okx" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -22700,10 +22738,41 @@
"otM" = (
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfaceone)
+"oux" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"ouF" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/monotile,
/area/rnd/xenobiology/xenoflora)
+"ouI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"ouJ" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1;
@@ -22776,15 +22845,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
-"oxY" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/table/rack,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/random/contraband,
-/obj/random/maintenance/cargo,
-/turf/simulated/floor/plating,
-/area/maintenance/security/lower)
"oyt" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate/medical,
@@ -22818,6 +22878,31 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/server)
+"ozq" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 10
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"ozG" = (
/obj/structure/mirror/long/broke{
pixel_y = -28
@@ -22845,13 +22930,7 @@
},
/turf/simulated/floor/tiled/monotile,
/area/medical/virology)
-"oBA" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"oBN" = (
-/obj/machinery/door/firedoor,
-/obj/structure/grille,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/darkred,
/turf/simulated/floor/plating,
@@ -22931,6 +23010,14 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
+"oDu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/holopad,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"oDG" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -23008,6 +23095,18 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/surface_north)
+"oFc" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/light,
+/obj/effect/floor_decal/industrial/loading{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"oFn" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 4
@@ -23047,8 +23146,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"oHy" = (
/obj/machinery/fire_alarm/west_mount{
pixel_x = -24
@@ -23158,6 +23257,24 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
+"oLW" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing,
+/obj/structure/cable/green,
+/obj/structure/cable/green{
+ icon_state = "16-0"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"oMd" = (
/obj/item/suit_cooling_unit,
/obj/item/storage/belt/archaeology,
@@ -23570,16 +23687,6 @@
},
/turf/simulated/floor/wood,
/area/maintenance/research/lower)
-"oWz" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"oWA" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 4
@@ -23656,13 +23763,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/testingroom)
-"oYT" = (
-/obj/structure/bed/chair,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"oZc" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -23728,6 +23828,12 @@
/obj/structure/catwalk,
/turf/simulated/floor/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"paf" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"pan" = (
/obj/structure/table/steel_reinforced,
/obj/item/storage/toolbox/mechanical{
@@ -23752,12 +23858,6 @@
},
/turf/simulated/floor/tiled,
/area/medical/virologypurge)
-"pba" = (
-/obj/item/paper_bin,
-/obj/structure/table/rack/shelf/steel,
-/obj/item/pen,
-/turf/simulated/floor/plating,
-/area/security/prison)
"pbf" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
@@ -23950,6 +24050,17 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_emt_bay)
+"peQ" = (
+/obj/structure/bed/chair/sofa/beige/right,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"pfy" = (
/obj/structure/table/rack/steel,
/obj/random/maintenance/research,
@@ -23973,13 +24084,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
-"pgK" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"phb" = (
/obj/machinery/computer/security/mining{
dir = 1
@@ -24133,18 +24237,6 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"pma" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"pmA" = (
/obj/structure/table/rack/steel,
/obj/random/tool,
@@ -24222,6 +24314,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
+"pnT" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/upper)
"poK" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -24257,11 +24352,6 @@
/obj/structure/girder,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
-"ppO" = (
-/obj/structure/closet/secure_closet/brig,
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled/red,
-/area/security/security_cell_hallway)
"ppX" = (
/obj/structure/table/woodentable,
/obj/item/tape_recorder{
@@ -24312,15 +24402,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/surface_south)
-"prD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"prO" = (
/obj/structure/undies_wardrobe,
/turf/simulated/floor/wood,
@@ -24553,6 +24634,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/white,
/area/medical/psych)
+"pwW" = (
+/obj/structure/table/reinforced,
+/obj/item/flashlight/lamp,
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"pxL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24562,6 +24648,15 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/hallway)
+"pys" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"pyt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/black,
@@ -24643,6 +24738,16 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
+"pAU" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/borderfloor/corner2,
+/obj/effect/floor_decal/corner/red/bordercorner2,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"pAV" = (
/obj/structure/extinguisher_cabinet{
pixel_y = 30
@@ -24654,22 +24759,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop)
-"pBg" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/holoposter{
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"pBn" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -24705,6 +24794,24 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"pCU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"pDh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -24885,6 +24992,16 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"pJd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/glass/security{
+ layer = 2.8;
+ name = "Visitation"
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"pJn" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/genericbush,
@@ -25000,12 +25117,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
-"pNt" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"pNv" = (
/obj/structure/table/reinforced,
/obj/fiftyspawner/rods,
@@ -25052,9 +25163,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
-"pOR" = (
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"pOV" = (
/obj/structure/table/standard,
/obj/item/gun/energy/taser/xeno,
@@ -25142,6 +25250,19 @@
},
/turf/simulated/floor/lino,
/area/tether/surfacebase/entertainment/backstage)
+"pRw" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/cups,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/camera/network/security,
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"pRD" = (
/obj/machinery/lapvend,
/obj/effect/floor_decal/borderfloor{
@@ -25254,6 +25375,38 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/cmo)
+"pUI" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ id = "cell_lock_1";
+ name = "Cell 1 Lock";
+ pixel_x = -24;
+ pixel_y = -8;
+ req_access = list(1,2,4,38)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"pUJ" = (
/obj/machinery/power/pointdefense{
id_tag = "s1south"
@@ -25289,13 +25442,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
-"pWP" = (
-/obj/structure/toilet{
- pixel_y = 9
- },
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/dark,
-/area/security/brig/bathroom)
"pXg" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/light{
@@ -25324,11 +25470,22 @@
"pYJ" = (
/turf/simulated/floor/tiled,
/area/medical/virologypurge)
+"pYS" = (
+/obj/structure/bed/chair/sofa/beige/corner,
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"pZn" = (
-/obj/structure/grille,
-/obj/structure/foamedmetal,
-/turf/simulated/floor/plating,
-/area/maintenance/security/lower)
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"qaB" = (
/obj/effect/floor_decal/rust,
/obj/structure/cable/green{
@@ -25380,15 +25537,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora)
-"qcH" = (
-/obj/machinery/door/airlock{
- name = "Bathroom"
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/brig/bathroom)
"qcL" = (
/obj/machinery/light_switch{
dir = 1;
@@ -25540,13 +25688,28 @@
},
/turf/simulated/floor/wood,
/area/maintenance/research/lower)
+"qhR" = (
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing,
+/obj/structure/lattice,
+/obj/structure/cable/green{
+ icon_state = "32-2"
+ },
+/turf/simulated/open,
+/area/maintenance/lowmedbaymaint)
"qhZ" = (
/obj/structure/flora/ausbushes/lavendergrass,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"qih" = (
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"qiy" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
@@ -25725,6 +25888,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
+"qls" = (
+/obj/structure/metal_edge,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/open,
+/area/security/prison/upper)
"qlA" = (
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/turbolift/rmine/surface)
@@ -25832,6 +26002,12 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva)
+"qpf" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"qpi" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 4
@@ -25890,6 +26066,16 @@
},
/turf/simulated/floor/tiled/white,
/area/rift/trade_shop)
+"qrX" = (
+/obj/structure/catwalk,
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"qse" = (
/obj/structure/bed/chair/bay{
dir = 1
@@ -26051,6 +26237,16 @@
/obj/machinery/disease2/incubator,
/turf/simulated/floor/tiled,
/area/medical/virology)
+"qvO" = (
+/obj/machinery/button/remote/blast_door{
+ id = "cell_lock_2";
+ name = "Cell 2 Lock";
+ pixel_x = 7;
+ pixel_y = 30;
+ req_access = list(1,2,4,38)
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"qwp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -26138,6 +26334,13 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
+"qzy" = (
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/structure/catwalk,
+/turf/simulated/open,
+/area/security/prison/upper)
"qzB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
@@ -26230,7 +26433,7 @@
dir = 4
},
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"qCA" = (
/obj/machinery/door/airlock/engineering{
name = "Medbay Substation";
@@ -26241,16 +26444,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/medical)
-"qCL" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"qCS" = (
/obj/structure/railing{
dir = 4
@@ -26323,6 +26516,28 @@
/obj/structure/flora/ausbushes/lavendergrass,
/turf/simulated/floor/outdoors/gravsnow/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"qFO" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
+"qGN" = (
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/turf/simulated/open,
+/area/security/prison/upper)
"qGS" = (
/turf/simulated/wall/wood/hardwood,
/area/library/study)
@@ -26369,22 +26584,19 @@
"qIr" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/camera/network/security{
- dir = 1
- },
/obj/machinery/power/apc/south_mount,
/obj/structure/cable/green,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"qIG" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
},
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
-"qIO" = (
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"qJb" = (
/obj/structure/bed/chair/wood,
/obj/machinery/newscaster{
@@ -26479,6 +26691,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
+"qMD" = (
+/obj/machinery/computer/secure_data,
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 5
+ },
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/item/radio/intercom/department/security{
+ dir = 1;
+ pixel_y = 35
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"qNR" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate,
@@ -26500,6 +26727,24 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_emt_bay)
+"qOe" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"qOm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -26632,17 +26877,6 @@
/obj/machinery/smartfridge/chemistry,
/turf/simulated/floor/plating,
/area/rnd/chemistry_lab)
-"qRW" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/table/steel,
-/obj/item/storage/box/gloves,
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
"qSJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/catwalk,
@@ -26950,6 +27184,12 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych)
+"qZc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"qZu" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 4
@@ -27121,19 +27361,31 @@
},
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"rhQ" = (
-/obj/machinery/door/airlock/maintenance/sec,
-/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/visible/supply,
-/turf/simulated/floor/plating,
-/area/security/security_cell_hallway)
"rii" = (
-/obj/structure/bed/chair{
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
dir = 4
},
-/obj/effect/floor_decal/industrial/outline/red,
-/turf/simulated/floor/tiled/red,
-/area/security/security_cell_hallway)
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"rik" = (
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/tool_storage)
@@ -27161,11 +27413,6 @@
/obj/machinery/disease2/incubator,
/turf/simulated/floor/tiled,
/area/medical/virology)
-"rkg" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"rkh" = (
/obj/item/stool/padded,
/turf/simulated/floor/wood/broken,
@@ -27220,6 +27467,9 @@
},
/obj/machinery/camera/network/medbay,
/obj/structure/flora/pottedplant/decorative,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/white,
/area/medical/psych)
"rmE" = (
@@ -27236,10 +27486,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"rmQ" = (
-/obj/structure/sign/department/prison,
-/turf/simulated/wall/prepainted/security,
-/area/security/security_cell_hallway)
"rnp" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
@@ -27306,15 +27552,11 @@
/area/maintenance/research/lower)
"roa" = (
/obj/machinery/door/airlock/glass/security{
- name = "Confinement Processing";
- req_access = list(2)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+ name = "Genpop"
},
/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"roQ" = (
/obj/structure/railing{
dir = 8
@@ -27398,14 +27640,6 @@
"rrk" = (
/turf/simulated/wall/prepainted/medical,
/area/medical/exam_room)
-"rrt" = (
-/obj/item/reagent_containers/glass/bucket/wood,
-/obj/structure/sink/kitchen{
- dir = 8;
- pixel_x = 15
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"rsj" = (
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
@@ -27428,15 +27662,30 @@
/obj/effect/floor_decal/industrial/danger,
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora/lab_atmos)
-"rtJ" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 5
+"rtc" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
},
-/obj/effect/floor_decal/corner/red/border{
- dir = 5
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/light,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison/upper)
"rtL" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -27457,6 +27706,12 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/maintenance/maint_bar)
+"rug" = (
+/obj/structure/cable/green{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"ruk" = (
/obj/machinery/light{
dir = 4
@@ -27472,7 +27727,7 @@
/area/quartermaster/delivery)
"rul" = (
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"ruA" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -27656,7 +27911,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/disposalpipe/segment,
-/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"rzz" = (
@@ -27737,6 +27991,17 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/testingroom)
+"rBA" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/fire_alarm/north_mount,
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"rCN" = (
/obj/structure/railing{
dir = 8
@@ -27970,6 +28235,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint)
+"rHw" = (
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"rHJ" = (
/obj/machinery/light/small,
/obj/effect/floor_decal/rust,
@@ -27998,6 +28269,30 @@
/mob/living/simple_mob/animal/sif/sakimm/dexter,
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
+"rIK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"rJv" = (
/turf/simulated/floor,
/area/maintenance/starboard)
@@ -28201,6 +28496,15 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/checkpoint)
+"rOP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"rOR" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -28339,7 +28643,7 @@
/area/maintenance/cargo)
"rSd" = (
/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
+/area/security/prison)
"rSM" = (
/obj/structure/reagent_dispensers/watertank,
/obj/item/reagent_containers/glass/bucket,
@@ -28351,12 +28655,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora)
-"rSV" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"rTa" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -28469,19 +28767,21 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
+"rXW" = (
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"rYs" = (
/obj/structure/sign/warning/biohazard,
/turf/simulated/wall/prepainted/science,
/area/rnd/hallway)
-"rZr" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 6
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"rZs" = (
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
@@ -28585,8 +28885,14 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
+/area/security/prison)
"seP" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
@@ -28677,12 +28983,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
-"sfP" = (
-/obj/structure/bed/chair,
-/obj/item/handcuffs/cable/white,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"sgf" = (
/obj/structure/flora/ausbushes,
/obj/structure/window/wooden{
@@ -28703,6 +29003,41 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
+"she" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ id = "cell_lock_2";
+ name = "Cell 2 Lock";
+ pixel_x = -24;
+ pixel_y = -8;
+ req_access = list(1,2,4,38)
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/obj/machinery/camera/network/security{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"shs" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
@@ -28908,10 +29243,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/lino,
/area/security/detectives_office)
"skw" = (
@@ -29048,10 +29385,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint)
-"snf" = (
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"snj" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/machinery/atmospherics/pipe/simple/visible/black,
@@ -29089,6 +29422,18 @@
},
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"snM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/loading{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"snN" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
@@ -29107,6 +29452,27 @@
"snT" = (
/turf/simulated/wall/prepainted,
/area/maintenance/library)
+"snU" = (
+/obj/structure/railing/grey{
+ dir = 4
+ },
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"soS" = (
/obj/structure/extinguisher_cabinet{
dir = 4;
@@ -29335,12 +29701,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
-"suf" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/darkred,
-/obj/structure/cable/green,
-/turf/simulated/floor/plating,
-/area/security/security_cell_hallway)
"sur" = (
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/outdoors/grass/heavy/interior,
@@ -29526,9 +29886,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/medical_restroom)
-"sAz" = (
-/turf/simulated/floor/wood/broken,
-/area/maintenance/maint_bar)
"sBt" = (
/obj/structure/disposalpipe/segment,
/obj/spawner/window/low_wall/reinforced/full/firelocks,
@@ -29554,6 +29911,12 @@
},
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/medical/virologyisolation)
+"sCY" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"sDz" = (
/obj/structure/table/hardwoodtable,
/obj/machinery/light_construct/small{
@@ -29633,6 +29996,25 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
+"sFJ" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"sFL" = (
/obj/structure/catwalk,
/obj/structure/railing{
@@ -29712,7 +30094,6 @@
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside1)
"sHE" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/shutters{
dir = 8;
id = "warehouse";
@@ -30003,6 +30384,11 @@
"sOh" = (
/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/foyer)
+"sPu" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/prison/upper)
"sPz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -30127,6 +30513,24 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
+"sSZ" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"sTp" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
@@ -30143,29 +30547,6 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_autopsy)
-"sTF" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 6
- },
-/obj/machinery/light{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"sVh" = (
/obj/machinery/button/remote/blast_door{
id = "warehouse";
@@ -30207,10 +30588,6 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"sWx" = (
-/obj/structure/kitchenspike,
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"sWN" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
@@ -30222,21 +30599,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
-"sWR" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 10
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 10
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"sWY" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -30262,6 +30624,14 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/game_room)
+"sXD" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"sXQ" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -30495,6 +30865,24 @@
/obj/effect/floor_decal/corner/beige/border,
/turf/simulated/floor/tiled/white,
/area/medical/psych)
+"tgm" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"tgG" = (
/obj/item/clothing/mask/gas/sexyclown,
/obj/item/toy/figure/clown,
@@ -30546,6 +30934,15 @@
},
/turf/simulated/floor/plating,
/area/rift/trade_shop)
+"tif" = (
+/obj/machinery/camera/network/security{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"tim" = (
/obj/machinery/portable_atmospherics/hydroponics,
/obj/effect/floor_decal/spline/plain{
@@ -30599,23 +30996,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
-"tjL" = (
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/railing,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"tjR" = (
/turf/simulated/floor/wood,
/area/library)
@@ -30685,6 +31065,12 @@
"tlw" = (
/turf/simulated/floor/water/indoors,
/area/rift/station/public_garden)
+"tlF" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"tlU" = (
/obj/structure/bed/chair/office/dark{
dir = 1
@@ -30767,6 +31153,18 @@
},
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
+"tnA" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"tnJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -30794,12 +31192,6 @@
/obj/structure/table/bench/wooden,
/turf/simulated/floor/snow,
/area/rift/surfacebase/outside/outside1)
-"toj" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/wood,
-/area/maintenance/maint_bar)
"toy" = (
/obj/machinery/camera/network/medbay{
dir = 1;
@@ -30887,6 +31279,18 @@
"trb" = (
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop)
+"trx" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"trC" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -31017,6 +31421,25 @@
"twG" = (
/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/psych_ward)
+"txe" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 10
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/fire_alarm/west_mount,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"txE" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -31108,10 +31531,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
-"tyY" = (
-/obj/machinery/washing_machine,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"tzf" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 8
@@ -31169,7 +31588,7 @@
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/effect/paint/darkred,
/turf/simulated/floor/plating,
-/area/security/security_cell_hallway)
+/area/security/prison)
"tBl" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/random/trash_pile,
@@ -31393,6 +31812,15 @@
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/white,
/area/medical/psych)
+"tGS" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"tGW" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -31451,16 +31879,6 @@
},
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/rift/station/public_garden)
-"tHW" = (
-/obj/machinery/door/airlock/glass/security{
- name = "Permanent Confinement";
- req_access = list(2)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"tIx" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -31555,6 +31973,29 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/outpost/xenobiology/outpost_hallway)
+"tLi" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"tLt" = (
/obj/effect/floor_decal/rust,
/obj/structure/catwalk,
@@ -31889,6 +32330,21 @@
/obj/effect/floor_decal/corner/purple/border,
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
+"tVQ" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/bed/chair,
+/obj/item/radio/intercom/department/security{
+ dir = 1;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"tWs" = (
/obj/structure/bookcase/legal/corpreg,
/turf/simulated/floor/wood,
@@ -31914,9 +32370,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
-"tXc" = (
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
"tXh" = (
/obj/structure/stairs/spawner/west,
/turf/simulated/floor/plating,
@@ -31935,11 +32388,6 @@
"tXx" = (
/turf/simulated/shuttle/wall/voidcraft,
/area/turbolift/rsurface/level1)
-"tXC" = (
-/obj/machinery/cryopod,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"tXS" = (
/obj/structure/closet/firecloset,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -32040,6 +32488,12 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
+"uai" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"uap" = (
/obj/structure/grille,
/obj/structure/sign/warning/secure_area,
@@ -32084,6 +32538,12 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/hallway)
+"ubi" = (
+/obj/structure/table/steel,
+/obj/effect/floor_decal/borderfloorblack,
+/obj/item/storage/firstaid/regular,
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"ubp" = (
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/outside/outside1)
@@ -32149,6 +32609,13 @@
/obj/machinery/fire_alarm/east_mount,
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_decon)
+"uel" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/library)
"ueA" = (
/turf/simulated/wall/prepainted/civilian,
/area/tether/station/public_meeting_room)
@@ -32229,6 +32696,23 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
+"uhV" = (
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
+"uih" = (
+/obj/machinery/door_timer/cell_1{
+ id = "isolation";
+ name = "Isolation"
+ },
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/upper)
"uii" = (
/obj/machinery/door/airlock/multi_tile/glass,
/obj/machinery/door/firedoor/glass,
@@ -32372,34 +32856,25 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/surface_one)
-"ulr" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
+"ukS" = (
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
dir = 4
},
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/visible/supply{
+ dir = 8
},
-/obj/effect/floor_decal/corner/red/bordercorner2{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/structure/catwalk,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
+/obj/machinery/light/small{
+ dir = 1
},
-/obj/machinery/fire_alarm/north_mount,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/turf/simulated/floor/plating,
+/area/maintenance/security/lower)
"ulQ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -32420,11 +32895,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
-"ulY" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/vending/hydronutrients,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"umf" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
@@ -32442,14 +32912,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
-"und" = (
-/obj/machinery/door/firedoor/glass{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner,
-/obj/effect/floor_decal/corner/red/bordercorner,
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"une" = (
/obj/machinery/light_construct/small{
dir = 8
@@ -32521,6 +32983,25 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
+"uoM" = (
+/obj/structure/table/reinforced,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/pen{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"uoZ" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -32566,9 +33047,37 @@
"upz" = (
/turf/simulated/wall/prepainted/civilian,
/area/maintenance/tool_storage)
+"upE" = (
+/obj/structure/table/steel,
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet{
+ dir = 8;
+ pixel_x = 30
+ },
+/obj/structure/cable/green{
+ icon_state = "0-8"
+ },
+/obj/machinery/recharger{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"upJ" = (
/turf/simulated/floor/plating,
/area/medical/psych)
+"upY" = (
+/obj/machinery/vending/snack,
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"uqa" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 1
@@ -32821,6 +33330,10 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_emt_bay)
+"uvs" = (
+/obj/machinery/computer/cryopod,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison/upper)
"uvA" = (
/obj/machinery/air_alarm{
dir = 1;
@@ -32847,20 +33360,30 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/garage)
-"uwn" = (
-/obj/structure/disposalpipe/segment{
+"uwf" = (
+/obj/structure/bed/chair/sofa/beige{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/visible/supply{
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
+"uwn" = (
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/structure/catwalk,
/obj/structure/cable{
icon_state = "1-4"
},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"uwt" = (
@@ -33042,6 +33565,38 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"uBa" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ id = "cell_lock_3";
+ name = "Cell 3 Lock";
+ pixel_x = -24;
+ pixel_y = -8;
+ req_access = list(1,2,4,38)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"uBj" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -33082,9 +33637,6 @@
"uBP" = (
/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/xenoarch_storage)
-"uBT" = (
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"uBV" = (
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloor{
@@ -33108,12 +33660,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora)
-"uCg" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"uCt" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -33230,17 +33776,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
-"uFU" = (
-/obj/effect/floor_decal/techfloor/orange{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/quartermaster/garage)
"uFZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -33478,8 +34013,11 @@
/obj/effect/floor_decal/corner/red/border{
dir = 4
},
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"uPk" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -33589,9 +34127,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint)
-"uTe" = (
-/turf/simulated/floor/tiled/dark,
-/area/prison/solitary)
"uTy" = (
/obj/machinery/atmospherics/portables_connector,
/obj/effect/floor_decal/borderfloor{
@@ -33848,6 +34383,22 @@
"vbN" = (
/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/virologytransitwest)
+"vbY" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 1
+ },
+/obj/landmark/spawnpoint/job/security_officer,
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_x = -24;
+ pixel_y = 38
+ },
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"vca" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/regular{
@@ -34067,7 +34618,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 8
},
@@ -34079,7 +34629,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
+/area/maintenance/security/lower)
"vke" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -34121,9 +34671,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
-"vky" = (
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"vls" = (
/obj/machinery/door/airlock/engineering{
name = "Cargo Substation";
@@ -34222,9 +34769,23 @@
/obj/structure/flora/pottedplant/minitree,
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
-"vsb" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
+"vrP" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
/area/security/prison)
"vtt" = (
/obj/effect/floor_decal/borderfloor,
@@ -34317,20 +34878,17 @@
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/outside/outside1)
"vwu" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
},
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/closet/hydrant{
- dir = 4;
- pixel_x = -32
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
},
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"vwA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -34387,11 +34945,6 @@
/obj/structure/bed/double/padded,
/turf/simulated/floor/carpet,
/area/maintenance/research/lower)
-"vyU" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/portable_atmospherics/hydroponics,
-/turf/simulated/floor/plating,
-/area/security/prison)
"vzD" = (
/obj/random/tool,
/turf/simulated/floor/plating,
@@ -34469,6 +35022,31 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/tankstorage)
+"vBr" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/vending/snack,
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"vBt" = (
/obj/machinery/air_alarm/monitor/isolation{
pixel_y = 26
@@ -34568,6 +35146,10 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
+"vFf" = (
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/security/lower)
"vFs" = (
/obj/machinery/light/flamp/noshade,
/turf/simulated/floor/plating/lythios43c,
@@ -34693,10 +35275,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyaccess)
-"vLm" = (
-/obj/structure/table/steel,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"vLK" = (
/obj/structure/closet/crate,
/obj/item/circuitboard/machine/lathe/autolathe,
@@ -34708,6 +35286,20 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
+"vMy" = (
+/obj/structure/railing/grey,
+/obj/effect/floor_decal/borderfloor{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 6
+ },
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"vMO" = (
/obj/machinery/vending/coffee,
/obj/effect/floor_decal/borderfloor{
@@ -34721,12 +35313,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
-"vNw" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/turf/simulated/floor/lino,
-/area/tether/surfacebase/entertainment)
"vNx" = (
/obj/structure/railing{
dir = 1
@@ -34809,11 +35395,6 @@
/obj/spawner/window/reinforced/full,
/turf/simulated/floor/plating,
/area/rift/surfacebase/outside/outside1)
-"vPL" = (
-/obj/machinery/portable_atmospherics/hydroponics,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"vPN" = (
/obj/machinery/button/remote/blast_door{
dir = 1;
@@ -34831,6 +35412,17 @@
"vQb" = (
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
+"vQi" = (
+/obj/structure/catwalk,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"vQy" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -35084,6 +35676,21 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry_lab)
+"vWS" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/machinery/door/window/brigdoor/eastright{
+ id = "isolation";
+ name = "Isolation"
+ },
+/obj/machinery/door/window/brigdoor/westleft{
+ id = "isolation";
+ name = "Isolation"
+ },
+/obj/structure/curtain/open/black,
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"vWY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 5
@@ -35093,28 +35700,22 @@
"vXh" = (
/turf/simulated/floor/carpet/gaycarpet,
/area/tether/surfacebase/funny/clownoffice)
-"vXr" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/wood/broken,
-/area/maintenance/maint_bar)
"vXw" = (
/obj/effect/overlay/snow/floor,
/obj/structure/grille,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/outside1)
"vXz" = (
-/obj/machinery/light/small{
- dir = 4
+/obj/machinery/door/airlock/glass/security{
+ id_tag = "cell_lock_1";
+ name = "Cell 1";
+ req_one_access = null
},
-/obj/effect/floor_decal/rust,
-/obj/machinery/air_alarm{
- dir = 8;
- pixel_x = 24
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
-/turf/simulated/floor/tiled/dark,
-/area/security/brig/bathroom)
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"vYy" = (
/turf/simulated/floor/wood,
/area/lawoffice)
@@ -35344,9 +35945,6 @@
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
-"weV" = (
-/turf/simulated/floor/wood,
-/area/maintenance/maint_bar)
"wft" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -35367,6 +35965,13 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
+"wgs" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/structure/catwalk,
+/turf/simulated/open,
+/area/security/prison/upper)
"wgx" = (
/obj/item/radio/intercom{
dir = 1;
@@ -35400,15 +36005,6 @@
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
-"whP" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/obj/machinery/fire_alarm/south_mount{
- pixel_y = -24
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"whS" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -35421,6 +36017,17 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
+"wiQ" = (
+/obj/structure/bed/padded,
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
+"wiU" = (
+/obj/machinery/door/airlock/maintenance/sec,
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/visible/supply,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/security/prison)
"wjj" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -35441,6 +36048,13 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
+"wjk" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 6
+ },
+/obj/machinery/photocopier,
+/turf/simulated/floor/tiled/dark,
+/area/security/prison/upper)
"wjG" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -35748,21 +36362,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/cargo)
-"wsl" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 9
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 9
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 10
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 10
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"wsx" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -35856,6 +36455,16 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
+"wuy" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"wuO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
@@ -35886,6 +36495,19 @@
},
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/tankstorage)
+"wva" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"wvd" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -35902,6 +36524,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
+"wvf" = (
+/turf/simulated/floor/tiled/monodark,
+/area/security/prison/upper)
"wvp" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -35917,6 +36542,18 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/delivery)
+"wvw" = (
+/obj/structure/cryofeed{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"wvD" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 6
@@ -36100,13 +36737,6 @@
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/tankstorage)
-"wCi" = (
-/obj/structure/toilet{
- pixel_y = 9
- },
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/tiled/red,
-/area/prison/solitary)
"wCk" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/turf/simulated/floor/tiled,
@@ -36176,10 +36806,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
-"wDT" = (
-/obj/machinery/portable_atmospherics/hydroponics,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"wEf" = (
/obj/structure/closet/secure_closet/detective,
/turf/simulated/floor/lino,
@@ -36227,14 +36853,6 @@
},
/turf/simulated/floor/tiled/white,
/area/security/forensics)
-"wFV" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/structure/catwalk,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"wGa" = (
/obj/machinery/light/fairy{
dir = 8
@@ -36318,15 +36936,6 @@
/obj/landmark/spawnpoint/job/paramedic,
/turf/simulated/floor/tiled/white,
/area/medical/medbay_emt_bay)
-"wGU" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/table/rack,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/clean,
-/obj/random/plushie,
-/obj/random/maintenance/cargo,
-/turf/simulated/floor/plating,
-/area/maintenance/security/lower)
"wGW" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -36363,23 +36972,6 @@
/obj/structure/bookcase,
/turf/simulated/floor/wood,
/area/maintenance/research/lower)
-"wIz" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/machinery/camera/network/security{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"wIJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -36514,10 +37106,6 @@
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/turbolift/rmine/surface)
-"wNE" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"wOB" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -37030,10 +37618,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/library)
-"xen" = (
-/obj/structure/table,
-/turf/simulated/floor/wood/broken,
-/area/maintenance/maint_bar)
"xex" = (
/obj/structure/table/woodentable,
/obj/random/maintenance/clean,
@@ -37093,13 +37677,6 @@
/obj/fiftyspawner/rods,
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/garage)
-"xgh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/holopad,
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"xgG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/spawner/window/low_wall/reinforced/full/firelocks,
@@ -37296,21 +37873,18 @@
/turf/simulated/floor/tiled/white,
/area/medical/patient_a)
"xlo" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_cell_hallway)
-"xlB" = (
-/obj/structure/sign/poster{
- pixel_y = 32
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
},
-/turf/simulated/floor/wood/broken,
-/area/maintenance/maint_bar)
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"xlG" = (
/obj/structure/bed/double/padded,
/obj/item/bedsheet/clowndouble,
@@ -37562,13 +38136,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
-"xvA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"xvD" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -37728,6 +38295,14 @@
/obj/random/plushie,
/turf/simulated/floor/tiled/white,
/area/medical/psych)
+"xyy" = (
+/obj/effect/floor_decal/borderfloor/corner,
+/obj/effect/floor_decal/corner/red/bordercorner,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"xyO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -37798,6 +38373,29 @@
/obj/item/extinguisher,
/turf/simulated/floor/tiled/techmaint,
/area/rnd/outpost/xenobiology/outpost_storage)
+"xBg" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 6
+ },
+/obj/effect/floor_decal/borderfloor/corner2,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2,
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison)
"xBi" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/steel,
@@ -37848,7 +38446,7 @@
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
"xDd" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
/area/medical/medbay_emt_bay)
@@ -37892,7 +38490,7 @@
"xEf" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/area/security/prison)
"xEl" = (
/obj/machinery/vending/snack{
dir = 4
@@ -37996,6 +38594,41 @@
"xIm" = (
/turf/simulated/wall/prepainted,
/area/rnd/outpost/xenobiology/outpost_stairs)
+"xJK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
+"xJP" = (
+/obj/machinery/air_alarm{
+ desc = " ";
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"xJV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -38062,20 +38695,6 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/medical/mentalhealth)
-"xMr" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/vending/wallmed1{
- name = "Emergency NanoMed";
- pixel_y = 32
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/security/prison)
-"xMw" = (
-/turf/simulated/floor/wood,
-/area/maintenance/lowmedbaymaint)
"xMJ" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -38088,6 +38707,30 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
+"xNr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"xND" = (
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
@@ -38150,6 +38793,18 @@
/obj/random/toolbox,
/turf/simulated/floor/tiled/steel,
/area/storage/tools)
+"xPa" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/prison/upper)
"xPm" = (
/turf/simulated/shuttle/wall/voidcraft,
/area/turbolift/rmine/surface)
@@ -38217,15 +38872,6 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
-"xQG" = (
-/obj/machinery/power/apc/north_mount{
- cell_type = /obj/item/cell/super
- },
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/prison)
"xRb" = (
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
@@ -38319,18 +38965,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
-"xTV" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"xUv" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
@@ -38463,29 +39097,6 @@
},
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"xXG" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 6
- },
-/obj/effect/floor_decal/borderfloor/corner2,
-/obj/effect/floor_decal/corner/red/bordercorner2,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
"xXX" = (
/obj/effect/blocker,
/turf/simulated/open/lythios43c,
@@ -38515,6 +39126,10 @@
"xZM" = (
/turf/simulated/wall/prepainted,
/area/tether/surfacebase/funny/mimeoffice)
+"yaq" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/prison)
"yav" = (
/obj/structure/table/hardwoodtable,
/obj/machinery/chemical_dispenser/catering/bar_soft,
@@ -38609,18 +39224,14 @@
/obj/structure/sign/securearea,
/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_hallway)
-"yeC" = (
-/obj/structure/table/steel,
-/obj/item/clothing/gloves/sterile/latex,
-/obj/item/surgical/hemostat,
-/obj/item/tool/screwdriver,
-/obj/item/tool/wirecutters,
-/turf/simulated/floor/tiled/dark,
-/area/maintenance/security/lower)
"yeH" = (
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
+"yeR" = (
+/obj/structure/table/reinforced,
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison/upper)
"yeX" = (
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
@@ -38644,11 +39255,17 @@
/obj/machinery/door/airlock/maintenance/cargo,
/turf/simulated/floor/plating,
/area/quartermaster/garage)
-"ygW" = (
-/obj/effect/floor_decal/rust,
-/obj/machinery/portable_atmospherics/hydroponics,
+"ygq" = (
+/obj/structure/bed/chair/sofa/beige,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
-/area/security/prison)
+/area/security/prison/upper)
"ygX" = (
/obj/structure/closet,
/obj/random/maintenance/clean,
@@ -38692,14 +39309,14 @@
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
"yiU" = (
-/obj/structure/bed/chair/office/dark{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
-/obj/machinery/camera/network/security{
- dir = 6
+/obj/machinery/door/airlock/security{
+ name = "Visitation"
},
-/turf/simulated/floor/tiled/steel,
-/area/security/security_cell_hallway)
+/turf/simulated/floor/tiled/monotile,
+/area/security/prison)
"yja" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -48957,7 +49574,7 @@ hgE
oFp
aeP
jfd
-jzl
+aeP
gso
qLr
wRf
@@ -49733,7 +50350,7 @@ oFp
oFp
hmw
jfd
-jzl
+aeP
pPL
reU
oFp
@@ -50310,7 +50927,7 @@ xvP
eCU
eFz
gnR
-uFU
+eCU
qIp
pMh
eCU
@@ -50948,9 +51565,9 @@ qvB
lCB
lCB
rZY
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
aeZ
oXj
uap
@@ -51332,7 +51949,7 @@ wOB
heV
evk
qvB
-fLU
+aIk
aeZ
oXj
oXj
@@ -51535,8 +52152,8 @@ rZY
rZY
rZY
hZe
-fLU
-fLU
+aIk
+aIk
eHL
rZY
rZY
@@ -51729,13 +52346,13 @@ mHx
mHx
rZY
hZe
-uBT
-fLU
+aIk
+aIk
kmM
rZY
jVg
aIk
-fLU
+aIk
rZY
rZY
oXj
@@ -51851,7 +52468,7 @@ oke
suV
vgQ
fUY
-nbp
+axD
brW
xqn
wRP
@@ -51923,14 +52540,14 @@ mHx
mHx
rZY
eHL
-fLU
-uBT
+aIk
+aIk
dAB
rZY
eHL
eFL
-fLU
-snf
+aIk
+dFT
rZY
oXj
rZY
@@ -52045,7 +52662,7 @@ uaw
iKU
sTp
fUY
-iVw
+brW
mBD
xqn
wRP
@@ -52124,7 +52741,7 @@ rZY
rZY
rZY
eHL
-fLU
+aIk
rZY
oXj
eHL
@@ -52240,8 +52857,8 @@ fUY
fUY
fUY
rLZ
-xMw
-iVw
+xqn
+brW
wRP
bBn
ebQ
@@ -52304,7 +52921,7 @@ bwN
bwN
sSY
oXj
-wFV
+kpd
iFZ
tmg
oal
@@ -52314,14 +52931,14 @@ uBP
xku
xwq
rRj
-fLU
+aIk
phU
rZY
jVg
-fLU
+aIk
rZY
oXj
-fLU
+aIk
rZY
rZY
rZY
@@ -52434,7 +53051,7 @@ pkC
pkC
miX
bxj
-qih
+mBD
xqn
wRP
vaP
@@ -52512,10 +53129,10 @@ eXb
qRt
rZY
eHL
-fLU
+aIk
gFo
oXj
-fLU
+aIk
rZY
lkl
vTJ
@@ -52701,7 +53318,7 @@ rDX
uBP
phU
xku
-fLU
+aIk
xku
ozG
rZY
@@ -52709,7 +53326,7 @@ rZY
rZY
rZY
oXj
-fLU
+aIk
rZY
qhJ
vTJ
@@ -52894,7 +53511,7 @@ uBP
uBP
uBP
xku
-fLU
+aIk
xku
nZq
nUs
@@ -52903,7 +53520,7 @@ jEl
kiX
rZY
oXj
-fLU
+aIk
gFo
vTJ
vTJ
@@ -53087,17 +53704,17 @@ lQO
grR
rDX
uBP
-fLU
+aIk
xkq
-fLU
-fLU
+aIk
+aIk
xku
rZY
jSH
wHW
rZY
oXj
-fLU
+aIk
rZY
vTJ
vTJ
@@ -53179,7 +53796,7 @@ ofx
kHo
kdy
hIo
-pOR
+mBD
buH
dwP
eIl
@@ -53281,17 +53898,17 @@ mUc
uBP
uBP
uBP
-fLU
+aIk
phU
xku
xku
xku
frG
-fLU
+aIk
iRH
rZY
oXj
-fLU
+aIk
rZY
qhJ
vTJ
@@ -53373,7 +53990,7 @@ cov
rDn
lOq
hIo
-pOR
+mBD
buH
dwP
eha
@@ -53476,16 +54093,16 @@ yhF
mNV
uBP
vcv
-fLU
+aIk
xku
-fLU
+aIk
xmD
rZY
iRH
-fLU
+aIk
rZY
oXj
-fLU
+aIk
rZY
wIf
vTJ
@@ -53672,14 +54289,14 @@ uBP
xku
nXv
phU
-fLU
+aIk
dNB
rZY
voo
voo
rZY
gLx
-fLU
+aIk
rZY
rZY
rZY
@@ -53873,7 +54490,7 @@ rZY
rZY
rZY
oXj
-fLU
+aIk
rZY
hgE
hgE
@@ -53958,17 +54575,17 @@ rUE
oGF
buH
buH
-pOR
+mBD
nkJ
wTn
lie
xky
nkJ
mCe
-pOR
-nbp
-nbp
-nbp
+mBD
+axD
+axD
+axD
uBK
sFY
rrk
@@ -54059,11 +54676,11 @@ uBP
oXj
oXj
oXj
-wNE
-wNE
-wNE
oXj
-wNE
+oXj
+oXj
+oXj
+oXj
oXj
oXj
oXj
@@ -54150,20 +54767,20 @@ gkg
eIC
cmU
oGF
-nbp
+axD
buH
-pOR
+mBD
nkJ
dVV
xtE
jof
nkJ
-pOR
-pOR
-pOR
-pOR
-nbp
-nbp
+mBD
+eWs
+qwF
+rHw
+axD
+axD
buH
pcA
haC
@@ -54251,10 +54868,10 @@ jdA
jdA
kkQ
kPf
-fLU
-vky
-eXK
-eXK
+aIk
+aIk
+aIk
+aIk
rZY
sZP
vZn
@@ -54344,23 +54961,23 @@ gkg
oRe
sKU
oGF
-nbp
+axD
hik
-pOR
+mBD
lUw
oZc
iHL
cQP
kgr
qwF
-qwF
-tjL
-qwF
+gur
+gXG
+rug
qwF
qaB
eHK
-pOR
-pOR
+mBD
+mBD
cKY
vTx
sZk
@@ -54445,8 +55062,8 @@ jLS
hDy
uBP
uob
-fMu
-vky
+aIk
+aIk
eHL
eHL
rZY
@@ -54538,20 +55155,20 @@ sDY
oVa
sDY
sDY
-pOR
+mBD
hik
-pOR
+mBD
mZJ
qCA
nkJ
nkJ
mZJ
-pOR
-pOR
-pOR
-pOR
-pOR
-nbp
+mBD
+mBD
+okr
+mBD
+mBD
+axD
daS
gTC
gTC
@@ -54639,7 +55256,7 @@ cYM
tpH
tpH
uob
-fLU
+aIk
rZY
rZY
rZY
@@ -54732,7 +55349,7 @@ mKQ
pfT
tGQ
sDY
-pOR
+mBD
buH
buH
buH
@@ -54740,12 +55357,12 @@ eSY
sNy
sNy
sNy
-sNy
-sNy
-sNy
-sNy
-sNy
-sNy
+mIw
+dki
+gyx
+dki
+dki
+dki
kku
wUo
qwF
@@ -54756,12 +55373,12 @@ qwF
dyA
qwF
ehd
-gXG
-pOR
-pOR
-pOR
-pOR
-pOR
+oLW
+mBD
+mBD
+mBD
+mBD
+mBD
kjp
eBp
pzE
@@ -54833,7 +55450,7 @@ cYM
mHx
rZY
uob
-vky
+aIk
rZY
hgE
hgE
@@ -54926,36 +55543,36 @@ oKE
bxi
oYs
sDY
-pOR
+mBD
buH
-pOR
-pOR
-pOR
-pOR
-pOR
-pOR
-pOR
-pOR
+mBD
+mBD
+mBD
+mBD
+mBD
+mBD
+qhR
+qwF
gKI
-pOR
-pOR
-pOR
-eSY
-sNy
-sNy
-sNy
+mBD
+mBD
+mBD
+qrX
+dki
+dki
+dki
hdq
-sNy
-sNy
-sNy
-sNy
+vQi
+dki
+dki
+dki
aEC
-hYf
-sNy
-sNy
-sNy
-sNy
-sNy
+iIN
+dki
+dki
+dki
+vQi
+iIN
uwn
eBp
kLo
@@ -55027,7 +55644,7 @@ cYM
mHx
rZY
uob
-fLU
+aIk
rZY
hgE
hgE
@@ -55122,34 +55739,34 @@ fJW
sDY
gTC
nQl
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-tdI
-pOR
-pOR
-pOR
-pOR
-nbp
-nbp
-pOR
-xvA
-pNt
-pOR
-pOR
-pOR
-pOR
-pOR
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+hFE
+hFE
+hFE
+hFE
+hFE
+hFE
+yaq
+hFE
+cIf
+aml
+aml
+aml
+aml
+aml
+aml
mNj
eBp
eBp
@@ -55221,7 +55838,7 @@ cYM
mHx
rZY
uob
-fLU
+aIk
rZY
hgE
hgE
@@ -55314,38 +55931,38 @@ pfT
uEt
pNx
sDY
-pOR
+mBD
buH
-tdI
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
+pnT
+paf
+tif
pZn
-pZn
-tdI
-nbp
-nbp
-nbp
-nbp
-liA
-pOR
-pOR
+pnT
+pwW
+emN
+pnT
+pwW
+emN
+pnT
+pwW
+emN
+hFE
+goO
+exp
+txe
+tBg
+vBr
+kRN
+tLi
aDx
jJS
-pOR
-nbp
+obG
+lPp
liA
-nbp
-gTC
+ozq
+aml
vjW
-tdI
+dMX
dMX
iFG
bXZ
@@ -55415,7 +56032,7 @@ cYM
mHx
rZY
uob
-fLU
+aIk
rZY
hgE
hgE
@@ -55508,37 +56125,37 @@ pfT
uEt
flr
sDY
-pOR
+mBD
buH
-tdI
-pZn
-iTF
-iTF
-iTF
-iTF
-iTF
-iTF
-iTF
-lLp
-lLp
-lLp
-lLp
-lLp
-hFE
-hFE
-hFE
-hFE
-hFE
+pnT
+tlF
+wiQ
+nHJ
+pnT
+wiQ
+wvf
+pnT
+wiQ
+wvf
+pnT
+wiQ
+wvf
hFE
-aml
-cIf
-aml
-aml
-aml
-aml
-aml
-aml
-uHe
+eaO
+rSd
+lfB
+pJd
+sXD
+rSd
+elP
+xlo
+rSd
+mWf
+rSd
+eZl
+oGP
+wiU
+jGC
dMX
dMX
ouV
@@ -55609,7 +56226,7 @@ cYM
mHx
rZY
uob
-fLU
+aIk
rZY
hgE
hgE
@@ -55702,37 +56319,37 @@ pfT
pfT
njD
sDY
-nbp
+axD
buH
-tdI
-pZn
-iTF
-luv
-luv
-izR
-vsb
-kFR
-pba
-lLp
-pWP
-jxk
-idS
-lLp
-aml
-bfj
-rii
-ftr
-rii
+pnT
+sCY
+qpf
+bPj
+pnT
+hiV
+wvf
+pnT
+qvO
+wvf
+pnT
+nDc
+wvf
+hFE
+sSZ
+rSd
+xBg
tBg
-gFi
-bGu
-pBg
-jdg
+rii
+rSd
+rSd
+seH
+kSK
+uPa
vwu
-nUS
-aIo
+kSK
+qCu
aml
-uHe
+ukS
dMX
dMX
ouV
@@ -55803,7 +56420,7 @@ cYM
mHx
rZY
uob
-vky
+aIk
rZY
hgE
hgE
@@ -55898,35 +56515,35 @@ vNy
sDY
qYv
buH
-tdI
-pZn
-iTF
-abL
-luv
-izR
-erN
-vsb
+pnT
+uih
+vWS
+pnT
+pnT
+iFM
+hzO
+pnT
kwn
-qcH
-ecn
+hzO
+pnT
vXz
hzO
-lLp
-aml
+hFE
+hFE
yiU
-rSV
-oBA
+hFE
+hFE
gcn
-fxo
-esT
-xlo
-nEg
-mWf
rSd
-eZl
-oGP
-rhQ
-jGC
+rSd
+seH
+hGe
+hFE
+wva
+eTk
+hFE
+aml
+uHe
dMX
dMX
ouV
@@ -55997,7 +56614,7 @@ cYM
mHx
rZY
uob
-fLU
+aIk
rZY
hgE
hgE
@@ -56090,37 +56707,37 @@ pfT
pfT
toa
sDY
-pOR
+mBD
buH
-tdI
-pZn
-iTF
-iTF
-iTF
-iTF
-jiM
-feR
-uCg
-lLp
-lLp
-lLp
-lLp
-lLp
-aml
-rmQ
+pnT
+xJP
+bKl
+rIK
+uBa
+tGS
+snM
+she
+tGS
+snM
+pUI
+tGS
+iFA
+tgm
+qOe
+bKl
roa
-lBS
-aml
-hFE
-ulr
+rSd
+dWU
+rSd
+rSd
seH
-kSK
-uPa
-xTV
-und
-qCu
-aml
-hTu
+bmR
+hFE
+rul
+rul
+hFE
+dMX
+uHe
dMX
dMX
dMX
@@ -56181,9 +56798,9 @@ pVU
pVU
pVU
eHL
-eir
-fLU
-fLU
+aIk
+aIk
+aIk
oXj
cYM
cYM
@@ -56191,7 +56808,7 @@ cYM
rZY
rZY
uob
-fLU
+aIk
rZY
hgE
hgE
@@ -56284,41 +56901,41 @@ qtZ
qtZ
gKx
sDY
-pOR
+mBD
buH
-tdI
-pZn
-iTF
-lHI
-lHI
-glj
-erN
-eoU
-nIQ
-tHW
-prD
-koh
-bPJ
-rSd
-mWf
-rSd
-khf
-eZl
-pma
-iQT
-jBw
+pnT
+lbY
+xPa
+hPd
+xyy
+gQC
+gQC
+snU
+gQC
+gQC
+gGC
+tnA
+pys
+bKl
+bKl
+bKl
+roa
+lJl
+dWU
+vrP
+vwu
nUE
qIr
hFE
-rul
-rul
+xEf
+xEf
hFE
-aml
-uHe
dMX
+uHe
dMX
dMX
dMX
+gvB
bXZ
sII
enu
@@ -56385,7 +57002,7 @@ gQl
eHL
ygX
uob
-fLU
+aIk
rZY
hgE
hgE
@@ -56478,34 +57095,34 @@ hVY
hVY
wxq
sDY
-nbp
+axD
buH
-tdI
-pZn
-iTF
-nRV
-vLm
-iTF
-pgK
-ejq
-qCL
-bQs
-mmi
-irQ
-evU
-nmA
-wIz
-jkz
-eFH
-sTF
-xXG
-suf
+pnT
+pnT
+uvs
+jya
+ejz
+qls
+gcW
+gcW
+gcW
+gcW
+gcW
+qFO
+pys
+bKl
+bKl
+pAU
+hFE
+dtA
+erN
+hFE
gKJ
-iEy
+seH
aUS
hFE
-xEf
-xEf
+hFE
+hFE
hFE
dMX
jJW
@@ -56579,7 +57196,7 @@ oQb
oQb
oQb
vST
-fLU
+aIk
rZY
hgE
hgE
@@ -56672,27 +57289,27 @@ bqE
hVY
qkQ
sDY
-nbp
+axD
buH
-tdI
-pZn
-iTF
-iTF
-iTF
-iTF
-xMr
-iWv
-whP
-llC
-llC
-jrX
-llC
-llC
-aml
-rmQ
-fcI
-aml
-aml
+pnT
+wvw
+eIt
+bRw
+trx
+eBk
+qGN
+gcW
+gcW
+gcW
+gcW
+qFO
+lCd
+tGS
+tGS
+oux
+xNr
+tGS
+oFc
nqs
nqs
sku
@@ -56766,14 +57383,14 @@ gsm
kFo
kFo
jnd
-fLU
+aIk
tTu
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
rZY
hgE
hgE
@@ -56866,27 +57483,27 @@ sDY
eck
sDY
sDY
-nbp
+axD
buH
-tdI
-pZn
-iTF
-lHI
-erN
-glj
-uCg
-oYT
-kVO
+pnT
+cvf
+flT
+ouI
+ibA
+gQC
+bIy
+gcW
+gcW
+gcW
+hsB
llC
-wCi
-uTe
-fVb
-llC
-ppO
-wsl
-elP
-sWR
-ppO
+gQC
+gQC
+gQC
+gQC
+gQC
+tnA
+iUq
nqs
jrz
iaK
@@ -56919,7 +57536,7 @@ oVt
dNx
kbe
iNE
-mKA
+dZn
iNE
dzN
kbe
@@ -56960,7 +57577,7 @@ fZh
fZh
rqe
jnd
-fLU
+aIk
tTu
dAB
rZY
@@ -57060,27 +57677,27 @@ rRV
pfT
vjl
sDY
-nbp
+axD
buH
-tdI
-pZn
-iTF
-nRV
-iaf
-iTF
-eaU
-lXV
-lGQ
-llC
-dUX
-oiL
-gAz
-llC
-fav
-oWz
-qRW
-iwC
-mIY
+pnT
+pnT
+uvs
+jya
+ejz
+qls
+gcW
+gcW
+gcW
+gcW
+gcW
+fed
+gcW
+gcW
+gcW
+gcW
+gcW
+iXO
+cQN
nqs
wEf
guj
@@ -57154,7 +57771,7 @@ tuV
nXV
dHq
jnd
-fLU
+aIk
tTu
eHL
rZY
@@ -57254,27 +57871,27 @@ egd
xMJ
qYD
sDY
-nbp
+axD
hik
-tdI
-pZn
-iTF
-iTF
-iTF
-iTF
-xQG
-xgh
-fJY
-llC
-llC
-llC
-llC
-llC
-ppO
-rtJ
-cwk
-rZr
-ppO
+pnT
+upY
+pCU
+bBB
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+iXO
+cQN
nqs
fOz
uXB
@@ -57348,9 +57965,9 @@ xwp
wuY
dUG
jnd
-vky
+aIk
tTu
-fLU
+aIk
rZY
hgE
hgE
@@ -57450,25 +58067,25 @@ pfT
sDY
ppr
hik
-tdI
-pZn
-iTF
-erN
-erN
-ees
-lHI
-iWv
-iHk
-him
-vyU
-wDT
-ygW
-iTF
-hFE
-hFE
-hFE
-hmK
-hFE
+pnT
+uoM
+iOy
+bKl
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+iXO
+cQN
nqs
eNh
nqk
@@ -57542,9 +58159,9 @@ uiu
rlw
rlw
jnd
-vky
+aIk
tTu
-vky
+aIk
rZY
hgE
hgE
@@ -57642,27 +58259,27 @@ sDY
sDY
sDY
sDY
-pOR
+mBD
hik
-tdI
-pZn
-iTF
-nRV
-maH
-iTF
-gvU
-iWv
-lHI
-erN
-erN
-erN
-erN
-lHI
-ulY
-iTF
-yeC
-hQd
-sWx
+pnT
+pRw
+rOP
+gFS
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+iXO
+cQN
nqs
lCl
cZd
@@ -57695,8 +58312,8 @@ kEs
uVN
mjk
jBF
-mKA
-mKA
+dZn
+dZn
ueA
ueA
eal
@@ -57736,9 +58353,9 @@ sJM
rvd
rlw
jnd
-fLU
+aIk
tTu
-ium
+dFT
rZY
hgE
hgE
@@ -57836,27 +58453,27 @@ upJ
aMb
vpu
sDY
-pOR
+mBD
buH
-tdI
-pZn
-iTF
-iTF
-iTF
-iTF
-bmT
-hCE
-vsb
-lHI
-erN
-erN
-erN
-erN
-mMk
-iTF
-sfP
-qIO
-coC
+pnT
+hek
+qZc
+bKl
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+iXO
+cQN
nqs
wEf
lSE
@@ -57885,8 +58502,8 @@ vRV
wUt
xTe
rAo
-mKA
-mKA
+dZn
+dZn
iNE
jBF
iNE
@@ -57930,9 +58547,9 @@ jnd
jnd
jnd
jnd
-fLU
+aIk
tTu
-eir
+aIk
rZY
hgE
hgE
@@ -58030,27 +58647,27 @@ upJ
upJ
upJ
chz
-pOR
+mBD
buH
-tdI
-pZn
-iTF
-lHI
-lHI
-glj
-erN
-lHI
-erN
-erN
-vsb
-lHI
-erN
-rrt
-gxu
-iTF
-gSP
-hhv
-hQd
+pnT
+rBA
+uai
+kDo
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+iXO
+cQN
nqs
csy
lSE
@@ -58126,7 +58743,7 @@ oQb
oQb
oQb
vST
-fLU
+aIk
rZY
hgE
hgE
@@ -58224,27 +58841,27 @@ upJ
txO
wtn
sDY
-pOR
+mBD
buH
-tdI
-pZn
-iTF
-nRV
-vLm
-iTF
-lHI
-ley
-tyY
-erN
-vPL
-bmG
-vyU
-iTF
-iTF
-iTF
-tdI
-tdI
-tdI
+pnT
+tVQ
+bKl
+bKl
+ejz
+qls
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gex
+gcW
+gcW
+gcW
+sFJ
+rtc
nqs
nqs
eNr
@@ -58277,7 +58894,7 @@ ydA
ydA
nKh
adJ
-mKA
+dZn
rAo
ueA
poK
@@ -58296,31 +58913,31 @@ hEu
eeN
mQx
rZY
-fLU
-fLU
+aIk
+aIk
+ccj
+aIk
+aIk
+aIk
ccj
-fLU
-vky
-fLU
-maP
-fLU
-vky
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
ccj
-fLU
-vky
-fLU
-fLU
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
rZY
hgE
hgE
@@ -58418,29 +59035,29 @@ sDY
sDY
sDY
sDY
-pOR
+mBD
buH
-tdI
-pZn
-iTF
-iTF
-iTF
-iTF
-glj
-iTF
-iTF
-hdy
-iTF
-iTF
-iTF
-iTF
-pZn
-pZn
-pZn
-tdI
-dMX
-dMX
-dMX
+pnT
+iwn
+bKl
+bKl
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+hsB
+cSI
+qzy
+qzy
+qzy
+uhV
+xJK
+fRT
+vFf
mpF
dMX
dMX
@@ -58612,29 +59229,29 @@ hgE
hgE
hgE
gTC
-pOR
+mBD
buH
-tdI
-pZn
-pZn
-iTF
-mJO
-lHI
-erN
-iTF
-fae
-erN
-tXC
-iTF
-pZn
-pZn
-pZn
-tdI
-tdI
-tdI
-dMX
-cFW
-cFW
+pnT
+wuy
+bKl
+bKl
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+wgs
+sPu
+sPu
+sPu
+pnT
+muR
+pnT
+pnT
lUJ
jAY
jAY
@@ -58691,12 +59308,12 @@ vAz
fJB
xBA
kbe
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
mTF
rZY
jhM
@@ -58704,9 +59321,9 @@ byi
eHL
dqb
eHL
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
rZY
hgE
hgE
@@ -58806,29 +59423,29 @@ hgE
hgE
hgE
gTC
-pOR
+mBD
buH
-tdI
-tdI
-pZn
-iTF
-cCK
-aBy
-rkg
+pnT
+peQ
+yeR
+yeR
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+wgs
+sPu
+aGe
+nFg
+hyP
+aCj
iTF
-aVt
-dCR
-acE
-iTF
-pZn
-kzX
-tdI
-tdI
-hmF
-dMX
-dMX
-dMX
-dMX
+pnT
dMX
dMX
dMX
@@ -58890,16 +59507,16 @@ hGO
iGc
iGc
fVM
-fLU
-fLU
+aIk
+aIk
gFo
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
dFT
rZY
hgE
@@ -59002,30 +59619,30 @@ gTC
gTC
qYv
buH
-pOR
-tdI
-pZn
-iTF
-iTF
-iTF
-iTF
-iTF
-iTF
-iTF
-iTF
-iTF
-pZn
-kzX
-wGU
-ouV
-ouV
-dMX
-dMX
-dMX
-dMX
-dMX
+pnT
+ygq
+yeR
+yeR
+ejz
+cVb
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+wgs
+sPu
+rXW
+vbY
+oDu
+hVB
+ubi
+pnT
dMX
dMX
+gvB
tdI
dMX
mol
@@ -59079,13 +59696,13 @@ vAz
ier
qqU
kbe
-fLU
+aIk
dYp
tjd
tjd
gpn
-fLU
-fLU
+aIk
+aIk
rZY
rZY
rZY
@@ -59193,30 +59810,30 @@ hgE
hgE
hgE
gTC
-pOR
-pOR
+mBD
+mBD
buH
-pOR
-kzX
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-pZn
-kzX
-oxY
-dob
-iFG
-dMX
-dMX
-dMX
-dMX
+pnT
+pYS
+uwf
+kbG
+vMy
+qls
+gcW
+gcW
+gcW
+gcW
+gcW
+gcW
+cpb
+wgs
+sPu
+qMD
+upE
+bDe
+luX
+wjk
+pnT
dMX
dMX
dMX
@@ -59273,12 +59890,12 @@ sNo
bUV
mnd
kbe
-fLU
+aIk
wUp
tjd
tjd
xre
-fLU
+aIk
nkz
rZY
hgE
@@ -59387,30 +60004,30 @@ gzd
gzd
hgE
gTC
-pOR
-pOR
+mBD
+mBD
buH
-pOR
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-kzX
-tdI
-tdI
-tdI
-tdI
-dMX
-dMX
-dMX
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+eeH
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
+pnT
dMX
dMX
dMX
@@ -59460,19 +60077,19 @@ rDi
rDi
sIP
wBu
-mKA
-mKA
+dZn
+dZn
vAz
vAz
tLG
lJY
kbe
-fLU
+aIk
oWp
ook
ook
awp
-fLU
+aIk
fIR
rZY
hgE
@@ -59581,7 +60198,7 @@ gzd
gzd
hgE
gTC
-nbp
+axD
buH
buH
buH
@@ -59602,7 +60219,7 @@ awP
awP
awP
snT
-snT
+rnG
snT
snT
snT
@@ -59637,11 +60254,11 @@ kIO
smQ
rmO
tFN
-mKA
-mKA
+dZn
+dZn
iNE
hdi
-tXc
+iNE
agE
eWC
kbe
@@ -59661,12 +60278,12 @@ vAz
xrC
iEQ
kbe
-fLU
-fLU
-fLU
-fLU
-fLU
-fLU
+aIk
+aIk
+aIk
+aIk
+aIk
+aIk
fIR
rZY
hgE
@@ -59775,7 +60392,7 @@ gzd
hgE
hgE
gTC
-nbp
+axD
gsS
xve
bXD
@@ -59855,12 +60472,12 @@ cGn
kgx
dBA
kbe
-fLU
+aIk
fIR
fIR
fIR
-fLU
-fLU
+aIk
+aIk
eKk
rZY
hgE
@@ -60223,7 +60840,7 @@ xRb
xNO
lHm
hdi
-tXc
+iNE
kbe
rJv
rJv
@@ -60378,7 +60995,7 @@ hgE
hgE
hgE
snT
-fiF
+eEY
oZF
snT
ryW
@@ -60572,7 +61189,7 @@ hgE
hgE
hgE
snT
-rnG
+uel
oZF
snT
snT
@@ -60756,7 +61373,7 @@ tFw
eGb
sHk
rkh
-jhW
+bny
jxa
cBk
hgE
@@ -60947,7 +61564,7 @@ hgE
hgE
cBk
cZm
-mDl
+eGb
ftg
rkh
bny
@@ -61193,7 +61810,7 @@ fCX
iNE
iNE
hdi
-tXc
+iNE
kbe
hgE
hgE
@@ -61336,10 +61953,10 @@ hgE
cBk
hcE
mXL
-jhW
+bny
lHT
mXL
-jhW
+bny
cBk
hgE
xSV
@@ -61530,9 +62147,9 @@ hgE
cBk
rWI
mXL
-jlF
-vXr
-jhW
+cIt
+lHT
+bny
nHc
cBk
hgE
@@ -61578,7 +62195,7 @@ bxK
pXY
jeg
fCX
-tXc
+iNE
iNE
hdi
iNE
@@ -61775,7 +62392,7 @@ fCX
iNE
iNE
hdi
-tXc
+iNE
kbe
hgE
hgE
@@ -61966,7 +62583,7 @@ tjR
bHO
gPk
fCX
-tXc
+iNE
iNE
hdi
dTX
@@ -62114,7 +62731,7 @@ xxZ
wTT
jxa
koD
-jlF
+cIt
jKI
cBk
toc
@@ -62138,7 +62755,7 @@ xad
tvX
dcT
cKp
-vNw
+nLd
nLd
mxM
syR
@@ -62305,9 +62922,9 @@ cBk
cBk
cBk
itT
-xen
+iAE
pDj
-toj
+koD
mXL
kVC
cBk
@@ -62356,8 +62973,8 @@ bbD
rAo
iNE
iNE
-tXc
-tXc
+iNE
+iNE
cPs
iNE
iNE
@@ -62689,11 +63306,11 @@ hgE
hgE
cBk
jgE
-jlF
+cIt
hPe
nKU
mXL
-jlF
+cIt
lje
eDQ
nyh
@@ -63080,7 +63697,7 @@ sMS
dix
pKE
cBk
-weV
+bny
mXL
cBk
xUB
@@ -63275,7 +63892,7 @@ cBk
cBk
cBk
mXL
-jhW
+bny
hhC
xUB
faL
@@ -63662,7 +64279,7 @@ aCk
wAc
wXJ
fRc
-jlF
+cIt
ajI
cBk
cBk
@@ -63852,15 +64469,15 @@ hgE
hgE
hgE
cBk
-xlB
+aCk
nAb
pmJ
rtX
-sAz
+mXL
mXL
cBk
mXL
-sAz
+mXL
lnK
cBk
hgE
@@ -64050,7 +64667,7 @@ bah
dSz
hTB
ixM
-jhW
+bny
bah
cBk
bEb
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index c86b22c93641..8972d4d46df9 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -21,15 +21,14 @@
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"aaU" = (
-/obj/machinery/light{
- dir = 8;
- light_range = 12
- },
/obj/machinery/light_switch{
dir = 8;
pixel_x = -24;
pixel_y = 6
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/white,
/area/crew_quarters/pool/changing_room)
"aaW" = (
@@ -501,6 +500,57 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/turf/simulated/floor/plating,
/area/maintenance/medbay)
+"auL" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair,
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 5
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/obj/item/material/twohanded/folded_metal_chair{
+ pixel_y = 10
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
+"auX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 6
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 1
+ },
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"auZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -599,9 +649,8 @@
/obj/effect/floor_decal/steeldecal/steel_decals_central1{
dir = 1
},
-/obj/machinery/light,
/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
+/area/security/hallway)
"axh" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -737,6 +786,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
+"ayW" = (
+/obj/landmark/spawnpoint/job/security_officer,
+/obj/structure/bed/chair/office/dark{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"aAG" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/surgery,
@@ -836,6 +892,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
"aBR" = (
@@ -1153,6 +1212,22 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
+"aLU" = (
+/obj/structure/table/steel_reinforced,
+/obj/machinery/door/window/brigdoor/northright{
+ name = "security reception";
+ req_one_access = list(1)
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "security_lockdown";
+ name = "Security Blast Doors";
+ opacity = 0
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"aMU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1316,10 +1391,10 @@
old_wall = 1
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/general)
"aTl" = (
@@ -2063,16 +2138,6 @@
/obj/structure/cable/green,
/turf/simulated/floor/tiled,
/area/security/briefing_room)
-"biL" = (
-/obj/machinery/papershredder,
-/obj/machinery/fire_alarm/west_mount{
- pixel_x = -24
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 10
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"bjq" = (
/obj/effect/floor_decal/techfloor{
dir = 6
@@ -2113,10 +2178,10 @@
old_wall = 1
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"bli" = (
@@ -2179,28 +2244,40 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/research)
"bmS" = (
-/obj/effect/paint/babyblue,
/obj/spawner/window/low_wall/reinforced/electrochromic/full{
- id = "operating_theatre_2";
+ id = null;
spawn_grille = 0
},
+/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
/area/medical/surgery2)
"bmY" = (
-/obj/machinery/computer/secure_data,
-/obj/effect/floor_decal/borderfloorblack{
- dir = 5
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
},
-/obj/item/radio/intercom{
- dir = 1;
- pixel_y = 24
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
},
-/obj/item/radio/intercom/department/security{
- dir = 1;
- pixel_y = 35
+/obj/machinery/light{
+ dir = 4
},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/photocopier,
+/turf/simulated/floor/tiled/steel,
/area/security/lobby)
+"bnf" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/air_alarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"bnh" = (
/obj/machinery/door/firedoor/glass{
dir = 8
@@ -2402,24 +2479,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/pool/changing_room)
-"btj" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 4
- },
-/obj/machinery/air_alarm{
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"btA" = (
/obj/structure/flora/pottedplant/stoutbush,
/obj/effect/floor_decal/borderfloor{
@@ -2726,6 +2785,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden/stairwell)
+"bDn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"bDx" = (
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating,
@@ -2804,10 +2878,10 @@
dir = 4
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/general)
"bFQ" = (
@@ -2847,6 +2921,12 @@
},
/turf/simulated/floor,
/area/maintenance/substation/cafeteria_dock)
+"bHa" = (
+/obj/effect/floor_decal/industrial/loading{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"bHs" = (
/obj/machinery/light/small{
dir = 4
@@ -3181,21 +3261,12 @@
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
"bVr" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/darkred,
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/floor/plating,
-/area/security/brig)
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/monotile,
+/area/security/hallway)
"bWd" = (
/obj/effect/floor_decal/techfloor{
dir = 10
@@ -3270,6 +3341,10 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
+"bYE" = (
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/medsec_maintenance)
"bZj" = (
/obj/structure/bed/chair{
dir = 8
@@ -3301,18 +3376,6 @@
},
/turf/simulated/floor,
/area/maintenance/substation/security)
-"cbn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 6
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"cbA" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -3358,6 +3421,14 @@
"cdE" = (
/turf/simulated/floor/plating,
/area/maintenance/locker)
+"ceg" = (
+/obj/machinery/door/airlock/glass/security{
+ name = "Holding Cell";
+ req_one_access = list(1,2,4,38)
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"cem" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -3549,6 +3620,27 @@
/obj/machinery/papershredder,
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
+"cin" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 6
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"civ" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/common,
@@ -3597,7 +3689,13 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
+"cjM" = (
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"ckC" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
/obj/effect/floor_decal/borderfloor{
dir = 8
},
@@ -3610,12 +3708,11 @@
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 10
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"ckI" = (
/turf/simulated/wall/prepainted,
/area/maintenance/substation/cafeteria_dock)
@@ -3943,21 +4040,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"cxh" = (
-/obj/machinery/photocopier,
-/obj/machinery/light{
- dir = 8;
- light_range = 12
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/machinery/computer/guestpass{
- dir = 4;
- pixel_x = -24
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"cxu" = (
/obj/machinery/door/blast/regular{
id = "xenobiodiv3";
@@ -4122,14 +4204,13 @@
/obj/effect/floor_decal/corner/red/border{
dir = 8
},
-/obj/machinery/light{
- dir = 8;
- light_range = 12
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
"cEt" = (
@@ -4178,8 +4259,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
@@ -4390,20 +4470,23 @@
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
"cMm" = (
-/obj/structure/table/steel,
-/obj/item/folder/red{
- pixel_y = 3
- },
-/obj/item/folder/red{
- pixel_x = 3
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
},
-/obj/effect/floor_decal/borderfloorblack{
+/obj/effect/floor_decal/corner/red/border{
dir = 4
},
-/obj/effect/floor_decal/borderfloorblack/corner2{
+/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
-/turf/simulated/floor/tiled/dark,
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 5
+ },
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/obj/structure/filingcabinet/chestdrawer,
+/turf/simulated/floor/tiled/steel,
/area/security/lobby)
"cMt" = (
/obj/structure/railing{
@@ -4456,6 +4539,15 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/resleeving)
+"cPE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"cPP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -4666,6 +4758,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/breakroom)
+"cXo" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/maintenance/sec,
+/turf/simulated/floor/plating,
+/area/security/lobby)
"cXI" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -4742,18 +4839,6 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/dark,
/area/rnd/breakroom)
-"dbc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"dbd" = (
/obj/machinery/power/apc/east_mount,
/obj/structure/cable/green,
@@ -4936,6 +5021,9 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
"djA" = (
@@ -5401,9 +5489,6 @@
/turf/simulated/wall/prepainted/medical,
/area/medical/medbay_primary_storage)
"dyd" = (
-/obj/machinery/door/firedoor/glass{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -5568,14 +5653,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"dBB" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/industrial/loading{
- dir = 1;
- pixel_y = 1
- },
-/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
"dCz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5660,7 +5737,6 @@
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
"dDP" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/darkred,
/turf/simulated/floor/plating,
@@ -5775,6 +5851,9 @@
/obj/item/pinpointer{
pixel_x = -8
},
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security/hos{
+ pixel_x = 5
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hos)
"dGm" = (
@@ -6025,6 +6104,19 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
+"dMT" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "security_lockdown";
+ name = "Security Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/lobby)
"dNb" = (
/obj/structure/flora/pottedplant/unusual,
/obj/effect/floor_decal/borderfloor{
@@ -6094,11 +6186,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
+/area/security/hallway)
"dPH" = (
/obj/machinery/light_switch{
pixel_x = 25
@@ -6154,22 +6243,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/storage)
-"dRG" = (
-/obj/structure/table/steel_reinforced,
-/obj/machinery/door/window/brigdoor/northright{
- name = "security reception";
- req_one_access = list(1)
- },
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"dRQ" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 10
@@ -6389,24 +6462,6 @@
/obj/structure/table/steel,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"ebx" = (
-/obj/machinery/door/window/brigdoor/southleft{
- dir = 4;
- id = "Cell 1";
- name = "Cell 1";
- req_access = list(2)
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/danger{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red{
- dir = 6
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/brig)
"ebM" = (
/turf/simulated/floor/tiled/white,
/area/medical/reception)
@@ -6443,6 +6498,29 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
+"ecR" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 8
+ },
+/obj/structure/table/steel,
+/obj/machinery/photocopier/faxmachine{
+ department = "Security"
+ },
+/obj/machinery/air_alarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"edb" = (
/obj/structure/railing{
dir = 4
@@ -6455,8 +6533,7 @@
dir = 4
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/open,
/area/rift/station/public_garden/gantry)
@@ -6624,8 +6701,6 @@
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
"eke" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/darkred,
/turf/simulated/floor/plating,
@@ -6761,7 +6836,6 @@
/turf/simulated/wall/prepainted/science,
/area/assembly/robotics)
"eon" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/shutters{
density = 0;
dir = 8;
@@ -6855,7 +6929,6 @@
/area/rift/station/public_garden/gantry)
"esQ" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/machinery/door/firedoor/glass,
/obj/effect/paint/darkred,
/obj/structure/cable/green,
/turf/simulated/floor/plating,
@@ -7114,9 +7187,6 @@
"eCq" = (
/turf/simulated/floor/tiled/dark,
/area/security/evidence_storage)
-"eCy" = (
-/turf/simulated/wall/prepainted/security,
-/area/maintenance/substation/cafeteria_dock)
"eCN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7305,6 +7375,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
+"eJW" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/lobby)
"eKx" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -7404,35 +7479,28 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"eQx" = (
-/obj/structure/table/woodentable,
-/obj/machinery/microwave,
-/obj/item/storage/box/donkpockets,
-/turf/simulated/floor/wood,
-/area/crew_quarters/sleep/Dorm_1)
-"eRf" = (
+"eOK" = (
/obj/effect/floor_decal/borderfloor{
- dir = 5
+ dir = 10
},
/obj/effect/floor_decal/corner/red/border{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals6{
- dir = 9
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 5
+ dir = 10
},
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 5
+/obj/structure/table/steel,
+/obj/item/folder/red{
+ pixel_y = 3
},
-/obj/structure/reagent_dispensers/water_cooler/full,
-/obj/item/reagent_containers/glass/cooler_bottle,
-/obj/machinery/holoposter{
- pixel_x = 32
+/obj/item/folder/red{
+ pixel_x = 3
},
/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+/area/security/lobby)
+"eQx" = (
+/obj/structure/table/woodentable,
+/obj/machinery/microwave,
+/obj/item/storage/box/donkpockets,
+/turf/simulated/floor/wood,
+/area/crew_quarters/sleep/Dorm_1)
"eRg" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -7732,26 +7800,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/research/researchdivision)
-"eZe" = (
-/obj/structure/bed/chair/office/dark,
-/obj/machinery/button/remote/airlock{
- id = "BrigFoyer";
- name = "Lobby Door Control";
- pixel_x = 24;
- pixel_y = 5;
- req_access = list(1)
- },
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = 24;
- pixel_y = -8
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 6
- },
-/obj/landmark/spawnpoint/job/security_officer,
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"eZQ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -7818,24 +7866,6 @@
},
/turf/simulated/floor/plating,
/area/rnd/telescience_lab/chamber)
-"fbe" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
- },
-/obj/machinery/camera/network/security{
- dir = 4
- },
-/obj/machinery/power/apc/west_mount,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"fbQ" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -7904,9 +7934,6 @@
pixel_x = -5
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/radio/intercom{
- pixel_y = -24
- },
/obj/structure/reagent_dispensers/peppertank{
pixel_x = -32
},
@@ -8055,18 +8082,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/warden)
-"fhH" = (
-/obj/structure/table/steel,
-/obj/item/storage/firstaid/regular,
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/machinery/power/apc/west_mount,
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"fic" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -8097,16 +8112,16 @@
/obj/effect/floor_decal/corner/red/border{
dir = 8
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 8
},
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"fiK" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 10
@@ -8244,10 +8259,10 @@
name = "Fighter Launch Tube"
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"fof" = (
@@ -8260,24 +8275,6 @@
},
/turf/simulated/floor/plating,
/area/rift/trade_shop/loading)
-"foy" = (
-/obj/machinery/door/window/brigdoor/southleft{
- dir = 4;
- id = "Cell 3";
- name = "Cell 3";
- req_access = list(2)
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/danger{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red{
- dir = 6
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/brig)
"foH" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -8294,10 +8291,10 @@
old_wall = 1
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/general)
"fqf" = (
@@ -8383,6 +8380,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"frf" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/computer/secure_data{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"frQ" = (
/obj/structure/cable/orange{
icon_state = "1-8"
@@ -8491,12 +8503,6 @@
/obj/structure/barricade,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/outside/outside2)
-"fwk" = (
-/obj/machinery/door/firedoor/glass,
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/effect/paint/babyblue,
-/turf/simulated/floor/plating,
-/area/medical/resleeving)
"fxc" = (
/obj/structure/table/steel,
/obj/effect/floor_decal/borderfloorblack{
@@ -8730,8 +8736,7 @@
"fIH" = (
/obj/structure/railing,
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/open,
/area/rift/station/public_garden/gantry)
@@ -8964,11 +8969,15 @@
"fPA" = (
/obj/effect/floor_decal/borderfloor,
/obj/structure/table/steel,
-/obj/item/phone,
/obj/effect/floor_decal/corner/red/border,
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 6
},
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/item/pen,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
"fPN" = (
@@ -9086,17 +9095,14 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
},
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
+/area/security/hallway)
"fSS" = (
-/obj/effect/paint/babyblue,
/obj/spawner/window/low_wall/reinforced/electrochromic/full{
- id = "operating_theatre_1";
+ id = null;
spawn_grille = 0
},
+/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
/area/medical/surgery)
"fTu" = (
@@ -9200,7 +9206,7 @@
"fWX" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/vending/coffee,
+/obj/structure/reagent_dispensers/water_cooler/full,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
"fXf" = (
@@ -9370,6 +9376,15 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"gbY" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"gcE" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
@@ -9525,8 +9540,6 @@
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacetwo)
"gjq" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
@@ -9536,10 +9549,13 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/light,
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/borderfloor/corner2,
+/obj/effect/floor_decal/corner/red/bordercorner2,
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
"gjx" = (
@@ -9701,6 +9717,14 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/pool/changing_room)
+"gnQ" = (
+/obj/structure/table/steel,
+/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security,
+/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security,
+/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security,
+/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security,
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"gon" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -9822,6 +9846,34 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
+"grp" = (
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/structure/table/steel,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/item/pen/red{
+ pixel_x = -2;
+ pixel_y = -2
+ },
+/obj/item/pen,
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
+"grI" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/light{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"grT" = (
/obj/machinery/mech_recharger,
/obj/mecha/combat/fighter/baron/sec/loaded{
@@ -10360,6 +10412,18 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
+"gEP" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"gFl" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -10591,6 +10655,15 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/hallway)
+"gMG" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals_central6{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/hallway/primary/surfacetwo)
"gMM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -10886,24 +10959,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"hbY" = (
-/obj/machinery/door/window/brigdoor/southleft{
- dir = 4;
- id = "Cell 2";
- name = "Cell 2";
- req_access = list(2)
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/danger{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red{
- dir = 6
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/brig)
"hcy" = (
/obj/structure/table/steel,
/obj/machinery/light{
@@ -10962,6 +11017,13 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"hdO" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/random/trash_pile,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/medsec_maintenance)
"heZ" = (
/turf/simulated/wall/prepainted/medical,
/area/medical/morgue)
@@ -10987,12 +11049,7 @@
/obj/item/storage/box/evidence,
/obj/item/camera,
/obj/effect/floor_decal/borderfloorblack,
-/obj/machinery/light_switch{
- pixel_y = -24
- },
-/obj/machinery/camera/network/security{
- dir = 1
- },
+/obj/machinery/light,
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
"hga" = (
@@ -11134,30 +11191,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/carpet/purcarpet,
/area/rnd/breakroom)
-"hkV" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/machinery/door_timer/cell_3{
- id = "Cell 1";
- name = "Cell 1";
- pixel_x = 32
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"hlq" = (
/obj/structure/sign/department/medbay{
pixel_x = -32
},
/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
- id = "medbay outer"
- },
/turf/simulated/floor/plating,
/area/medical/reception)
"hlW" = (
@@ -11562,16 +11602,16 @@
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
"hBp" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 6
},
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 8
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"hBC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 1
@@ -11752,6 +11792,10 @@
pixel_y = 7
},
/obj/item/pen,
+/obj/item/tape_recorder{
+ pixel_x = 10;
+ pixel_y = 2
+ },
/turf/simulated/floor/tiled/red,
/area/security/security_processing)
"hGK" = (
@@ -11977,9 +12021,6 @@
/turf/simulated/floor/wood,
/area/security/breakroom)
"hLM" = (
-/obj/effect/floor_decal/steeldecal/steel_decals_central6{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -12330,19 +12371,37 @@
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
"hRV" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/maintenance/sec,
-/turf/simulated/floor/plating,
-/area/security/brig)
-"hSd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/structure/cable/green{
- icon_state = "1-2"
+ 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
+ },
+/obj/machinery/door/airlock/glass/security{
+ name = "Security Reception";
+ req_access = list();
+ req_one_access = list(2,4)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
+"hSd" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
+/area/security/hallway)
"hSj" = (
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/tiled/freezer,
@@ -12376,7 +12435,6 @@
/area/assembly/robotics)
"hUf" = (
/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
@@ -12387,6 +12445,11 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/status_display{
+ pixel_y = -32
+ },
+/obj/machinery/light,
+/obj/effect/floor_decal/corner/red/border,
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
"hUs" = (
@@ -12490,10 +12553,10 @@
},
/obj/machinery/atmospheric_field_generator/perma,
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"hYR" = (
@@ -12563,10 +12626,10 @@
name = "Fighter Launch Tube"
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"iaY" = (
@@ -12610,16 +12673,6 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"icx" = (
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 6
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 1
- },
-/obj/structure/flora/pottedplant/fern,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"idk" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -12803,7 +12856,6 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_3)
"ifW" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/turf/simulated/floor/plating,
/area/holodeck_control)
@@ -12922,19 +12974,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
-"ijr" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/effect/paint/darkred,
-/turf/simulated/floor/plating,
-/area/security/brig)
"ijv" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -13015,9 +13054,14 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_1)
-"ind" = (
-/turf/simulated/wall/r_wall/prepainted,
-/area/security/range)
+"imP" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"inX" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -13046,6 +13090,12 @@
/obj/effect/floor_decal/borderfloorblack/corner2{
dir = 9
},
+/obj/machinery/light_switch{
+ pixel_y = -24
+ },
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
"ioQ" = (
@@ -13088,8 +13138,8 @@
"iqw" = (
/obj/effect/floor_decal/corner_techfloor_grid/full,
/obj/machinery/computer/security{
- icon_state = "computer";
- dir = 4
+ dir = 4;
+ icon_state = "computer"
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/cockpit)
@@ -13190,24 +13240,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
-"iwt" = (
-/obj/structure/closet/hydrant{
- pixel_y = 32
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"ixd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -13903,12 +13935,6 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/airlock/glass/security{
- id_tag = "BrigFoyer";
- layer = 2.8;
- name = "Security";
- req_one_access = list(38,63)
- },
/obj/machinery/door/blast/regular{
density = 0;
dir = 4;
@@ -13922,8 +13948,14 @@
},
/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/glass/security{
+ id_tag = "BrigFoyer";
+ layer = 2.8;
+ name = "Security";
+ req_one_access = list(38,63)
+ },
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"iVL" = (
/obj/structure/railing,
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -14250,7 +14282,6 @@
/turf/simulated/floor/plating,
/area/medical/chemistry)
"jdi" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
@@ -14957,6 +14988,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
+"jHi" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"jHS" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -15018,6 +15055,23 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/hammerhead/general)
+"jKG" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/computer/security{
+ dir = 4;
+ icon_state = "computer"
+ },
+/obj/machinery/air_alarm{
+ dir = 4;
+ pixel_x = -23
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"jLI" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -15097,6 +15151,12 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
+"jMp" = (
+/obj/machinery/turnstile/exit{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"jMu" = (
/obj/machinery/light,
/turf/simulated/floor/tiled/steel,
@@ -15235,19 +15295,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
-"jQM" = (
-/obj/structure/filingcabinet/chestdrawer{
- pixel_y = 16
- },
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_x = -30
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"jQP" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor,
@@ -15306,7 +15353,6 @@
name = "Pen 8 Blast Doors";
opacity = 0
},
-/obj/machinery/door/firedoor,
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/effect/paint/purplegray,
/turf/simulated/floor/reinforced,
@@ -15561,14 +15607,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
-"jZN" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/floodlight,
-/turf/simulated/floor/plating,
-/area/maintenance/locker)
"kap" = (
/obj/machinery/button/remote/blast_door{
id = "armorytactical";
@@ -15713,8 +15751,6 @@
/turf/simulated/floor/tiled/steel,
/area/maintenance/medbay)
"keC" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/darkred,
/turf/simulated/floor/plating,
@@ -16187,24 +16223,24 @@
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
"ksX" = (
-/obj/machinery/holoposter{
- pixel_x = -32
- },
/obj/effect/floor_decal/borderfloor{
- dir = 9
+ dir = 5
},
/obj/effect/floor_decal/corner/red/border{
- dir = 9
+ dir = 5
},
/obj/effect/floor_decal/borderfloor/corner2{
- dir = 10
+ dir = 5
},
/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 10
+ dir = 5
+ },
+/obj/machinery/vending/coffee,
+/obj/machinery/light{
+ dir = 1
},
-/obj/structure/flora/pottedplant/minitree,
/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
+/area/hallway/primary/surfacetwo)
"ksY" = (
/obj/machinery/door/airlock/engineering{
name = "Security Substation";
@@ -16327,9 +16363,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"kvg" = (
-/turf/simulated/wall/r_wall/prepainted/security,
-/area/security/brig)
"kvr" = (
/turf/simulated/wall/r_wall/prepainted/security,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
@@ -16396,6 +16429,24 @@
},
/turf/simulated/floor/wood,
/area/rift/station/public_garden/gantry)
+"kxd" = (
+/obj/effect/floor_decal/steeldecal/steel_decals_central1{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"kxv" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
@@ -16473,24 +16524,16 @@
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"kzS" = (
-/obj/machinery/door_timer/cell_3{
- pixel_x = 32
- },
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/red/border{
dir = 4
},
-/obj/machinery/door/airlock/glass/security{
- layer = 2.8;
- name = "Security";
- req_one_access = list(1,38)
- },
-/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"kAt" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -16642,7 +16685,6 @@
/area/security/range)
"kGz" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/machinery/door/firedoor/glass,
/obj/effect/paint/darkred,
/obj/structure/cable/green{
icon_state = "0-8"
@@ -16726,6 +16768,15 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"kLx" = (
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 6
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"kMg" = (
/obj/spawner/window/low_wall/full/nogrille/firelocks,
/turf/simulated/floor/plating,
@@ -17353,8 +17404,6 @@
/turf/simulated/floor/tiled,
/area/security/briefing_room)
"laa" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/turf/simulated/floor/plating,
/area/crew_quarters/locker)
@@ -17702,17 +17751,8 @@
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
"llM" = (
-/obj/machinery/computer/security,
-/obj/item/radio/intercom{
- dir = 1;
- pixel_y = 24
- },
-/obj/machinery/camera/network/security,
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"llR" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -17800,10 +17840,10 @@
old_wall = 1
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"lqA" = (
@@ -18095,7 +18135,6 @@
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
"lAW" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -18105,6 +18144,15 @@
},
/turf/simulated/floor/plating,
/area/holodeck_control)
+"lBj" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"lBx" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/lightorange/bordercorner,
@@ -18270,8 +18318,7 @@
dir = 4
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/tiled/steel,
/area/security/hammerhead_bay)
@@ -18367,16 +18414,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/heads/hor)
-"lIf" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/structure/bed/chair,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"lIF" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -18389,17 +18426,7 @@
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
"lIZ" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "research_shutter_int";
- name = "Research shutter";
- opacity = 0
- },
-/obj/effect/paint/purplegray,
/turf/simulated/floor/plating,
/area/rnd/research)
"lJq" = (
@@ -18486,12 +18513,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
-"lNl" = (
-/obj/structure/toilet{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/brig)
"lNm" = (
/obj/structure/curtain/open/bed{
name = "brown curtain";
@@ -18552,7 +18573,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass/security{
name = "Firing Range";
req_one_access = list(1,2,4)
@@ -18560,6 +18580,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/security/range)
"lOg" = (
@@ -18899,8 +18922,8 @@
dir = 8
},
/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 9
+ dir = 9;
+ icon_state = "warning"
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/hammerhead/general)
@@ -18987,6 +19010,13 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
+"mao" = (
+/obj/random/trash_pile,
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/medsec_maintenance)
"maJ" = (
/obj/structure/bed/chair{
dir = 8
@@ -19232,23 +19262,6 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/sleeper)
-"mix" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
-/obj/effect/floor_decal/borderfloor/corner2,
-/obj/effect/floor_decal/corner/red/bordercorner2,
-/obj/machinery/light,
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 9
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"miH" = (
/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
@@ -19289,6 +19302,12 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/security_lockerroom)
+"mjR" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"mjV" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
@@ -19554,7 +19573,6 @@
/area/crew_quarters/pool)
"mqC" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/machinery/door/firedoor/glass,
/obj/effect/paint/darkred,
/obj/structure/cable/green{
icon_state = "0-2"
@@ -19607,7 +19625,6 @@
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
"mrZ" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass/security{
layer = 2.8;
name = "EVA Operations";
@@ -19622,6 +19639,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/security/evastorage)
"msb" = (
@@ -19654,6 +19674,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/security/hammerhead_bay)
"mua" = (
@@ -19709,10 +19732,10 @@
name = "Fighter Launch Tube"
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"mvo" = (
@@ -19791,6 +19814,9 @@
pixel_y = 26;
req_access = list(1)
},
+/obj/machinery/light{
+ dir = 4
+ },
/turf/simulated/floor/tiled/red,
/area/security/security_processing)
"mzD" = (
@@ -19863,9 +19889,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
"mAG" = (
-/obj/machinery/door/firedoor/glass{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
@@ -20287,7 +20310,7 @@
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
"mJx" = (
-/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/darkred,
/turf/simulated/floor/plating,
/area/security/hallway)
@@ -20309,17 +20332,23 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/storage)
-"mLK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
+"mLV" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
dir = 6
},
-/obj/structure/cable/green{
- icon_state = "1-4"
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 6
},
-/turf/simulated/floor/tiled/dark,
+/obj/machinery/power/apc/east_mount,
+/obj/structure/cable/green,
+/obj/machinery/papershredder,
+/turf/simulated/floor/tiled/steel,
/area/security/lobby)
"mMs" = (
/obj/effect/floor_decal/borderfloor{
@@ -20386,6 +20415,31 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
+"mOm" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 1
+ },
+/obj/machinery/holoposter{
+ pixel_x = -32
+ },
+/obj/structure/flora/pottedplant/minitree,
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"mPu" = (
/obj/structure/closet/secure_closet/guncabinet/robotics,
/turf/simulated/floor/tiled/steel_ridged,
@@ -20620,6 +20674,36 @@
/obj/item/gun/ballistic/deagle/taj,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
+"mVF" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/item/radio/intercom/department/security{
+ dir = 1;
+ pixel_y = 35
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 4
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"mWB" = (
/turf/simulated/wall/r_wall/prepainted/security,
/area/security/security_lockerroom)
@@ -20667,6 +20751,10 @@
/obj/machinery/light_construct,
/turf/simulated/floor/plating,
/area/maintenance/medbay)
+"mXv" = (
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/medsec_maintenance)
"mXw" = (
/obj/machinery/door/firedoor/glass{
dir = 4
@@ -20707,21 +20795,14 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
"mYE" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 6
- },
-/obj/structure/table/steel,
-/obj/effect/floor_decal/corner/red/border{
- dir = 6
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 6
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/air_alarm{
+ dir = 1;
+ pixel_y = -24
},
-/obj/structure/closet/hydrant{
- pixel_x = 32
+/obj/structure/bed/chair{
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
@@ -20805,15 +20886,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/assembly/robotics)
-"ncH" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 6
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"ncO" = (
/obj/structure/table/rack/shelf/steel,
/obj/effect/floor_decal/borderfloorblack{
@@ -20993,6 +21065,9 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hor)
+"niy" = (
+/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
+/area/security/prison)
"niV" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/computer/skills,
@@ -21020,6 +21095,17 @@
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
+"nkq" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 6
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"nkD" = (
/obj/machinery/holopad,
/turf/simulated/floor/tiled/monotile,
@@ -21030,6 +21116,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/breakroom)
+"nkM" = (
+/obj/structure/bed/chair/office/dark,
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"nmy" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -21150,6 +21240,13 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"nrr" = (
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4,
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"nrE" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -21400,16 +21497,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hammerhead_bay)
-"nxD" = (
-/obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/obj/machinery/light{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
"nxY" = (
/turf/simulated/wall/r_wall/prepainted,
/area/crew_quarters/coffee_shop)
@@ -21631,6 +21718,32 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
+"nDY" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 5
+ },
+/obj/structure/extinguisher_cabinet{
+ dir = 8;
+ pixel_x = 30
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"nEg" = (
/obj/machinery/camera/network/research/xenobio{
dir = 4;
@@ -21751,6 +21864,22 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
/area/medical/reception)
+"nJI" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"nJT" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -21835,18 +21964,52 @@
/turf/simulated/floor/tiled/monotile,
/area/rnd/workshop)
"nMi" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/darkred,
-/turf/simulated/floor/plating,
-/area/security/brig)
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 8
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"nMq" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass/security{
name = "Firing Range";
req_one_access = list(1,2,4)
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/security/range)
+"nMx" = (
+/obj/machinery/button/remote/airlock{
+ id = "BrigFoyer";
+ name = "Lobby Door Control";
+ pixel_x = 24;
+ pixel_y = 5;
+ req_access = list(1)
+ },
+/obj/machinery/light_switch{
+ dir = 4;
+ pixel_x = 24;
+ pixel_y = -8
+ },
+/obj/structure/bed/chair/office/dark,
+/obj/landmark/spawnpoint/job/security_officer,
+/obj/effect/floor_decal/borderfloor{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"nNb" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -21895,9 +22058,6 @@
/obj/effect/floor_decal/corner/red/border{
dir = 9
},
-/obj/machinery/photocopier/faxmachine{
- department = "Security"
- },
/turf/simulated/floor/tiled,
/area/security/briefing_room)
"nOt" = (
@@ -21929,15 +22089,19 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
"nQn" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
},
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4,
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 10
},
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"nRi" = (
/obj/effect/floor_decal/borderfloorblack/cee{
alpha = 255;
@@ -22356,6 +22520,14 @@
/obj/item/reagent_containers/blood/OMinus,
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
+"ocm" = (
+/obj/structure/table/steel,
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security,
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security,
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security,
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security,
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"ocv" = (
/turf/simulated/floor/tiled/monotile,
/area/assembly/robotics)
@@ -22388,6 +22560,21 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
+"odA" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"odF" = (
/obj/structure/table/steel,
/obj/random/maintenance/clean,
@@ -22429,7 +22616,6 @@
/turf/simulated/floor/carpet,
/area/security/warden)
"ofr" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
@@ -22474,6 +22660,15 @@
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
+"ogI" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/light,
+/obj/machinery/computer/security{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"ohi" = (
/obj/structure/symbol/sa,
/turf/simulated/wall/r_wall/prepainted,
@@ -22554,12 +22749,16 @@
/turf/simulated/floor/tiled/white,
/area/medical/surgeryprep)
"oji" = (
-/obj/structure/table/steel,
-/obj/machinery/light/small{
+/obj/effect/floor_decal/borderfloorblack{
dir = 4
},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/genpop,
/turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/security_processing)
"ojJ" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -22575,6 +22774,17 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"okK" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 10
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"olp" = (
/obj/structure/table/glass,
/obj/machinery/recharger,
@@ -22614,6 +22824,11 @@
/obj/random/medical/lite,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
+"ooG" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/structure/curtain/open/black,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"opb" = (
/obj/structure/table/steel,
/obj/item/storage/box/masks{
@@ -22800,14 +23015,7 @@
/area/assembly/chargebay)
"owT" = (
/obj/effect/floor_decal/borderfloorblack{
- dir = 9
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_x = -30
+ dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
@@ -23075,7 +23283,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_4)
"oFb" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
/area/medical/resleeving)
@@ -23194,9 +23402,6 @@
/area/rnd/telescience_lab/foyer)
"oLy" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central1,
-/obj/machinery/light{
- dir = 1
- },
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
"oLJ" = (
@@ -23459,13 +23664,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
-"oSh" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
-/obj/effect/floor_decal/borderfloor/corner2,
-/obj/effect/floor_decal/corner/red/bordercorner2,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"oSn" = (
/obj/machinery/disposal,
/obj/machinery/light{
@@ -23495,8 +23693,8 @@
dir = 4
},
/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 6
+ dir = 6;
+ icon_state = "warning"
},
/obj/effect/floor_decal/sign/dock/two,
/turf/simulated/floor/tiled/techmaint,
@@ -23538,6 +23736,20 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/security_lockerroom)
+"oTT" = (
+/obj/structure/table/steel,
+/obj/item/reagent_containers/food/drinks/cans/waterbottle,
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"oUb" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -23669,9 +23881,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals_central1{
dir = 8
},
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
@@ -23681,6 +23891,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/maintenance/lower/medsec_maintenance)
"oWD" = (
@@ -23739,8 +23952,12 @@
/area/crew_quarters/pool)
"oXc" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/maintenance/sec,
-/turf/simulated/floor/plating,
+/obj/machinery/door/airlock/glass/security/polarized{
+ id_tint = "seclocker";
+ name = "Locker Room";
+ req_one_access = list(2)
+ },
+/turf/simulated/floor/tiled/steel,
/area/security/security_lockerroom)
"oXn" = (
/obj/effect/floor_decal/spline/plain,
@@ -23892,8 +24109,8 @@
dir = 4
},
/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 5
+ dir = 5;
+ icon_state = "warning"
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/hammerhead/general)
@@ -24047,11 +24264,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
-"pge" = (
-/obj/structure/table/rack,
-/obj/random/firstaid,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/medsec_maintenance)
"pgh" = (
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
@@ -24125,6 +24337,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark,
/area/security/interrogation)
"pkN" = (
@@ -24232,10 +24447,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"pmi" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/security/upper)
"pmF" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -24246,28 +24457,6 @@
/obj/effect/floor_decal/sign/dock/one,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/hammerhead/general)
-"pnl" = (
-/obj/structure/table/steel,
-/obj/item/storage/box/evidence,
-/obj/item/pen/red{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/pen{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/machinery/requests_console/preset/security{
- pixel_y = 30
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 9
- },
-/obj/machinery/newscaster{
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"pnZ" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -24481,6 +24670,20 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/security_lockerroom)
+"pvp" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 5
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"pvE" = (
/obj/structure/table/reinforced,
/obj/item/surgical/bioregen,
@@ -24518,8 +24721,7 @@
dir = 1
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
@@ -24673,6 +24875,12 @@
"pBj" = (
/turf/simulated/mineral/icerock/lythios43c,
/area/rift/surfacebase/outside/outside2)
+"pBw" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"pBz" = (
/obj/item/radio/beacon/anchored,
/turf/simulated/floor/tiled/techfloor,
@@ -25487,6 +25695,26 @@
},
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
+"qiX" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 6
+ },
+/obj/structure/table/steel,
+/obj/effect/floor_decal/corner/red/border{
+ dir = 6
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 6
+ },
+/obj/structure/closet/hydrant{
+ pixel_x = 32
+ },
+/obj/item/toy/figure/secofficer,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"qjg" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -25912,15 +26140,6 @@
/obj/machinery/light,
/turf/simulated/floor/water/pool,
/area/triumph/surfacebase/sauna)
-"qvp" = (
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 6
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"qvx" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -26316,6 +26535,9 @@
dir = 1
},
/obj/structure/lattice,
+/obj/structure/cable/green{
+ icon_state = "32-4"
+ },
/turf/simulated/open,
/area/maintenance/lower/medsec_maintenance)
"qJa" = (
@@ -26620,8 +26842,8 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
},
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"qSY" = (
/obj/machinery/air_alarm{
desc = " ";
@@ -26720,9 +26942,8 @@
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"qUt" = (
/obj/structure/closet/crate/freezer,
/obj/item/nif/bad,
@@ -26743,6 +26964,20 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
+"qUR" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"qVn" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 8
@@ -26867,6 +27102,20 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"rav" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"raA" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -26905,12 +27154,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
-"rba" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lower/medsec_maintenance)
"rbb" = (
/obj/effect/floor_decal/spline/plain{
dir = 5
@@ -26950,25 +27193,20 @@
},
/turf/simulated/shuttle/wall/voidcraft/red,
/area/shuttle/hammerhead/general)
-"rcB" = (
-/obj/machinery/door_timer/cell_3{
- id = "Cell 2";
- name = "Cell 2";
- pixel_x = 32
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"rcQ" = (
/obj/machinery/smartfridge/chemistry,
/turf/simulated/wall/r_wall/prepainted,
/area/medical/chemistry)
+"rcS" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"rda" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -27043,11 +27281,14 @@
/area/crew_quarters/pool)
"reL" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/obj/structure/cable/green{
- icon_state = "1-2"
+ icon_state = "1-8"
},
/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
+/area/security/hallway)
"rfv" = (
/obj/machinery/space_heater,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -27437,15 +27678,18 @@
/obj/effect/floor_decal/corner/red/border{
dir = 8
},
-/obj/machinery/fire_alarm/west_mount{
- pixel_x = -24
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"rnP" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -27501,6 +27745,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/light,
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
"rrr" = (
@@ -27817,6 +28062,10 @@
/obj/effect/paint/purplegray,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"rDz" = (
+/obj/effect/floor_decal/borderfloorblack/corner,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"rEg" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/engi{
@@ -28097,20 +28346,14 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/airlock/glass/security{
- layer = 2.8;
- name = "Security";
- req_one_access = list(1,38)
- },
/obj/effect/floor_decal/corner/red/border{
dir = 8
},
-/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
"rNb" = (
/turf/simulated/wall/prepainted/security,
/area/security/security_lockerroom)
@@ -28316,8 +28559,8 @@
},
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/obj/effect/paint/darkred,
-/turf/simulated/floor/plating,
-/area/security/brig)
+/turf/simulated/floor/tiled/monotile,
+/area/security/hallway)
"rTn" = (
/turf/simulated/floor/carpet/blue,
/area/security/breakroom)
@@ -28327,23 +28570,21 @@
/turf/simulated/floor/tiled/monotile,
/area/rnd/research)
"rTT" = (
-/obj/machinery/door/airlock/glass/security{
- name = "Security Reception";
- req_access = list();
- req_one_access = list(2,4)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
-/obj/structure/cable/green{
- icon_state = "4-8"
+/obj/machinery/door/airlock/glass/security{
+ name = "Processing";
+ req_one_access = list(1,2,4,38)
},
-/turf/simulated/floor/tiled/monotile,
-/area/security/lobby)
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"rUn" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
@@ -28361,16 +28602,12 @@
/obj/effect/floor_decal/corner/red{
dir = 1
},
-/obj/machinery/camera/network/security{
- dir = 1
- },
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/security/interrogation)
"rVb" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -28388,6 +28625,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/security/security_lockerroom)
"rVf" = (
@@ -28435,6 +28675,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
+"rWX" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/security_processing)
"rXz" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -28560,6 +28803,23 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/interrogation)
+"sdt" = (
+/obj/structure/table/steel,
+/obj/item/storage/firstaid/regular,
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"sdv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -28573,7 +28833,6 @@
/turf/simulated/floor/water/deep/pool,
/area/crew_quarters/pool)
"sdE" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/turf/simulated/floor/plating,
/area/triumph/surfacebase/sauna)
@@ -28605,18 +28864,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"seB" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"seE" = (
/obj/machinery/light/no_nightshift{
dir = 8
@@ -28627,8 +28874,8 @@
pixel_x = -24
},
/obj/machinery/computer/shuttle_control/explore/hammerhead{
- icon_state = "computer";
- dir = 4
+ dir = 4;
+ icon_state = "computer"
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/cockpit)
@@ -28686,17 +28933,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
-"shx" = (
-/obj/structure/bed/chair/office/dark{
- dir = 1
- },
-/obj/landmark/spawnpoint/job/security_officer,
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
"siA" = (
/turf/simulated/wall/prepainted/science,
/area/rnd/research/researchdivision)
@@ -28859,15 +29095,9 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
"soJ" = (
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/structure/table/steel,
-/obj/item/pen,
/obj/effect/floor_decal/borderfloorblack,
/turf/simulated/floor/tiled/dark,
-/area/security/lobby)
+/area/security/security_processing)
"spg" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/reinforced,
@@ -29052,8 +29282,7 @@
/area/rift/station/public_garden/gantry)
"sxp" = (
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
@@ -29168,9 +29397,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"szQ" = (
-/turf/simulated/floor/plating,
-/area/maintenance/lower/medsec_maintenance)
"sAv" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -29256,14 +29482,10 @@
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"sEs" = (
-/obj/effect/floor_decal/borderfloor/corner{
+/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/status_display{
- pixel_x = 32;
- pixel_y = 32
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
+/obj/effect/floor_decal/corner/red/border{
dir = 4
},
/obj/structure/disposalpipe/segment,
@@ -29357,8 +29579,7 @@
dir = 1
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/open,
/area/rift/station/public_garden/gantry)
@@ -29558,6 +29779,17 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/water/pool,
/area/crew_quarters/pool)
+"sOJ" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/machinery/door/airlock/glass/security{
+ name = "Security Reception";
+ req_access = list();
+ req_one_access = list(2,4)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"sPc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -29940,12 +30172,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"teZ" = (
-/obj/structure/filingcabinet/chestdrawer{
- name = "Scan Records"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lower/medsec_maintenance)
"tfk" = (
/obj/structure/curtain/open/bed{
name = "brown curtain"
@@ -30047,6 +30273,22 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"tkZ" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction{
+ dir = 1;
+ icon_state = "pipe-j2"
+ },
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"tll" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
@@ -30084,19 +30326,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"tmt" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/darkred,
-/turf/simulated/floor/plating,
-/area/security/lobby)
"tmA" = (
/obj/structure/table/steel,
/obj/item/folder/red,
@@ -30149,16 +30378,6 @@
/obj/random/maintenance/research,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"toi" = (
-/obj/machinery/holopad,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
-/turf/simulated/floor/tiled/monotile,
-/area/security/brig)
"toG" = (
/obj/structure/table/steel,
/obj/item/integrated_electronics/debugger{
@@ -30480,6 +30699,29 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
+"tyF" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"tyH" = (
/obj/structure/catwalk,
/turf/simulated/floor/plating,
@@ -30660,12 +30902,8 @@
"tDr" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/air_alarm{
- dir = 1;
- pixel_y = -24
- },
/obj/structure/table/steel,
-/obj/item/toy/figure/secofficer,
+/obj/item/storage/box/cups,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
"tDY" = (
@@ -30880,6 +31118,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
+"tJz" = (
+/obj/effect/floor_decal/borderfloorblack/corner{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"tJG" = (
/obj/machinery/door/airlock/glass/research{
name = "Telescience Wing"
@@ -31172,6 +31416,28 @@
"tVG" = (
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside2)
+"tWm" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4,
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"tWJ" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -31239,7 +31505,6 @@
/turf/simulated/floor/plating,
/area/maintenance/medbay)
"tZG" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
@@ -31256,19 +31521,6 @@
"tZW" = (
/turf/simulated/floor,
/area/maintenance/substation/security)
-"tZX" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals6{
- dir = 10
- },
-/obj/structure/bed/chair,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"uax" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -31670,6 +31922,13 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"uoj" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/structure/curtain/open/black,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"uom" = (
/turf/simulated/wall/prepainted,
/area/maintenance/research/xenobio)
@@ -31835,8 +32094,23 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"uxa" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"uxm" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -31990,6 +32264,15 @@
/obj/landmark/spawnpoint/job/scientist,
/turf/simulated/floor/tiled/monotile,
/area/rnd/research)
+"uEK" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/structure/bed/chair{
+ dir = 1
+ },
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"uFa" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
@@ -32175,11 +32458,26 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
"uLD" = (
-/obj/machinery/light/small{
+/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/turf/simulated/floor/plating,
-/area/maintenance/lower/medsec_maintenance)
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/structure/table/steel,
+/obj/machinery/recharger{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/machinery/recharger{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"uLE" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -32308,11 +32606,6 @@
/obj/machinery/disposal,
/turf/simulated/floor/tiled/monotile,
/area/security/security_lockerroom)
-"uOj" = (
-/obj/machinery/door/airlock/maintenance/common,
-/obj/item/barrier_tape_segment/engineering,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/medsec_maintenance)
"uOH" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
@@ -33254,6 +33547,9 @@
/area/hallway/primary/surfacetwo)
"vlE" = (
/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/security/hammerhead_bay)
"vmd" = (
@@ -33326,6 +33622,14 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
+"vpt" = (
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/closet/emcloset,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/medsec_maintenance)
"vpB" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -33449,15 +33753,22 @@
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"vtq" = (
-/obj/machinery/light{
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
dir = 8
},
-/obj/structure/closet/secure_closet/brig{
- id = "Cell 1";
- name = "Cell 1 Locker"
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 8
},
+/obj/structure/closet/secure_closet/genpop,
/turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/security_processing)
"vtu" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
dir = 4
@@ -33683,10 +33994,10 @@
icon_state = "4-8"
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"vBG" = (
@@ -33758,10 +34069,10 @@
icon_state = "2-4"
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"vFi" = (
@@ -33873,9 +34184,8 @@
/obj/structure/cable/orange{
icon_state = "1-4"
},
-/obj/effect/floor_decal/industrial/warning,
/obj/effect/floor_decal/industrial/warning{
- dir = 8
+ dir = 10
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
@@ -33899,14 +34209,13 @@
},
/obj/machinery/mech_recharger,
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/general)
"vKj" = (
-/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/shutters{
density = 0;
dir = 2;
@@ -33937,13 +34246,15 @@
/area/hallway/primary/surfacetwo)
"vLE" = (
/obj/machinery/door/airlock/maintenance/sec,
-/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/tiled/steel,
/area/security/range)
"vLT" = (
@@ -33965,6 +34276,20 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
+"vNc" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 9
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"vNQ" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -33999,10 +34324,8 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/locker)
"vPP" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
- id = "medbay outer"
- },
/turf/simulated/floor/plating,
/area/medical/reception)
"vQg" = (
@@ -34367,7 +34690,6 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
"weU" = (
-/obj/machinery/light,
/obj/effect/floor_decal/steeldecal/steel_decals_central1{
dir = 1
},
@@ -34408,19 +34730,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacetwo)
-"wft" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/structure/reagent_dispensers/peppertank{
- pixel_x = 32
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"wfD" = (
/obj/structure/railing{
dir = 1
@@ -34650,6 +34959,28 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/hallway)
+"wop" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 9
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/machinery/disposal,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 1
+ },
+/obj/machinery/requests_console/preset/security{
+ pixel_y = 32
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"woM" = (
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
@@ -34763,10 +35094,10 @@
/area/medical/reception)
"wqC" = (
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"wrb" = (
@@ -34818,7 +35149,6 @@
/turf/simulated/floor/tiled/monowhite,
/area/medical/resleeving)
"wto" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/structure/cable/green{
icon_state = "4-8"
@@ -35078,6 +35408,23 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
+"wCk" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 10
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"wCr" = (
/obj/machinery/fire_alarm/west_mount{
pixel_x = -24
@@ -35283,6 +35630,16 @@
/obj/machinery/fire_alarm/east_mount,
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
+"wKT" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/structure/table/steel,
+/obj/machinery/computer/guestpass{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"wLS" = (
/obj/machinery/door/blast/regular{
density = 0;
@@ -35325,6 +35682,20 @@
/obj/landmark/spawnpoint/job/medical_doctor,
/turf/simulated/floor/tiled/monowhite,
/area/medical/medbay_primary_storage)
+"wNG" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 10
+ },
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/closet/secure_closet/genpop,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"wNZ" = (
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
@@ -35341,9 +35712,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"wOG" = (
-/turf/simulated/floor/plating,
-/area/maintenance/security/upper)
"wPF" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -35659,6 +36027,15 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"wZc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"xax" = (
/obj/structure/railing{
dir = 1
@@ -35668,6 +36045,16 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
+"xaJ" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"xaM" = (
/obj/structure/cable/orange{
icon_state = "4-8"
@@ -35692,18 +36079,15 @@
/area/security/evastorage)
"xbD" = (
/obj/effect/floor_decal/corner_techfloor_grid/diagonal,
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
/obj/machinery/button/remote/blast_door{
id = "hammerheadtba";
name = "Fighter Tube Access";
pixel_x = -26;
pixel_y = 8
},
+/obj/effect/floor_decal/industrial/warning{
+ dir = 5
+ },
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
"xbW" = (
@@ -35723,6 +36107,18 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"xcj" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/structure/closet/hydrant{
+ pixel_y = 32
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"xco" = (
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
@@ -35837,11 +36233,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/showers)
-"xgN" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/closet/emcloset,
-/turf/simulated/floor/plating,
-/area/maintenance/locker)
"xhk" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -36025,22 +36416,11 @@
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"xpX" = (
-/obj/structure/table/steel,
-/obj/item/tape_recorder{
- pixel_x = -2;
- pixel_y = -2
- },
-/obj/item/tape_recorder{
- pixel_x = 2;
- pixel_y = 2
- },
/obj/machinery/air_alarm{
dir = 1;
pixel_y = -25
},
-/obj/effect/floor_decal/borderfloorblack{
- dir = 10
- },
+/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/borderfloorblack/corner2{
dir = 9
},
@@ -36166,9 +36546,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"xsX" = (
-/turf/simulated/floor/tiled/dark,
-/area/security/brig)
"xtd" = (
/obj/machinery/recharger/wallcharger{
pixel_y = 26
@@ -36305,6 +36682,25 @@
},
/turf/simulated/floor/tiled/red,
/area/security/evidence_storage)
+"xys" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 5
+ },
+/obj/machinery/lapvend,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/lobby)
"xyC" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36441,10 +36837,10 @@
icon_state = "1-2"
},
/turf/simulated/floor/maglev{
+ desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!";
dir = 8;
icon_state = "maglevup";
- name = "launch rail";
- desc = "Magnetic propulsion fighter launch rails. Caution! Electrified!"
+ name = "launch rail"
},
/area/shuttle/hammerhead/cockpit)
"xFu" = (
@@ -36896,11 +37292,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacetwo)
-"xOW" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/darkred,
-/turf/simulated/floor/plating,
-/area/security/lobby)
"xPj" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -36978,6 +37369,13 @@
pixel_y = 26;
req_access = list(1)
},
+/obj/structure/extinguisher_cabinet{
+ dir = 4;
+ pixel_x = -30
+ },
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/red,
/area/security/security_processing)
"xQH" = (
@@ -37248,16 +37646,31 @@
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
"xXR" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 1
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 10
+ },
+/obj/machinery/fire_alarm/west_mount{
+ pixel_x = -24
+ },
/turf/simulated/floor/tiled/steel,
-/area/security/brig)
+/area/security/hallway)
+"xYb" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/lobby)
"xYc" = (
/obj/machinery/door/blast/regular{
density = 0;
@@ -37351,9 +37764,6 @@
/obj/effect/floor_decal/borderfloorblack{
dir = 5
},
-/obj/machinery/light{
- dir = 4
- },
/obj/machinery/fire_alarm/east_mount,
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
@@ -37403,6 +37813,9 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
"ydS" = (
@@ -37425,7 +37838,10 @@
},
/obj/structure/table/steel_reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/item/paper/armory_info,
+/obj/item/paper/armory_info{
+ pixel_x = 16
+ },
+/obj/item/modular_computer/laptop/preset/custom_loadout/standard/security/warden,
/turf/simulated/floor/carpet,
/area/security/warden)
"yeu" = (
@@ -37448,9 +37864,9 @@
/turf/simulated/floor/water/pool,
/area/triumph/surfacebase/sauna)
"yeT" = (
-/obj/structure/bed/padded,
-/turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled/monodark,
+/area/security/security_processing)
"yfc" = (
/obj/machinery/power/apc/south_mount,
/obj/effect/floor_decal/rust,
@@ -37520,16 +37936,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden/stairwell)
-"ygT" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"yhc" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 1
@@ -48071,8 +48477,8 @@ oLJ
oLJ
kid
kid
-fwk
-fwk
+oFb
+oFb
kid
kid
kid
@@ -48656,7 +49062,7 @@ eYx
gHr
ixy
odu
-fwk
+oFb
jvX
vjt
wnW
@@ -48850,7 +49256,7 @@ eYx
iKu
kRa
lto
-fwk
+oFb
eUN
dyj
wBH
@@ -49044,7 +49450,7 @@ oUw
dTk
bor
lto
-fwk
+oFb
epz
tQp
xkt
@@ -51133,7 +51539,7 @@ enB
nFd
enB
enB
-enB
+niy
enB
enB
enB
@@ -53119,10 +53525,10 @@ jOk
jOk
sLL
mpJ
-mYq
+mao
cYo
xco
-rba
+bVi
hpT
tci
hhp
@@ -53281,16 +53687,16 @@ uWX
cgA
lxh
qIG
-szQ
-szQ
-szQ
+bVi
+bVi
+bVi
bWq
-szQ
-szQ
+bVi
+bVi
tMV
-szQ
-szQ
-szQ
+bVi
+bVi
+bVi
gcX
jGy
lFw
@@ -53298,16 +53704,16 @@ mDK
yaL
mDK
eVV
-szQ
+bVi
mYq
oMM
wGP
-szQ
+bVi
mYq
-szQ
-szQ
-szQ
-szQ
+bVi
+bVi
+bVi
+bVi
nxc
gNc
bue
@@ -53482,15 +53888,15 @@ otA
tmh
tmh
dKq
-szQ
-szQ
-szQ
+bVi
+bVi
+bVi
gcX
-szQ
+bVi
xyC
-szQ
+bVi
ora
-szQ
+bVi
lTc
ryQ
ryQ
@@ -53499,20 +53905,20 @@ ryQ
ryQ
ryQ
ryQ
-szQ
-szQ
-szQ
-szQ
-szQ
-szQ
+bVi
+bVi
+bVi
+bVi
+bVi
+bVi
tdp
+bVi
+bVi
qUB
-szQ
-szQ
-xco
-szQ
bVi
-szQ
+odF
+mYq
+bVi
sJg
mHQ
twZ
@@ -53668,17 +54074,17 @@ tZW
tZW
cbe
lxh
-qUB
-szQ
-szQ
-szQ
+gne
+bVi
+bVi
+bVi
bWq
xco
xco
ssT
xco
-szQ
-szQ
+bVi
+bVi
diz
kXq
jBV
@@ -53694,19 +54100,19 @@ ldl
xRj
ryQ
qDl
-szQ
+bVi
mYq
yjX
mYq
-szQ
-szQ
+bVi
+bVi
+bVi
+mXv
qUB
-szQ
-xco
-xco
-xco
-xco
-szQ
+bVi
+bVi
+bVi
+bVi
sJg
mHQ
mHQ
@@ -53862,8 +54268,8 @@ aLs
tZW
lQX
lxh
-qUB
-ind
+gne
+qjY
xPp
xPp
xPp
@@ -53877,8 +54283,8 @@ dep
vLE
dep
dep
-ora
-xco
+qSP
+ssT
lTc
ryQ
ayC
@@ -53892,15 +54298,15 @@ mWB
mWB
mWB
mWB
+odF
+bVi
mYq
-szQ
+mXv
qUB
-bWq
-bWq
-uOj
-bWq
-bWq
-uLD
+bVi
+hdO
+vpt
+bYE
xPE
lzT
met
@@ -54057,7 +54463,7 @@ sfs
oqx
nyq
ycY
-ind
+qjY
xPp
dTx
dTx
@@ -54071,32 +54477,32 @@ jQY
mEM
uNo
dep
-qSP
-ssT
-lTc
+epm
+ckI
+eVY
ryQ
rkB
vnm
vfF
aeO
uLE
-ryQ
+mWB
mWB
buN
nSn
uNX
mWB
mWB
-szQ
-qUB
-bWq
-mYq
-szQ
-pge
-bWq
-szQ
-szQ
-szQ
+xjt
+xjt
+xjt
+cXo
+xjt
+xjt
+xjt
+xjt
+xjt
+yjX
sJg
iBi
pFC
@@ -54251,7 +54657,7 @@ lxh
lxh
lxh
gne
-ind
+qjY
xPp
dTx
lOg
@@ -54265,9 +54671,9 @@ fyx
dOP
mpk
dep
-epm
-ckI
-eVY
+eFZ
+gDE
+yfc
ryQ
hPT
vnm
@@ -54281,15 +54687,15 @@ eGD
pvo
fcX
mWB
-szQ
-qUB
-bWq
-szQ
-szQ
-mYq
-bWq
-bWq
-bWq
+wop
+oTT
+sdt
+kLx
+ecR
+frf
+jKG
+eOK
+xjt
bWq
oWC
bWq
@@ -54445,7 +54851,7 @@ aEk
xco
xco
xFu
-ind
+qjY
xPp
sfI
dTx
@@ -54459,9 +54865,9 @@ fyx
jxw
bYv
dep
-eFZ
-gDE
-yfc
+lQr
+nKp
+jOn
ryQ
qmn
vnm
@@ -54475,15 +54881,15 @@ mjL
hRp
umt
oXc
-qUB
-qUB
-bWq
-teZ
-szQ
-odF
-bWq
-bWq
-bWq
+gEP
+jHi
+jHi
+cjM
+cjM
+cjM
+ayW
+wKT
+xjt
djg
riA
fZA
@@ -54635,11 +55041,11 @@ tll
kXL
hPc
lTi
-szQ
-szQ
-szQ
+bVi
+bVi
+bVi
gne
-ind
+qjY
xPp
dTx
lOg
@@ -54653,9 +55059,9 @@ fyx
xdO
kre
dep
-lQr
-nKp
-jOn
+iiw
+vcn
+bGX
ryQ
rNs
vnm
@@ -54669,15 +55075,15 @@ wWl
lSx
sjU
mWB
-uLD
-qUB
-xjt
-xjt
-xjt
-xjt
-xjt
-xjt
-xjt
+mVF
+rcS
+xYb
+cjM
+cjM
+cjM
+cjM
+pBw
+dMT
jNi
lQY
fPA
@@ -54833,7 +55239,7 @@ ayG
cwt
cwt
fse
-ind
+qjY
xPp
sfI
dTx
@@ -54847,9 +55253,9 @@ fyx
tut
fNI
dep
-iiw
-vcn
-bGX
+jbk
+jbk
+jbk
ryQ
fPN
vnm
@@ -54862,16 +55268,16 @@ iKd
oTn
von
qNS
-mWB
-szQ
-qUB
-xjt
-pnl
-fhH
-cxh
-jQM
-biL
-xjt
+eke
+auL
+wZc
+cjM
+ocm
+gnQ
+cjM
+nkM
+ogI
+dMT
obA
qTk
sDd
@@ -55024,10 +55430,10 @@ fxj
uAn
lTi
gne
-szQ
-szQ
-szQ
-ind
+bVi
+bVi
+bVi
+qjY
xPp
dTx
lOg
@@ -55041,9 +55447,9 @@ fyx
tut
lvP
dep
-eCy
-eCy
-eCy
+jbk
+rEC
+rEC
ryQ
ies
axV
@@ -55056,16 +55462,16 @@ iKd
wWl
von
lUK
-mWB
-kvg
-hRV
-xjt
-llM
-shx
-mLK
-qSU
-soJ
-tmt
+eke
+uLD
+bDn
+mjR
+cjM
+cjM
+cjM
+cjM
+grp
+dMT
kVi
lYJ
bew
@@ -55218,10 +55624,10 @@ gQB
uAn
qjY
gne
-szQ
+bVi
yjX
-szQ
-ind
+bVi
+qjY
xPp
dTx
dTx
@@ -55251,15 +55657,15 @@ mfE
mZa
qBn
mWB
-icx
-qvp
-xjt
+xys
+tWm
+mLV
bmY
cMm
-dbc
-ncH
-eZe
-dRG
+nrr
+odA
+nMx
+aLU
gxK
wja
wPF
@@ -55415,7 +55821,7 @@ msH
uAn
uAn
yga
-xPp
+yga
xPp
dep
dep
@@ -55430,8 +55836,8 @@ lNS
dep
dep
jbk
-rEC
-rEC
+uxa
+imP
ryQ
ryQ
ryQ
@@ -55445,15 +55851,15 @@ rVb
rNb
eke
mWB
-btj
-oSh
+xjt
+hRV
xjt
xjt
-xOW
-rTT
-xOW
xjt
-tmt
+sOJ
+eJW
+xjt
+dMT
uwD
hCS
vkb
@@ -55626,7 +56032,7 @@ ezU
fAu
dyd
mAG
-llR
+rav
fUV
hSr
elc
@@ -55640,11 +56046,11 @@ soA
ojJ
rMY
xXR
-hBp
+cin
rnL
-fbe
+uVt
ckC
-seB
+hBp
fiF
qUk
sLC
@@ -55833,10 +56239,10 @@ lhR
kvL
weU
bVr
-nxD
+gMv
reL
dPC
-toi
+ewu
hSd
fSE
axb
@@ -56027,16 +56433,16 @@ nJT
scJ
hpE
kzS
+bnf
+tkZ
+vCw
+grI
+nDY
nQn
-wft
-rcB
-nQn
-wft
-hkV
-nQn
+nJI
iUP
-ygT
sEs
+xaJ
bSS
rtZ
vnU
@@ -56220,17 +56626,17 @@ ukp
uSV
uUo
hUf
-kvg
-foy
-kvg
-kvg
-hbY
-kvg
-kvg
-ebx
-kvg
-kvg
-lIf
+rWX
+rWX
+rWX
+jMp
+rWX
+rWX
+rTT
+rWX
+rWX
+rWX
+gbY
hhN
fWX
vnU
@@ -56413,18 +56819,18 @@ oPH
vKj
tiu
bhS
-nuH
-nMi
-xsX
-vtq
-nMi
-xsX
-vtq
+tyF
+keC
+vNc
+wCk
+bHa
nMi
-xsX
+wNG
+lBj
vtq
-ijr
-tZX
+okK
+rWX
+gbY
hLM
tDr
vnU
@@ -56607,20 +57013,20 @@ wsa
vKj
tiu
bhS
-nuH
-nMi
-dBB
-yeT
-nMi
-dBB
-yeT
-nMi
-dBB
+kxd
+ceg
+llM
+llM
+llM
+llM
yeT
-ijr
-eRf
-qUz
-mYE
+cPE
+qSU
+soJ
+rWX
+gbY
+hLM
+uEK
kiM
yaF
vnU
@@ -56802,19 +57208,19 @@ ukp
tiu
bhS
gjq
-kvg
-lNl
+keC
+pvp
oji
-kvg
-lNl
+tJz
+rDz
+qUR
oji
-kvg
-lNl
oji
-kvg
-jbk
-uDc
-jbk
+nkq
+rWX
+gbY
+gMG
+mYE
vnU
cdE
vnU
@@ -56996,20 +57402,20 @@ vKj
tiu
bhS
rrl
-kvg
-kvg
-kvg
-kvg
-kvg
-kvg
-kvg
-kvg
-kvg
-kvg
+rWX
+rWX
+rWX
+uoj
+ooG
+rWX
+rWX
+rWX
+rWX
+rWX
ksX
-cbn
-jbk
-jZN
+qUz
+qiX
+vnU
cdE
vnU
gtD
@@ -57199,11 +57605,11 @@ uaX
jVH
iHi
pch
-uaX
-iwt
-mix
+gBj
jbk
-xgN
+uDc
+jbk
+vnU
cdE
vnU
plZ
@@ -57393,9 +57799,9 @@ gvr
qpE
cIY
pjS
-jrD
-pwT
-dyg
+uaX
+mOm
+auX
jbk
jNL
sym
@@ -57587,9 +57993,9 @@ uaX
pcO
uMY
rUw
-uaX
-nsP
-mrE
+jrD
+pwT
+dyg
jbk
gmT
dVi
@@ -57782,8 +58188,8 @@ jnl
jIN
scA
uaX
-tiu
-hiE
+nsP
+mrE
jbk
gap
nDj
@@ -57976,7 +58382,7 @@ mqC
kGz
esQ
gBj
-tiu
+xcj
cXI
jbk
gmT
@@ -58920,7 +59326,7 @@ nfd
wFc
iLp
qGR
-pmi
+lMt
nLl
wiw
hLf
@@ -60864,7 +61270,7 @@ pBj
pBj
kcn
qdL
-wOG
+vBG
nNc
kcn
vBG
diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm
index dc76fa06fd55..b84524a8c394 100644
--- a/maps/rift/levels/rift-06-surface3.dmm
+++ b/maps/rift/levels/rift-06-surface3.dmm
@@ -881,8 +881,8 @@
pixel_y = 1
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
- id_tag = "expshuttle_dock";
frequency = 1380;
+ id_tag = "expshuttle_dock";
pixel_y = 29
},
/turf/simulated/floor/tiled/steel_grid,
@@ -2831,8 +2831,7 @@
icon_state = "0-4"
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/general)
@@ -3364,8 +3363,8 @@
/area/crew_quarters/locker/laundry_arrival)
"akc" = (
/obj/machinery/power/smes/buildable/power_shuttle{
- name = "Courser Charging Port";
- RCon_tag = "Courser Charging Port"
+ RCon_tag = "Courser Charging Port";
+ name = "Courser Charging Port"
},
/obj/structure/catwalk,
/obj/structure/cable/pink{
@@ -4553,14 +4552,13 @@
/obj/structure/railing{
dir = 4
},
-/obj/machinery/light{
- dir = 8;
- light_range = 12
- },
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{
frequency = 1379;
scrub_id = "shop_south_scrubber"
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/rift/trade_shop/landing_pad)
"anv" = (
@@ -4586,16 +4584,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/machinery/light{
- dir = 8;
- light_range = 12
- },
/obj/item/storage/toolbox/mechanical,
/obj/item/tank/phoron,
/obj/machinery/air_alarm{
dir = 4;
pixel_x = -24
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/cockpit)
"anx" = (
@@ -6625,9 +6622,6 @@
/obj/machinery/computer/shuttle_control/explore/civvie,
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/cockpit)
-"asQ" = (
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"asR" = (
/obj/machinery/porta_turret/ai_defense,
/obj/machinery/camera/network/command,
@@ -7849,10 +7843,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/ai)
-"awb" = (
-/obj/random/trash_pile,
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"awd" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -8908,9 +8898,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/hop)
-"ayK" = (
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"ayL" = (
/obj/effect/floor_decal/techfloor,
/obj/structure/cable/green{
@@ -10016,10 +10003,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
-"aCk" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/kitchen)
"aCl" = (
/obj/structure/bed/double/padded,
/obj/item/bedsheet/captaindouble,
@@ -10727,9 +10710,6 @@
},
/turf/simulated/floor/carpet/purcarpet,
/area/exploration/meeting)
-"aEx" = (
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"aEy" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 8
@@ -11578,9 +11558,6 @@
/obj/machinery/telecomms/relay/preset/telecomms,
/turf/simulated/floor/tiled/techfloor/grid/lythios43c,
/area/shuttle/civvie/cockpit)
-"aGO" = (
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/rift/surfacebase/outside/outside3)
"aGP" = (
/obj/structure/shuttle/engine/heater,
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -11939,8 +11916,7 @@
/obj/machinery/honey_extractor,
/obj/structure/flora/ausbushes/leafybush,
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/grass,
/area/hydroponics)
@@ -12167,8 +12143,8 @@
"aIr" = (
/obj/machinery/power/smes/buildable{
RCon_tag = "Substation - Exploration and Research Shuttles";
- output_attempt = 0;
- inputting = 1
+ inputting = 1;
+ output_attempt = 0
},
/obj/structure/cable/green{
icon_state = "0-2"
@@ -12425,8 +12401,7 @@
pixel_x = -32
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/cockpit)
@@ -12981,9 +12956,6 @@
/obj/machinery/vending/cigarette,
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
-"aKt" = (
-/turf/simulated/floor/plating,
-/area/maintenance/station/exploration)
"aKu" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/simulated/floor/tiled/freezer/cold,
@@ -13032,13 +13004,6 @@
/obj/effect/floor_decal/industrial/outline,
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
-"aKC" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/kitchen)
"aKD" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -13278,9 +13243,6 @@
/obj/item/radio/beacon/anchored,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/cockpit)
-"aLl" = (
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"aLm" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -13423,10 +13385,6 @@
/obj/effect/floor_decal/industrial/outline,
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
-"aLO" = (
-/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind,
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"aLQ" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13743,8 +13701,7 @@
dir = 4
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
@@ -14583,8 +14540,7 @@
pixel_x = -24
},
/obj/machinery/light{
- dir = 8;
- light_range = 12
+ dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/general)
@@ -16146,10 +16102,6 @@
/obj/structure/table/reinforced,
/turf/simulated/floor/tiled/dark,
/area/bridge)
-"aTs" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/kitchen)
"aTt" = (
/obj/structure/railing,
/obj/machinery/light/flamp,
@@ -16168,10 +16120,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/exploration)
-"aTv" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/bar/lower)
"aTw" = (
/obj/machinery/disperser/front{
dir = 4
@@ -19753,13 +19701,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/rift/turbolift/maint)
-"eAl" = (
-/obj/structure/catwalk,
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/turf/simulated/floor/plating,
-/area/maintenance/bar/lower)
"eDm" = (
/turf/simulated/wall/r_wall/prepainted,
/area/crew_quarters/locker/laundry_arrival)
@@ -20094,9 +20035,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/secondary/docking_hallway)
-"ffg" = (
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"fgP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -20411,7 +20349,6 @@
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
"fTJ" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
@@ -20488,9 +20425,9 @@
dir = 4
},
/obj/machinery/button/remote/blast_door{
+ dir = 4;
id = "pilot_prep";
name = "Window Shutter Controll";
- dir = 4;
pixel_x = -25
},
/obj/effect/floor_decal/spline/fancy{
@@ -20639,12 +20576,6 @@
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/bar)
-"gvt" = (
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint_stripe/violet,
-/obj/effect/paint_stripe/violet,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cockpit)
"gzQ" = (
/obj/machinery/light{
dir = 8
@@ -21060,10 +20991,10 @@
dir = 4
},
/obj/machinery/button/remote/blast_door{
+ dir = 4;
id = "Pilot_office_Shutter";
name = "Window Shutter Controll";
- pixel_x = -24;
- dir = 4
+ pixel_x = -24
},
/obj/effect/floor_decal/spline/fancy{
dir = 8
@@ -21742,21 +21673,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
-"jrU" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/spawner/window/low_wall/reinforced/full/firelocks,
-/obj/effect/paint/commandblue,
-/turf/simulated/floor/plating,
-/area/bridge)
"jsa" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -22194,20 +22110,6 @@
/obj/effect/paint/palebottlegreen,
/turf/simulated/floor/plating,
/area/hydroponics)
-"kdh" = (
-/obj/machinery/door/firedoor/glass,
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/machinery/door/blast/shutters{
- density = 0;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/effect/paint/commandblue,
-/turf/simulated/floor/plating,
-/area/bridge)
"kih" = (
/obj/machinery/door/firedoor/glass{
dir = 8
@@ -23257,10 +23159,6 @@
"mOy" = (
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
-"mPf" = (
-/obj/item/trash/cheesie,
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"mPB" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -23981,7 +23879,6 @@
/turf/simulated/floor/tiled/steel,
/area/exploration/excursion_dock)
"oJN" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/commandblue,
/turf/simulated/floor/plating,
@@ -24093,10 +23990,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
-"oXj" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"oXU" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -24260,8 +24153,6 @@
/turf/simulated/floor/tiled/monotile,
/area/exploration/pilot_prep)
"pul" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
@@ -24278,21 +24169,6 @@
},
/turf/simulated/floor/plating,
/area/bridge/bunker)
-"pwb" = (
-/obj/machinery/door/firedoor/glass,
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 4;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/effect/paint/commandblue,
-/turf/simulated/floor/plating,
-/area/bridge)
"pxd" = (
/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/obj/effect/paint/purplegray,
@@ -24480,10 +24356,6 @@
/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/shuttle/civvie/general)
-"qaO" = (
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/bar/lower)
"qcL" = (
/obj/landmark/spawnpoint/job/pilot,
/obj/item/stool/padded,
@@ -24574,10 +24446,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
-"qlA" = (
-/obj/item/trash/cheesie,
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"qmp" = (
/turf/simulated/wall/prepainted/civilian,
/area/crew_quarters/freezer)
@@ -24786,7 +24654,7 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"qKp" = (
-/obj/machinery/door/firedoor/glass,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
dir = 4;
@@ -24796,7 +24664,6 @@
name = "Bridge Lockdown Shutters";
opacity = 0
},
-/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/commandblue,
/turf/simulated/floor/plating,
/area/bridge)
@@ -25360,13 +25227,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
-"szx" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/kitchen)
"sEW" = (
/obj/machinery/light/spot{
dir = 4;
@@ -26019,11 +25879,9 @@
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
"uyj" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
- dir = 2;
icon_state = "shutter0";
id = "bridge";
layer = 3.1;
@@ -26031,7 +25889,7 @@
opacity = 0
},
/obj/effect/paint/commandblue,
-/turf/simulated/wall/r_wall/prepainted/command,
+/turf/simulated/floor/plating,
/area/bridge)
"uAA" = (
/obj/structure/closet/firecloset/full,
@@ -26179,9 +26037,9 @@
/area/shuttle/excursion/general)
"uTt" = (
/obj/machinery/door/airlock/exploration{
+ locked = 1;
name = "Exploration Airlock";
- req_one_access = list(19,43,67);
- locked = 1
+ req_one_access = list(19,43,67)
},
/turf/simulated/floor/tiled/steel_grid,
/area/exploration/excursion_dock)
@@ -26889,8 +26747,6 @@
/turf/simulated/wall/r_wall/prepainted/command,
/area/bridge/office)
"wlz" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/machinery/door/blast/shutters{
density = 0;
@@ -26914,7 +26770,6 @@
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/hop)
"wns" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/commandblue,
/turf/simulated/floor/plating,
@@ -27064,6 +26919,12 @@
/obj/effect/paint_stripe/violet,
/turf/simulated/wall/rshull,
/area/shuttle/excursion/general)
+"wGH" = (
+/obj/structure/ladder{
+ pixel_y = 10
+ },
+/turf/simulated/floor/plating,
+/area/security/prison)
"wIv" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -27117,7 +26978,6 @@
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
"wTS" = (
-/obj/machinery/door/firedoor/glass,
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/commandblue,
/turf/simulated/floor/plating,
@@ -38841,7 +38701,7 @@ aZm
aHQ
azG
rba
-aCk
+axO
axB
alX
aLZ
@@ -39035,7 +38895,7 @@ naw
aHQ
aNg
aUj
-aCk
+axO
aYN
aiu
aFu
@@ -39229,11 +39089,11 @@ aZf
aHQ
aNg
abH
-aCk
-aKC
+axO
+axB
adj
aLZ
-aCk
+axO
qSL
aJu
aJu
@@ -39617,7 +39477,7 @@ wec
aNU
aMs
aUj
-aCk
+axO
amJ
aWd
ghf
@@ -39812,7 +39672,7 @@ exk
exk
exk
ake
-aCk
+axO
arL
eGU
aAZ
@@ -40006,9 +39866,9 @@ qnV
age
exk
aBM
-aCk
+axO
aYm
-szx
+eGU
axZ
qSL
aKu
@@ -40200,7 +40060,7 @@ auW
ajf
exk
azR
-aTs
+axO
aTa
eGU
aoP
@@ -40394,13 +40254,13 @@ nKj
rMY
exk
aFF
-aCk
+axO
lXN
bSo
aYs
mCR
-eAl
-aTv
+aiR
+aGy
arr
cnu
arp
@@ -40594,7 +40454,7 @@ auq
cIq
cIq
sny
-aTv
+aGy
atT
aks
avH
@@ -40788,7 +40648,7 @@ apc
aJB
cIq
aAn
-aTv
+aGy
aUi
cnu
akT
@@ -40981,8 +40841,8 @@ apx
aJQ
fpt
cIq
-aTv
-aTv
+aGy
+aGy
aUi
cnu
alc
@@ -41369,8 +41229,8 @@ aoF
aEK
akC
arW
-aTv
-aTv
+aGy
+aGy
wce
aMM
acH
@@ -41564,7 +41424,7 @@ aEK
ahC
cIq
aWb
-qaO
+aGy
cnu
cnu
cnu
@@ -41758,7 +41618,7 @@ aEK
agn
cIq
aBz
-aTv
+aGy
cnu
amc
cnu
@@ -41952,7 +41812,7 @@ aEK
aBE
cIq
aJg
-aTv
+aGy
cnu
aYE
auU
@@ -42146,7 +42006,7 @@ aEK
aqD
cIq
aCU
-aTv
+aGy
afU
aUi
aUi
@@ -42340,7 +42200,7 @@ aEK
acJ
cIq
aUi
-aTv
+aGy
cnu
aad
aUi
@@ -42357,7 +42217,7 @@ aTm
ocs
oGm
oGm
-gvt
+ocs
oGm
oGm
afV
@@ -42534,7 +42394,7 @@ arz
akg
cIq
fIY
-aTv
+aGy
cnu
cnu
afh
@@ -42728,7 +42588,7 @@ alN
aVf
cIq
aUi
-aTv
+aGy
cnu
aVh
aUi
@@ -42922,7 +42782,7 @@ aUp
aJx
cIq
arS
-aTv
+aGy
cnu
aIt
aZQ
@@ -43310,7 +43170,7 @@ iRO
qnC
cnu
arS
-aTv
+aGy
aih
nFC
aIr
@@ -44078,7 +43938,7 @@ cnu
vOW
iRO
aUi
-aTv
+aGy
aUi
gtg
cnu
@@ -44088,8 +43948,8 @@ fRT
njG
wUC
aGm
-aTv
-aTv
+aGy
+aGy
tAt
aiR
axz
@@ -44272,7 +44132,7 @@ cnu
vOW
abF
bqH
-aTv
+aGy
aUi
arS
cnu
@@ -46593,7 +46453,7 @@ tAo
tAo
hMC
tSU
-jrU
+cQV
fFo
hMC
tAo
@@ -46772,7 +46632,7 @@ akk
atK
aoa
avu
-aEx
+aaA
avu
aoa
aTi
@@ -46964,7 +46824,7 @@ aqW
lSR
kIZ
bID
-oXj
+aEo
aEo
aEo
aEo
@@ -46977,7 +46837,7 @@ arR
acP
adk
aGI
-kdh
+uyj
aee
aFS
aeE
@@ -47753,7 +47613,7 @@ wOC
wOC
ajx
aIF
-kdh
+uyj
amZ
aYB
aHH
@@ -47867,7 +47727,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -48061,7 +47921,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -48172,7 +48032,7 @@ aro
avn
mrz
aif
-aKt
+ayE
pxw
agh
gpa
@@ -48255,7 +48115,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -48366,7 +48226,7 @@ aWQ
mrz
mrz
aif
-aKt
+ayE
pxw
agh
gpa
@@ -48447,9 +48307,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -48532,7 +48392,7 @@ aIF
qKs
qKs
tAo
-pwb
+qKp
qKp
qKp
tAo
@@ -48558,7 +48418,7 @@ mrz
mrz
mrz
fhj
-aKt
+ayE
aif
cQT
pxw
@@ -48641,7 +48501,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -48678,7 +48538,7 @@ acH
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -48743,10 +48603,10 @@ ieJ
ieJ
ieJ
ieJ
-aKt
+ayE
mPB
pxw
-aKt
+ayE
aif
aif
asV
@@ -48754,7 +48614,7 @@ aif
aif
aif
aif
-aKt
+ayE
pxw
agh
gpa
@@ -48836,9 +48696,9 @@ afq
afq
afq
abL
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -48886,12 +48746,12 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -48936,15 +48796,15 @@ aEj
aEj
aEj
aEj
-aKt
-aKt
+ayE
+ayE
mPB
aMP
aif
aif
ayE
-aKt
-aKt
+ayE
+ayE
pxw
ify
pxw
@@ -49032,7 +48892,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -49056,7 +48916,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -49066,7 +48926,7 @@ acH
afq
afq
acH
-aGO
+ajp
afq
afq
afq
@@ -49080,12 +48940,12 @@ afq
afq
afq
apL
-aGO
+ajp
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -49130,19 +48990,19 @@ aLT
aYP
adf
aEj
-aKt
+ayE
aif
ajV
pxw
pxw
aif
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
agh
gpa
@@ -49225,8 +49085,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -49249,8 +49109,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -49259,8 +49119,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -49274,16 +49134,16 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
aqG
aqG
@@ -49324,18 +49184,18 @@ aBB
aBB
avX
aEj
-aKt
+ayE
aif
aUH
asC
pxw
aif
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
-aKt
-aKt
+ayE
+ayE
cQT
pxw
agh
@@ -49417,9 +49277,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -49441,12 +49301,12 @@ aDR
jBo
agB
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -49454,28 +49314,28 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
aqG
afq
afq
@@ -49518,18 +49378,18 @@ ahy
aPW
acx
aEj
-aKt
+ayE
aif
aUH
ajz
pxw
aif
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
rXm
-aKt
+ayE
rXm
pxw
agh
@@ -49611,7 +49471,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -49635,41 +49495,41 @@ aQP
akj
agB
agB
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -49682,7 +49542,7 @@ bWN
bWN
jHN
aaA
-aEx
+aaA
aEo
hgO
aiO
@@ -49712,7 +49572,7 @@ ahr
aNO
ahc
aEj
-aKt
+ayE
aif
ajX
aKr
@@ -49720,7 +49580,7 @@ pxw
aif
awK
jmj
-aKt
+ayE
pxw
pxw
pxw
@@ -49829,13 +49689,13 @@ aQP
akj
agB
agB
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -49843,23 +49703,23 @@ afq
afq
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -49906,7 +49766,7 @@ aEj
aVz
aVz
aEj
-aKt
+ayE
aif
pxw
pxw
@@ -49916,9 +49776,9 @@ pxw
pxw
pxw
pxw
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
agh
gpa
@@ -49998,8 +49858,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -50022,37 +49882,37 @@ jBo
jBo
jBo
agB
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -50069,7 +49929,7 @@ afq
asf
aEY
aaA
-aEx
+aaA
aKT
dsO
hgO
@@ -50106,13 +49966,13 @@ aQM
aRb
aZG
aif
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
jSm
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
agh
gpa
@@ -50191,8 +50051,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -50223,33 +50083,33 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
aXH
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -50302,11 +50162,11 @@ aif
aif
aif
aif
-aKt
+ayE
pxw
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
agh
gpa
@@ -50385,7 +50245,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -50417,34 +50277,34 @@ afq
afq
afq
afq
-aGO
+ajp
afq
-aGO
+ajp
aXH
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -50485,22 +50345,22 @@ aHt
aBA
hQo
ayq
-aKt
-aKt
+ayE
+ayE
aMP
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
ayE
jmj
loG
sMy
aif
-aKt
+ayE
pxw
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
agh
gpa
@@ -50579,7 +50439,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -50588,8 +50448,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -50614,28 +50474,28 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
apL
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -50645,7 +50505,7 @@ afq
afq
afq
aqG
-aGO
+ajp
afq
afq
afq
@@ -50772,21 +50632,21 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -50808,8 +50668,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -50817,8 +50677,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -50826,9 +50686,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -50838,14 +50698,14 @@ afq
afq
afq
afq
-aGO
+ajp
aqG
afq
afq
+afq
+afq
bWN
-bWN
-bWN
-aaA
+avu
aaA
aAN
aaA
@@ -50876,8 +50736,8 @@ owP
owP
agh
pxw
-aKt
-aKt
+ayE
+ayE
pxw
afq
afq
@@ -50965,114 +50825,114 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-afq
-afq
-afq
-afq
-afq
-aGO
-afq
-afq
-afq
-afq
-afq
-afq
-aGO
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-aGO
-aGO
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-aGO
-aGO
-afq
-afq
-afq
-apL
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-aGO
-afq
+ajp
+ajp
+ajp
afq
-bWN
-aaA
-acp
-aEx
-uPI
-aAN
-aaA
-avu
-dDI
-eIs
-xgH
-lcP
-fGK
-gGW
-axv
-aWx
-ama
-aub
-azb
-aNy
-aGf
-awt
-aav
-aak
-nlb
-owP
-owP
-xHc
-aQS
-aFG
-owP
-owP
-agh
-pxw
-aKt
-aKt
-pxw
+afq
+afq
+afq
+afq
+ajp
+afq
+afq
+afq
+afq
+afq
+afq
+ajp
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+ajp
+ajp
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+ajp
+ajp
+afq
+afq
+afq
+apL
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+ajp
+afq
+afq
+bWN
+bWN
+bWN
+aaA
+wGH
+aAN
+aaA
+avu
+dDI
+eIs
+xgH
+lcP
+fGK
+gGW
+axv
+aWx
+ama
+aub
+azb
+aNy
+aGf
+awt
+aav
+aak
+nlb
+owP
+owP
+xHc
+aQS
+aFG
+owP
+owP
+agh
+pxw
+ayE
+ayE
+pxw
afq
afq
afq
@@ -51159,23 +51019,23 @@ afq
afq
afq
afq
-aGO
+ajp
aXd
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -51194,33 +51054,33 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -51231,8 +51091,8 @@ afq
afq
bWN
bWN
-ayK
-bWN
+aaA
+acp
aaA
aaA
aAN
@@ -51264,8 +51124,8 @@ aCK
owP
agh
pxw
-aKt
-aKt
+ayE
+ayE
pxw
afq
afq
@@ -51353,13 +51213,13 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -51368,7 +51228,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -51387,35 +51247,35 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -51459,7 +51319,7 @@ owP
agh
pxw
uHs
-aKt
+ayE
pxw
afq
afq
@@ -51547,11 +51407,11 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
aXh
-aGO
+ajp
afq
afq
afq
@@ -51562,9 +51422,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -51582,35 +51442,35 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
apL
-aGO
-aGO
+ajp
+ajp
afq
-aGO
+ajp
aXH
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -51619,7 +51479,7 @@ afq
afq
bWN
auP
-aLl
+aaA
bWN
bWN
aaA
@@ -51652,8 +51512,8 @@ aLN
owP
agh
pxw
-aKt
-aKt
+ayE
+ayE
pxw
afq
afq
@@ -51742,10 +51602,10 @@ afq
afq
afq
asH
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -51757,8 +51617,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -51776,8 +51636,8 @@ afq
afq
afq
apL
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -51785,36 +51645,36 @@ afq
afq
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
bWN
-awb
-aLO
-ayK
+avu
+awA
+aaA
acp
aaA
aAN
@@ -51846,8 +51706,8 @@ aFD
owP
agh
pxw
-aKt
-aKt
+ayE
+ayE
pxw
afq
afq
@@ -51936,10 +51796,10 @@ afq
afq
afq
abL
-aGO
+ajp
aXd
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -51951,8 +51811,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -51971,43 +51831,43 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
bWN
awA
-ffg
+aaA
lKG
bWN
aaA
@@ -52040,7 +51900,7 @@ owP
owP
agh
pxw
-aKt
+ayE
cQT
pxw
afq
@@ -52131,8 +51991,8 @@ afq
afq
afq
abL
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -52144,8 +52004,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -52165,27 +52025,27 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -52193,12 +52053,12 @@ apL
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
bWN
dxW
axU
@@ -52210,7 +52070,7 @@ aaA
bWN
alg
aaA
-ayK
+aaA
bWN
aXk
ryP
@@ -52234,8 +52094,8 @@ owP
agh
agh
pxw
-aKt
-aKt
+ayE
+ayE
pxw
afq
afq
@@ -52326,7 +52186,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -52339,8 +52199,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -52363,47 +52223,47 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
bWN
cxI
iPo
-mPf
+axU
bWN
pNP
aAN
aaA
bWN
alg
-asQ
+aaA
aaA
bWN
aXk
@@ -52428,8 +52288,8 @@ agh
agh
pxw
pxw
-aKt
-aKt
+ayE
+ayE
pxw
afq
afq
@@ -52520,7 +52380,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -52534,7 +52394,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -52559,37 +52419,37 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
bWN
mbP
-qlA
+axU
fPD
bWN
aaA
@@ -52622,8 +52482,8 @@ pxw
pxw
pxw
ajW
-aKt
-aKt
+ayE
+ayE
pxw
afq
afq
@@ -52714,7 +52574,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -52727,8 +52587,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -52753,30 +52613,30 @@ afq
afq
afq
apL
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
+ajp
bWN
bWN
bWN
@@ -52790,7 +52650,7 @@ aaA
aAN
aaA
bWN
-aEx
+aaA
aaA
uPI
bWN
@@ -52811,13 +52671,13 @@ pxw
pxw
pxw
pxw
-aKt
-aKt
-aKt
-aKt
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
+ayE
+ayE
+ayE
+ayE
pxw
afq
afq
@@ -52908,7 +52768,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -52921,8 +52781,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -52953,8 +52813,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -52962,13 +52822,13 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
bWN
@@ -53002,16 +52862,16 @@ ryP
agh
pxw
aAL
-aKt
+ayE
arU
wMt
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
jmj
-aKt
-aKt
-aKt
+ayE
+ayE
+ayE
pxw
afq
afq
@@ -53101,8 +52961,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -53116,7 +52976,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -53148,22 +53008,22 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
aXH
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
bWN
tFR
@@ -53294,8 +53154,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -53310,8 +53170,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -53328,7 +53188,7 @@ afq
afq
afq
asH
-aGO
+ajp
asH
anO
afq
@@ -53338,27 +53198,27 @@ afq
afq
afq
asH
-aGO
+ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
bWN
aaA
aaA
@@ -53487,26 +53347,26 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -53531,28 +53391,28 @@ afq
afq
afq
aXd
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
bWN
avS
aaA
@@ -53584,7 +53444,7 @@ eod
eod
eod
agh
-aKt
+ayE
agh
cYF
afq
@@ -53680,34 +53540,34 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -53716,37 +53576,37 @@ afq
afq
aWs
avc
-aGO
+ajp
asH
-aGO
-aGO
+ajp
+ajp
auw
afq
afq
afq
aWs
-aGO
+ajp
aXh
-aGO
+ajp
ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
bWN
aaA
aaA
@@ -53874,14 +53734,14 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -53889,9 +53749,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -53901,7 +53761,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -53911,36 +53771,36 @@ afq
asH
aya
axA
-aGO
+ajp
axR
asH
-aGO
+ajp
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
aXd
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
+ajp
bWN
bWN
bWN
@@ -53972,7 +53832,7 @@ aTG
eod
eod
eod
-aKt
+ayE
agh
cYF
afq
@@ -54068,15 +53928,15 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -54095,29 +53955,29 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
ayd
-aGO
-aGO
+ajp
+ajp
auw
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -54125,12 +53985,12 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -54262,15 +54122,15 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -54291,8 +54151,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -54300,17 +54160,17 @@ afq
axR
anO
auw
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
aXh
-aGO
+ajp
aXd
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -54320,10 +54180,10 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -54455,108 +54315,108 @@ afq
afq
afq
afq
-aGO
+ajp
aXh
-aGO
-asH
-afq
-afq
-afq
-afq
-afq
-aGO
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-aGO
-afq
-afq
-afq
-afq
-afq
-aGO
-aAs
+ajp
asH
-aWs
-afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-afq
-aGO
-aGO
-afq
-afq
-afq
-afq
-afq
afq
afq
afq
-bWN
-aBL
-bWN
-aVA
-aVA
-hNS
-aja
-aEo
-acG
-aEo
-alx
-hNS
-aBL
-bWN
-iKl
-aCI
-eod
-aCa
-aAi
-aAi
-aSo
-aNN
-neL
-aNN
-aAi
-aAi
-aAi
-aVl
-eod
-eod
-iKl
-cYF
+afq
+afq
+ajp
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+ajp
+afq
+afq
+afq
+afq
+afq
+ajp
+aAs
+asH
+aWs
+afq
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+ajp
+ajp
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+afq
+bWN
+aBL
+bWN
+aVA
+aVA
+hNS
+aja
+aEo
+acG
+aEo
+alx
+hNS
+aBL
+bWN
+iKl
+aCI
+eod
+aCa
+aAi
+aAi
+aSo
+aNN
+neL
+aNN
+aAi
+aAi
+aAi
+aVl
+eod
+eod
+iKl
+cYF
afq
afq
afq
@@ -54649,17 +54509,17 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
auw
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -54670,17 +54530,17 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
asH
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -54692,12 +54552,12 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -54710,10 +54570,10 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -54844,16 +54704,16 @@ afq
afq
afq
aXh
-aGO
-aGO
+ajp
+ajp
axR
-aGO
+ajp
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -54864,7 +54724,7 @@ afq
afq
afq
afq
-aGO
+ajp
aXd
axA
afq
@@ -54872,9 +54732,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -54887,11 +54747,11 @@ afq
afq
afq
afq
-aGO
+ajp
aXd
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -54903,8 +54763,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -55037,17 +54897,17 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
aXd
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -55060,13 +54920,13 @@ afq
afq
asH
axR
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
aAs
afq
@@ -55081,12 +54941,12 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
asH
afq
afq
@@ -55097,13 +54957,13 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
bWN
aBL
@@ -55232,14 +55092,14 @@ afq
afq
afq
abL
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -55254,32 +55114,32 @@ afq
afq
afq
aXh
-aGO
+ajp
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
aXh
afq
afq
@@ -55291,12 +55151,12 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
agB
afq
bWN
@@ -55426,14 +55286,14 @@ afq
afq
afq
afq
-aGO
+ajp
asH
-aGO
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -55457,23 +55317,23 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
aya
-aGO
+ajp
afq
-aGO
+ajp
aXd
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
aXd
-aGO
+ajp
afq
afq
afq
@@ -55485,13 +55345,13 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
agB
-aGO
+ajp
agB
acr
aBL
@@ -55622,16 +55482,16 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -55657,17 +55517,17 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
aXh
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -55679,9 +55539,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -55818,15 +55678,15 @@ afq
afq
afq
abL
-aGO
+ajp
aAs
afq
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -55851,17 +55711,17 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
aXd
-aGO
-aGO
+ajp
+ajp
aXd
aXd
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -55874,8 +55734,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -56013,15 +55873,15 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -56047,17 +55907,17 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
asH
afq
@@ -56068,9 +55928,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -56207,16 +56067,16 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -56226,8 +56086,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -56241,20 +56101,20 @@ afq
afq
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
-aGO
+ajp
asH
axR
-aGO
+ajp
afq
afq
afq
@@ -56263,8 +56123,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -56401,27 +56261,27 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
asH
afq
afq
@@ -56431,24 +56291,24 @@ afq
afq
afq
ajp
-aGO
-aGO
+ajp
+ajp
afq
-aGO
+ajp
axR
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
aXd
-aGO
+ajp
afq
afq
axA
auw
-aGO
-aGO
+ajp
+ajp
auw
afq
afq
@@ -56457,8 +56317,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -56594,30 +56454,30 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
aXh
-aGO
+ajp
axA
-aGO
+ajp
afq
afq
afq
@@ -56626,25 +56486,25 @@ afq
afq
auw
aAs
-aGO
+ajp
auw
-aGO
+ajp
afq
afq
ajp
afq
afq
-aGO
+ajp
afq
afq
afq
asH
axR
-aGO
+ajp
afq
afq
asH
-aGO
+ajp
anO
afq
afq
@@ -56652,7 +56512,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -56788,18 +56648,18 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
asH
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -56807,39 +56667,39 @@ afq
afq
afq
asH
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
aXd
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
-aGO
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
axR
-aGO
+ajp
auw
asH
afq
@@ -56982,18 +56842,18 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
auw
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -57001,11 +56861,11 @@ afq
afq
afq
abL
-aGO
+ajp
auw
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -57014,15 +56874,15 @@ afq
aWs
axA
auw
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
+ajp
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -57176,7 +57036,7 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -57184,7 +57044,7 @@ afq
afq
axR
aXd
-aGO
+ajp
afq
afq
auw
@@ -57196,18 +57056,18 @@ afq
afq
afq
aXd
-aGO
-aGO
+ajp
+ajp
asH
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -57370,18 +57230,18 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
abL
-aGO
+ajp
axA
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -57389,11 +57249,11 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
axR
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -57401,7 +57261,7 @@ afq
afq
afq
axR
-aGO
+ajp
afq
afq
afq
@@ -57562,20 +57422,20 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
aXh
-aGO
+ajp
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -57583,9 +57443,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -57594,9 +57454,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -57615,7 +57475,7 @@ afq
afq
afq
asH
-aGO
+ajp
afq
afq
afq
@@ -57756,29 +57616,29 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -57790,9 +57650,9 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -57808,7 +57668,7 @@ afq
afq
afq
aWs
-aGO
+ajp
axR
asH
afq
@@ -57950,28 +57810,28 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -57986,25 +57846,25 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
anO
auw
aXH
-aGO
-afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+afq
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
anO
afq
afq
@@ -58144,14 +58004,14 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -58159,13 +58019,13 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -58184,23 +58044,23 @@ afq
afq
auw
axR
-aGO
-aGO
+ajp
+ajp
auw
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
anO
afq
-aGO
-aGO
+ajp
+ajp
aAs
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -58337,15 +58197,15 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -58353,18 +58213,18 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
afq
afq
@@ -58374,13 +58234,13 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
afq
-aGO
+ajp
aVp
amA
afq
@@ -58391,8 +58251,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
aya
asH
asH
@@ -58531,15 +58391,15 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
asH
-aGO
-aGO
+ajp
+ajp
afq
-aGO
+ajp
afq
afq
afq
@@ -58549,17 +58409,17 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
aAs
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -58567,8 +58427,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -58587,8 +58447,8 @@ afq
afq
auw
aUF
-aGO
-aGO
+ajp
+ajp
auw
afq
afq
@@ -58724,17 +58584,17 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
afq
aXh
-aGO
+ajp
auw
-aGO
+ajp
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -58747,21 +58607,21 @@ afq
afq
afq
abL
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -58779,10 +58639,10 @@ afq
afq
afq
asH
-aGO
+ajp
axR
-aGO
-aGO
+ajp
+ajp
aWs
afq
afq
@@ -58918,17 +58778,17 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
abL
axA
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -58948,13 +58808,13 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -58972,10 +58832,10 @@ afq
asH
anO
axA
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
asH
anO
afq
@@ -59112,17 +58972,17 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
axR
aXd
-aGO
+ajp
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -59143,12 +59003,12 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -59307,16 +59167,16 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
asH
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -59340,8 +59200,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
@@ -59362,7 +59222,7 @@ asH
afq
aMN
aya
-aGO
+ajp
asH
afq
afq
@@ -59501,16 +59361,16 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -59555,7 +59415,7 @@ afq
afq
afq
asH
-aGO
+ajp
aUb
afq
afq
@@ -59696,15 +59556,15 @@ afq
afq
afq
afq
-aGO
+ajp
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
-aGO
+ajp
afq
afq
afq
@@ -59891,14 +59751,14 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
aAs
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -60086,10 +59946,10 @@ afq
afq
afq
afq
-aGO
-aGO
-aGO
-aGO
+ajp
+ajp
+ajp
+ajp
afq
afq
afq
@@ -60281,8 +60141,8 @@ afq
afq
afq
afq
-aGO
-aGO
+ajp
+ajp
afq
afq
afq
diff --git a/maps/rift/levels/rift-08-west_deep.dmm b/maps/rift/levels/rift-08-west_deep.dmm
index 99dc62be70a3..c079562ca053 100644
--- a/maps/rift/levels/rift-08-west_deep.dmm
+++ b/maps/rift/levels/rift-08-west_deep.dmm
@@ -224,9 +224,6 @@
/obj/machinery/door/window/brigdoor/southleft,
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/facility/interior/prison)
-"bZ" = (
-/turf/simulated/floor/tiled/steel/lythios43c,
-/area/rift/facility/interior/underground2)
"ce" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/monotile,
@@ -366,15 +363,6 @@
},
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
-"dG" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/underground2)
"dP" = (
/turf/simulated/shuttle/wall/voidcraft,
/area/turbolift/rwest_mining/deep)
@@ -736,11 +724,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/facility/interior/prison)
-"hP" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/beige/border,
-/turf/simulated/floor/tiled/steel/lythios43c,
-/area/rift/facility/interior/underground2)
"hR" = (
/obj/structure/bed,
/turf/simulated/floor/tiled/dark,
@@ -770,9 +753,6 @@
/obj/item/reagent_containers/food/drinks/metaglass,
/turf/simulated/floor/wood,
/area/outpost/mining_main/outpost/recreation)
-"hW" = (
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/exterior/bunker/bottom)
"hX" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/camera/network/mining{
@@ -812,14 +792,14 @@
/turf/simulated/floor,
/area/outpost/mining_main/outpost/airlock/three)
"ii" = (
-/obj/effect/floor_decal/borderfloor{
+/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/effect/floor_decal/corner/beige/border{
- dir = 4
+/obj/machinery/sheet_silo{
+ obj_persist_static_id = "sheet-silo-plains-mining-refinery"
},
-/turf/simulated/floor/tiled/steel/lythios43c,
-/area/rift/facility/interior/underground2)
+/turf/simulated/floor/tiled,
+/area/outpost/mining_main/refinery)
"il" = (
/turf/simulated/floor/sky/depths/west/lythios43c,
/area/rift/surfacebase/outside/west_deep)
@@ -1595,11 +1575,6 @@
"nN" = (
/turf/simulated/wall,
/area/rift/facility/interior/underground2)
-"nP" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/beige/border,
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/underground2)
"nR" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1743,7 +1718,7 @@
},
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/turf/simulated/floor/tiled/dark,
/area/rift/facility/interior/temple)
@@ -1822,9 +1797,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/belterdock)
-"pH" = (
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/underground2)
"pI" = (
/obj/effect/floor_decal/techfloor/orange{
dir = 1
@@ -2256,18 +2228,6 @@
},
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
-"ud" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/underground2)
"ue" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 9
@@ -2366,9 +2326,6 @@
},
/turf/simulated/shuttle/plating/carry,
/area/shuttle/belter)
-"uO" = (
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/prison)
"uP" = (
/obj/effect/floor_decal/techfloor/orange{
dir = 9
@@ -2735,7 +2692,7 @@
/obj/structure/bed/chair,
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -3026,6 +2983,9 @@
/area/rift/facility/interior/underground2)
"Bm" = (
/obj/effect/floor_decal/industrial/loading,
+/obj/machinery/sheet_silo_loader{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/outpost/mining_main/refinery)
"Bu" = (
@@ -3058,15 +3018,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/facility/interior/underground2)
-"BI" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel_dirty,
-/area/rift/facility/interior/underground2)
"BO" = (
/obj/structure/table/bench/standard,
/turf/simulated/floor/tiled/monotile,
@@ -4220,7 +4171,7 @@
"Mc" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -4316,15 +4267,6 @@
"MM" = (
/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
/area/rift/exterior/bunker/bottom)
-"MN" = (
-/obj/structure/fence{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor/orange{
- dir = 6
- },
-/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors,
-/area/rift/facility/interior/underground2)
"MO" = (
/obj/structure/bed/chair/shuttle{
dir = 4
@@ -4366,10 +4308,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/facility/interior/underground2)
-"Ng" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/lythios43c/indoors,
-/area/rift/surfacebase/outside/west_deep)
"Nl" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 4;
@@ -4592,18 +4530,6 @@
/obj/machinery/power/apc/west_mount,
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/belterdock)
-"Pz" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/prison)
-"PJ" = (
-/turf/simulated/floor/tiled/steel_dirty,
-/area/rift/facility/interior/underground2)
"PL" = (
/obj/machinery/mineral/processing_unit,
/turf/simulated/floor/plating,
@@ -5071,7 +4997,7 @@
"UD" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/turf/simulated/floor/tiled/steel_dirty,
/area/rift/facility/interior/janitorial)
@@ -5328,9 +5254,6 @@
/obj/structure/cable/green,
/turf/simulated/floor/plating,
/area/outpost/mining_main/outpost/substation)
-"WR" = (
-/turf/simulated/floor/lythios43c/indoors,
-/area/rift/surfacebase/outside/west_deep)
"WW" = (
/turf/simulated/mineral/icerock/lythios43c,
/area/rift/surfacebase/outside/west_deep/submap_seedzone)
@@ -5513,9 +5436,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/outpost/mining_main/outpost/airlock/three)
-"YK" = (
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/prison)
"YL" = (
/obj/machinery/floodlight,
/turf/simulated/floor/tiled/dark,
@@ -5562,14 +5482,11 @@
/turf/simulated/floor/tiled/dark,
/area/gateway/prep_room)
"Zl" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 4
+/obj/machinery/sheet_silo_loader{
+ dir = 1
},
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/underground2)
+/turf/simulated/mineral/ignore_cavegen/lythios43c,
+/area/rift/surfacebase/outside/west_deep)
"Zn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -8224,7 +8141,7 @@ Cu
nY
fQ
oh
-YK
+ys
yB
oh
XQ
@@ -8415,10 +8332,10 @@ oh
yG
ys
kE
-YK
+ys
dW
GO
-YK
+ys
yB
gx
ky
@@ -8798,7 +8715,7 @@ fx
Bg
je
yM
-hP
+Ex
BW
Fg
kE
@@ -8806,7 +8723,7 @@ Gx
nn
Hs
oh
-YK
+ys
JA
oh
ky
@@ -9000,7 +8917,7 @@ EN
lR
RK
oh
-YK
+ys
yB
oh
ky
@@ -9180,7 +9097,7 @@ iJ
iJ
nN
Mc
-hP
+Ex
nN
VD
VD
@@ -9191,7 +9108,7 @@ oh
oh
oh
oh
-Pz
+UF
mi
oh
oh
@@ -9374,7 +9291,7 @@ nN
nN
nN
Eh
-hP
+Ex
vJ
vJ
vJ
@@ -9383,9 +9300,9 @@ Ia
Vr
oh
jr
-YK
+ys
bY
-Pz
+UF
RK
UC
hZ
@@ -9568,21 +9485,21 @@ cP
cP
EQ
lP
-nP
+Wx
vJ
yT
ZB
vJ
QW
-hP
+Ex
oh
sc
-YK
+ys
mz
UF
RK
mz
-uO
+ys
OW
oh
ky
@@ -9760,9 +9677,9 @@ hS
SN
nm
nm
-MN
+rO
lP
-nP
+Wx
NQ
Ie
Ie
@@ -9956,7 +9873,7 @@ nN
nN
nN
Eh
-hP
+Ex
vJ
Ky
yH
@@ -9965,12 +9882,12 @@ Qi
cJ
oh
jr
-YK
+ys
bY
Fg
QX
gq
-YK
+ys
jr
oh
XQ
@@ -10150,13 +10067,13 @@ lL
lL
lL
lP
-nP
+Wx
vJ
ar
yH
vJ
Qi
-hP
+Ex
oh
sc
kE
@@ -10344,13 +10261,13 @@ zo
lL
lL
Qi
-nP
+Wx
vJ
UD
cz
vJ
-dG
-nP
+lP
+Wx
oh
oh
oh
@@ -10538,7 +10455,7 @@ pX
lL
lL
lP
-nP
+Wx
vJ
xN
Ie
@@ -10547,9 +10464,9 @@ lP
Vr
oh
jr
-uO
+ys
bY
-Pz
+UF
RK
gq
kE
@@ -10732,7 +10649,7 @@ Oy
lL
lL
Qi
-nP
+Wx
vJ
mC
xc
@@ -10741,7 +10658,7 @@ QW
Ik
oh
iL
-YK
+ys
mz
Ha
RK
@@ -11129,7 +11046,7 @@ Bw
Mi
yq
Mh
-BI
+Mh
Mh
Wb
mr
@@ -11314,16 +11231,16 @@ iq
iq
lL
Fh
-bZ
+Cf
KD
nN
-bZ
Cf
-bZ
+Cf
+Cf
Fh
-PJ
-bZ
-bZ
+hC
+Cf
+Cf
Wb
Wb
Wb
@@ -11507,13 +11424,13 @@ CN
er
Oy
zV
-Zl
+XT
XT
Ep
Nf
yM
-bZ
-bZ
+Cf
+Cf
Fh
hC
vm
@@ -11537,7 +11454,7 @@ gS
rr
rr
Cb
-Ng
+Fl
Ap
ah
so
@@ -11705,7 +11622,7 @@ nN
nN
nN
nN
-ud
+Eh
Fh
Fh
vm
@@ -11922,7 +11839,7 @@ ah
ah
ah
ah
-WR
+rr
rr
gS
Fl
@@ -11998,7 +11915,7 @@ AO
AO
AO
AO
-AO
+Zl
WW
WW
WW
@@ -12310,7 +12227,7 @@ Fl
rr
Fl
Fl
-WR
+rr
rr
Gr
Fl
@@ -12495,12 +12412,12 @@ dy
Su
rr
rr
-Ng
+Fl
Fl
rr
rr
gS
-WR
+rr
Cb
Gr
rr
@@ -13072,8 +12989,8 @@ vm
vm
vm
vm
-pH
-hP
+Fh
+Ex
nN
XQ
XQ
@@ -13264,8 +13181,8 @@ qd
Hu
eT
eT
-Zl
-ii
+XT
+eT
eT
Ca
nN
@@ -18618,14 +18535,14 @@ AO
so
so
bl
-hW
-hW
-hW
-hW
-hW
-hW
-hW
-hW
+HW
+HW
+HW
+HW
+HW
+HW
+HW
+HW
HW
HW
nC
@@ -18812,7 +18729,7 @@ AO
AO
so
bl
-hW
+HW
gI
XF
gI
@@ -18821,7 +18738,7 @@ gI
hi
gI
gI
-hW
+HW
bl
so
so
@@ -19015,7 +18932,7 @@ MM
gI
gI
gI
-hW
+HW
bl
so
so
@@ -19394,7 +19311,7 @@ AO
AO
so
nC
-hW
+HW
gI
gI
MM
@@ -19404,7 +19321,7 @@ MM
gI
gI
HW
-hW
+HW
EX
nC
so
@@ -19588,7 +19505,7 @@ AO
AO
AO
nC
-hW
+HW
gI
gI
gI
@@ -19597,8 +19514,8 @@ wb
MM
gI
gI
-hW
-hW
+HW
+HW
EX
nC
so
@@ -19782,8 +19699,8 @@ HF
AO
AO
nC
-hW
-hW
+HW
+HW
gI
MM
MM
@@ -19791,7 +19708,7 @@ MM
gI
bl
gI
-hW
+HW
nC
nC
nC
@@ -19976,7 +19893,7 @@ HF
HF
AO
nC
-hW
+HW
jz
bl
gI
@@ -20170,8 +20087,8 @@ HF
HF
HF
bl
-hW
-hW
+HW
+HW
HW
gI
gI
@@ -20179,7 +20096,7 @@ gI
gI
gI
gI
-hW
+HW
nC
so
so
@@ -20364,16 +20281,16 @@ AO
HF
HF
bl
-hW
-hW
+HW
+HW
jz
-hW
-hW
+HW
+HW
gI
-hW
+HW
Vu
-hW
-hW
+HW
+HW
nC
so
so
@@ -34853,7 +34770,7 @@ bp
qp
qp
qp
-Jo
+ii
Jo
aV
Of
diff --git a/maps/rift/levels/rift-09-west_caves.dmm b/maps/rift/levels/rift-09-west_caves.dmm
index 8cfd8fa9083e..c2f3a5d7f964 100644
--- a/maps/rift/levels/rift-09-west_caves.dmm
+++ b/maps/rift/levels/rift-09-west_caves.dmm
@@ -761,10 +761,6 @@
},
/turf/simulated/open/lythios43c/indoors,
/area/rift/surfacebase/outside/west_caves)
-"iC" = (
-/obj/spawner/window/reinforced/full,
-/turf/simulated/mineral/icerock/lythios43c,
-/area/rift/surfacebase/outside/west_caves/submap_seedzone)
"iD" = (
/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
/area/rift/facility/interior/medical)
@@ -1154,12 +1150,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/facility/interior/workroom)
-"nN" = (
-/obj/structure/loot_pile/surface/medicine_cabinet{
- pixel_y = -32
- },
-/turf/simulated/floor/tiled/monotile/lythios43c,
-/area/rift/facility/interior/bathrooms)
"nU" = (
/obj/structure/transit_tube/high_velocity{
icon_state = "N-S"
@@ -1400,8 +1390,7 @@
/area/rift/facility/interior/workroom)
"qF" = (
/obj/random/obstruction,
-/obj/machinery/power/apc/alarms_hidden/north_mount{
- },
+/obj/machinery/power/apc/alarms_hidden/north_mount,
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
@@ -1659,9 +1648,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c,
/area/rift/surfacebase/outside/west_caves)
-"tM" = (
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/exterior/bunker/lower)
"tP" = (
/turf/simulated/mineral/ignore_cavegen/lythios43c,
/area/rift/surfacebase/outside/west_caves)
@@ -2064,15 +2050,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c,
/area/rift/surfacebase/outside/west_caves)
-"xZ" = (
-/obj/structure/bed/chair/bay{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor/orange{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors,
-/area/rift/facility/interior/workroom)
"yv" = (
/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors,
/area/rift/exterior/mineshaft)
@@ -2203,7 +2180,7 @@
"As" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -2389,13 +2366,6 @@
"Cm" = (
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/facility/interior/underground1)
-"Cq" = (
-/obj/structure/railing/grey{
- dir = 1
- },
-/obj/structure/catwalk/plank,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/west_caves)
"Cv" = (
/obj/machinery/suit_storage_unit/mining,
/turf/simulated/floor/tiled/techmaint,
@@ -2512,10 +2482,6 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/west_caves)
-"Dz" = (
-/obj/structure/catwalk/plank,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/west_caves)
"DJ" = (
/obj/structure/salvageable/data,
/obj/effect/floor_decal/techfloor/orange{
@@ -2866,9 +2832,6 @@
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/outpost/mining_main/outpost)
-"GI" = (
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/west_caves)
"GN" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -3165,9 +3128,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/outpost/storage)
-"KS" = (
-/turf/simulated/floor/tiled/steel/lythios43c,
-/area/rift/facility/interior/workroom)
"KU" = (
/obj/structure/lattice,
/turf/simulated/open/lythios43c,
@@ -3409,12 +3369,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors,
/area/rift/facility/interior/workroom)
-"Ob" = (
-/obj/effect/floor_decal/techfloor/orange{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors,
-/area/rift/facility/interior/workroom)
"Og" = (
/obj/structure/catwalk,
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
@@ -3422,10 +3376,6 @@
"Oh" = (
/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
/area/rift/surfacebase/outside/west_caves/submap_seedzone)
-"Ot" = (
-/obj/structure/catwalk,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/west_caves)
"Ou" = (
/obj/machinery/door/firedoor/glass,
/obj/spawner/window/reinforced/full,
@@ -3592,10 +3542,6 @@
"Qd" = (
/turf/simulated/floor/outdoors/rocks/lythios43c/indoors,
/area/rift/surfacebase/outside/west_caves)
-"Qe" = (
-/obj/structure/grille/broken,
-/turf/simulated/floor/lythios43c/indoors,
-/area/rift/facility/interior/command)
"Qh" = (
/obj/machinery/light/small,
/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen,
@@ -3706,9 +3652,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/outpost)
-"Ra" = (
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/west_caves)
"Rd" = (
/obj/machinery/light/small{
dir = 8
@@ -3748,7 +3691,7 @@
"RG" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -3806,9 +3749,6 @@
"Sv" = (
/turf/simulated/floor/tiled/steel_dirty/lythios43c,
/area/rift/surfacebase/outside/west_caves)
-"Sw" = (
-/turf/simulated/floor/lythios43c/indoors,
-/area/rift/facility/interior/command)
"SF" = (
/obj/structure/cable/white{
icon_state = "1-8"
@@ -3840,9 +3780,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/outpost)
-"SP" = (
-/turf/simulated/floor/tiled/monotile/lythios43c,
-/area/rift/facility/interior/bathrooms)
"SQ" = (
/obj/structure/toilet{
dir = 4
@@ -3963,10 +3900,6 @@
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/lythios43c,
/area/rift/surfacebase/outside/west_caves)
-"Uz" = (
-/obj/structure/railing,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/west_caves)
"UC" = (
/obj/effect/floor_decal/industrial/warning/dust,
/turf/simulated/floor/tiled/steel/lythios43c,
@@ -4137,9 +4070,6 @@
"VL" = (
/turf/simulated/floor,
/area/rnd/outpost/maintenance)
-"VS" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfacebase/outside/west_caves)
"VU" = (
/obj/machinery/power/geothermal_collector/fourway,
/turf/simulated/floor/outdoors/lava/indoors/geothermal,
@@ -4205,15 +4135,6 @@
/obj/item/suit_cooling_unit,
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/outpost/storage)
-"WL" = (
-/obj/structure/toilet{
- pixel_y = 9
- },
-/obj/machinery/light/small{
- dir = 4
- },
-/turf/simulated/floor/tiled/monotile/lythios43c,
-/area/rift/facility/interior/bathrooms)
"WQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -4303,10 +4224,6 @@
},
/turf/simulated/floor/tiled/white,
/area/outpost/mining_main/outpost/washrooms)
-"XB" = (
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/lythios43c,
-/area/rift/facility/interior/medical)
"XC" = (
/obj/structure/barricade/cutout/fluke,
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
@@ -4323,9 +4240,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/outpost/storage)
-"XG" = (
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/workroom)
"XJ" = (
/turf/simulated/mineral/floor/ignore_cavegen/lythios43c,
/area/rift/surfacebase/outside/west_caves/submap_seedzone)
@@ -4536,9 +4450,6 @@
/obj/structure/catwalk,
/turf/simulated/floor,
/area/rnd/outpost/atmos)
-"ZM" = (
-/turf/simulated/floor/lythios43c/indoors,
-/area/rift/surfacebase/outside/west_caves)
"ZQ" = (
/obj/machinery/power/geothermal_collector/manifold{
dir = 4
@@ -7880,9 +7791,9 @@ Fx
Fx
vI
vI
-Sw
-Sw
-Sw
+yE
+yE
+yE
vI
vI
be
@@ -8070,11 +7981,11 @@ MC
Fx
Vb
zC
-SP
+gP
lq
vI
-Sw
-Sw
+yE
+yE
BC
yE
BC
@@ -8267,11 +8178,11 @@ Fx
Ds
Ds
PZ
-Sw
-Sw
yE
-Sw
-Sw
+yE
+yE
+yE
+yE
vI
ux
be
@@ -8456,16 +8367,16 @@ fP
Cm
vh
Fx
-WL
+jd
UN
gP
lf
PZ
-Sw
-Sw
-Sw
+yE
+yE
+yE
KI
-Sw
+yE
PZ
ux
ux
@@ -8655,11 +8566,11 @@ Fx
Ds
Ds
PZ
-Sw
+yE
BC
-Sw
-Sw
-Sw
+yE
+yE
+yE
PZ
ux
ux
@@ -8846,14 +8757,14 @@ rA
Fx
jd
kR
-SP
-nN
+gP
+lq
vI
-Sw
-Sw
-Sw
-Sw
-Sw
+yE
+yE
+yE
+yE
+yE
vI
ux
ux
@@ -9043,9 +8954,9 @@ Fx
pN
Fx
vI
-Qe
DO
-Sw
+DO
+yE
DO
DO
vI
@@ -9422,21 +9333,21 @@ be
be
mB
NX
-Ob
-Ob
-Ob
qp
-Ob
-Ob
-Ob
-Ob
-Ob
-Ob
+qp
+qp
+qp
+qp
+qp
+qp
+qp
+qp
+qp
WY
WY
-xZ
xu
-Ob
+xu
+qp
qp
Ba
FO
@@ -9810,18 +9721,18 @@ be
be
mB
SV
-KS
+jZ
jj
jZ
jZ
jj
-KS
+jZ
jj
jZ
jZ
jZ
-KS
-XG
+jZ
+jj
Fk
Fk
Fk
@@ -10208,8 +10119,8 @@ Te
Te
Te
zW
-XB
-XB
+fg
+fg
hv
dc
hv
@@ -10399,8 +10310,8 @@ be
be
Te
oT
-XB
-XB
+fg
+fg
hv
hv
hv
@@ -10408,7 +10319,7 @@ ie
ie
ie
hv
-XB
+fg
EO
Te
be
@@ -10592,7 +10503,7 @@ be
be
iD
zW
-XB
+fg
hv
hv
dc
@@ -10786,7 +10697,7 @@ be
iD
iD
zW
-XB
+fg
hv
ie
ie
@@ -10797,7 +10708,7 @@ ie
ie
dc
hv
-XB
+fg
Te
be
be
@@ -10991,7 +10902,7 @@ ie
ie
ie
hv
-XB
+fg
Te
be
be
@@ -11174,7 +11085,7 @@ be
iD
aQ
zW
-XB
+fg
ie
ie
ie
@@ -11185,7 +11096,7 @@ ie
ie
ie
hv
-XB
+fg
Te
be
be
@@ -11368,7 +11279,7 @@ be
iD
aQ
zW
-XB
+fg
ie
ie
ie
@@ -11378,7 +11289,7 @@ ie
ie
ie
hv
-XB
+fg
kz
Te
be
@@ -11562,7 +11473,7 @@ be
iD
aQ
aQ
-XB
+fg
hv
ie
ie
@@ -11572,7 +11483,7 @@ ie
ie
ie
hv
-XB
+fg
hn
Te
be
@@ -11755,7 +11666,7 @@ be
be
iD
iD
-XB
+fg
hv
hv
dc
@@ -11950,7 +11861,7 @@ be
be
iD
dj
-XB
+fg
hv
hv
ie
@@ -11959,7 +11870,7 @@ ie
ie
ie
hv
-XB
+fg
dj
Te
Te
@@ -11973,8 +11884,8 @@ JD
JD
JD
US
-ZM
-ZM
+pG
+pG
US
JD
JD
@@ -12145,15 +12056,15 @@ be
be
Te
qL
-XB
-XB
+fg
+fg
hv
hv
dc
ie
hv
hv
-XB
+fg
Vj
yN
Te
@@ -12342,10 +12253,10 @@ As
ST
kz
UQ
-XB
fg
-XB
-XB
+fg
+fg
+fg
UQ
dS
GR
@@ -12359,7 +12270,7 @@ JD
JD
JD
gx
-ZM
+pG
KD
Je
xA
@@ -12424,15 +12335,15 @@ ge
Wn
Wn
Wn
-ZM
-ZM
-ZM
-ZM
-ZM
-ZM
-ZM
-ZM
-ZM
+pG
+pG
+pG
+pG
+pG
+pG
+pG
+pG
+pG
tP
tP
tP
@@ -12553,10 +12464,10 @@ JD
JD
JD
US
-ZM
pG
-ZM
-ZM
+pG
+pG
+pG
tT
Je
US
@@ -12603,7 +12514,7 @@ ge
tP
tP
tP
-ZM
+pG
ge
tP
tP
@@ -12618,15 +12529,15 @@ ge
ge
ge
Wn
-ZM
+pG
Kf
Kf
-ZM
-ZM
-ZM
-ZM
-ZM
-ZM
+pG
+pG
+pG
+pG
+pG
+pG
Wn
tP
tP
@@ -12751,8 +12662,8 @@ gx
tT
tT
gx
-ZM
-ZM
+pG
+pG
gx
JD
JD
@@ -12941,10 +12852,10 @@ JD
JD
JD
US
-ZM
+pG
xA
-ZM
-ZM
+pG
+pG
pG
Je
US
@@ -14544,8 +14455,8 @@ ge
ge
ge
ge
-Ra
-Ra
+uD
+uD
ge
ge
ge
@@ -14558,9 +14469,9 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
ge
@@ -14738,9 +14649,9 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
ge
@@ -14752,10 +14663,10 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -14932,25 +14843,25 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
ge
ge
ge
ge
ge
ge
-Ra
-Ra
+uD
+uD
ge
ge
ge
ge
ge
-Ra
-Ra
+uD
+uD
ge
ge
ge
@@ -15127,9 +15038,9 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
ge
@@ -15322,9 +15233,9 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
ge
@@ -15516,16 +15427,16 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
Wn
Wn
Wn
-Ra
-Ra
+uD
+uD
ge
ge
ge
@@ -15711,15 +15622,15 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
Wn
Wn
tP
Wn
Wn
-Ra
+uD
ge
ge
ge
@@ -15905,7 +15816,7 @@ ge
ge
ge
ge
-Ra
+uD
Wn
Wn
Wn
@@ -15913,7 +15824,7 @@ tP
tP
Wn
Wn
-Ra
+uD
ge
ge
ge
@@ -16098,7 +16009,7 @@ Wn
ge
ge
ge
-Ra
+uD
Wn
Wn
tP
@@ -16292,7 +16203,7 @@ Wn
Wn
ge
ge
-Ra
+uD
Wn
tP
tP
@@ -16686,7 +16597,7 @@ Wn
Wn
Wn
Wn
-Ra
+uD
ge
ge
ge
@@ -16869,13 +16780,13 @@ Wn
Wn
Wn
Wn
-Ra
-Ra
+uD
+uD
Wn
Wn
Wn
-Ra
-Ra
+uD
+uD
Wn
Wn
Wn
@@ -17064,13 +16975,13 @@ Wn
Wn
Wn
ge
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -17256,15 +17167,15 @@ Wn
Wn
ge
ge
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -17452,13 +17363,13 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -17514,7 +17425,7 @@ lx
lx
lx
lx
-tM
+lx
qR
JD
JD
@@ -17644,14 +17555,14 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -17702,7 +17613,7 @@ qR
lx
lx
uS
-tM
+lx
lx
lx
XC
@@ -17838,14 +17749,14 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -17893,7 +17804,7 @@ Sn
Sn
JD
qR
-tM
+lx
lx
lx
lx
@@ -18034,11 +17945,11 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -18093,7 +18004,7 @@ lx
lx
lx
lx
-tM
+lx
lx
lx
lx
@@ -18229,9 +18140,9 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
ge
@@ -18423,9 +18334,9 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
ge
@@ -18615,11 +18526,11 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -18808,11 +18719,11 @@ ge
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -18871,7 +18782,7 @@ lx
lx
qR
qR
-tM
+lx
lx
qR
JD
@@ -19002,10 +18913,10 @@ Wn
ge
ge
ge
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -19058,14 +18969,14 @@ Sn
JD
qR
Yu
-tM
lx
lx
lx
lx
lx
lx
-tM
+lx
+lx
uS
qR
JD
@@ -19196,9 +19107,9 @@ Wn
Wn
ge
ge
-Ra
-Ra
-Ra
+uD
+uD
+uD
ge
ge
ge
@@ -19255,7 +19166,7 @@ lx
lx
XC
lx
-tM
+lx
lx
lx
uS
@@ -19389,10 +19300,10 @@ Wn
Wn
Wn
ge
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -19582,10 +19493,10 @@ tP
Wn
Wn
Wn
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
ge
ge
ge
@@ -19778,7 +19689,7 @@ Wn
Wn
Wn
Wn
-Ra
+uD
ge
ge
ge
@@ -19966,8 +19877,8 @@ Wn
ge
ge
ge
-Ra
-Ra
+uD
+uD
Wn
Wn
Wn
@@ -20157,12 +20068,12 @@ tP
tP
Wn
Wn
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
ge
-Ra
+uD
Wn
Wn
Wn
@@ -25005,7 +24916,7 @@ Sn
Sn
Sn
Sn
-iC
+Sn
Sn
Sn
Sn
@@ -35314,7 +35225,7 @@ WX
ux
nY
ux
-ZM
+pG
DZ
Dc
Pl
@@ -35510,8 +35421,8 @@ ux
ux
CK
ad
-ZM
-ZM
+pG
+pG
yA
Ly
Zb
@@ -35893,14 +35804,14 @@ Yg
ri
ga
WX
-ZM
+pG
wS
Fa
Pl
EB
Dc
-ZM
-ZM
+pG
+pG
wS
CH
ux
@@ -36238,12 +36149,12 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
wH
wH
mJ
@@ -36429,15 +36340,15 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
wH
wH
mJ
@@ -36478,7 +36389,7 @@ qU
qU
ga
WX
-ZM
+pG
Mt
ux
ux
@@ -36620,18 +36531,18 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
wH
wH
mJ
@@ -36672,7 +36583,7 @@ qU
qU
ga
WX
-ZM
+pG
Mt
ux
ux
@@ -36807,25 +36718,25 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
wH
wH
mJ
@@ -36991,35 +36902,35 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
AL
AL
Vp
@@ -37176,43 +37087,43 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
xU
Dh
@@ -37368,45 +37279,45 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
Sv
@@ -37541,66 +37452,66 @@ vv
vv
vv
vv
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
Sv
@@ -37731,70 +37642,70 @@ vv
"}
(172,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
Sv
@@ -37925,70 +37836,70 @@ vv
"}
(173,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
Sv
@@ -38119,70 +38030,70 @@ vv
"}
(174,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
Sv
@@ -38266,14 +38177,14 @@ be
be
be
be
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
be
be
be
@@ -38313,70 +38224,70 @@ vv
"}
(175,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
vz
@@ -38420,12 +38331,12 @@ wO
WX
Rj
Mt
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
ux
be
be
@@ -38457,20 +38368,20 @@ be
be
be
be
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
be
be
be
@@ -38497,80 +38408,80 @@ Og
Og
Ql
US
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(176,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
vz
@@ -38598,29 +38509,29 @@ OF
OF
OF
OF
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
WX
wS
qf
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
be
be
be
@@ -38648,26 +38559,26 @@ be
be
be
be
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
be
be
be
@@ -38691,80 +38602,80 @@ Og
Og
qK
US
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(177,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
Sv
@@ -38781,51 +38692,45 @@ Sv
Sv
gj
XD
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
YW
tr
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-be
-be
-be
-be
-be
-be
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
be
be
be
@@ -38839,126 +38744,132 @@ be
be
be
be
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
be
be
be
be
be
be
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Qs
-kx
-kx
-rT
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-gk
-"}
-(178,1,1) = {"
-gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+be
+be
+be
+be
+be
+be
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+Qs
+kx
+kx
+rT
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+gk
+"}
+(178,1,1) = {"
+gk
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Zy
Sv
@@ -38975,184 +38886,184 @@ Sv
Sv
gj
XD
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
wS
-ZM
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-be
-be
-be
-be
-be
-be
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pG
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+be
+be
+be
+be
+be
+be
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
Qs
kx
kx
rT
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(179,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Xw
YV
@@ -39169,185 +39080,185 @@ YV
YV
bm
XD
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Sp
wS
TG
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
Qs
kx
kx
rT
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(180,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
OF
OF
OF
@@ -39362,2444 +39273,2444 @@ OF
OF
OF
OF
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-tW
-kx
-wS
-tr
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Qs
-kx
-kx
-rT
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-gk
-"}
-(181,1,1) = {"
-gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-tW
-kx
-YW
-ZM
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-fj
-ru
-ru
-Vr
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-gk
-"}
-(182,1,1) = {"
-gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
wS
tr
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-gk
-"}
-(183,1,1) = {"
-gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-tW
-Sp
-wS
-TG
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-gk
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+Qs
+kx
+kx
+rT
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+gk
+"}
+(181,1,1) = {"
+gk
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+tW
+kx
+YW
+pG
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+fj
+ru
+ru
+Vr
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+gk
+"}
+(182,1,1) = {"
+gk
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+tW
+kx
+wS
+tr
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uP
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+gk
+"}
+(183,1,1) = {"
+gk
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+tW
+Sp
+wS
+TG
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uP
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+gk
"}
(184,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
wS
tr
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(185,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
YW
-ZM
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pG
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(186,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
wS
-ZM
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pG
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(187,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Sp
wS
TG
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(188,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
wS
-ZM
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pG
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(189,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
YW
tr
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(190,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
kx
wS
tr
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(191,1,1) = {"
gk
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
tW
Sp
wS
qf
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uP
-Dz
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
+pA
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
gk
"}
(192,1,1) = {"
gk
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-Uz
-Ot
-VS
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+tW
+kx
+wS
PE
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-Cq
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uP
pA
-GI
-GI
-GI
-GI
-GI
-GI
-GI
-GI
+uD
+uD
+uD
+uD
+uD
+uD
+uD
+uD
uD
gk
"}
diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm
index 093fe75fc253..02c0b954d93a 100644
--- a/maps/rift/levels/rift-10-west_plains.dmm
+++ b/maps/rift/levels/rift-10-west_plains.dmm
@@ -266,7 +266,7 @@
/turf/simulated/wall,
/area/rnd/outpost/storage)
"bz" = (
-/obj/structure/simple_door,
+/obj/structure/simple_door/wood,
/turf/simulated/floor/tiled/steel_dirty,
/area/rift/exterior/checkpoint/south)
"bA" = (
@@ -1098,7 +1098,7 @@
"fj" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -1991,10 +1991,6 @@
},
/turf/simulated/floor/plating,
/area/rift/exterior/nuketown/interior)
-"iX" = (
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/lythios43c,
-/area/rift/facility/interior/surface)
"iY" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 4
@@ -2032,9 +2028,6 @@
},
/turf/simulated/floor,
/area/rnd/outpost/atmos)
-"ji" = (
-/turf/simulated/floor/tiled/steel_grid/lythios43c,
-/area/rift/surfacebase/outside/west)
"jm" = (
/turf/simulated/wall,
/area/rift/facility/interior/elevator)
@@ -2755,13 +2748,6 @@
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c,
/area/construction/solars)
-"mJ" = (
-/obj/structure/cable/heavyduty{
- icon_state = "4-8"
- },
-/obj/structure/railing,
-/turf/simulated/floor/lythios43c,
-/area/rift/surfacebase/outside/west)
"mL" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/obj/machinery/light{
@@ -3571,10 +3557,6 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/lythios43c/indoors,
/area/rift/facility/interior/surface)
-"qN" = (
-/obj/structure/closet/crate/radiation,
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/exterior/shuttle)
"qO" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -3748,13 +3730,6 @@
},
/turf/simulated/floor,
/area/construction/solarscontrol)
-"rB" = (
-/obj/structure/bed/chair/shuttle{
- dir = 1
- },
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/exterior/shuttle)
"rE" = (
/obj/structure/extinguisher_cabinet{
dir = 1;
@@ -4242,10 +4217,6 @@
"tG" = (
/turf/simulated/floor/tiled/techfloor/grid/lythios43c/indoors,
/area/rift/facility/exterior)
-"tH" = (
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/tiled/steel_dirty/lythios43c,
-/area/rift/facility/interior/surface)
"tI" = (
/turf/simulated/open/lythios43c,
/area/rift/facility/interior/surface)
@@ -4543,7 +4514,7 @@
"uU" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/facility/interior/surface)
@@ -4787,7 +4758,7 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/anomaly_lab/analysis)
"vY" = (
-/obj/structure/simple_door/iron,
+/obj/structure/simple_door/wood,
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/exterior/checkpoint/south)
"vZ" = (
@@ -4935,15 +4906,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor,
/area/rnd/outpost/atmos)
-"wL" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 9
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 10
- },
-/turf/simulated/floor/tiled/steel_grid/lythios43c,
-/area/rift/surfacebase/outside/west)
"wP" = (
/obj/machinery/door/blast/shutters{
dir = 8;
@@ -6195,12 +6157,6 @@
/obj/machinery/portable_atmospherics/canister/empty,
/turf/simulated/floor,
/area/rnd/outpost/storage)
-"CX" = (
-/obj/effect/overlay/snow/floor/edges,
-/obj/effect/overlay/snow/floor,
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/exterior/shuttle)
"CY" = (
/obj/effect/map_effect/radiation_emitter/strong,
/turf/simulated/floor/outdoors/snow/lythios43c,
@@ -6419,7 +6375,7 @@
"DU" = (
/obj/machinery/power/apc/alarms_hidden/north_mount{
cell_type = null;
- chargelevel = 0;
+ chargelevel = 0
},
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/rift/facility/exterior/shuttle)
@@ -6507,10 +6463,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/testing_lab)
-"EF" = (
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating,
-/area/rift/exterior/nuketown/interior)
"EG" = (
/obj/structure/catwalk,
/turf/simulated/floor/lythios43c/indoors,
@@ -6851,9 +6803,6 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/mixing)
-"Gr" = (
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/exterior/shuttle)
"Gs" = (
/obj/machinery/vending/coffee{
dir = 8
@@ -7908,10 +7857,6 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/heating)
-"Lb" = (
-/obj/structure/railing,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/west)
"Lf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -7932,10 +7877,6 @@
},
/turf/simulated/floor/tiled,
/area/outpost/mining_main/outpost/airlock/one)
-"Lv" = (
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/lythios43c/indoors,
-/area/rift/facility/interior/surface)
"Lx" = (
/obj/random/trash_pile,
/turf/simulated/floor/tiled/steel_dirty/lythios43c,
@@ -8272,8 +8213,8 @@
/area/rnd/outpost/anomaly_lab)
"Na" = (
/obj/machinery/door/firedoor{
- req_one_access = list(18,47);
- dir = 4
+ dir = 4;
+ req_one_access = list(18,47)
},
/turf/simulated/floor/tiled,
/area/rnd/outpost)
@@ -8702,16 +8643,6 @@
/obj/structure/barricade/cutout,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/exterior/nuketown)
-"Pg" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 6
- },
-/obj/structure/railing,
-/turf/simulated/floor/tiled/steel_grid/lythios43c,
-/area/rift/surfacebase/outside/west)
"Pi" = (
/obj/structure/window/wooden{
dir = 1
@@ -10417,10 +10348,6 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/heating)
-"Xw" = (
-/obj/effect/overlay/snow/floor,
-/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
-/area/rift/facility/interior/surface)
"Xy" = (
/obj/structure/fence/door,
/turf/simulated/floor/outdoors/snow/lythios43c,
@@ -14698,7 +14625,7 @@ ip
TF
ns
vE
-iX
+dx
dx
dx
bk
@@ -14709,11 +14636,11 @@ Rs
Yn
yj
lF
-rB
+rf
da
cn
mF
-Gr
+vW
bS
bS
cn
@@ -14908,7 +14835,7 @@ LN
vh
ul
vW
-Gr
+vW
fU
cn
as
@@ -15098,12 +15025,12 @@ rw
yj
FR
rf
-CX
+da
cn
DU
vW
XE
-qN
+bS
cn
as
mY
@@ -15861,11 +15788,11 @@ Rs
Rs
Rs
VU
-iX
+dx
dx
dx
sl
-Lv
+Dg
sr
sr
sr
@@ -18008,7 +17935,7 @@ bk
dx
ns
tT
-Xw
+lo
ti
sr
sr
@@ -18393,9 +18320,9 @@ tI
tI
bk
dx
-Xw
+lo
kc
-Xw
+lo
fc
kc
sr
@@ -18456,7 +18383,7 @@ zz
zz
RU
zz
-EF
+zz
zz
lH
wu
@@ -18577,7 +18504,7 @@ Rs
Rs
Rs
ns
-tH
+ll
bk
bk
tI
@@ -18586,7 +18513,7 @@ tI
tI
yA
bk
-Xw
+lo
lo
gY
lo
@@ -18839,13 +18766,13 @@ gA
gA
wu
mS
-EF
zz
zz
zz
zz
zz
-EF
+zz
+zz
iV
wu
ed
@@ -41358,7 +41285,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -41552,7 +41479,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -41746,7 +41673,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -41940,7 +41867,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -42134,7 +42061,7 @@ sv
sv
sv
bL
-wL
+qZ
bw
Hz
bL
@@ -42328,7 +42255,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -42522,7 +42449,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -42716,7 +42643,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -42910,7 +42837,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -43104,7 +43031,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -43298,7 +43225,7 @@ sv
sv
sv
bL
-wL
+qZ
bw
Hz
bL
@@ -43492,7 +43419,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -44074,7 +44001,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -44268,7 +44195,7 @@ sv
sv
sv
bL
-wL
+qZ
bw
Hz
bL
@@ -44462,7 +44389,7 @@ sv
sv
sv
sv
-wL
+qZ
bw
Hz
sv
@@ -44635,7 +44562,7 @@ we
we
we
we
-Lb
+zL
Yp
Yp
Qf
@@ -44656,9 +44583,9 @@ sv
sv
sv
or
-wL
+qZ
bw
-Pg
+ES
or
sv
or
@@ -44850,9 +44777,9 @@ dC
dC
dC
wm
-wL
+qZ
bw
-Pg
+ES
bL
dC
or
@@ -45044,12 +44971,12 @@ we
we
we
or
-wL
+qZ
bw
-Pg
+ES
or
we
-Lb
+zL
je
we
we
@@ -45237,13 +45164,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -45431,13 +45358,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -45625,13 +45552,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -45819,13 +45746,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -46014,12 +45941,12 @@ we
we
we
wm
-wL
+qZ
bw
-Pg
+ES
bL
we
-Lb
+zL
je
we
we
@@ -46207,13 +46134,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -46401,13 +46328,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -46595,13 +46522,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -46789,13 +46716,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -46983,13 +46910,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -47178,12 +47105,12 @@ we
we
we
wm
-wL
+qZ
bw
-Pg
+ES
bL
we
-Lb
+zL
je
we
we
@@ -47371,13 +47298,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -47565,13 +47492,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -47759,13 +47686,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -47953,13 +47880,13 @@ we
we
we
we
-Lb
-wL
+zL
+qZ
bw
-Pg
+ES
we
we
-Lb
+zL
je
we
we
@@ -48149,12 +48076,12 @@ we
we
zL
qZ
-ji
+bw
ES
we
we
zL
-mJ
+je
we
we
we
diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm
index 6bd02a441bf1..745b3cce20e9 100644
--- a/maps/rift/levels/rift-11-orbital.dmm
+++ b/maps/rift/levels/rift-11-orbital.dmm
@@ -306,15 +306,11 @@
/area/holodeck/source_courtroom)
"bf" = (
/obj/machinery/door/window/holowindoor{
- name = "Red Team";
- dir = 4
+ dir = 4;
+ name = "Red Team"
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_emptycourt)
-"bh" = (
-/turf/space/basic,
-/turf/space/basic,
-/area/space)
"bi" = (
/obj/structure/window/reinforced{
dir = 8
@@ -366,9 +362,6 @@
/obj/structure/holostool,
/turf/simulated/floor/holofloor/desert,
/area/holodeck/source_picnicarea)
-"bp" = (
-/turf/simulated/floor/holofloor/desert,
-/area/holodeck/source_picnicarea)
"bq" = (
/obj/structure/flora/ausbushes/brflowers,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -765,8 +758,8 @@
"cB" = (
/obj/machinery/door/window/holowindoor{
base_state = "right";
- icon_state = "right";
- dir = 4
+ dir = 4;
+ icon_state = "right"
},
/turf/simulated/floor/holofloor/tiled,
/area/holodeck/source_courtroom)
@@ -785,9 +778,9 @@
"cE" = (
/obj/machinery/door/window/holowindoor{
base_state = "right";
+ dir = 4;
icon_state = "right";
- name = "Green Team";
- dir = 4
+ name = "Green Team"
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_emptycourt)
@@ -1254,8 +1247,8 @@
/area/holodeck/source_meetinghall)
"eg" = (
/obj/machinery/door/window/holowindoor{
- name = "Red Team";
- dir = 4
+ dir = 4;
+ name = "Red Team"
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_basketball)
@@ -1270,8 +1263,8 @@
/area/holodeck/source_beach)
"ej" = (
/obj/machinery/door/window/holowindoor{
- name = "Red Team";
- dir = 4
+ dir = 4;
+ name = "Red Team"
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_thunderdomecourt)
@@ -1878,9 +1871,9 @@
"fX" = (
/obj/machinery/door/window/holowindoor{
base_state = "right";
+ dir = 4;
icon_state = "right";
- name = "Green Team";
- dir = 4
+ name = "Green Team"
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_basketball)
@@ -1898,9 +1891,9 @@
"ga" = (
/obj/machinery/door/window/holowindoor{
base_state = "right";
+ dir = 4;
icon_state = "right";
- name = "Green Team";
- dir = 4
+ name = "Green Team"
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_thunderdomecourt)
@@ -2109,7 +2102,7 @@
"gH" = (
/obj/machinery/account_database{
dir = 1;
- name = "CentComm Accounts database"
+ name = "CentCom Accounts database"
},
/turf/unsimulated/floor/steel,
/area/centcom/control)
@@ -5522,6 +5515,12 @@
},
/turf/simulated/floor/tiled/white,
/area/centcom/simulated/medical)
+"qL" = (
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/centcom/command)
"qM" = (
/obj/machinery/atmospherics/component/unary/cryo_cell,
/obj/effect/floor_decal/borderfloorwhite{
@@ -6606,6 +6605,7 @@
/obj/machinery/light{
dir = 4
},
+/obj/effect/floor_decal/industrial/halfstair,
/turf/simulated/floor/reinforced,
/area/centcom/command)
"xX" = (
@@ -7972,6 +7972,15 @@
/obj/machinery/vending/tool,
/turf/unsimulated/floor/dark,
/area/centcom/specops)
+"EI" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/centcom/command)
"EP" = (
/obj/structure/window/reinforced{
dir = 1
@@ -8885,6 +8894,10 @@
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/plating,
/area/shuttle/specops/engine)
+"Ps" = (
+/obj/effect/floor_decal/industrial/halfstair,
+/turf/simulated/floor/reinforced,
+/area/centcom/command)
"Pw" = (
/obj/structure/table/bone,
/turf/simulated/floor/tiled/dark,
@@ -9318,10 +9331,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/specops/general)
-"Ui" = (
-/obj/structure/fake_stairs/south/bottom,
-/turf/simulated/floor/tiled/dark,
-/area/centcom/command)
"Uj" = (
/obj/structure/table/rack,
/obj/item/clothing/under/color/red,
@@ -9512,10 +9521,6 @@
/obj/structure/bed/chair/bay/shuttle,
/turf/simulated/floor/tiled/dark,
/area/shuttle/specops/general)
-"VH" = (
-/obj/structure/fake_stairs/north/bottom,
-/turf/simulated/floor/tiled/dark,
-/area/centcom/command)
"Wj" = (
/obj/structure/bed/chair/bay/shuttle{
dir = 4
@@ -32137,13 +32142,13 @@ Bv
Bv
yw
TY
-TY
-Ui
+qL
+XJ
Un
Un
Un
-VH
-TY
+XJ
+Ps
TY
yw
Bv
@@ -32331,12 +32336,12 @@ Bv
Bv
yw
TY
-xW
-Ui
+EI
+XJ
+XJ
XJ
XJ
XJ
-VH
xW
TY
yw
@@ -32749,11 +32754,11 @@ Bv
Bv
Bv
Bv
-bh
-bh
-bh
-bh
-bh
+Bv
+Bv
+Bv
+Bv
+Bv
Bv
Bv
Bv
@@ -34418,8 +34423,8 @@ am
aG
aH
aX
-bp
-bp
+bn
+bn
cp
aH
aG
@@ -34612,8 +34617,8 @@ an
aH
aG
aY
-bp
-bp
+bn
+bn
cq
aG
aH
@@ -34806,8 +34811,8 @@ am
aG
aW
bm
-bp
-bp
+bn
+bn
cr
cz
aG
@@ -35000,8 +35005,8 @@ an
aH
aX
bn
-bp
-bp
+bn
+bn
bn
cp
aH
@@ -35581,10 +35586,10 @@ af
an
aG
aY
-bp
-bp
-bp
-bp
+bn
+bn
+bn
+bn
cq
aG
an
diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm
index c1175bccb68f..b4ee05195d45 100644
--- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm
+++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm
@@ -807,8 +807,8 @@
/turf/simulated/floor/wood,
/area/tether_away/beach/mineshaft)
"eZ" = (
-/obj/structure/stairs/middle{
- dir = 2
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 1
},
/turf/simulated/floor/tiled/asteroid_steel,
/area/tether_away/beach/desalinator)
@@ -963,8 +963,8 @@
/turf/simulated/floor/wood,
/area/tether_away/beach/resort/canteen)
"gC" = (
-/obj/structure/stairs/middle{
- dir = 4
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 8
},
/turf/simulated/floor/tiled/asteroid_steel,
/area/tether_away/beach/desalinator)
@@ -1414,8 +1414,8 @@
},
/area/tether_away/beach/mineshaft)
"jJ" = (
-/obj/structure/stairs/middle{
- dir = 4
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 8
},
/turf/simulated/floor/outdoors/beach/sand/desert,
/area/tether_away/beach/desalinator)
@@ -1601,9 +1601,7 @@
/turf/simulated/floor/wood/broken,
/area/tether_away/beach/resort/dorm2)
"la" = (
-/obj/structure/stairs/middle{
- dir = 1
- },
+/obj/effect/floor_decal/industrial/halfstair,
/turf/simulated/mineral/floor/cave{
name = "dirt"
},
@@ -2325,8 +2323,8 @@
/turf/simulated/floor/wood,
/area/tether_away/beach/resort/dorm1)
"rM" = (
-/obj/structure/stairs/middle{
- dir = 2
+/obj/effect/floor_decal/industrial/halfstair{
+ dir = 1
},
/turf/simulated/floor/tiled/asteroid_steel{
outdoors = 1
@@ -5942,7 +5940,6 @@
},
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
desc = "Its bone dry.";
- dir = 2;
name = "water pipe"
},
/turf/simulated/floor/tiled/steel_dirty,
diff --git a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm
index a6e10fddebee..0b0a55241ff4 100644
--- a/maps/submaps/level_specific/debrisfield_vr/debris14.dmm
+++ b/maps/submaps/level_specific/debrisfield_vr/debris14.dmm
@@ -31,7 +31,6 @@
/area/tether_away/debrisfield_vr/shuttle_buffer)
"h" = (
/obj/structure/lattice,
-/obj/structure/lattice,
/turf/space,
/area/tether_away/debrisfield_vr/shuttle_buffer)
"i" = (
diff --git a/maps/templates/admin/dhael_centcom.dmm b/maps/templates/admin/dhael_centcom.dmm
index dd77112b7dad..e7cc4bbbc509 100644
--- a/maps/templates/admin/dhael_centcom.dmm
+++ b/maps/templates/admin/dhael_centcom.dmm
@@ -4048,7 +4048,7 @@
/area/centcom/medical)
"lQ" = (
/obj/machinery/account_database{
- name = "CentComm Accounts database"
+ name = "CentCom Accounts database"
},
/turf/unsimulated/floor/steel,
/area/centcom/control)
diff --git a/maps/templates/shuttles/overmaps/generic/cruiser.dmm b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
index 2ba877ae413c..a2748bc9d959 100644
--- a/maps/templates/shuttles/overmaps/generic/cruiser.dmm
+++ b/maps/templates/shuttles/overmaps/generic/cruiser.dmm
@@ -7136,7 +7136,7 @@
/area/mothership/telecomms2)
"pP" = (
/obj/machinery/account_database{
- name = "CentComm Accounts database"
+ name = "CentCom Accounts database"
},
/turf/simulated/floor/greengrid,
/area/mothership/telecomms2)
diff --git a/maps/tether/levels/misc.dmm b/maps/tether/levels/misc.dmm
index fb40ef86861b..8a2a8e112c1b 100644
--- a/maps/tether/levels/misc.dmm
+++ b/maps/tether/levels/misc.dmm
@@ -4211,7 +4211,7 @@
"HP" = (
/obj/machinery/account_database{
dir = 1;
- name = "CentComm Accounts database"
+ name = "CentCom Accounts database"
},
/turf/unsimulated/floor/steel,
/area/centcom/control)
diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm
index f7d8c92c07c9..2552197e4c77 100644
--- a/maps/tether/levels/station2.dmm
+++ b/maps/tether/levels/station2.dmm
@@ -1356,12 +1356,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/visitorhallway/lounge)
-"cO" = (
-/obj/effect/floor_decal/techfloor{
- dir = 8
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"cP" = (
/obj/structure/bed/chair/shuttle{
dir = 4
@@ -2654,10 +2648,6 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
-"fu" = (
-/obj/item/paper,
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"fv" = (
/obj/effect/floor_decal/industrial/warning{
dir = 9
@@ -4417,12 +4407,6 @@
},
/turf/simulated/wall/rshull,
/area/shuttle/excursion/general)
-"iY" = (
-/obj/effect/floor_decal/techfloor{
- dir = 1
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"iZ" = (
/obj/machinery/power/apc/west_mount,
/obj/structure/cable/green{
@@ -6493,9 +6477,6 @@
},
/turf/simulated/floor/wood,
/area/tether/exploration/pathfinder_office)
-"nj" = (
-/turf/simulated/floor/plating,
-/area/vacant/vacant_restaurant_upper)
"nk" = (
/obj/machinery/power/apc/east_mount,
/obj/structure/cable{
@@ -7413,13 +7394,6 @@
"pf" = (
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/cockpit)
-"pg" = (
-/obj/effect/floor_decal/rust,
-/obj/effect/floor_decal/techfloor{
- dir = 8
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"ph" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -9938,9 +9912,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
-"uj" = (
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"uk" = (
/obj/machinery/light{
dir = 1
@@ -11538,13 +11509,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/gateway)
-"xm" = (
-/obj/effect/floor_decal/rust,
-/obj/effect/floor_decal/techfloor{
- dir = 1
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"xn" = (
/obj/machinery/light/small,
/obj/structure/table/rack{
@@ -11677,12 +11641,6 @@
icon_state = "monotile"
},
/area/tether/station/visitorhallway/lounge)
-"xB" = (
-/obj/effect/floor_decal/techfloor{
- dir = 8
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"xC" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/disposalpipe/segment{
@@ -11811,9 +11769,6 @@
},
/turf/simulated/shuttle/floor/voidcraft,
/area/shuttle/belter)
-"xP" = (
-/turf/simulated/floor/plating,
-/area/vacant/vacant_restaurant_upper)
"xQ" = (
/obj/machinery/button/windowtint{
dir = 1;
@@ -13149,12 +13104,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/public_meeting_room)
-"AJ" = (
-/obj/machinery/air_alarm{
- pixel_y = 22
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"AK" = (
/obj/structure/bed/chair/sofa/black/left{
dir = 1
@@ -15745,12 +15694,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
-"FU" = (
-/obj/effect/floor_decal/techfloor{
- dir = 8
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"FV" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -16809,13 +16752,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/office)
-"Ic" = (
-/obj/effect/floor_decal/rust,
-/obj/effect/floor_decal/techfloor{
- dir = 1
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"Id" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18827,6 +18763,9 @@
/obj/effect/floor_decal/industrial/loading{
dir = 8
},
+/obj/machinery/sheet_silo_loader{
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"Mo" = (
@@ -19965,9 +19904,6 @@
/obj/random/maintenance/clean,
/turf/simulated/floor/tiled/white,
/area/tether/station/visitorhallway/laundry)
-"Oz" = (
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"OA" = (
/turf/simulated/floor/tiled/asteroid_steel/airless,
/area/quartermaster/belterdock)
@@ -23320,12 +23256,6 @@
},
/turf/simulated/floor/plating,
/area/engineering/shaft)
-"VF" = (
-/obj/effect/floor_decal/techfloor{
- dir = 1
- },
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"VG" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24500,10 +24430,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/exploration)
-"XQ" = (
-/obj/item/reagent_containers/blood,
-/turf/simulated/floor,
-/area/maintenance/station/eng_upper)
"XR" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -24799,6 +24725,7 @@
/area/maintenance/station/eng_upper)
"YA" = (
/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/sheet_silo,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"YB" = (
@@ -41749,25 +41676,25 @@ jF
jF
uX
kQ
-cO
-FU
-FU
+LT
+LT
+LT
mK
-FU
-FU
-FU
-xB
+LT
+LT
+LT
+LT
mK
mK
-FU
-FU
-FU
+LT
+LT
+LT
LT
mK
mK
-FU
-FU
-FU
+LT
+LT
+LT
Rq
sV
MA
@@ -41778,7 +41705,7 @@ eW
RA
mK
mK
-pg
+mK
eR
uX
Dh
@@ -41942,7 +41869,7 @@ jF
jF
II
uX
-VF
+LM
pe
TH
sj
@@ -42176,7 +42103,7 @@ Dh
Dh
ey
Dh
-nj
+Dh
Dh
UH
Dh
@@ -42328,31 +42255,31 @@ EM
jF
jF
by
-Oz
+BA
uX
-iY
+LM
mg
uX
tR
Bd
Bd
-Oz
+BA
PH
ki
uX
-Oz
+BA
uX
uu
uu
uu
uu
uX
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
+BA
+BA
uX
EM
uu
@@ -42365,7 +42292,7 @@ uu
wg
Dh
Dh
-xP
+Dh
ey
ey
ey
@@ -42521,20 +42448,20 @@ EM
EM
uX
jF
-Oz
-Oz
+BA
+BA
uX
-iY
+LM
Jx
uX
fx
Bd
Mu
-Oz
+BA
Bd
Ep
uX
-Oz
+BA
uX
EM
uu
@@ -42542,10 +42469,10 @@ uu
uu
uX
jW
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
vu
uX
uu
@@ -42559,12 +42486,12 @@ uu
wg
Dh
Dh
-nj
Dh
Dh
Dh
Dh
-xP
+Dh
+Dh
Dh
Dh
Dh
@@ -42715,8 +42642,8 @@ EM
EM
uX
jF
-Oz
-Oz
+BA
+BA
uX
fQ
Jx
@@ -42728,7 +42655,7 @@ Zp
MU
UF
uX
-Oz
+BA
uX
EM
EM
@@ -42736,10 +42663,10 @@ EM
uu
uX
Cq
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
xn
uX
uu
@@ -42909,10 +42836,10 @@ EM
EM
uX
jF
-Oz
-Oz
+BA
+BA
uX
-iY
+LM
Jx
uX
uX
@@ -43103,20 +43030,20 @@ EM
EM
uX
jF
-Oz
-Oz
+BA
+BA
uX
fQ
Jx
uX
KI
NU
-Oz
-Oz
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
+BA
+BA
uX
EM
uu
@@ -43297,14 +43224,14 @@ EM
EM
uX
by
-Oz
-Oz
+BA
+BA
uX
-iY
+LM
Jx
uX
-AJ
-Oz
+LX
+BA
uX
uX
uX
@@ -43492,12 +43419,12 @@ EM
uX
by
by
-Oz
+BA
uX
-xm
+Kz
Jx
SP
-Oz
+BA
NU
uX
EM
@@ -43688,11 +43615,11 @@ jF
by
by
uX
-iY
+LM
Jx
uX
-Oz
-Oz
+BA
+BA
uX
EM
EM
@@ -43882,11 +43809,11 @@ jF
II
Sx
uX
-iY
+LM
Jx
uX
eM
-Oz
+BA
uX
EM
uX
@@ -44270,7 +44197,7 @@ Jh
Rb
KI
uX
-Ic
+Kz
mg
uX
EM
@@ -44459,12 +44386,12 @@ EM
EM
EM
uX
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
uX
-Ic
+Kz
uh
uX
WB
@@ -44654,11 +44581,11 @@ EM
EM
uX
LX
-Oz
-Oz
+BA
+BA
BQ
uX
-Ic
+Kz
uh
uX
EM
@@ -44847,12 +44774,12 @@ EM
EM
EM
uX
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
uX
-iY
+LM
Ci
uX
EM
@@ -45041,12 +44968,12 @@ EM
EM
EM
uX
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
SP
-iY
+LM
Ci
uX
EM
@@ -45237,7 +45164,7 @@ EM
uX
GG
XC
-Oz
+BA
iP
uX
rR
@@ -45434,7 +45361,7 @@ uX
uX
uX
uX
-Ic
+Kz
Ci
uX
EM
@@ -45628,7 +45555,7 @@ EM
uu
EM
uX
-Ic
+Kz
Ci
uX
EM
@@ -45822,7 +45749,7 @@ uu
uu
uu
uX
-iY
+LM
Ci
uX
EM
@@ -46016,7 +45943,7 @@ uu
uu
uu
uX
-iY
+LM
Ci
uX
EM
@@ -46210,7 +46137,7 @@ EM
uu
uu
uX
-iY
+LM
XG
uX
EM
@@ -46404,7 +46331,7 @@ EM
EM
EM
uX
-iY
+LM
Mv
uX
EM
@@ -46784,7 +46711,7 @@ gd
gd
nV
Fs
-Oz
+BA
SZ
Yz
rb
@@ -46980,8 +46907,8 @@ vR
NY
Yz
QX
-Oz
-Oz
+BA
+BA
NU
nr
Rb
@@ -47172,7 +47099,7 @@ gd
gd
uX
Ma
-Oz
+BA
NU
NU
uX
@@ -47180,7 +47107,7 @@ uX
uX
uX
uX
-Ic
+Kz
wX
uX
uX
@@ -47374,9 +47301,9 @@ uu
uu
EM
uX
-iY
+LM
Jx
-Oz
+BA
uX
EM
EM
@@ -47560,7 +47487,7 @@ gd
gd
nV
YV
-Oz
+BA
dh
Us
uX
@@ -47568,9 +47495,9 @@ EM
uu
uu
uX
-iY
+LM
uh
-Oz
+BA
uX
uX
uX
@@ -47762,15 +47689,15 @@ EM
uu
EM
uX
-iY
+LM
uh
-Oz
+BA
uX
-uj
+BA
Bj
-Oz
-uj
-uj
+BA
+BA
+BA
CO
uX
uu
@@ -47956,16 +47883,16 @@ EM
uu
EM
uX
-iY
+LM
eW
-Oz
+BA
uX
BA
-Oz
-fu
-Oz
-fu
-Oz
+BA
+Bj
+BA
+Bj
+BA
uX
uu
uu
@@ -48150,16 +48077,16 @@ EM
uu
uu
uX
-iY
+LM
eW
-Oz
+BA
uX
-Oz
+BA
ad
At
-Oz
-Oz
-Oz
+BA
+BA
+BA
uX
uu
uu
@@ -48344,16 +48271,16 @@ uu
uu
EM
uX
-iY
+LM
wX
-Oz
+BA
uX
UW
-Oz
-XQ
-Oz
+BA
+CO
+BA
Bj
-uj
+BA
uX
uu
uu
@@ -48538,9 +48465,9 @@ uX
uX
uX
uX
-iY
+LM
ch
-Oz
+BA
uX
uX
uX
@@ -48554,11 +48481,11 @@ uX
uX
Ze
vj
-Oz
-Oz
-Oz
-Oz
-Oz
+BA
+BA
+BA
+BA
+BA
uX
gH
Nt
@@ -48727,7 +48654,7 @@ gd
uX
uX
uX
-Oz
+BA
MT
bw
bw
@@ -48736,12 +48663,12 @@ ae
di
NB
uX
-Oz
-Oz
+BA
+BA
BN
-Oz
-Oz
-Oz
+BA
+BA
+BA
MT
bw
bw
@@ -48948,7 +48875,7 @@ Rg
Rg
Rg
Rg
-Oz
+BA
ZP
uX
Ji
diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm
index fc2774aeb01a..2fbe8a22150d 100644
--- a/maps/triumph/levels/deck2.dmm
+++ b/maps/triumph/levels/deck2.dmm
@@ -3915,6 +3915,9 @@
/obj/machinery/air_alarm{
pixel_y = 27
},
+/obj/machinery/sheet_silo{
+ obj_persist_static_id = "sheet-silo-mining"
+ },
/turf/simulated/floor/tiled,
/area/triumph/surfacebase/mining_main/refinery)
"lR" = (
@@ -4099,9 +4102,6 @@
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area_hallway)
-"mF" = (
-/turf/simulated/floor/plating,
-/area/maintenance/cargo)
"mG" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/obj/landmark/spawnpoint/job/bartender,
@@ -5863,16 +5863,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
-"rS" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor,
-/turf/simulated/floor/tiled,
-/area/crew_quarters/bar)
"rT" = (
/obj/machinery/air_alarm{
dir = 4;
@@ -10674,12 +10664,6 @@
"Gn" = (
/turf/simulated/floor/tiled,
/area/crew_quarters/kitchen)
-"Go" = (
-/obj/effect/floor_decal/techfloor{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/crew_quarters/bar)
"Gp" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -12654,9 +12638,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"MC" = (
-/turf/simulated/floor/plating,
-/area/maintenance/bar/lower)
"MD" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -16894,6 +16875,9 @@
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
+/obj/machinery/sheet_silo_loader{
+ dir = 8
+ },
/turf/simulated/floor/tiled,
/area/triumph/surfacebase/mining_main/refinery)
"Zq" = (
@@ -27869,7 +27853,7 @@ ix
Oc
UC
DY
-Go
+XI
Hm
Qp
JB
@@ -28260,7 +28244,7 @@ DY
DY
DY
XI
-rS
+TZ
Ye
lw
mc
@@ -33475,7 +33459,7 @@ he
xY
Rx
TH
-MC
+UG
CM
oC
ov
@@ -39101,7 +39085,7 @@ jl
dy
gT
QY
-mF
+Se
BT
pm
du
@@ -42983,7 +42967,7 @@ mc
mc
mc
Sw
-mF
+Se
BM
BM
pW
@@ -43177,9 +43161,9 @@ mc
mc
mc
Sw
-mF
+Se
BM
-mF
+Se
Hk
Zy
gK
@@ -43567,7 +43551,7 @@ cW
Sw
Pb
BM
-mF
+Se
Hk
sq
sq
@@ -43759,9 +43743,9 @@ aG
cW
cW
rZ
-mF
+Se
BM
-mF
+Se
Hk
Hk
nV
@@ -43953,9 +43937,9 @@ aG
cW
cW
rZ
-mF
+Se
BM
-mF
+Se
CR
DA
gK
@@ -44341,9 +44325,9 @@ oj
cW
cW
rZ
-mF
+Se
BM
-mF
+Se
Hk
Hk
Hk
@@ -44537,8 +44521,8 @@ cW
Sw
Ze
BM
-mF
-mF
+Se
+Se
tD
Hk
md
@@ -45118,7 +45102,7 @@ cW
cW
Sw
JO
-mF
+Se
ph
Tb
Vu
@@ -45312,7 +45296,7 @@ cW
cW
Sw
Sw
-mF
+Se
ph
oW
kV
diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm
index 2fa65d55e538..487e4c446f3d 100644
--- a/maps/triumph/levels/flagship.dmm
+++ b/maps/triumph/levels/flagship.dmm
@@ -6455,7 +6455,7 @@
/area/centcom/bathroom)
"uC" = (
/obj/machinery/account_database{
- name = "CentComm Accounts database"
+ name = "CentCom Accounts database"
},
/turf/unsimulated/floor/steel,
/area/centcom/control)
diff --git a/tgui/packages/tgui/interfaces/Vote.tsx b/tgui/packages/tgui/interfaces/Vote.tsx
index 2ec6c83f5cb9..0afa7ecf983a 100644
--- a/tgui/packages/tgui/interfaces/Vote.tsx
+++ b/tgui/packages/tgui/interfaces/Vote.tsx
@@ -7,6 +7,7 @@ import {
Button,
Section,
NoticeBox,
+ NumberInput,
LabeledList,
Collapsible,
} from "../components";
@@ -20,6 +21,8 @@ interface VoteContext {
question: string;
time_remaining : number;
secret : BooleanLike;
+ ghost : BooleanLike;
+ ghost_weight : number;
}
interface VoteChoice {
@@ -41,6 +44,7 @@ export const Vote = (props, context) => {
{!!admin && (
)}
@@ -62,7 +66,7 @@ export const Vote = (props, context) => {
const StartVoteOptions = (props, context) => {
const { act, data } = useBackend(context);
- const { vote_happening, secret } = data;
+ const { vote_happening } = data;
return (
@@ -93,13 +97,41 @@ const StartVoteOptions = (props, context) => {
Custom Vote
+
+
+
+
+
+ );
+};
+
+const VoteConfig = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { ghost_weight, secret } = data;
+ return (
+
+
+
+
+
+
+ Ghost weight:
+ act('ghost_weight', { ghost_weight: value })}
+ />
+
@@ -112,7 +144,7 @@ const StartVoteOptions = (props, context) => {
// Display choices
const ChoicesPanel = (props, context) => {
const { act, data } = useBackend(context);
- const { admin, choices, selected_choice, question, secret } = data;
+ const { ghost_weight, ghost, admin, choices, selected_choice, question, secret } = data;
return (
@@ -129,7 +161,7 @@ const ChoicesPanel = (props, context) => {
color={
selected_choice !== choice.name ? "green" : "grey"
}
- disabled={choice.name === selected_choice}
+ disabled={choice.name === selected_choice || (ghost_weight === 0 && ghost)}
onClick={() => {
act("vote", { index: i + 1 });
}}
diff --git a/tgui/packages/tgui/interfaces/machines/SheetSilo.tsx b/tgui/packages/tgui/interfaces/machines/SheetSilo.tsx
new file mode 100644
index 000000000000..b4e9b3dca56e
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/machines/SheetSilo.tsx
@@ -0,0 +1,65 @@
+import { useBackend, useLocalState } from "../../backend";
+import { Box, Button, NumberInput, Section, Stack } from "../../components";
+import { Window } from "../../layouts";
+import { MaterialsContext } from "../common/Materials";
+
+interface SheetSiloData {
+ materialContext: MaterialsContext;
+ stored: Record;
+}
+
+export const SheetSilo = (props, context) => {
+ const { act, data } = useBackend(context);
+ const [dropAmounts, setDropAmounts] = useLocalState>(context, 'dropAmounts', {});
+ const setDropAmount = (id: string, amt: number) => {
+ let corrected = { ...dropAmounts };
+ corrected[id] = amt;
+ setDropAmounts(corrected);
+ };
+
+ return (
+
+
+
+
+ {Object.entries(data.stored).sort(
+ ([k1, v1], [k2, v2]) => (
+ (data.materialContext.materials[k1]?.name || "AAAAA").localeCompare(
+ (data.materialContext.materials[k2]?.name || "AAAAA")
+ )
+ )
+ ).map(([k, v]) => (
+
+
+
+
+ {data.materialContext.materials[k]?.name || 'UNKNOWN'} - {v}
+
+
+
+
+
+ setDropAmount(k, Math.floor(val))} />
+
+
+
+
+
+
+
+ ))}
+
+
+
+
+ );
+};
diff --git a/tools/mapmerge2/__init__.py b/tools/mapmerge2/__init__.py
new file mode 100644
index 000000000000..283eef7d356d
--- /dev/null
+++ b/tools/mapmerge2/__init__.py
@@ -0,0 +1 @@
+# Needed for python imports
diff --git a/tools/mapmerge2/merge_driver.py b/tools/mapmerge2/merge_driver.py
index 39bc1f723e33..8daead9c165c 100644
--- a/tools/mapmerge2/merge_driver.py
+++ b/tools/mapmerge2/merge_driver.py
@@ -75,9 +75,13 @@ def three_way_merge(base, left, right):
print(f" C: Both sides touch the tile at {coord}")
if merged_movables is None:
- obj_name = "---Merge conflict marker---"
- merged_movables = left_movables + [f'/obj{{name = "{obj_name}"}}'] + right_movables
- print(f" Left and right movable groups are split by an `/obj` named \"{obj_name}\"")
+ # Note that if you do not have an object that matches this path in your DME, the invalid path may be discarded when the map is loaded into a map editor.
+ # To rectify this, either add an object with this same path, or create a new object/denote an existing object in the obj_path define.
+ obj_path = "/obj/merge_conflict_marker"
+ obj_name = "---Merge Conflict Marker---"
+ obj_desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
+ merged_movables = left_movables + [f'{obj_path}{{name = "{obj_name}";\n\tdesc = "{obj_desc}"}}'] + right_movables
+ print(f" Left and right movable groups are split by an `{obj_path}` named \"{obj_name}\"")
if merged_turfs is None:
merged_turfs = left_turfs
print(f" Saving turf: {', '.join(left_turfs)}")