diff --git a/citadel.dme b/citadel.dme
index b6b545851dde..a5330f20ddc6 100644
--- a/citadel.dme
+++ b/citadel.dme
@@ -35,6 +35,7 @@
#include "code\__DEFINES\appearance.dm"
#include "code\__DEFINES\automata.dm"
#include "code\__DEFINES\belly_modes_vr.dm"
+#include "code\__DEFINES\bitflags.dm"
#include "code\__DEFINES\callbacks.dm"
#include "code\__DEFINES\chat.dm"
#include "code\__DEFINES\chemistry.dm"
@@ -205,6 +206,7 @@
#include "code\__DEFINES\languages\ids.dm"
#include "code\__DEFINES\languages\legacy.dm"
#include "code\__DEFINES\languages\translation.dm"
+#include "code\__DEFINES\machines\door.dm"
#include "code\__DEFINES\mapping\levels.dm"
#include "code\__DEFINES\mapping\maploader.dm"
#include "code\__DEFINES\mapping\maps.dm"
@@ -1240,6 +1242,7 @@
#include "code\game\machinery\doors\airlock.dm"
#include "code\game\machinery\doors\airlock_control.dm"
#include "code\game\machinery\doors\airlock_electronics.dm"
+#include "code\game\machinery\doors\airlock_subtypes.dm"
#include "code\game\machinery\doors\airlock_vr.dm"
#include "code\game\machinery\doors\alarmlock.dm"
#include "code\game\machinery\doors\blast_door.dm"
@@ -1534,7 +1537,6 @@
#include "code\game\objects\items\devices\holowarrant.dm"
#include "code\game\objects\items\devices\laserpointer.dm"
#include "code\game\objects\items\devices\lightreplacer.dm"
-#include "code\game\objects\items\devices\locker_painter.dm"
#include "code\game\objects\items\devices\megaphone.dm"
#include "code\game\objects\items\devices\modkit.dm"
#include "code\game\objects\items\devices\multitool.dm"
@@ -1756,6 +1758,7 @@
#include "code\game\objects\structures\ledges.dm"
#include "code\game\objects\structures\lightpost.dm"
#include "code\game\objects\structures\loot_piles.dm"
+#include "code\game\objects\structures\low_wall.dm"
#include "code\game\objects\structures\map_blocker.dm"
#include "code\game\objects\structures\medical_stand_vr.dm"
#include "code\game\objects\structures\mineral_bath.dm"
@@ -1782,7 +1785,8 @@
#include "code\game\objects\structures\windoor_assembly.dm"
#include "code\game\objects\structures\window.dm"
#include "code\game\objects\structures\window_spawner.dm"
-#include "code\game\objects\structures\crates_lockers\closets.dm"
+#include "code\game\objects\structures\crates_lockers\__closet.dm"
+#include "code\game\objects\structures\crates_lockers\_closet_appearance_definitions.dm"
#include "code\game\objects\structures\crates_lockers\crates.dm"
#include "code\game\objects\structures\crates_lockers\largecrate.dm"
#include "code\game\objects\structures\crates_lockers\vehiclecage.dm"
@@ -2902,6 +2906,7 @@
#include "code\modules\mapping\map_template.dm"
#include "code\modules\mapping\minimaps.dm"
#include "code\modules\mapping\multiz_helpers.dm"
+#include "code\modules\mapping\paint.dm"
#include "code\modules\mapping\shuttle.dm"
#include "code\modules\mapping\submap.dm"
#include "code\modules\mapping\submaps_legacy.dm"
diff --git a/code/__DEFINES/_planes+layers.dm b/code/__DEFINES/_planes+layers.dm
index 28c55f1f9cdb..6afc620eed59 100644
--- a/code/__DEFINES/_planes+layers.dm
+++ b/code/__DEFINES/_planes+layers.dm
@@ -173,6 +173,7 @@
#define OBJ_PLANE -35
#define OBJ_PLANE_RENDER_TARGET "OBJ_PLANE"
+#define WALL_LAYER (TURF_LAYER+0.3) //! For walls.
#define DEBRIS_LAYER (TURF_LAYER+0.4) /// Cleanable debris.
#define STAIRS_LAYER (TURF_LAYER+0.5) /// Layer for stairs.
#define DOOR_OPEN_LAYER (TURF_LAYER+0.7) /// Under all objects if opened. 2.7 due to tables being at 2.6.
@@ -184,6 +185,8 @@
#define ABOVE_JUNK_LAYER (OBJ_LAYER+0.1) /// Things that want to be slightly above common objects.
#define DOOR_CLOSED_LAYER (OBJ_LAYER+0.1) /// Doors when closed.
+#define LOW_WALL_LAYER (OBJ_LAYER+0.11)
+#define GRILLE_LAYER (OBJ_LAYER+0.12)
#define WINDOW_LAYER (OBJ_LAYER+0.2) /// Windows.
#define ON_WINDOW_LAYER (OBJ_LAYER+0.3) /// Ontop of a window.
#define ABOVE_WINDOW_LAYER (OBJ_LAYER+0.4) /// Above full tile windows so wall items are clickable.
diff --git a/code/__DEFINES/bitflags.dm b/code/__DEFINES/bitflags.dm
new file mode 100644
index 000000000000..c9fed68b9337
--- /dev/null
+++ b/code/__DEFINES/bitflags.dm
@@ -0,0 +1,3 @@
+#define BITSHIFT_LEFT(X, N) (X << (N))
+#define BITSHIFT_RIGHT(X, N) (X >> (N))
+#define BITFLAG(X) BITSHIFT_LEFT(1, X)
diff --git a/code/__DEFINES/color/color.dm b/code/__DEFINES/color/color.dm
index f3e1761dd083..5bd7520141fa 100644
--- a/code/__DEFINES/color/color.dm
+++ b/code/__DEFINES/color/color.dm
@@ -34,6 +34,70 @@
#define COLOR_PALE_PURPLE_GRAY "#BDA2BA"
#define COLOR_PURPLE_GRAY "#A2819E"
#define COLOR_DEEP_SKY_BLUE "#00e1ff"
+#define COLOR_NAVY_BLUE "#000080"
+#define COLOR_DARK_GRAY "#404040"
+#define COLOR_VIOLET "#9933ff"
+#define COLOR_EXPLO_VIOLET "#410083"
+#define COLOR_BROWN_ORANGE "#824b28"
+#define COLOR_GRAY40 "#666666"
+#define COLOR_GRAY20 "#333333"
+#define COLOR_GRAY15 "#151515"
+#define COLOR_SEDONA "#cc6600"
+#define COLOR_DARK_RED "#aa0000"
+#define COLOR_PALE_PINK "#bf89ba"
+#define COLOR_YELLOW_GRAY "#c9a344"
+#define COLOR_PALE_YELLOW "#c1bb7a"
+#define COLOR_WARM_YELLOW "#b3863c"
+#define COLOR_DARK_GREEN_GRAY "#54654c"
+#define COLOR_DARK_BLUE_GRAY "#3e4855"
+#define COLOR_SURGERY_BLUE "#e0f2f6"
+#define COLOR_SUN "#ec8b2f"
+#define COLOR_BLUE_LIGHT "#33ccff"
+#define COLOR_BABY_BLUE "#89cff0"
+#define COLOR_ACID_CYAN "#00ffc8"
+#define COLOR_GRAY80 "#cccccc"
+#define COLOR_OFF_WHITE "#eeeeee"
+#define COLOR_EGGSHELL "#e4e0d2"
+#define COLOR_CLOSET_GOLD "#6d6133"
+#define COLOR_NT_RED "#9d2300"
+#define COLOR_BOTTLE_GREEN "#1f6b4f"
+#define COLOR_PALE_BTL_GREEN "#57967f"
+#define COLOR_GUNMETAL "#545c68"
+#define COLOR_WALL_GUNMETAL "#353a42"
+#define COLOR_STEEL "#a8b0b2"
+#define COLOR_MUZZLE_FLASH "#ffffb2"
+#define COLOR_CHESTNUT "#996633"
+#define COLOR_COPPER "#b87333"
+#define COLOR_BEASTY_BROWN "#663300"
+#define COLOR_WHEAT "#ffff99"
+#define COLOR_CYAN_BLUE "#3366cc"
+#define COLOR_CYAN_DARK "#006999"
+#define COLOR_LIGHT_CYAN "#66ccff"
+#define COLOR_PAKISTAN_GREEN "#006600"
+#define COLOR_HULL "#436b8e"
+#define COLOR_AMBER "#ffbf00"
+#define COLOR_COMMAND_BLUE "#46698c"
+#define COLOR_SKY_BLUE "#5ca1cc"
+#define COLOR_PALE_ORANGE "#b88a3b"
+#define COLOR_CIVIE_GREEN "#b7f27d"
+#define COLOR_TITANIUM "#d1e6e3"
+#define COLOR_DARK_GUNMETAL "#4c535b"
+#define COLOR_BRONZE "#8c7853"
+#define COLOR_TAN "#a39682"
+#define COLOR_BRASS "#b99d71"
+#define COLOR_POLISHED_BRASS "#fdef6e"
+#define COLOR_INDIGO "#4b0082"
+#define COLOR_ALUMINIUM "#bbbbbb"
+#define COLOR_CRYSTAL "#00c8a5"
+#define COLOR_DIAMOND "#d8d4ea"
+
+#define WOOD_COLOR_GENERIC "#d5a66e"
+#define WOOD_COLOR_RICH "#792f27"
+#define WOOD_COLOR_PALE "#d2bc9d"
+#define WOOD_COLOR_PALE2 "#e6d2ba"
+#define WOOD_COLOR_BLACK "#332521"
+#define WOOD_COLOR_CHOCOLATE "#543c30"
+#define WOOD_COLOR_YELLOW "#e3994e"
// Color defines used by the assembly detailer.
#define COLOR_ASSEMBLY_BLACK "#545454"
@@ -63,3 +127,8 @@
#define COLOR_DARKMODE_BACKGROUND "#202020"
#define COLOR_DARKMODE_DARKBACKGROUND "#171717"
#define COLOR_DARKMODE_TEXT "#a4bad6"
+
+#define GLASS_COLOR "#AACCFF"
+#define GLASS_COLOR_SILICATE "#7C3A9A"
+#define GLASS_COLOR_TINTED "#222222"
+#define GLASS_COLOR_FROSTED "#EEEEEE"
diff --git a/code/__DEFINES/machines/door.dm b/code/__DEFINES/machines/door.dm
new file mode 100644
index 000000000000..14e0494201fc
--- /dev/null
+++ b/code/__DEFINES/machines/door.dm
@@ -0,0 +1,15 @@
+// door do_animate animations
+#define DOOR_ANIMATION_OPEN "open"
+#define DOOR_ANIMATION_CLOSE "close"
+#define DOOR_ANIMATION_EMAG "emag"
+#define DOOR_ANIMATION_DENY "deny"
+#define DOOR_ANIMATION_SPARK "spark"
+
+// airlock var/state
+
+#define AIRLOCK_CLOSED 1
+#define AIRLOCK_CLOSING 2
+#define AIRLOCK_OPEN 3
+#define AIRLOCK_OPENING 4
+#define AIRLOCK_DENY 5
+#define AIRLOCK_EMAG 6
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 60103b244a38..f1b15da6cacb 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -112,7 +112,7 @@
if(WIRE_IDSCAN)
//Sending a pulse through flashes the red light on the door (if the door has power).
if(A.arePowerSystemsOn() && A.density)
- A.do_animate("deny")
+ A.do_animate(DOOR_ANIMATION_DENY)
if(WIRE_MAIN_POWER1, WIRE_MAIN_POWER2)
//Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter).
diff --git a/code/game/gamemodes/changeling/powers/electric_lockpick.dm b/code/game/gamemodes/changeling/powers/electric_lockpick.dm
index d8210dfe2ed5..a93bf2dc0266 100644
--- a/code/game/gamemodes/changeling/powers/electric_lockpick.dm
+++ b/code/game/gamemodes/changeling/powers/electric_lockpick.dm
@@ -62,7 +62,7 @@
to_chat(user, "We send an electrical pulse up our finger, and into \the [target], attempting to open it.")
if(door.density && door.operable())
- door.do_animate("spark")
+ door.do_animate(DOOR_ANIMATION_SPARK)
sleep(6)
//More typechecks, because windoors can't be locked. Fun.
if(istype(target,/obj/machinery/door/airlock))
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index e1fad3307623..96ba1507cf5e 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -91,7 +91,7 @@ var/hadevent = 0
for (var/obj/machinery/door/airlock/security/temp_airlock in A)
spawn(0) temp_airlock.prison_open()
- for (var/obj/machinery/door/airlock/glass_security/temp_glassairlock in A)
+ for (var/obj/machinery/door/airlock/glass/security/temp_glassairlock in A)
spawn(0) temp_glassairlock.prison_open()
for (var/obj/machinery/door_timer/temp_timer in A)
diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index b4b2d977a7e3..0f238880a4fd 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -121,6 +121,7 @@ GLOBAL_LIST_EMPTY(air_alarms)
TLV["other"] = list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa
TLV["pressure"] = list(ONE_ATMOSPHERE * 0.80, ONE_ATMOSPHERE * 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20) /* kpa */
TLV["temperature"] = list(T0C - 26, T0C, T0C + 40, T0C + 66) // K
+ setDir(dir)
/obj/machinery/alarm/Initialize(mapload)
. = ..()
@@ -325,6 +326,23 @@ GLOBAL_LIST_EMPTY(air_alarms)
return TRUE
return FALSE
+/obj/machinery/alarm/setDir(ndir)
+ . = ..()
+ base_pixel_x = 0
+ base_pixel_y = 0
+ var/turf/T = get_step(get_turf(src), turn(dir, 180))
+ if(istype(T) && T.density)
+ switch(dir)
+ if(NORTH)
+ base_pixel_y = -21
+ if(SOUTH)
+ base_pixel_y = 21
+ if(WEST)
+ base_pixel_x = 21
+ if(EAST)
+ base_pixel_x = -21
+ reset_pixel_offsets()
+
/obj/machinery/alarm/update_icon()
cut_overlays()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index a95f5ad4b504..e87757a02b27 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -1,7 +1,7 @@
/obj/machinery/camera
name = "security camera"
desc = "It's used to monitor rooms."
- icon = 'icons/obj/monitors_vr.dmi'
+ icon = 'icons/obj/monitors.dmi'
icon_state = "camera"
use_power = USE_POWER_ACTIVE
idle_power_usage = 5
@@ -65,6 +65,7 @@
if(!c_tag)
var/area/A = get_area(src)
c_tag = "[A ? A.name : "Unknown"] #[rand(111,999)]"
+ update_icon()
return ..()
/obj/machinery/camera/Destroy()
@@ -294,6 +295,23 @@
else
icon_state = initial(icon_state)
+/obj/machinery/camera/setDir(ndir)
+ . = ..()
+ base_pixel_x = 0
+ base_pixel_y = 0
+ var/turf/T = get_step(get_turf(src), turn(src.dir, 180))
+ for(var/obj/O in T.contents)
+ if(O.density)
+ switch(dir)
+ if(SOUTH)
+ base_pixel_y = 21
+ if(WEST)
+ base_pixel_x = 10
+ if(EAST)
+ base_pixel_x = -10
+ break
+ reset_pixel_offsets()
+
/obj/machinery/camera/proc/triggerCameraAlarm(duration = 0)
alarm_on = 1
camera_alarm.triggerAlarm(loc, src, duration)
diff --git a/code/game/machinery/computer/timeclock_vr.dm b/code/game/machinery/computer/timeclock_vr.dm
index 3c548c747fdf..8d18a35c73e6 100644
--- a/code/game/machinery/computer/timeclock_vr.dm
+++ b/code/game/machinery/computer/timeclock_vr.dm
@@ -134,6 +134,9 @@
makeOnDuty(params["switch-to-onduty-rank"], params["switch-to-onduty-assignment"])
usr.put_in_hands_or_drop(card)
card = null
+ flick(icon, "timeclock_approved")
+ else
+ flick(icon, "timeclock_denied")
update_icon()
return TRUE
if("switch-to-offduty")
@@ -142,6 +145,9 @@
makeOffDuty()
usr.put_in_hands_or_drop(card)
card = null
+ flick(icon, "timeclock_approved")
+ else
+ flick(icon, "timeclock_denied")
update_icon()
return TRUE
@@ -232,16 +238,20 @@
/obj/machinery/computer/timeclock/proc/checkFace()
if(!card)
to_chat(usr, "No ID is inserted.")
+ flick(icon, "timeclock_denied")
return FALSE
var/mob/living/carbon/human/H = usr
if(!(istype(H)))
to_chat(usr, "Invalid user detected. Access denied.")
+ flick(icon, "timeclock_denied")
return FALSE
else if((H.wear_mask && (H.wear_mask.inv_hide_flags & HIDEFACE)) || (H.head && (H.head.inv_hide_flags & HIDEFACE))) //Face hiding bad
to_chat(usr, "Facial recognition scan failed due to physical obstructions. Access denied.")
+ flick(icon, "timeclock_denied")
return FALSE
else if(H.get_face_name() == "Unknown" || !(H.real_name == card.registered_name))
to_chat(usr, "Facial recognition scan failed. Access denied.")
+ flick(icon, "timeclock_denied")
return FALSE
else
return TRUE
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 585958e53410..7e8513bf1486 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -7,10 +7,28 @@
* Improper'd all of the names in the new()
*/
+GLOBAL_LIST_EMPTY(airlock_icon_cache)
+
+GLOBAL_REAL_VAR(airlock_typecache) = typecacheof(list(
+ /obj/structure/window/reinforced/tinted/full,
+ /obj/structure/window/reinforced/full,
+ /obj/structure/window/phoronreinforced/full,
+ /obj/structure/window/phoronbasic/full,
+ /obj/structure/window/basic/full,
+ /obj/structure/window/reinforced/polarized/full,
+ /obj/structure/wall_frame,
+ /obj/spawner/window
+ )) //the spawner is there specifically because doors are initializing weird.
+
+#define AIRLOCK_PAINTABLE 1
+#define AIRLOCK_STRIPABLE 2
+#define AIRLOCK_DETAILABLE 4
+#define AIRLOCK_WINDOW_PAINTABLE 8
+
/obj/machinery/door/airlock
name = "Airlock"
- icon = 'icons/obj/doors/Doorint.dmi'
- icon_state = "door_closed"
+ icon = 'icons/obj/doors/station/door.dmi'
+ icon_state = "preview"
power_channel = ENVIRON
rad_flags = RAD_BLOCK_CONTENTS
rad_insulation = RAD_INSULATION_MEDIUM
@@ -19,7 +37,9 @@
autoclose = 1
normalspeed = 1
+ smoothing_flags = SMOOTH_CUSTOM
smoothing_groups = (SMOOTH_GROUP_AIRLOCK)
+ canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_GRILLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS )
/**
* If -1, the control is enabled but the AI had bypassed it earlier, so if it is disabled again the AI would have no trouble getting back in.
@@ -64,9 +84,142 @@
var/bolt_up_sound = 'sound/machines/boltsup.ogg'
var/bolt_down_sound = 'sound/machines/boltsdown.ogg'
+ var/paintable = AIRLOCK_PAINTABLE|AIRLOCK_STRIPABLE|AIRLOCK_WINDOW_PAINTABLE
+ var/door_color = null
+ var/stripe_color = null
+ var/symbol_color = null
+ var/window_color = GLASS_COLOR
+ var/window_material = /datum/material/glass
+
+ var/fill_file = 'icons/obj/doors/station/fill_steel.dmi'
+ var/color_file = 'icons/obj/doors/station/color.dmi'
+ var/color_fill_file = 'icons/obj/doors/station/fill_color.dmi'
+ var/stripe_file = 'icons/obj/doors/station/stripe.dmi'
+ var/stripe_fill_file = 'icons/obj/doors/station/fill_stripe.dmi'
+ var/glass_file = 'icons/obj/doors/station/fill_glass.dmi'
+ var/bolts_file = 'icons/obj/doors/station/lights_bolts.dmi'
+ var/deny_file = 'icons/obj/doors/station/lights_deny.dmi'
+ var/lights_file = 'icons/obj/doors/station/lights_green.dmi'
+ var/panel_file = 'icons/obj/doors/station/panel.dmi'
+ var/sparks_damaged_file = 'icons/obj/doors/station/sparks_damaged.dmi'
+ var/sparks_broken_file = 'icons/obj/doors/station/sparks_broken.dmi'
+ var/welded_file = 'icons/obj/doors/station/welded.dmi'
+ var/emag_file = 'icons/obj/doors/station/emag.dmi'
+ var/airlock_type = "Standard"
+ var/state = AIRLOCK_CLOSED
+ var/speaker = TRUE
+
/// Bandaid around a problem.
var/last_spark = 0
+
+/obj/machinery/door/airlock/proc/set_airlock_overlays(state)
+ var/icon/color_overlay
+ var/icon/filling_overlay
+ var/icon/stripe_overlay
+ var/icon/stripe_filling_overlay
+ var/icon/lights_overlay
+ var/icon/panel_overlay
+ var/icon/weld_overlay
+ var/icon/damage_overlay
+ var/icon/sparks_overlay
+ var/icon/brace_overlay
+
+ set_light(0)
+
+ if(door_color && !(door_color == "none"))
+ var/ikey = "[airlock_type]-[door_color]-color"
+ color_overlay = GLOB.airlock_icon_cache["[ikey]"]
+ if(!color_overlay)
+ color_overlay = new(color_file)
+ color_overlay.Blend(door_color, ICON_MULTIPLY)
+ GLOB.airlock_icon_cache["[ikey]"] = color_overlay
+ if(glass)
+ if (window_color && window_color != "none")
+ var/ikey = "[airlock_type]-[window_color]-windowcolor"
+ filling_overlay = GLOB.airlock_icon_cache["[ikey]"]
+ if (!filling_overlay)
+ filling_overlay = new(glass_file)
+ filling_overlay.Blend(window_color, ICON_MULTIPLY)
+ GLOB.airlock_icon_cache["[ikey]"] = filling_overlay
+ else
+ filling_overlay = glass_file
+ else
+ if(door_color && !(door_color == "none"))
+ var/ikey = "[airlock_type]-[door_color]-fillcolor"
+ filling_overlay = GLOB.airlock_icon_cache["[ikey]"]
+ if(!filling_overlay)
+ filling_overlay = new(color_fill_file)
+ filling_overlay.Blend(door_color, ICON_MULTIPLY)
+ GLOB.airlock_icon_cache["[ikey]"] = filling_overlay
+ else
+ filling_overlay = fill_file
+ if(stripe_color && !(stripe_color == "none"))
+ var/ikey = "[airlock_type]-[stripe_color]-stripe"
+ stripe_overlay = GLOB.airlock_icon_cache["[ikey]"]
+ if(!stripe_overlay)
+ stripe_overlay = new(stripe_file)
+ stripe_overlay.Blend(stripe_color, ICON_MULTIPLY)
+ GLOB.airlock_icon_cache["[ikey]"] = stripe_overlay
+ if(!glass)
+ var/ikey2 = "[airlock_type]-[stripe_color]-fillstripe"
+ stripe_filling_overlay = GLOB.airlock_icon_cache["[ikey2]"]
+ if(!stripe_filling_overlay)
+ stripe_filling_overlay = new(stripe_fill_file)
+ stripe_filling_overlay.Blend(stripe_color, ICON_MULTIPLY)
+ GLOB.airlock_icon_cache["[ikey2]"] = stripe_filling_overlay
+
+ if(arePowerSystemsOn())
+ switch(state)
+ if(AIRLOCK_CLOSED)
+ if(lights && locked)
+ lights_overlay = bolts_file
+ set_light(1, 2, l_color = COLOR_RED_LIGHT)
+
+ if(AIRLOCK_DENY)
+ if(lights)
+ lights_overlay = deny_file
+ set_light(1, 2, l_color = COLOR_RED_LIGHT)
+
+ if(AIRLOCK_EMAG)
+ sparks_overlay = emag_file
+
+ if(AIRLOCK_CLOSING)
+ if(lights)
+ lights_overlay = lights_file
+ set_light(1, 2, l_color = COLOR_LIME)
+
+ if(AIRLOCK_OPENING)
+ if(lights)
+ lights_overlay = lights_file
+ set_light(1, 2, l_color = COLOR_LIME)
+
+ if(machine_stat & BROKEN)
+ damage_overlay = sparks_broken_file
+ else if(health < maxhealth * 3/4)
+ damage_overlay = sparks_damaged_file
+
+ if(welded)
+ weld_overlay = welded_file
+
+ if(panel_open)
+ panel_overlay = panel_file
+
+ cut_overlays()
+ // todo: micro-optimizations, right now we're just using listclearnulls on SSoverlays side ~silicons
+ add_overlay(list(
+ color_overlay,
+ filling_overlay,
+ stripe_overlay,
+ stripe_filling_overlay,
+ panel_overlay,
+ weld_overlay,
+ brace_overlay,
+ lights_overlay,
+ sparks_overlay,
+ damage_overlay,
+ ))
+
/obj/machinery/door/airlock/attack_generic(var/mob/living/user, var/damage)
if(machine_stat & (BROKEN|NOPOWER))
if(damage >= STRUCTURE_MIN_DAMAGE_THRESHOLD)
@@ -98,10 +251,10 @@
if(istype(X.species, /datum/species/xenos))
if(src.locked || src.welded)
visible_message("\The [user] begins digging into \the [src] internals!")
- src.do_animate("deny")
+ src.do_animate(DOOR_ANIMATION_DENY)
if(do_after(user,5 SECONDS,src))
visible_message("\The [user] forces \the [src] open, sparks flying from its electronics!")
- src.do_animate("spark")
+ src.do_animate(DOOR_ANIMATION_SPARK)
playsound(src.loc, 'sound/machines/airlock_creaking.ogg', 100, 1)
src.locked = 0
src.welded = 0
@@ -118,7 +271,7 @@
visible_message("\The [user] forces \the [src] closed!")
close(1)
else
- src.do_animate("deny")
+ src.do_animate(DOOR_ANIMATION_DENY)
visible_message("\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].")
return
..()
@@ -128,351 +281,6 @@
return get_material_by_name(mineral)
return get_material_by_name(MAT_STEEL)
-/obj/machinery/door/airlock/command
- name = "Command Airlock"
- icon = 'icons/obj/doors/Doorcom.dmi'
- req_one_access = list(ACCESS_COMMAND_BRIDGE)
- assembly_type = /obj/structure/door_assembly/door_assembly_com
- open_sound_powered = 'sound/machines/door/cmd3o.ogg'
- close_sound_powered = 'sound/machines/door/cmd3c.ogg'
-
-/obj/machinery/door/airlock/security
- name = "Security Airlock"
- icon = 'icons/obj/doors/Doorsec.dmi'
- req_one_access = list(ACCESS_SECURITY_EQUIPMENT)
- assembly_type = /obj/structure/door_assembly/door_assembly_sec
- open_sound_powered = 'sound/machines/door/sec1o.ogg'
- close_sound_powered = 'sound/machines/door/sec1c.ogg'
-
-/obj/machinery/door/airlock/engineering
- name = "Engineering Airlock"
- icon = 'icons/obj/doors/Dooreng.dmi'
- req_one_access = list(ACCESS_ENGINEERING_MAIN)
- assembly_type = /obj/structure/door_assembly/door_assembly_eng
- open_sound_powered = 'sound/machines/door/eng1o.ogg'
- close_sound_powered = 'sound/machines/door/eng1c.ogg'
-
-/obj/machinery/door/airlock/engineeringatmos
- name = "Atmospherics Airlock"
- icon = 'icons/obj/doors/Doorengatmos.dmi'
- req_one_access = list(ACCESS_ENGINEERING_ATMOS)
- assembly_type = /obj/structure/door_assembly/door_assembly_eat
- open_sound_powered = 'sound/machines/door/eng1o.ogg'
- close_sound_powered = 'sound/machines/door/eng1c.ogg'
-
-/obj/machinery/door/airlock/medical
- name = "Medical Airlock"
- icon = 'icons/obj/doors/Doormed.dmi'
- req_one_access = list(ACCESS_MEDICAL_MAIN)
- assembly_type = /obj/structure/door_assembly/door_assembly_med
- open_sound_powered = 'sound/machines/door/med1o.ogg'
- close_sound_powered = 'sound/machines/door/med1c.ogg'
-
-/obj/machinery/door/airlock/maintenance
- name = "Maintenance Access"
- icon = 'icons/obj/doors/Doormaint.dmi'
- //req_one_access = list(ACCESS_ENGINEERING_MAINT) // Maintenance is open access
- assembly_type = /obj/structure/door_assembly/door_assembly_mai
- open_sound_powered = 'sound/machines/door/door2o.ogg'
- close_sound_powered = 'sound/machines/door/door2c.ogg'
-
-/obj/machinery/door/airlock/maintenance/cargo
- icon = 'icons/obj/doors/Doormaint_cargo.dmi'
- req_one_access = list(ACCESS_SUPPLY_BAY)
- open_sound_powered = 'sound/machines/door/door2o.ogg'
- close_sound_powered = 'sound/machines/door/door2c.ogg'
-
-/obj/machinery/door/airlock/maintenance/command
- icon = 'icons/obj/doors/Doormaint_command.dmi'
- req_one_access = list(ACCESS_COMMAND_BRIDGE)
-
-/obj/machinery/door/airlock/maintenance/common
- icon = 'icons/obj/doors/Doormaint_common.dmi'
- open_sound_powered = 'sound/machines/door/hall3o.ogg'
- close_sound_powered = 'sound/machines/door/hall3c.ogg'
-
-/obj/machinery/door/airlock/maintenance/engi
- icon = 'icons/obj/doors/Doormaint_engi.dmi'
- req_one_access = list(ACCESS_ENGINEERING_MAIN)
-
-/obj/machinery/door/airlock/maintenance/int
- icon = 'icons/obj/doors/Doormaint_int.dmi'
-
-/obj/machinery/door/airlock/maintenance/medical
- icon = 'icons/obj/doors/Doormaint_med.dmi'
- req_one_access = list(ACCESS_MEDICAL_MAIN)
-
-/obj/machinery/door/airlock/maintenance/rnd
- icon = 'icons/obj/doors/Doormaint_rnd.dmi'
- req_one_access = list(ACCESS_SCIENCE_MAIN)
-
-/obj/machinery/door/airlock/maintenance/sec
- icon = 'icons/obj/doors/Doormaint_sec.dmi'
- req_one_access = list(ACCESS_SECURITY_EQUIPMENT)
-
-/obj/machinery/door/airlock/external
- name = "External Airlock"
- icon = 'icons/obj/doors/Doorext.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_ext
- open_sound_powered = 'sound/machines/door/space1o.ogg'
- close_sound_powered = 'sound/machines/door/space1c.ogg'
-
-/obj/machinery/door/airlock/external/glass/bolted
- icon_state = "door_locked" // So it looks visibly bolted in map editor
- locked = 1
-
-// For convenience in making docking ports: one that is pre-bolted with frequency set!
-/obj/machinery/door/airlock/external/glass/bolted/cycling
- frequency = 1379
-
-/obj/machinery/door/airlock/glass_external
- name = "External Airlock"
- icon = 'icons/obj/doors/Doorextglass.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_ext
- opacity = 0
- glass = 1
- req_one_access = list(ACCESS_ENGINEERING_AIRLOCK)
- open_sound_powered = 'sound/machines/door/space1o.ogg'
- close_sound_powered = 'sound/machines/door/space1c.ogg'
-
-/obj/machinery/door/airlock/glass
- name = "Glass Airlock"
- icon = 'icons/obj/doors/Doorglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- open_sound_powered = 'sound/machines/door/hall1o.ogg'
- close_sound_powered = 'sound/machines/door/hall1c.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- glass = 1
-
-/obj/machinery/door/airlock/centcom
- name = "Centcom Airlock"
- icon = 'icons/obj/doors/Doorele.dmi'
- req_one_access = list(ACCESS_CENTCOM_GENERAL)
- opacity = 1
- open_sound_powered = 'sound/machines/door/cmd3o.ogg'
- close_sound_powered = 'sound/machines/door/cmd3c.ogg'
-
-/obj/machinery/door/airlock/glass_centcom
- name = "Airlock"
- icon = 'icons/obj/doors/Dooreleglass.dmi'
- opacity = 0
- glass = 1
- open_sound_powered = 'sound/machines/door/cmd3o.ogg'
- close_sound_powered = 'sound/machines/door/cmd3c.ogg'
-
-/obj/machinery/door/airlock/vault
- name = "Vault"
- icon = 'icons/obj/doors/vault.dmi'
- explosion_resistance = 20
- opacity = 1
- secured_wires = 1
- assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites.
- req_one_access = list(ACCESS_COMMAND_VAULT)
- open_sound_powered = 'sound/machines/door/vault1o.ogg'
- close_sound_powered = 'sound/machines/door/vault1c.ogg'
-
-/obj/machinery/door/airlock/vault/bolted
- icon_state = "door_locked"
- locked = 1
-
-/obj/machinery/door/airlock/freezer
- name = "Freezer Airlock"
- icon = 'icons/obj/doors/Doorfreezer.dmi'
- opacity = 1
- assembly_type = /obj/structure/door_assembly/door_assembly_fre
-
-/obj/machinery/door/airlock/hatch
- name = "Airtight Hatch"
- icon = 'icons/obj/doors/Doorhatchele.dmi'
- explosion_resistance = 20
- opacity = 1
- assembly_type = /obj/structure/door_assembly/door_assembly_hatch
- req_one_access = list(ACCESS_ENGINEERING_MAINT)
- open_sound_powered = 'sound/machines/door/hatchopen.ogg'
- close_sound_powered = 'sound/machines/door/hatchclose.ogg'
- open_sound_unpowered = 'sound/machines/door/hatchforced.ogg'
-
-/obj/machinery/door/airlock/maintenance_hatch
- name = "Maintenance Hatch"
- icon = 'icons/obj/doors/Doorhatchmaint2.dmi'
- explosion_resistance = 20
- opacity = 1
- assembly_type = /obj/structure/door_assembly/door_assembly_mhatch
- req_one_access = list(ACCESS_ENGINEERING_MAINT)
- open_sound_powered = 'sound/machines/door/hatchopen.ogg'
- close_sound_powered = 'sound/machines/door/hatchclose.ogg'
- open_sound_unpowered = 'sound/machines/door/hatchforced.ogg'
-
-/obj/machinery/door/airlock/glass_command
- name = "Command Airlock"
- icon = 'icons/obj/doors/Doorcomglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_com
- glass = 1
- req_one_access = list(ACCESS_COMMAND_BRIDGE)
- open_sound_powered = 'sound/machines/door/cmd1o.ogg'
- close_sound_powered = 'sound/machines/door/cmd1c.ogg'
-
-
-/obj/machinery/door/airlock/glass_engineering
- name = "Engineering Airlock"
- icon = 'icons/obj/doors/Doorengglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_eng
- glass = 1
- req_one_access = list(ACCESS_ENGINEERING_MAIN)
- open_sound_powered = 'sound/machines/door/eng1o.ogg'
- close_sound_powered = 'sound/machines/door/eng1c.ogg'
-
-/obj/machinery/door/airlock/glass_engineeringatmos
- name = "Atmospherics Airlock"
- icon = 'icons/obj/doors/Doorengatmoglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_eat
- glass = 1
- req_one_access = list(ACCESS_ENGINEERING_ATMOS)
- open_sound_powered = 'sound/machines/door/eng1o.ogg'
- close_sound_powered = 'sound/machines/door/eng1c.ogg'
-
-/obj/machinery/door/airlock/glass_security
- name = "Security Airlock"
- icon = 'icons/obj/doors/Doorsecglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_sec
- glass = 1
- req_one_access = list(ACCESS_SECURITY_EQUIPMENT)
- open_sound_powered = 'sound/machines/door/sec1o.ogg'
- close_sound_powered = 'sound/machines/door/sec1c.ogg'
-
-/obj/machinery/door/airlock/glass_medical
- name = "Medical Airlock"
- icon = 'icons/obj/doors/Doormedglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_med
- glass = 1
- req_one_access = list(ACCESS_MEDICAL_MAIN)
- open_sound_powered = 'sound/machines/door/med1o.ogg'
- close_sound_powered = 'sound/machines/door/med1c.ogg'
-
-/obj/machinery/door/airlock/mining
- name = "Mining Airlock"
- icon = 'icons/obj/doors/Doormining.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_min
- req_one_access = list(ACCESS_SUPPLY_MINE)
- open_sound_powered = 'sound/machines/door/eng1o.ogg'
- close_sound_powered = 'sound/machines/door/eng1c.ogg'
-
-/obj/machinery/door/airlock/atmos
- name = "Atmospherics Airlock"
- icon = 'icons/obj/doors/Dooratmo.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_atmo
- req_one_access = list(ACCESS_ENGINEERING_ATMOS)
- open_sound_powered = 'sound/machines/door/eng1o.ogg'
- close_sound_powered = 'sound/machines/door/eng1c.ogg'
-
-/obj/machinery/door/airlock/research
- name = "Research Airlock"
- icon = 'icons/obj/doors/Doorresearch.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_research
- open_sound_powered = 'sound/machines/door/sci1o.ogg'
- close_sound_powered = 'sound/machines/door/sci1c.ogg'
-
-/obj/machinery/door/airlock/glass_research
- name = "Research Airlock"
- icon = 'icons/obj/doors/Doorresearchglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_research
- glass = 1
- req_one_access = list(ACCESS_SCIENCE_MAIN)
- open_sound_powered = 'sound/machines/door/sci1o.ogg'
- close_sound_powered = 'sound/machines/door/sci1c.ogg'
-
-/obj/machinery/door/airlock/glass_mining
- name = "Mining Airlock"
- icon = 'icons/obj/doors/Doorminingglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_min
- glass = 1
- req_one_access = list(ACCESS_SUPPLY_MINE)
- open_sound_powered = 'sound/machines/door/cgo1o.ogg'
- close_sound_powered = 'sound/machines/door/cgo1c.ogg'
-
-/obj/machinery/door/airlock/glass_atmos
- name = "Atmospherics Airlock"
- icon = 'icons/obj/doors/Dooratmoglass.dmi'
- hitsound = 'sound/effects/Glasshit.ogg'
- maxhealth = 300
- explosion_resistance = 5
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_atmo
- glass = 1
- req_one_access = list(ACCESS_ENGINEERING_ATMOS)
- open_sound_powered = 'sound/machines/door/eng1o.ogg'
- close_sound_powered = 'sound/machines/door/eng1c.ogg'
-
-
-/obj/machinery/door/airlock/gold
- name = "Gold Airlock"
- icon = 'icons/obj/doors/Doorgold.dmi'
- mineral = "gold"
-
-/obj/machinery/door/airlock/silver
- name = "Silver Airlock"
- icon = 'icons/obj/doors/Doorsilver.dmi'
- mineral = "silver"
-
-/obj/machinery/door/airlock/diamond
- name = "Diamond Airlock"
- icon = 'icons/obj/doors/Doordiamond.dmi'
- mineral = "diamond"
-
-/obj/machinery/door/airlock/uranium
- name = "Uranium Airlock"
- desc = "And they said I was crazy."
- icon = 'icons/obj/doors/Dooruranium.dmi'
- mineral = "uranium"
- var/last_event = 0
- var/rad_power = RAD_INTENSITY_MAT_SPECIAL_URANIUM_AIRLOCK
-
-/obj/machinery/door/airlock/bananium
- name = "Bananium Airlock"
- desc = "An absolute atrocity."
- icon = 'icons/obj/doors/Doorbananium.dmi'
- mineral = "bananium"
- open_sound_powered = 'sound/items/bikehorn.ogg'
- close_sound_powered = 'sound/items/bikehorn.ogg'
-
-/obj/machinery/door/airlock/silencium
- name = "Silencium Airlock"
- desc = "The pinnacle of noise cancelling door technology."
- icon = 'icons/obj/doors/Doorsilencium.dmi'
- mineral = "silencium"
- open_sound_powered = 'sound/effects/footstep/carpet1.ogg'
- close_sound_powered = 'sound/effects/footstep/carpet1.ogg'
-
/obj/machinery/door/airlock/process(delta_time)
// Deliberate no call to parent.
if(main_power_lost_until > 0 && world.time >= main_power_lost_until)
@@ -519,107 +327,6 @@
new/obj/structure/door_assembly( src.loc )
qdel(src)
-/obj/machinery/door/airlock/sandstone
- name = "Sandstone Airlock"
- icon = 'icons/obj/doors/Doorsand.dmi'
- mineral = "sandstone"
-
-/obj/machinery/door/airlock/science
- name = "Research Airlock"
- icon = 'icons/obj/doors/Doorsci.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_science
- req_one_access = list(ACCESS_SCIENCE_MAIN)
- open_sound_powered = 'sound/machines/door/sci1o.ogg'
- close_sound_powered = 'sound/machines/door/sci1c.ogg'
-
-/obj/machinery/door/airlock/glass_science
- name = "Glass Airlocks"
- icon = 'icons/obj/doors/Doorsciglass.dmi'
- opacity = 0
- assembly_type = /obj/structure/door_assembly/door_assembly_science
- glass = 1
- req_one_access = list(ACCESS_SCIENCE_MAIN)
- open_sound_powered = 'sound/machines/door/sci1o.ogg'
- close_sound_powered = 'sound/machines/door/sci1c.ogg'
-
-/obj/machinery/door/airlock/highsecurity
- name = "Secure Airlock"
- icon = 'icons/obj/doors/hightechsecurity.dmi'
- explosion_resistance = 20
- secured_wires = 1
- assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity
- req_one_access = list(ACCESS_COMMAND_VAULT)
- open_sound_powered = 'sound/machines/door/secure1o.ogg'
- close_sound_powered = 'sound/machines/door/secure1c.ogg'
-
-/obj/machinery/door/airlock/voidcraft
- name = "voidcraft hatch"
- desc = "It's an extra resilient airlock intended for spacefaring vessels."
- icon = 'icons/obj/doors/shuttledoors.dmi'
- explosion_resistance = 20
- opacity = 0
- glass = 1
- assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft
- open_sound_powered = 'sound/machines/door/shuttle1o.ogg'
- close_sound_powered = 'sound/machines/door/shuttle1c.ogg'
-
-// Airlock opens from top-bottom instead of left-right.
-/obj/machinery/door/airlock/voidcraft/vertical
- icon = 'icons/obj/doors/shuttledoors_vertical.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft/vertical
- open_sound_powered = 'sound/machines/door/shuttle1o.ogg'
- close_sound_powered = 'sound/machines/door/shuttle1c.ogg'
-
-/datum/category_item/catalogue/anomalous/precursor_a/alien_airlock
- name = "Precursor Alpha Object - Doors"
- desc = "This object appears to be used in order to restrict or allow access to \
- rooms based on its physical state. In other words, a door. \
- Despite being designed and created by unknown ancient alien hands, this door has \
- a large number of similarities to the conventional airlock, such as being driven by \
- electricity, opening and closing by physically moving, and being air tight. \
- It also operates by responding to signals through internal electrical conduits. \
- These characteristics make it possible for one with experience with a multitool \
- to manipulate the door.\
-
\
- The symbol on the door does not match any living species' patterns, giving further \
- implications that this door is very old, and yet it remains operational after \
- thousands of years. It is unknown if that is due to superb construction, or \
- unseen autonomous maintenance having been performed."
- value = CATALOGUER_REWARD_EASY
-
-/obj/machinery/door/airlock/alien
- name = "alien airlock"
- desc = "You're fairly sure this is a door."
- catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_airlock)
- icon = 'icons/obj/doors/Dooralien.dmi'
- explosion_resistance = 20
- secured_wires = TRUE
- hackProof = TRUE
- assembly_type = /obj/structure/door_assembly/door_assembly_alien
- req_one_access = list(ACCESS_FACTION_ALIEN)
-
-/obj/machinery/door/airlock/alien/locked
- icon_state = "door_locked"
- locked = TRUE
-
-/obj/machinery/door/airlock/alien/public // Entry to UFO.
- req_one_access = list()
- normalspeed = FALSE // So it closes faster and hopefully keeps the warm air inside.
- hackProof = TRUE // No borgs
-
-//"Red" Armory Door
-/obj/machinery/door/airlock/security/armory
- name = "Red Armory"
- //color = ""
-
-/obj/machinery/door/airlock/security/armory/allowed(mob/user)
- if(get_security_level() in list("green","blue"))
- return FALSE
-
- return ..(user)
-
-
-
/*
About the new airlock wires panel:
* An airlock wire dialog can be accessed by the normal way or by using wirecutters or a multitool on the door while the wire-panel is open. This would show the following wires, which you can either wirecut/mend or send a multitool pulse through. There are 9 wires.
@@ -800,68 +507,43 @@ About the new airlock wires panel:
return 0
-/obj/machinery/door/airlock/update_icon()
- if(overlays)
- cut_overlays()
-
- var/list/overlays_to_add = list()
+/obj/machinery/door/airlock/update_icon(var/doorstate)
+ switch(doorstate)
+ if(AIRLOCK_OPEN)
+ icon_state = "open"
+ if(AIRLOCK_CLOSED)
+ icon_state = "closed"
+ if(AIRLOCK_OPENING, AIRLOCK_CLOSING, AIRLOCK_EMAG, AIRLOCK_DENY)
+ icon_state = ""
- if(density)
- if(locked && lights && src.arePowerSystemsOn())
- icon_state = "door_locked"
- else
- icon_state = "door_closed"
- if(p_open || welded)
- if(p_open)
- overlays_to_add += image(icon, "panel_open")
- if (!(machine_stat & NOPOWER))
- if(machine_stat & BROKEN)
- overlays_to_add += image(icon, "sparks_broken")
- else if (health < maxhealth * 3/4)
- overlays_to_add += image(icon, "sparks_damaged")
- if(welded)
- overlays_to_add += image(icon, "welded")
- else if (health < maxhealth * 3/4 && !(machine_stat & NOPOWER))
- overlays_to_add += image(icon, "sparks_damaged")
- else
- icon_state = "door_open"
- if((machine_stat & BROKEN) && !(machine_stat & NOPOWER))
- overlays_to_add += image(icon, "sparks_open")
+ set_airlock_overlays(state)
- add_overlay(overlays_to_add)
-
- return
+/obj/machinery/door/airlock/custom_smooth()
+ return //we only custom smooth because we don't need to do anything else.
/obj/machinery/door/airlock/do_animate(animation)
switch(animation)
- if("opening")
- if(overlays)
- cut_overlays()
- if(p_open)
- spawn(2) // The only work around that works. Downside is that the door will be gone for a millisecond.
- flick("o_door_opening", src) //can not use flick due to BYOND bug updating overlays right before flicking
- update_icon()
- else
- flick("door_opening", src)//[machine_stat ? "_stat":]
- update_icon()
- if("closing")
- if(overlays)
- cut_overlays()
- if(p_open)
- spawn(2)
- flick("o_door_closing", src)
- update_icon()
- else
- flick("door_closing", src)
- update_icon()
- if("spark")
- if(density)
- flick("door_spark", src)
- if("deny")
- if(density && src.arePowerSystemsOn())
- flick("door_deny", src)
- playsound(src, denied_sound, 50, 0, 3)
- return
+ if(DOOR_ANIMATION_OPEN)
+ set_airlock_overlays(AIRLOCK_OPENING)
+ flick("opening", src)//[stat ? "_stat":]
+ update_icon(AIRLOCK_OPEN)
+ if(DOOR_ANIMATION_CLOSE)
+ set_airlock_overlays(AIRLOCK_CLOSING)
+ flick("closing", src)
+ update_icon(AIRLOCK_CLOSED)
+ if(DOOR_ANIMATION_DENY)
+ set_airlock_overlays(AIRLOCK_DENY)
+ if(density && arePowerSystemsOn())
+ flick("deny", src)
+ if(speaker)
+ playsound(loc, denied_sound, 50, 0)
+ update_icon(AIRLOCK_CLOSED)
+ if(DOOR_ANIMATION_EMAG)
+ set_airlock_overlays(AIRLOCK_EMAG)
+ if(density && arePowerSystemsOn())
+ flick("deny", src)
+ else
+ update_icon()
/obj/machinery/door/airlock/attack_ai(mob/user as mob)
ui_interact(user)
@@ -1417,6 +1099,33 @@ About the new airlock wires panel:
src.closeOther = A
break
name = "\improper [name]"
+ if(autoset_dir)
+ for (var/cardinal in GLOB.cardinal) //No list copy please good sir
+ var/turf/step_turf = get_step(src, cardinal)
+ for(var/atom/thing as anything in step_turf)
+ if(thing.type in airlock_typecache)
+ switch(cardinal)
+ if(EAST)
+ setDir(SOUTH)
+ if(WEST)
+ setDir(SOUTH)
+ if(NORTH)
+ setDir(WEST)
+ if(SOUTH)
+ setDir(WEST)
+ break
+ if (step_turf.density == TRUE)
+ switch(cardinal)
+ if(EAST)
+ setDir(SOUTH)
+ if(WEST)
+ setDir(SOUTH)
+ if(NORTH)
+ setDir(WEST)
+ if(SOUTH)
+ setDir(WEST)
+ break
+ update_icon(AIRLOCK_CLOSED)
. = ..()
/obj/machinery/door/airlock/Destroy()
diff --git a/code/game/machinery/doors/airlock_subtypes.dm b/code/game/machinery/doors/airlock_subtypes.dm
new file mode 100644
index 000000000000..b7c3d650a202
--- /dev/null
+++ b/code/game/machinery/doors/airlock_subtypes.dm
@@ -0,0 +1,568 @@
+// i kind of want to strangle whoever thought it was a good idea to shove a bunch of door subtypes in the middle of the fucking airlock code.
+
+/obj/machinery/door/airlock/command
+ name = "Command Airlock"
+ icon_state = "preview"
+ req_one_access = list(ACCESS_COMMAND_BRIDGE)
+ assembly_type = /obj/structure/door_assembly/door_assembly_com
+ open_sound_powered = 'sound/machines/door/cmd3o.ogg'
+ close_sound_powered = 'sound/machines/door/cmd3c.ogg'
+ door_color = COLOR_COMMAND_BLUE
+ stripe_color = COLOR_SKY_BLUE
+
+/obj/machinery/door/airlock/security
+ name = "Security Airlock"
+ icon_state = "preview"
+ req_one_access = list(ACCESS_SECURITY_EQUIPMENT)
+ assembly_type = /obj/structure/door_assembly/door_assembly_sec
+ open_sound_powered = 'sound/machines/door/sec1o.ogg'
+ close_sound_powered = 'sound/machines/door/sec1c.ogg'
+ door_color = COLOR_MAROON
+
+/obj/machinery/door/airlock/engineering
+ name = "Engineering Airlock"
+ icon_state = "preview"
+ req_one_access = list(ACCESS_ENGINEERING_MAIN)
+ assembly_type = /obj/structure/door_assembly/door_assembly_eng
+ open_sound_powered = 'sound/machines/door/eng1o.ogg'
+ close_sound_powered = 'sound/machines/door/eng1c.ogg'
+ door_color = COLOR_AMBER
+
+/obj/machinery/door/airlock/engineeringatmos
+ name = "Atmospherics Airlock"
+ icon_state = "preview"
+ req_one_access = list(ACCESS_ENGINEERING_ATMOS)
+ assembly_type = /obj/structure/door_assembly/door_assembly_eat
+ open_sound_powered = 'sound/machines/door/eng1o.ogg'
+ close_sound_powered = 'sound/machines/door/eng1c.ogg'
+ door_color = COLOR_AMBER
+ stripe_color = COLOR_CYAN
+
+/obj/machinery/door/airlock/medical
+ name = "Medical Airlock"
+ icon_state = "preview"
+ req_one_access = list(ACCESS_MEDICAL_MAIN)
+ assembly_type = /obj/structure/door_assembly/door_assembly_med
+ open_sound_powered = 'sound/machines/door/med1o.ogg'
+ close_sound_powered = 'sound/machines/door/med1c.ogg'
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_DEEP_SKY_BLUE
+
+/obj/machinery/door/airlock/maintenance
+ name = "Maintenance Access"
+ icon_state = "preview"
+ //req_one_access = list(ACCESS_ENGINEERING_MAINT) // Maintenance is open access
+ assembly_type = /obj/structure/door_assembly/door_assembly_mai
+ open_sound_powered = 'sound/machines/door/door2o.ogg'
+ close_sound_powered = 'sound/machines/door/door2c.ogg'
+ stripe_color = COLOR_AMBER
+
+/obj/machinery/door/airlock/maintenance/cargo
+ req_one_access = list(ACCESS_SUPPLY_BAY)
+ open_sound_powered = 'sound/machines/door/door2o.ogg'
+ close_sound_powered = 'sound/machines/door/door2c.ogg'
+
+/obj/machinery/door/airlock/maintenance/command
+ req_one_access = list(ACCESS_COMMAND_BRIDGE)
+
+/obj/machinery/door/airlock/maintenance/common
+ open_sound_powered = 'sound/machines/door/hall3o.ogg'
+ close_sound_powered = 'sound/machines/door/hall3c.ogg'
+
+/obj/machinery/door/airlock/maintenance/engi
+ req_one_access = list(ACCESS_ENGINEERING_MAIN)
+
+/obj/machinery/door/airlock/maintenance/int
+
+
+/obj/machinery/door/airlock/maintenance/medical
+ req_one_access = list(ACCESS_MEDICAL_MAIN)
+
+/obj/machinery/door/airlock/maintenance/rnd
+ req_one_access = list(ACCESS_SCIENCE_MAIN)
+
+/obj/machinery/door/airlock/maintenance/sec
+ req_one_access = list(ACCESS_SECURITY_EQUIPMENT)
+
+/obj/machinery/door/airlock/external
+ name = "External Airlock"
+ icon_state = "preview"
+ airlock_type = "External"
+ assembly_type = /obj/structure/door_assembly/door_assembly_ext
+ open_sound_powered = 'sound/machines/door/space1o.ogg'
+ close_sound_powered = 'sound/machines/door/space1c.ogg'
+ icon = 'icons/obj/doors/external/door.dmi'
+ fill_file = 'icons/obj/doors/external/fill_steel.dmi'
+ color_file = 'icons/obj/doors/external/color.dmi'
+ color_fill_file = 'icons/obj/doors/external/fill_color.dmi'
+ glass_file = 'icons/obj/doors/external/fill_glass.dmi'
+ bolts_file = 'icons/obj/doors/external/lights_bolts.dmi'
+ deny_file = 'icons/obj/doors/external/lights_deny.dmi'
+ lights_file = 'icons/obj/doors/external/lights_green.dmi'
+ emag_file = 'icons/obj/doors/external/emag.dmi'
+ door_color = COLOR_NT_RED
+
+/obj/machinery/door/airlock/external/glass/bolted
+ window_color = GLASS_COLOR
+ icon_state = "door_locked" // So it looks visibly bolted in map editor
+ locked = 1
+
+// For convenience in making docking ports: one that is pre-bolted with frequency set!
+/obj/machinery/door/airlock/external/glass/bolted/cycling
+ frequency = 1379
+
+/obj/machinery/door/airlock/glass_external
+ name = "External Airlock"
+ airlock_type = "GExternal"
+ icon = 'icons/obj/doors/external/door.dmi'
+ fill_file = 'icons/obj/doors/external/fill_steel.dmi'
+ color_file = 'icons/obj/doors/external/color.dmi'
+ color_fill_file = 'icons/obj/doors/external/fill_color.dmi'
+ glass_file = 'icons/obj/doors/external/fill_glass.dmi'
+ bolts_file = 'icons/obj/doors/external/lights_bolts.dmi'
+ deny_file = 'icons/obj/doors/external/lights_deny.dmi'
+ lights_file = 'icons/obj/doors/external/lights_green.dmi'
+ emag_file = 'icons/obj/doors/external/emag.dmi'
+ opacity = FALSE
+ glass = TRUE
+ assembly_type = /obj/structure/door_assembly/door_assembly_ext
+ opacity = 0
+ glass = 1
+ req_one_access = list(ACCESS_ENGINEERING_AIRLOCK)
+ open_sound_powered = 'sound/machines/door/space1o.ogg'
+ close_sound_powered = 'sound/machines/door/space1c.ogg'
+ door_color = COLOR_MAROON
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/glass
+ name = "Glass Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ open_sound_powered = 'sound/machines/door/hall1o.ogg'
+ close_sound_powered = 'sound/machines/door/hall1c.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 1
+ glass = 1
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/centcom
+ name = "Centcom Airlock"
+ icon = 'icons/obj/doors/centcomm/door.dmi'
+ req_one_access = list(ACCESS_CENTCOM_GENERAL)
+ opacity = 1
+ open_sound_powered = 'sound/machines/door/cmd3o.ogg'
+ close_sound_powered = 'sound/machines/door/cmd3c.ogg'
+
+/obj/machinery/door/airlock/glass/centcom
+ name = "Airlock"
+ icon = 'icons/obj/doors/centcomm/door.dmi'
+ opacity = 0
+ glass = 1
+ open_sound_powered = 'sound/machines/door/cmd3o.ogg'
+ close_sound_powered = 'sound/machines/door/cmd3c.ogg'
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/vault
+ name = "Vault"
+ airlock_type = "Vault"
+ explosion_resistance = 20
+ opacity = 1
+ secured_wires = 1
+ assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity //Until somebody makes better sprites.
+ req_one_access = list(ACCESS_COMMAND_VAULT)
+ open_sound_powered = 'sound/machines/door/vault1o.ogg'
+ close_sound_powered = 'sound/machines/door/vault1c.ogg'
+ icon = 'icons/obj/doors/vault/door.dmi'
+ fill_file = 'icons/obj/doors/vault/fill_steel.dmi'
+
+/obj/machinery/door/airlock/vault/bolted
+ icon_state = "door_locked"
+ locked = 1
+
+/obj/machinery/door/airlock/freezer
+ name = "Freezer Airlock"
+ opacity = 1
+ assembly_type = /obj/structure/door_assembly/door_assembly_fre
+ door_color = COLOR_WHITE
+
+/obj/machinery/door/airlock/hatch
+ name = "Airtight Hatch"
+ airlock_type = "Hatch"
+ explosion_resistance = 20
+ opacity = 1
+ assembly_type = /obj/structure/door_assembly/door_assembly_hatch
+ req_one_access = list(ACCESS_ENGINEERING_MAINT)
+ open_sound_powered = 'sound/machines/door/hatchopen.ogg'
+ close_sound_powered = 'sound/machines/door/hatchclose.ogg'
+ open_sound_unpowered = 'sound/machines/door/hatchforced.ogg'
+ icon = 'icons/obj/doors/hatch/door.dmi'
+ fill_file = 'icons/obj/doors/hatch/fill_steel.dmi'
+ stripe_file = 'icons/obj/doors/hatch/stripe.dmi'
+ stripe_fill_file = 'icons/obj/doors/hatch/fill_stripe.dmi'
+ bolts_file = 'icons/obj/doors/hatch/lights_bolts.dmi'
+ deny_file = 'icons/obj/doors/hatch/lights_deny.dmi'
+ lights_file = 'icons/obj/doors/hatch/lights_green.dmi'
+ panel_file = 'icons/obj/doors/hatch/panel.dmi'
+ welded_file = 'icons/obj/doors/hatch/welded.dmi'
+ emag_file = 'icons/obj/doors/hatch/emag.dmi'
+ stripe_color = COLOR_AMBER
+
+/obj/machinery/door/airlock/maintenance_hatch
+ name = "Maintenance Hatch"
+ airlock_type = "Hatch"
+ explosion_resistance = 20
+ opacity = 1
+ assembly_type = /obj/structure/door_assembly/door_assembly_mhatch
+ req_one_access = list(ACCESS_ENGINEERING_MAINT)
+ open_sound_powered = 'sound/machines/door/hatchopen.ogg'
+ close_sound_powered = 'sound/machines/door/hatchclose.ogg'
+ open_sound_unpowered = 'sound/machines/door/hatchforced.ogg'
+ icon = 'icons/obj/doors/hatch/door.dmi'
+ fill_file = 'icons/obj/doors/hatch/fill_steel.dmi'
+ stripe_file = 'icons/obj/doors/hatch/stripe.dmi'
+ stripe_fill_file = 'icons/obj/doors/hatch/fill_stripe.dmi'
+ bolts_file = 'icons/obj/doors/hatch/lights_bolts.dmi'
+ deny_file = 'icons/obj/doors/hatch/lights_deny.dmi'
+ lights_file = 'icons/obj/doors/hatch/lights_green.dmi'
+ panel_file = 'icons/obj/doors/hatch/panel.dmi'
+ welded_file = 'icons/obj/doors/hatch/welded.dmi'
+ emag_file = 'icons/obj/doors/hatch/emag.dmi'
+ stripe_color = COLOR_AMBER
+
+
+/obj/machinery/door/airlock/glass/command
+ name = "Command Airlock"
+ opacity = FALSE
+ glass = TRUE
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_com
+ glass = 1
+ req_one_access = list(ACCESS_COMMAND_BRIDGE)
+ open_sound_powered = 'sound/machines/door/cmd1o.ogg'
+ close_sound_powered = 'sound/machines/door/cmd1c.ogg'
+ door_color = COLOR_COMMAND_BLUE
+ stripe_color = COLOR_SKY_BLUE
+ window_color = GLASS_COLOR
+
+
+/obj/machinery/door/airlock/glass/engineering
+ name = "Engineering Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_eng
+ glass = 1
+ req_one_access = list(ACCESS_ENGINEERING_MAIN)
+ open_sound_powered = 'sound/machines/door/eng1o.ogg'
+ close_sound_powered = 'sound/machines/door/eng1c.ogg'
+ door_color = COLOR_AMBER
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/glass/engineeringatmos
+ name = "Atmospherics Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_eat
+ glass = 1
+ req_one_access = list(ACCESS_ENGINEERING_ATMOS)
+ open_sound_powered = 'sound/machines/door/eng1o.ogg'
+ close_sound_powered = 'sound/machines/door/eng1c.ogg'
+ door_color = COLOR_AMBER
+ stripe_color = COLOR_CYAN
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/glass/security
+ name = "Security Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_sec
+ glass = 1
+ req_one_access = list(ACCESS_SECURITY_EQUIPMENT)
+ open_sound_powered = 'sound/machines/door/sec1o.ogg'
+ close_sound_powered = 'sound/machines/door/sec1c.ogg'
+ door_color = COLOR_MAROON
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/glass/medical
+ name = "Medical Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_med
+ glass = 1
+ req_one_access = list(ACCESS_MEDICAL_MAIN)
+ open_sound_powered = 'sound/machines/door/med1o.ogg'
+ close_sound_powered = 'sound/machines/door/med1c.ogg'
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_DEEP_SKY_BLUE
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/mining
+ name = "Mining Airlock"
+ assembly_type = /obj/structure/door_assembly/door_assembly_min
+ req_one_access = list(ACCESS_SUPPLY_MINE)
+ open_sound_powered = 'sound/machines/door/eng1o.ogg'
+ close_sound_powered = 'sound/machines/door/eng1c.ogg'
+ door_color = COLOR_PALE_ORANGE
+ stripe_color = COLOR_BEASTY_BROWN
+
+/obj/machinery/door/airlock/atmos
+ name = "Atmospherics Airlock"
+ assembly_type = /obj/structure/door_assembly/door_assembly_atmo
+ req_one_access = list(ACCESS_ENGINEERING_ATMOS)
+ open_sound_powered = 'sound/machines/door/eng1o.ogg'
+ close_sound_powered = 'sound/machines/door/eng1c.ogg'
+ door_color = COLOR_AMBER
+ stripe_color = COLOR_CYAN
+
+/obj/machinery/door/airlock/research
+ name = "Research Airlock"
+ assembly_type = /obj/structure/door_assembly/door_assembly_research
+ open_sound_powered = 'sound/machines/door/sci1o.ogg'
+ close_sound_powered = 'sound/machines/door/sci1c.ogg'
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_PALE_PURPLE_GRAY
+
+/obj/machinery/door/airlock/glass/research
+ name = "Research Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_research
+ glass = 1
+ req_one_access = list(ACCESS_SCIENCE_MAIN)
+ open_sound_powered = 'sound/machines/door/sci1o.ogg'
+ close_sound_powered = 'sound/machines/door/sci1c.ogg'
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_PURPLE_GRAY
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/glass/mining
+ name = "Mining Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_min
+ glass = 1
+ req_one_access = list(ACCESS_SUPPLY_MINE)
+ open_sound_powered = 'sound/machines/door/cgo1o.ogg'
+ close_sound_powered = 'sound/machines/door/cgo1c.ogg'
+ door_color = COLOR_PALE_ORANGE
+ stripe_color = COLOR_BEASTY_BROWN
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/glass/atmos
+ name = "Atmospherics Airlock"
+ hitsound = 'sound/effects/Glasshit.ogg'
+ maxhealth = 300
+ explosion_resistance = 5
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_atmo
+ glass = 1
+ req_one_access = list(ACCESS_ENGINEERING_ATMOS)
+ open_sound_powered = 'sound/machines/door/eng1o.ogg'
+ close_sound_powered = 'sound/machines/door/eng1c.ogg'
+ door_color = COLOR_AMBER
+ stripe_color = COLOR_CYAN
+ window_color = GLASS_COLOR
+
+
+/obj/machinery/door/airlock/gold
+ name = "Gold Airlock"
+ icon = 'icons/obj/doors/Doorgold.dmi'
+ mineral = "gold"
+ door_color = COLOR_GOLD
+
+/obj/machinery/door/airlock/silver
+ name = "Silver Airlock"
+ mineral = "silver"
+ door_color = COLOR_SILVER
+
+/obj/machinery/door/airlock/diamond
+ name = "Diamond Airlock"
+ mineral = "diamond"
+ door_color = COLOR_DIAMOND
+
+/obj/machinery/door/airlock/uranium
+ name = "Uranium Airlock"
+ desc = "And they said I was crazy."
+ mineral = "uranium"
+ var/last_event = 0
+ var/rad_power = RAD_INTENSITY_MAT_SPECIAL_URANIUM_AIRLOCK
+ door_color = COLOR_PAKISTAN_GREEN
+
+/obj/machinery/door/airlock/bananium
+ name = "Bananium Airlock"
+ desc = "An absolute atrocity."
+ mineral = "bananium"
+ open_sound_powered = 'sound/items/bikehorn.ogg'
+ close_sound_powered = 'sound/items/bikehorn.ogg'
+ door_color = COLOR_YELLOW
+
+/obj/machinery/door/airlock/silencium
+ name = "Silencium Airlock"
+ desc = "The pinnacle of noise cancelling door technology."
+ mineral = "silencium"
+ open_sound_powered = 'sound/effects/footstep/carpet1.ogg'
+ close_sound_powered = 'sound/effects/footstep/carpet1.ogg'
+ door_color = COLOR_SILVER
+
+/obj/machinery/door/airlock/sandstone
+ name = "Sandstone Airlock"
+ mineral = "sandstone"
+ door_color = COLOR_PALE_ORANGE
+
+/obj/machinery/door/airlock/science
+ name = "Research Airlock"
+ assembly_type = /obj/structure/door_assembly/door_assembly_science
+ req_one_access = list(ACCESS_SCIENCE_MAIN)
+ open_sound_powered = 'sound/machines/door/sci1o.ogg'
+ close_sound_powered = 'sound/machines/door/sci1c.ogg'
+
+/obj/machinery/door/airlock/glass_science
+ name = "Glass Airlocks"
+ opacity = 0
+ assembly_type = /obj/structure/door_assembly/door_assembly_science
+ glass = 1
+ req_one_access = list(ACCESS_SCIENCE_MAIN)
+ open_sound_powered = 'sound/machines/door/sci1o.ogg'
+ close_sound_powered = 'sound/machines/door/sci1c.ogg'
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/highsecurity
+ name = "Secure Airlock"
+ airlock_type = "Secure"
+ icon = 'icons/obj/doors/secure/door.dmi'
+ fill_file = 'icons/obj/doors/secure/fill_steel.dmi'
+ explosion_resistance = 20
+ secured_wires = 1
+ assembly_type = /obj/structure/door_assembly/door_assembly_highsecurity
+ req_one_access = list(ACCESS_COMMAND_VAULT)
+ open_sound_powered = 'sound/machines/door/secure1o.ogg'
+ close_sound_powered = 'sound/machines/door/secure1c.ogg'
+
+/obj/machinery/door/airlock/voidcraft
+ name = "voidcraft hatch"
+ desc = "It's an extra resilient airlock intended for spacefaring vessels."
+ explosion_resistance = 20
+ opacity = 0
+ glass = 1
+ assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft
+ open_sound_powered = 'sound/machines/door/shuttle1o.ogg'
+ close_sound_powered = 'sound/machines/door/shuttle1c.ogg'
+
+// Airlock opens from top-bottom instead of left-right.
+/obj/machinery/door/airlock/voidcraft/vertical
+ assembly_type = /obj/structure/door_assembly/door_assembly_voidcraft/vertical
+ open_sound_powered = 'sound/machines/door/shuttle1o.ogg'
+ close_sound_powered = 'sound/machines/door/shuttle1c.ogg'
+
+/datum/category_item/catalogue/anomalous/precursor_a/alien_airlock
+ name = "Precursor Alpha Object - Doors"
+ desc = "This object appears to be used in order to restrict or allow access to \
+ rooms based on its physical state. In other words, a door. \
+ Despite being designed and created by unknown ancient alien hands, this door has \
+ a large number of similarities to the conventional airlock, such as being driven by \
+ electricity, opening and closing by physically moving, and being air tight. \
+ It also operates by responding to signals through internal electrical conduits. \
+ These characteristics make it possible for one with experience with a multitool \
+ to manipulate the door.\
+
\
+ The symbol on the door does not match any living species' patterns, giving further \
+ implications that this door is very old, and yet it remains operational after \
+ thousands of years. It is unknown if that is due to superb construction, or \
+ unseen autonomous maintenance having been performed."
+ value = CATALOGUER_REWARD_EASY
+
+/obj/machinery/door/airlock/alien
+ name = "alien airlock"
+ desc = "You're fairly sure this is a door."
+ catalogue_data = list(/datum/category_item/catalogue/anomalous/precursor_a/alien_airlock)
+ icon = 'icons/obj/doors/Dooralien.dmi'
+ explosion_resistance = 20
+ secured_wires = TRUE
+ hackProof = TRUE
+ assembly_type = /obj/structure/door_assembly/door_assembly_alien
+ req_one_access = list(ACCESS_FACTION_ALIEN)
+
+/obj/machinery/door/airlock/alien/locked
+ icon_state = "door_locked"
+ locked = TRUE
+
+/obj/machinery/door/airlock/alien/public // Entry to UFO.
+ req_one_access = list()
+ normalspeed = FALSE // So it closes faster and hopefully keeps the warm air inside.
+ hackProof = TRUE // No borgs
+
+//"Red" Armory Door
+/obj/machinery/door/airlock/security/armory
+ name = "Red Armory"
+ //color = ""
+
+/obj/machinery/door/airlock/security/armory/allowed(mob/user)
+ if(get_security_level() in list("green","blue"))
+ return FALSE
+
+ return ..(user)
+
+/obj/machinery/door/airlock/multi_tile/glass/
+ glass = TRUE
+ window_color = GLASS_COLOR
+
+/obj/machinery/door/airlock/multi_tile/medical
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_DEEP_SKY_BLUE
+
+/obj/machinery/door/airlock/glass/civilian
+ glass = TRUE
+ door_color = COLOR_EGGSHELL
+ stripe_color = COLOR_PALE_BTL_GREEN
+
+/obj/machinery/door/airlock/glass/civilian/alt
+ glass = TRUE
+ stripe_color = COLOR_PALE_BTL_GREEN
+
+/obj/machinery/door/airlock/civilian
+ door_color = COLOR_EGGSHELL
+ stripe_color = COLOR_PALE_BTL_GREEN
+
+/obj/machinery/door/airlock/civilian/alt
+ stripe_color = COLOR_PALE_BTL_GREEN
+
+/obj/machinery/door/airlock/multi_tile/glass/civilian
+ door_color = COLOR_EGGSHELL
+ stripe_color = COLOR_PALE_BTL_GREEN
+
+/obj/machinery/door/airlock/multi_tile/glass/civilian/alt
+ stripe_color = COLOR_PALE_BTL_GREEN
+
+/obj/machinery/door/airlock/multi_tile/glass/exploration
+ door_color = COLOR_GRAY20
+ stripe_color = COLOR_EXPLO_VIOLET
+
+/obj/machinery/door/airlock/multi_tile/glass/medical
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_DEEP_SKY_BLUE
+
+/obj/machinery/door/airlock/glass/medical
+ door_color = COLOR_WHITE
+ stripe_color = COLOR_DEEP_SKY_BLUE
+
+/obj/machinery/door/airlock/glass/exploration
+ door_color = COLOR_GRAY20
+ stripe_color = COLOR_EXPLO_VIOLET
+
+/obj/machinery/door/airlock/exploration
+ door_color = COLOR_GRAY20
+ stripe_color = COLOR_EXPLO_VIOLET
diff --git a/code/game/machinery/doors/airlock_vr.dm b/code/game/machinery/doors/airlock_vr.dm
index 4eaa9f79d9c1..858ce86170bd 100644
--- a/code/game/machinery/doors/airlock_vr.dm
+++ b/code/game/machinery/doors/airlock_vr.dm
@@ -21,14 +21,14 @@
normalspeed = FALSE // So it closes faster and hopefully keeps the warm air inside.
hackProof = TRUE // No borgs
-/obj/machinery/door/airlock/glass_security/polarized
+/obj/machinery/door/airlock/glass/security/polarized
name = "Electrochromic Security Airlock"
icon_tinted = 'icons/obj/doors/Doorsectinted_vr.dmi'
-/obj/machinery/door/airlock/glass_medical/polarized
+/obj/machinery/door/airlock/glass/medical/polarized
name = "Electrochromic Medical Airlock"
icon_tinted = 'icons/obj/doors/doormedtinted_vr.dmi'
-/obj/machinery/door/airlock/glass_command/polarized
+/obj/machinery/door/airlock/glass/command/polarized
name = "Electrochormic Command Airlock"
icon_tinted = 'icons/obj/doors/Doorcomtinted_vr.dmi'
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 799422689d3c..a1cb606f3bea 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -34,8 +34,8 @@
var/close_door_at = 0 //When to automatically close the door, if possible
//Multi-tile doors
- dir = EAST
var/width = 1
+ var/autoset_dir = TRUE
// turf animation
var/atom/movable/overlay/c_animation = null
@@ -64,16 +64,18 @@
if(width > 1)
if(dir in list(EAST, WEST))
- bound_width = width * world.icon_size
- bound_height = world.icon_size
- else
bound_width = world.icon_size
bound_height = width * world.icon_size
+ else
+ bound_width = width * world.icon_size
+ bound_height = world.icon_size
health = maxhealth
update_icon()
update_nearby_tiles()
+ if(autoset_dir)
+ setDir(dir)
/obj/machinery/door/Destroy()
density = FALSE
@@ -129,7 +131,7 @@
if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access)))
open()
else
- do_animate("deny")
+ do_animate(DOOR_ANIMATION_DENY)
return
if(istype(AM, /obj/structure/bed/chair/wheelchair))
var/obj/structure/bed/chair/wheelchair/wheel = AM
@@ -137,7 +139,7 @@
if(wheel.pulling && (src.allowed(wheel.pulling)))
open()
else
- do_animate("deny")
+ do_animate(DOOR_ANIMATION_DENY)
/obj/machinery/door/CanAllowThrough(atom/movable/mover, turf/target)
if(!opacity && mover.check_pass_flags(ATOM_PASS_GLASS))
@@ -159,12 +161,10 @@
return
src.add_fingerprint(user)
if(density)
- if(istype(user, /mob/living/simple_mob) && !(user.ckey))
- do_animate("smdeny")
- else if(allowed(user))
+ if(allowed(user))
open()
else
- do_animate("deny")
+ do_animate(DOOR_ANIMATION_DENY)
/obj/machinery/door/bullet_act(var/obj/projectile/Proj)
..()
@@ -300,12 +300,12 @@
return
if(src.density)
- do_animate("deny")
+ do_animate(DOOR_ANIMATION_DENY)
return
/obj/machinery/door/emag_act(var/remaining_charges)
if(density && operable())
- do_animate("spark")
+ do_animate(DOOR_ANIMATION_SPARK)
sleep(6)
open()
operating = -1
@@ -388,36 +388,30 @@
/obj/machinery/door/proc/do_animate(animation)
switch(animation)
- if("opening")
+ if(DOOR_ANIMATION_OPEN)
if(p_open)
flick("o_doorc0", src)
else
flick("doorc0", src)
- if("closing")
+ if(DOOR_ANIMATION_CLOSE)
if(p_open)
flick("o_doorc1", src)
else
flick("doorc1", src)
- if("spark")
+ if(DOOR_ANIMATION_SPARK)
if(density)
flick("door_spark", src)
- if("deny")
+ if(DOOR_ANIMATION_DENY)
if(density && !(machine_stat & (NOPOWER|BROKEN)))
flick("door_deny", src)
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
- if("smdeny")
- if(density && !(machine_stat & (NOPOWER|BROKEN)))
- flick("door_deny", src)
- return
-
/obj/machinery/door/proc/open(var/forced = 0)
if(!can_open(forced))
return
operating = 1
- do_animate("opening")
- icon_state = "door0"
+ do_animate(DOOR_ANIMATION_OPEN)
set_opacity(0)
sleep(3)
src.density = 0
@@ -444,7 +438,7 @@
operating = 1
close_door_at = 0
- do_animate("closing")
+ do_animate(DOOR_ANIMATION_CLOSE)
sleep(3)
src.density = 1
explosion_resistance = initial(explosion_resistance)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 29d51e911076..d6b3e404015a 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -1,4 +1,14 @@
-
+GLOBAL_LIST_INIT(firelock_align_types, typecacheof(list(
+ /obj/structure/window/reinforced/tinted/full,
+ /obj/structure/window/reinforced/full,
+ /obj/structure/window/phoronreinforced/full,
+ /obj/structure/window/phoronbasic/full,
+ /obj/structure/window/basic/full,
+ /obj/structure/window/reinforced/polarized/full,
+ /obj/structure/wall_frame/prepainted/,
+ /obj/structure/wall_frame,
+ /obj/machinery/door/airlock/multi_tile,
+ /obj/machinery/door/airlock)))
/// kPa
#define FIREDOOR_MAX_PRESSURE_DIFF 25
/// °C
@@ -13,14 +23,17 @@
/obj/machinery/door/firedoor
name = "\improper Emergency Shutter"
desc = "Emergency air-tight shutter, capable of sealing off breached areas."
- icon = 'icons/obj/doors/DoorHazard.dmi'
- icon_state = "door_open"
+ icon = 'icons/obj/doors/hazard/door.dmi'
+ var/panel_file = 'icons/obj/doors/hazard/panel.dmi'
+ var/welded_file = 'icons/obj/doors/hazard/welded.dmi'
+ icon_state = "open"
req_one_access = list(ACCESS_COMMAND_EVA) //ACCESS_ENGINEERING_ATMOS, ACCESS_ENGINEERING_ENGINE)
opacity = 0
density = 0
layer = DOOR_OPEN_LAYER - 0.01
- open_layer = DOOR_OPEN_LAYER - 0.01 // Just below doors when open
- closed_layer = DOOR_CLOSED_LAYER + 0.01 // Just above doors when closed
+ open_layer = DOOR_OPEN_LAYER - 0.01// Just below doors when open
+ closed_layer = MID_LANDMARK_LAYER // Need this to be above windows/grilles/low walls.
+ smoothing_groups = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS)
//These are frequenly used with windows, so make sure zones can pass.
//Generally if a firedoor is at a place where there should be a zone boundery then there will be a regular door underneath it.
@@ -36,12 +49,14 @@
var/list/areas_added
var/list/users_to_open = new
var/next_process_time = 0
+ var/low_profile = FALSE
var/hatch_open = 0
power_channel = ENVIRON
use_power = USE_POWER_IDLE
idle_power_usage = 5
+ autoset_dir = FALSE
var/list/tile_info[4]
var/list/dir_alerts[4] // 4 dirs, bitflags
@@ -69,6 +84,11 @@
LAZYADD(A.all_doors, src)
areas_added += A
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/door/firedoor/LateInitialize()
+ setDir(dir)
+
/obj/machinery/door/firedoor/Destroy()
for(var/area/A in areas_added)
LAZYREMOVE(A.all_doors, src)
@@ -427,46 +447,82 @@
/obj/machinery/door/firedoor/do_animate(animation)
switch(animation)
if("opening")
- flick("door_opening", src)
+ flick("opening", src)
playsound(src, 'sound/machines/firelockopen.ogg', 37, 1)
if("closing")
playsound(src, 'sound/machines/firelockclose.ogg', 37, 1)
- flick("door_closing", src)
+ flick("closing", src)
return
/obj/machinery/door/firedoor/update_icon()
+ var/image/lights_overlay
cut_overlays()
- var/list/overlays_to_add = list()
+ set_light(0)
+ var/do_set_light = FALSE
if(density)
- icon_state = "door_closed"
- if(prying)
- icon_state = "prying_closed"
- if(hatch_open)
- overlays_to_add += "hatch"
- if(blocked)
- overlays_to_add += "welded"
+ icon_state = "closed"
+ if(panel_open)
+ add_overlay(panel_file)
if(pdiff_alert)
- overlays_to_add += "palert"
+ lights_overlay += "palert"
+ do_set_light = TRUE
if(dir_alerts)
for(var/d=1;d<=4;d++)
- var/cdir = GLOB.cardinal[d]
for(var/i=1;i<=ALERT_STATES.len;i++)
- if(dir_alerts[d] & (1<<(i-1)))
- overlays_to_add += new/icon(icon,"alert_[ALERT_STATES[i]]", dir=cdir)
+ if(dir_alerts[d] & BITFLAG(i-1))
+ add_overlay("alert_[ALERT_STATES[i]]")
+ do_set_light = TRUE
else
- icon_state = "door_open"
- if(prying)
- icon_state = "prying_open"
- if(blocked)
- overlays_to_add += "welded_open"
+ if(low_profile)
+ icon_state = "open_lowprofile"
+ else
+ icon_state = "open"
+
+ if(blocked)
+ add_overlay(welded_file)
- add_overlay(overlays_to_add)
+ if(do_set_light)
+ set_light(2, 0.25, COLOR_SUN)
return
-//These are playing merry hell on ZAS. Sorry fellas :(
+/obj/machinery/door/firedoor/setDir(ndir)
+ for(var/D in GLOB.cardinal)
+ var/turf/T = get_step(src, D)
+ for(var/obj/A in T.contents)
+ if(A.type in GLOB.firelock_align_types) //this is mainly for the cases where mappers can't manually align firelocks, i.e window spawners.
+ switch(D)
+ if(NORTH)
+ dir = WEST
+ break
+ if(EAST)
+ dir = SOUTH
+ break
+ if(SOUTH)
+ dir = WEST
+ break
+ if(WEST)
+ dir = SOUTH
+ break
+ if(T.density)
+ switch(D)
+ if(NORTH)
+ dir = WEST
+ break
+ if(EAST)
+ dir = SOUTH
+ break
+ if(SOUTH)
+ dir = WEST
+ break
+ if(WEST)
+ dir = SOUTH
+ break
+ ..()
+
+
/obj/machinery/door/firedoor/border_only
/*
@@ -517,32 +573,6 @@
/obj/machinery/door/firedoor/glass
name = "\improper Emergency Glass Shutter"
desc = "Emergency air-tight shutter, capable of sealing off breached areas. This one has a resilient glass window, allowing you to see the danger."
- icon = 'icons/obj/doors/DoorHazardGlass.dmi'
- icon_state = "door_open"
+ icon_state = "open"
glass = 1
-
-/obj/machinery/door/firedoor/glass/hidden
- name = "\improper Emergency Shutter System"
- desc = "Emergency air-tight shutter, capable of sealing off breached areas. This model fits flush with the walls, and has a panel in the floor for maintenance."
- icon = 'icons/obj/doors/DoorHazardHidden.dmi'
- plane = TURF_PLANE
-
- #ifndef IN_MAP_EDITOR
- layer = HEAVYDUTY_WIRE_LAYER //Just below pipes
- #else
- layer = BELOW_OBJ_LAYER
- #endif
-
-/obj/machinery/door/firedoor/glass/hidden/open()
- . = ..()
- plane = TURF_PLANE
-
-/obj/machinery/door/firedoor/glass/hidden/close()
- . = ..()
- plane = OBJ_PLANE
-
-/obj/machinery/door/firedoor/glass/hidden/steel
- name = "\improper Emergency Shutter System"
- desc = "Emergency air-tight shutter, capable of sealing off breached areas. This model fits flush with the walls, and has a panel in the floor for maintenance."
- icon = 'icons/obj/doors/DoorHazardHidden_steel.dmi'
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
index 5ccaf6cdc388..b2061b3f01de 100644
--- a/code/game/machinery/doors/multi_tile.dm
+++ b/code/game/machinery/doors/multi_tile.dm
@@ -1,17 +1,32 @@
//Terribly sorry for the code doubling, but things go derpy otherwise.
/obj/machinery/door/airlock/multi_tile
+ airlock_type = "Wide"
width = 2
appearance_flags = 0
- var/obj/machinery/filler_object/filler1
- var/obj/machinery/filler_object/filler2
+ var/obj/structure/filler_object/filler1
+ var/obj/structure/filler_object/filler2
open_sound_powered = 'sound/machines/door/WideOpen.ogg'
close_sound_powered = 'sound/machines/door/WideClose.ogg'
+ icon = 'icons/obj/doors/double/door.dmi'
+ fill_file = 'icons/obj/doors/double/fill_steel.dmi'
+ color_file = 'icons/obj/doors/double/color.dmi'
+ color_fill_file = 'icons/obj/doors/double/fill_color.dmi'
+ glass_file = 'icons/obj/doors/double/fill_glass.dmi'
+ bolts_file = 'icons/obj/doors/double/lights_bolts.dmi'
+ deny_file = 'icons/obj/doors/double/lights_deny.dmi'
+ lights_file = 'icons/obj/doors/double/lights_green.dmi'
+ emag_file = 'icons/obj/doors/double/emag.dmi'
+ stripe_file = 'icons/obj/doors/double/stripe.dmi'
+ stripe_fill_file = 'icons/obj/doors/double/fill_stripe.dmi'
/obj/machinery/door/airlock/multi_tile/Initialize(mapload)
. = ..()
+ update_icon()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/door/airlock/multi_tile/LateInitialize()
SetBounds()
- if(opacity)
- create_fillers()
+ create_fillers()
/obj/machinery/door/airlock/multi_tile/Destroy()
QDEL_NULL(filler1)
@@ -43,43 +58,56 @@
return .
/obj/machinery/door/airlock/multi_tile/proc/SetBounds()
- if(dir in list(EAST, WEST))
- bound_width = width * world.icon_size
- bound_height = world.icon_size
- else
- bound_width = world.icon_size
- bound_height = width * world.icon_size
+ if(width > 1)
+ if(dir in list(EAST, WEST))
+ bound_width = world.icon_size
+ bound_height = width * world.icon_size
+ else
+ bound_width = width * world.icon_size
+ bound_height = world.icon_size
/obj/machinery/door/airlock/multi_tile/proc/create_fillers()
- if(src.dir > 3)
- filler1 = new/obj/machinery/filler_object (src.loc)
- filler2 = new/obj/machinery/filler_object (get_step(src,EAST))
- else
- filler1 = new/obj/machinery/filler_object (src.loc)
- filler2 = new/obj/machinery/filler_object (get_step(src,NORTH))
+ var/filler2_loc
+ if(dir == SOUTH)
+ filler2_loc = get_step(src,EAST)
+ else if(dir == WEST)
+ filler2_loc = get_step(src,NORTH)
+ filler1 = new(get_turf(src.loc))
+ filler2 = new(get_turf(filler2_loc))
filler1.density = 0
filler2.density = 0
filler1.set_opacity(opacity)
filler2.set_opacity(opacity)
+ QUEUE_SMOOTH(filler2)
+ QUEUE_SMOOTH_NEIGHBORS(filler2) //do blending for filler 2, which represents the far side of the door. blending already happens for the airlock itself.
+ SetBounds()
/obj/machinery/door/airlock/multi_tile/glass
name = "Glass Airlock"
- icon = 'icons/obj/doors/Door2x1glass.dmi'
opacity = 0
glass = 1
assembly_type = /obj/structure/door_assembly/multi_tile
+ window_color = GLASS_COLOR
+
/obj/machinery/door/airlock/multi_tile/metal
name = "Airlock"
- icon = 'icons/obj/doors/Door2x1metal.dmi'
assembly_type = /obj/structure/door_assembly/multi_tile
-/obj/machinery/filler_object
+/obj/structure/filler_object
name = ""
icon = 'icons/obj/doors/rapid_pdoor.dmi'
icon_state = ""
- density = 0
+ density = 1
+ anchored = 1
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS+SMOOTH_GROUP_AIRLOCK+SMOOTH_GROUP_WINDOW_FULLTILE+SMOOTH_GROUP_WALLS)
+
+/obj/structure/filler_object/Initialize(mapload)
+ . = ..()
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
/obj/machinery/door/airlock/multi_tile/metal/mait
- icon = 'icons/obj/doors/Door2x1_Maint.dmi'
//req_one_access = list(ACCESS_ENGINEERING_MAINT) //VOREStaiton Edit - Maintenance is open access
diff --git a/code/game/machinery/fire_alarm.dm b/code/game/machinery/fire_alarm.dm
index 4d588634364d..14264d8ffbdf 100644
--- a/code/game/machinery/fire_alarm.dm
+++ b/code/game/machinery/fire_alarm.dm
@@ -4,8 +4,8 @@ FIRE ALARM
/obj/machinery/firealarm
name = "fire alarm"
desc = "\"Pull this in case of emergency\". Thus, keep pulling it forever."
- icon = 'icons/obj/monitors.dmi'
- icon_state = "fire0"
+ icon = 'icons/obj/firealarm.dmi'
+ icon_state = "casing"
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
var/detecting = TRUE
@@ -32,35 +32,83 @@ FIRE ALARM
. = ..()
if(z in (LEGACY_MAP_DATUM).contact_levels)
set_security_level(GLOB.security_level ? get_security_level() : "green")
+ setDir(dir)
+
+/obj/machinery/firealarm/setDir(ndir)
+ . = ..()
+ base_pixel_x = 0
+ base_pixel_y = 0
+ switch(dir)
+ if(NORTH)
+ base_pixel_y = -21
+ if(SOUTH)
+ base_pixel_y = 21
+ if(WEST)
+ base_pixel_x = -21
+ if(EAST)
+ base_pixel_x = 21
+ reset_pixel_offsets()
/obj/machinery/firealarm/update_icon()
cut_overlays()
+ add_overlay("casing")
if(panel_open)
set_light(0)
return
if(machine_stat & BROKEN)
- icon_state = "firex"
+ add_overlay("broken")
set_light(0)
else if(machine_stat & NOPOWER)
- icon_state = "firep"
set_light(0)
+ return
else
if(!detecting)
- icon_state = "fire1"
+ add_overlay("fire1")
set_light(l_range = 4, l_power = 0.9, l_color = "#ff0000")
else
- icon_state = "fire0"
+ add_overlay("fire0")
+ var/image/alarm_img
switch(seclevel)
- if("green") set_light(l_range = 2, l_power = 0.25, l_color = "#00ff00")
- if("yellow") set_light(l_range = 2, l_power = 0.25, l_color = "#ffff00")
- if("violet") set_light(l_range = 2, l_power = 0.25, l_color = "#9933ff")
- if("orange") set_light(l_range = 2, l_power = 0.25, l_color = "#ff9900")
- if("blue") set_light(l_range = 2, l_power = 0.25, l_color = "#1024A9")
- if("red") set_light(l_range = 4, l_power = 0.9, l_color = "#ff0000")
- if("delta") set_light(l_range = 4, l_power = 0.9, l_color = "#FF6633")
- add_overlay("overlay_[seclevel]")
+ if("green")
+ alarm_img = image(icon, "alarm_normal")
+ alarm_img.color = "#00ff00"
+ add_overlay(alarm_img)
+ set_light(l_range = 2, l_power = 0.25, l_color = "#00ff00")
+ if("yellow")
+ alarm_img = image(icon, "alarm_blinking")
+ alarm_img.color = "#ffff00"
+ add_overlay(alarm_img)
+ set_light(l_range = 2, l_power = 0.25, l_color = "#ffff00")
+ if("violet")
+ alarm_img = image(icon, "alarm_blinking")
+ alarm_img.color = "#9933ff"
+ add_overlay(alarm_img)
+ set_light(l_range = 2, l_power = 0.25, l_color = "#9933ff")
+ if("orange")
+ alarm_img = image(icon, "alarm_blinking")
+ alarm_img.color = "#ff9900"
+ add_overlay(alarm_img)
+ set_light(l_range = 2, l_power = 0.25, l_color = "#ff9900")
+ if("blue")
+ alarm_img = image(icon, "alarm_blinking")
+ alarm_img.color = "#1024A9"
+ add_overlay(alarm_img)
+ set_light(l_range = 2, l_power = 0.25, l_color = "#1024A9")
+ if("red")
+ alarm_img = image(icon, "alarm_blinking")
+ alarm_img.color = "#ff0000"
+ add_overlay(alarm_img)
+ set_light(l_range = 4, l_power = 0.9, l_color = "#ff0000")
+ if("delta")
+ alarm_img = image(icon, "alarm_blinking_twotone1")
+ alarm_img.color = COLOR_YELLOW
+ var/image/alarm_img2 = image(icon, "alarm_blinking_twotone2")
+ alarm_img2.color = COLOR_RED
+ add_overlay(alarm_img)
+ add_overlay(alarm_img2)
+ set_light(l_range = 4, l_power = 0.9, l_color = "#FF6633")
/obj/machinery/firealarm/fire_act(datum/gas_mixture/air, temperature, volume)
if(detecting)
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 4eb4267d2d47..e43dfc9eb6f2 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -36,9 +36,7 @@
name = "body bag"
desc = "A plastic bag designed for the storage and transportation of cadavers."
icon = 'icons/obj/medical/bodybag.dmi'
- icon_state = "bodybag_closed"
- icon_closed = "bodybag_closed"
- icon_opened = "bodybag_open"
+ closet_appearance = null
open_sound = 'sound/items/zip.ogg'
close_sound = 'sound/items/zip.ogg'
var/item_path = /obj/item/bodybag
diff --git a/code/game/objects/items/devices/locker_painter.dm b/code/game/objects/items/devices/locker_painter.dm
deleted file mode 100644
index e9dbbb2d90a8..000000000000
--- a/code/game/objects/items/devices/locker_painter.dm
+++ /dev/null
@@ -1,160 +0,0 @@
-/obj/item/closet_painter
- name = "closet painter"
- icon = 'icons/obj/bureaucracy.dmi'
- icon_state = "labeler1"
-
- var/colour = "plain"
- var/colour_secure = "plain"
-
- var/list/colours = list(
- "plain" = list("open" = "open", "closed" = "closed"),
- "blue" = list("open" = "open", "closed" = "blue"),
- "mixed" = list("open" = "open", "closed" = "mixed"),
- "grey" = list("open" = "open", "closed" = "grey"),
- "green" = list("open" = "open", "closed" = "green"),
- "orange" = list("open" = "open", "closed" = "orange"),
- "pink" = list("open" = "open", "closed" = "pink"),
- "red" = list("open" = "open", "closed" = "red"),
- "white" = list("open" = "open", "closed" = "white"),
- "yellow" = list("open" = "open", "closed" = "yellow"),
- "black" = list("open" = "open", "closed" = "black"),
- "bio" = list("open" = "bioopen", "closed" = "bio"),
- "bio-virology" = list("open" = "bio_virologyopen", "closed" = "bio_virology"),
- "bio-security" = list("open" = "bio_securityopen", "closed" = "bio_security"),
- "bio-janitor" = list("open" = "bio_janitoropen", "closed" = "bio_janitor"),
- "bio-scientist" = list("open" = "bio_scientistopen", "closed" = "bio_scientist"),
- "bombsuit" = list("open" = "bombsuitopen", "closed" = "bombsuit"),
- "bombsuit-security" = list("open" = "bombsuitsecopen", "closed" = "bombsuitsec"),
- "full-red" = list("open" = "syndicateopen", "closed" = "syndicate"),
- "full-green" = list("open" = "syndicate1open", "closed" = "syndicate1"),
- "full-purple" = list("open" = "aclosetopen", "closed" = "acloset"),
- "mining" = list("open" = "miningopen", "closed" = "mining"),
- "emergency" = list("open" = "emergencyopen", "closed" = "emergency"),
- "fire" = list("open" = "fireclosetopen", "closed" = "firecloset"),
- "tool" = list("open" = "toolclosetopen", "closed" = "toolcloset"),
- "radiation" = list("open" = "toolclosetopen", "closed" = "radsuitcloset")
- )
-
- var/list/colours_secure = list(
- "plain" = list("open" = "open", "closed" = "secure", "locked" = "secure1", "broken" = "securebroken", "off" = "secureoff"),
- "medical-red" = list("open" = "medicalopen", "closed" = "medical", "locked" = "medical1", "broken" = "medicalbroken", "off" = "medicaloff"),
- "medical-green" = list("open" = "securemedopen", "closed" = "securemed", "locked" = "securemed1", "broken" = "securemedbroken", "off" = "securemedoff"),
- "CMO" = list("open" = "cmosecureopen", "closed" = "cmosecure", "locked" = "cmosecure1", "broken" = "cmosecurebroken", "off" = "cmosecureoff"),
- "cargo" = list("open" = "securecargoopen", "closed" = "securecargo", "locked" = "securecargo1", "broken" = "securecargobroken", "off" = "securecargooff"),
- "mining" = list("open" = "miningsecopen", "closed" = "miningsec", "locked" = "miningsec1", "broken" = "miningsecbroken", "off" = "miningsecoff"),
- "QM" = list("open" = "secureqmopen", "closed" = "secureqm", "locked" = "secureqm1", "broken" = "secureqmbroken", "off" = "secureqmoff"),
- "hydroponics" = list("open" = "hydrosecureopen", "closed" = "hydrosecure", "locked" = "hydrosecure1", "broken" = "hydrosecurebroken", "off" = "hydrosecureoff"),
- "atmospherics" = list("open" = "secureatmopen", "closed" = "secureatm", "locked" = "secureatm1", "broken" = "secureatmbroken", "off" = "secureatmoff"),
- "engineer" = list("open" = "secureengopen", "closed" = "secureeng", "locked" = "secureeng1", "broken" = "secureengbroken", "off" = "secureengoff"),
- "CE" = list("open" = "secureceopen", "closed" = "securece", "locked" = "securece1", "broken" = "securecebroken", "off" = "secureceoff"),
- "electrical" = list("open" = "toolclosetopen", "closed" = "secureengelec", "locked" = "secureengelec1", "broken" = "secureengelecbroken", "off" = "secureengelecoff"),
- "welding" = list("open" = "toolclosetopen", "closed" = "secureengweld", "locked" = "secureengweld1", "broken" = "secureengweldbroken", "off" = "secureengweldoff"),
- "research" = list("open" = "secureresopen", "closed" = "secureres", "locked" = "secureres1", "broken" = "secureresbroken", "off" = "secureresoff"),
- "RD" = list("open" = "rdsecureopen", "closed" = "rdsecure", "locked" = "rdsecure1", "broken" = "rdsecurebroken", "off" = "rdsecureoff"),
- "security" = list("open" = "secopen", "closed" = "sec", "locked" = "sec1", "broken" = "secbroken", "off" = "secoff"),
- "warden" = list("open" = "wardensecureopen", "closed" = "wardensecure", "locked" = "wardensecure1", "broken" = "wardensecurebroken", "off" = "wardensecureoff"),
- "HoS" = list("open" = "hossecureopen", "closed" = "hossecure", "locked" = "hossecure1", "broken" = "hossecurebroken", "off" = "hossecureoff"),
- "HoP" = list("open" = "hopsecureopen", "closed" = "hopsecure", "locked" = "hopsecure1", "broken" = "hopsecurebroken", "off" = "hopsecureoff"),
- "Administrator" = list("open" = "capsecureopen", "closed" = "capsecure", "locked" = "capsecure1", "broken" = "capsecurebroken", "off" = "capsecureoff")
- )
-
- var/forbidden_types = list(
- /obj/structure/closet/alien,
- /obj/structure/closet/body_bag,
- /obj/structure/closet/cabinet,
- /obj/structure/closet/crate,
- /obj/structure/closet/coffin,
- /obj/structure/closet/hydrant,
- /obj/structure/closet/medical_wall,
- /obj/structure/closet/statue,
- /obj/structure/closet/walllocker
- )
-
-/obj/item/closet_painter/afterattack(atom/target, mob/user, clickchain_flags, list/params)
- if(!(clickchain_flags & CLICKCHAIN_HAS_PROXIMITY))
- return
-
- var/non_closet = 0
- if(!istype(target, /obj/structure/closet))
- non_closet = 1
- for(var/ctype in forbidden_types)
- if(istype(target, ctype))
- non_closet = 1
- if(non_closet)
- to_chat(user, "\The [src] can only be used on closets.")
- return
-
- var/config_error
-
- if(istype(target, /obj/structure/closet/secure_closet))
- var/obj/structure/closet/secure_closet/F = target
- if(F.broken)
- to_chat(user, "\The [src] cannot paint broken closets.")
- return
-
- var/list/colour_data = colours_secure[colour_secure]
- if(!islist(colour_data))
- config_error = 1
- if(!config_error)
- F.icon_opened = colour_data["open"]
- F.icon_closed = colour_data["closed"]
- F.icon_locked = colour_data["locked"]
- F.icon_broken = colour_data["broken"]
- F.icon_off = colour_data["off"]
- F.update_icon()
-
- else
- var/obj/structure/closet/F = target
- var/list/colour_data = colours[colour]
- if(!islist(colour_data))
- config_error = 1
- if(!config_error)
- F.icon_opened = colour_data["open"]
- F.icon_closed = colour_data["closed"]
- F.update_icon()
-
- if(config_error)
- to_chat(user, "\The [src] flashes an error light. You might need to reconfigure it.")
- return
-
-/obj/item/closet_painter/attack_self(mob/user)
- . = ..()
- if(.)
- return
- var/choice = input("Do you wish to change the regular closet colour or the secure closet colour?") as null|anything in list("Regular Closet Colour","Secure Closet Colour")
- if(choice == "Regular Closet Colour")
- choose_colour()
- else if(choice == "Secure Closet Colour")
- choose_colour_secure()
-
-/obj/item/closet_painter/examine(mob/user, dist)
- . = ..()
- . += "It is configured to produce the '[colour]' paint scheme or the '[colour_secure]' secure closet paint scheme."
-
-/obj/item/closet_painter/verb/choose_colour()
- set name = "Choose Colour"
- set desc = "Choose a regular closet painter colour."
- set category = "Object"
- set src in usr
-
- if(usr.incapacitated())
- return
-
- var/new_colour = input("Select a colour.") as null|anything in colours
- if(new_colour && !isnull(colours[new_colour]))
- colour = new_colour
- to_chat(usr, "You set \the [src] regular closet colour to '[colour]'.")
-
-/obj/item/closet_painter/verb/choose_colour_secure()
- set name = "Choose Secure Colour"
- set desc = "Choose a secure closet painter colour."
- set category = "Object"
- set src in usr
-
- if(usr.incapacitated())
- return
-
- var/new_colour_secure = input("Select a colour.") as null|anything in colours_secure
- if(new_colour_secure && !isnull(colours_secure[new_colour_secure]))
- colour_secure = new_colour_secure
- to_chat(usr, "You set \the [src] secure closet colour to '[colour_secure]'.")
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index cc90f74aee4e..a57119fdb8f6 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -1,7 +1,7 @@
/obj/item/radio/intercom
name = "station intercom (General)"
desc = "Talk through this."
- icon = 'icons/obj/radio.dmi'
+ icon = 'icons/obj/intercom.dmi'
icon_state = "intercom"
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
@@ -13,6 +13,17 @@
var/number = 0
var/last_tick //used to delay the powercheck
var/wiresexposed = 0
+ var/overlay_color = PIPE_COLOR_GREEN
+
+/obj/item/radio/intercom/update_icon(updates)
+ cut_overlays()
+ if(!on)
+ icon_state = "intercom-p"
+ else
+ icon_state = "intercom_[broadcasting][listening]"
+ var/image/I = image(icon, "intercom_overlay")
+ I.color = overlay_color
+ add_overlay(I)
/obj/item/radio/intercom/custom
name = "station intercom (Custom)"
@@ -40,13 +51,13 @@
/obj/item/radio/intercom/department/medbay
name = "station intercom (Medbay)"
- icon_state = "medintercom"
frequency = MED_I_FREQ
+ overlay_color = COLOR_TEAL
/obj/item/radio/intercom/department/security
name = "station intercom (Security)"
- icon_state = "secintercom"
frequency = SEC_I_FREQ
+ overlay_color = COLOR_MAROON
/obj/item/radio/intercom/entertainment
name = "entertainment intercom"
@@ -191,16 +202,7 @@
else
on = A.powered(EQUIP) // set "on" to the power status
- if(!on)
- if(wiresexposed)
- icon_state = "intercom-p_open"
- else
- icon_state = "intercom-p"
- else
- if(wiresexposed)
- icon_state = "intercom_open"
- else
- icon_state = initial(icon_state)
+ update_icon()
/obj/item/radio/intercom/locked
var/locked_frequency
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/__closet.dm
similarity index 72%
rename from code/game/objects/structures/crates_lockers/closets.dm
rename to code/game/objects/structures/crates_lockers/__closet.dm
index b6b11fc1354d..0fba49437032 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/__closet.dm
@@ -2,7 +2,7 @@
name = "closet"
desc = "It's a basic storage unit."
icon = 'icons/obj/closet.dmi'
- icon_state = "closed"
+ icon_state = "base"
density = 1
w_class = ITEMSIZE_HUGE
layer = UNDER_JUNK_LAYER
@@ -31,6 +31,10 @@
var/max_closets = 0 //Number of other closets allowed on tile before it won't close.
var/list/starts_with
+ var/singleton/closet_appearance = /singleton/closet_appearance
+ var/broken = FALSE
+ var/secure = FALSE
+ var/locked = FALSE
var/obj/item/electronics/airlock/lockerelectronics //Installed electronics
@@ -56,7 +60,12 @@
if(starts_with)
create_objects_in_loc(src, starts_with)
starts_with = null
- update_icon()
+ if(ispath(closet_appearance))
+ var/singleton/closet_appearance/app = GET_SINGLETON(closet_appearance)
+ if(app)
+ icon = app.icon
+ color = null
+ update_icon()
/obj/structure/closet/proc/take_contents()
// if(istype(loc, /mob/living))
@@ -64,12 +73,12 @@
// I'll leave this out, if someone dies to this from voring someone who made a closet go yell at a coder to
// fix the fact you can build closets inside living people, not try to make it work you numbskulls.
var/obj/item/I
- for(I in src.loc)
+ for(I in loc)
if(I.density || I.anchored || I == src) continue
I.forceMove(src)
// adjust locker size to hold all items with 5 units of free store room
var/content_size = 0
- for(I in src.contents)
+ for(I in contents)
content_size += CEILING(I.w_class/2, 1)
if(content_size > storage_capacity-5)
storage_capacity = content_size + 5
@@ -84,7 +93,7 @@
. = ..()
if(!opened)
var/content_size = 0
- for(var/obj/item/I in src.contents)
+ for(var/obj/item/I in contents)
if(!I.anchored)
content_size += CEILING(I.w_class/2, 1)
if(!content_size)
@@ -104,9 +113,11 @@
return ..()
/obj/structure/closet/proc/can_open()
- if(src.sealed)
- return 0
- return 1
+ if(sealed)
+ return FALSE
+ if(locked)
+ return FALSE
+ return TRUE
/obj/structure/closet/proc/can_close()
var/closet_count = 0
@@ -121,35 +132,35 @@
/obj/structure/closet/proc/dump_contents()
//Cham Projector Exception
for(var/obj/effect/dummy/chameleon/AD in src)
- AD.forceMove(src.loc)
+ AD.forceMove(loc)
for(var/obj/I in src)
- I.forceMove(src.loc)
+ I.forceMove(loc)
for(var/mob/M in src)
M.forceMove(loc)
M.update_perspective()
/obj/structure/closet/proc/open()
- if(src.opened)
+ if(opened)
return 0
- if(!src.can_open())
+ if(!can_open())
return 0
- src.dump_contents()
+ dump_contents()
- src.icon_state = src.icon_opened
- src.opened = 1
- playsound(src.loc, open_sound, 15, 1, -3)
+ icon_state = icon_opened
+ opened = 1
+ playsound(src, open_sound, 15, 1, -3)
if(initial(density))
density = !density
return 1
/obj/structure/closet/proc/close()
- if(!src.opened)
+ if(!opened)
return 0
- if(!src.can_close())
+ if(!can_close())
return 0
var/stored_units = 0
@@ -163,10 +174,10 @@
if(max_closets)
stored_units += store_closets(stored_units)
- src.icon_state = src.icon_closed
- src.opened = 0
+ icon_state = icon_closed
+ opened = 0
- playsound(src.loc, close_sound, 15, 1, -3)
+ playsound(src, close_sound, 15, 1, -3)
if(initial(density))
density = !density
return 1
@@ -174,7 +185,7 @@
//Cham Projector Exception
/obj/structure/closet/proc/store_misc(var/stored_units)
var/added_units = 0
- for(var/obj/effect/dummy/chameleon/AD in src.loc)
+ for(var/obj/effect/dummy/chameleon/AD in loc)
if((stored_units + added_units) > storage_capacity)
break
AD.forceMove(src)
@@ -183,7 +194,7 @@
/obj/structure/closet/proc/store_items(var/stored_units)
var/added_units = 0
- for(var/obj/item/I in src.loc)
+ for(var/obj/item/I in loc)
var/item_size = CEILING(I.w_class / 2, 1)
if(stored_units + added_units + item_size > storage_capacity)
continue
@@ -194,7 +205,7 @@
/obj/structure/closet/proc/store_mobs(var/stored_units)
var/added_units = 0
- for(var/mob/living/M in src.loc)
+ for(var/mob/living/M in loc)
if(M.buckled || M.pinned.len)
continue
if(stored_units + added_units + M.mob_size > storage_capacity)
@@ -206,7 +217,7 @@
/obj/structure/closet/proc/store_closets(var/stored_units)
var/added_units = 0
- for(var/obj/structure/closet/C in src.loc)
+ for(var/obj/structure/closet/C in loc)
if(C == src) //Don't store ourself
continue
if(C.anchored) //Don't worry about anchored things on the same tile
@@ -221,7 +232,7 @@
/obj/structure/closet/proc/toggle(mob/user as mob)
- if(!(src.opened ? src.close() : src.open()))
+ if(!(opened ? close() : open()))
to_chat(user, "It won't budge!")
return
update_icon()
@@ -231,19 +242,19 @@
switch(severity)
if(1)
for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
- A.forceMove(src.loc)
+ A.forceMove(loc)
LEGACY_EX_ACT(A, severity + 1, null)
qdel(src)
if(2)
if(prob(50))
for (var/atom/movable/A as mob|obj in src)
- A.forceMove(src.loc)
+ A.forceMove(loc)
LEGACY_EX_ACT(A, severity + 1, null)
qdel(src)
if(3)
if(prob(5))
for(var/atom/movable/A as mob|obj in src)
- A.forceMove(src.loc)
+ A.forceMove(loc)
qdel(src)
/obj/structure/closet/blob_act()
@@ -253,7 +264,7 @@
health -= damage
if(health <= 0)
for(var/atom/movable/A in src)
- A.forceMove(src.loc)
+ A.forceMove(loc)
qdel(src)
/obj/structure/closet/bullet_act(var/obj/projectile/Proj)
@@ -267,10 +278,10 @@
return
/obj/structure/closet/attackby(obj/item/W as obj, mob/user as mob)
- if(src.opened)
+ if(opened)
if(istype(W, /obj/item/grab))
var/obj/item/grab/G = W
- src.MouseDroppedOn(G.affecting, user) //act like they were dragged onto the closet
+ MouseDroppedOn(G.affecting, user) //act like they were dragged onto the closet
return 0
if(istype(W,/obj/item/tk_grab))
return 0
@@ -283,7 +294,7 @@
to_chat(user, "You need more welding fuel to complete this task.")
return
playsound(src, WT.tool_sound, 50)
- new /obj/item/stack/material/steel(src.loc)
+ new /obj/item/stack/material/steel(loc)
for(var/mob/M in viewers(src))
M.show_message("\The [src] has been cut apart by [user] with \the [WT].", 3, "You hear welding.", 2)
qdel(src)
@@ -303,10 +314,30 @@
return
if(!user.attempt_insert_item_for_installation(W, opened? loc : src))
return
+ else if(istype(W, /obj/item/melee/energy/blade))
+ if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying."))
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
+ spark_system.set_up(5, 0, loc)
+ spark_system.start()
+ playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(src, "sparks", 50, 1)
+
+ else if(W.is_wrench())
+ if(sealed)
+ if(anchored)
+ user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
+ else
+ user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
+ if(do_after(user, 20 * W.tool_speed))
+ if(!src) return
+ to_chat(user, "You [anchored? "un" : ""]secured \the [src]!")
+ anchored = !anchored
+ return
+
else if(istype(W, /obj/item/packageWrap))
return
else if(istype(W, /obj/item/extraction_pack)) //so fulton extracts dont open closets
- src.close()
+ close()
return
else if(seal_tool)
if(istype(W, seal_tool))
@@ -323,8 +354,8 @@
if(opened)
return
playsound(src, S.tool_sound, 50)
- src.sealed = !src.sealed
- src.update_icon()
+ sealed = !sealed
+ update_icon()
for(var/mob/M in viewers(src))
M.show_message("[src] has been [sealed?"sealed":"unsealed"] by [user.name].", 3)
else if(W.is_wrench())
@@ -338,10 +369,17 @@
if(!src) return
to_chat(user, "You [anchored? "un" : ""]secured \the [src]!")
anchored = !anchored
+ else if (!secure)
+ attack_hand(user)
else
- src.attack_hand(user)
+ togglelock(user)
return
+/obj/structure/closet/emag_act(remaining_charges, mob/user, emag_source)
+ . = ..()
+ broken = TRUE
+ update_icon()
+
/obj/structure/closet/MouseDroppedOnLegacy(atom/movable/O as mob|obj, mob/user as mob)
if(istype(O, /atom/movable/screen)) //fix for HUD elements making their way into the world -Pete
return
@@ -353,14 +391,14 @@
return
if(!isturf(user.loc)) // are you in a container/closet/pod/etc?
return
- if(!src.opened)
+ if(!opened)
return
if(istype(O, /obj/structure/closet))
return
- step_towards(O, src.loc)
+ step_towards(O, loc)
if(user != O)
user.show_viewers("[user] stuffs [O] into [src]!")
- src.add_fingerprint(user)
+ add_fingerprint(user)
return
/obj/structure/closet/attack_robot(mob/user)
@@ -368,27 +406,47 @@
attack_hand(user)
/obj/structure/closet/relaymove(mob/user as mob)
- if(user.stat || !isturf(src.loc))
+ if(user.stat || !isturf(loc))
return
- if(!src.open())
+ if(!open())
to_chat(user, "It won't budge!")
/obj/structure/closet/attack_hand(mob/user, list/params)
- src.add_fingerprint(user)
- src.toggle(user)
+ add_fingerprint(user)
+ if(locked && secure)
+ togglelock(user)
+ else
+ toggle(user)
+
+/obj/structure/closet/AltClick()
+ ..()
+ if(secure)
+ verb_togglelock()
+
+/obj/structure/closet/verb/verb_togglelock()
+ set src in oview(1) // One square distance
+ set category = "Object"
+ set name = "Toggle Lock"
+
+ if(!CHECK_MOBILITY(usr, MOBILITY_CAN_USE)) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
+ return
+
+ if((ishuman(usr) || isrobot(usr)) && secure)
+ src.add_fingerprint(usr)
+ src.togglelock(usr)
// tk grab then use on self
/obj/structure/closet/attack_self_tk(mob/user as mob)
- src.add_fingerprint(user)
- if(!src.toggle())
+ add_fingerprint(user)
+ if(!toggle())
to_chat(usr, "It won't budge!")
/obj/structure/closet/attack_ghost(mob/ghost)
. = ..()
if(ghost.client && ghost.client.inquisitive_ghost)
ghost.examinate(src)
- if (!src.opened)
+ if (!opened)
to_chat(ghost, "It contains: [english_list(contents)].")
/obj/structure/closet/verb/verb_toggleopen()
@@ -400,19 +458,20 @@
return
if(ishuman(usr) || isrobot(usr))
- src.add_fingerprint(usr)
- src.toggle(usr)
+ add_fingerprint(usr)
+ toggle(usr)
else
to_chat(usr, "This mob type can't use this verb.")
/obj/structure/closet/update_icon()//Putting the sealed stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
- cut_overlays()
- if(!opened)
- icon_state = icon_closed
- if(sealed)
- add_overlay("welded")
+ if(opened)
+ icon_state = "open"
+ else if(broken)
+ icon_state = "closed_emagged[sealed ? "_welded" : ""]"
+ else if(locked)
+ icon_state = "closed_locked[sealed ? "_welded" : ""]"
else
- icon_state = icon_opened
+ icon_state = "closed_unlocked[sealed ? "_welded" : ""]"
/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys")
if(damage < STRUCTURE_MIN_DAMAGE_THRESHOLD)
@@ -425,10 +484,12 @@
/obj/structure/closet/proc/req_breakout()
if(opened)
- return 0 //Door's open... wait, why are you in it's contents then?
+ return FALSE //Door's open... wait, why are you in it's contents then?
if(!sealed)
- return 0 //closed but not sealed...
- return 1
+ return FALSE //closed but not sealed...
+ if(secure && locked && !opened)
+ return TRUE
+ return TRUE
/obj/structure/closet/contents_resist(mob/escapee)
if(breakout)
@@ -458,7 +519,7 @@
breakout = 0
return
- playsound(src.loc, breakout_sound, 100, 1)
+ playsound(src, breakout_sound, 100, 1)
animate_shake()
add_fingerprint(escapee)
@@ -466,7 +527,7 @@
breakout = 0
to_chat(escapee, SPAN_WARNING("You successfully break out!"))
visible_message(SPAN_DANGER("\The [escapee] successfully broke out of \the [src]!"))
- playsound(src.loc, breakout_sound, 100, 1)
+ playsound(src, breakout_sound, 100, 1)
animate_shake()
break_open()
@@ -477,6 +538,10 @@
if(istype(loc, /obj/structure/bigDelivery))
var/obj/structure/bigDelivery/BD = loc
BD.unwrap()
+ if(secure)
+ desc += " It appears to be broken."
+ broken = 1
+ locked = 0
open()
/obj/structure/closet/proc/animate_shake()
@@ -492,8 +557,8 @@
return !opened
/obj/structure/closet/return_air_for_internal_lifeform(var/mob/living/L)
- if(src.loc)
- if(istype(src.loc, /obj/structure/closet))
+ if(loc)
+ if(istype(loc, /obj/structure/closet))
return (loc.return_air_for_internal_lifeform(L))
return return_air()
@@ -509,3 +574,55 @@
/obj/structure/closet/CanReachIn(atom/movable/mover, atom/target, obj/item/tool, list/cache)
return FALSE
+
+/obj/structure/closet/emp_act(severity)
+ for(var/obj/O in src)
+ O.emp_act(severity)
+ if(!broken && secure)
+ if(prob(50/severity))
+ locked = !locked
+ update_icon()
+ if(prob(20/severity) && !opened)
+ if(!locked)
+ open()
+ else
+ req_access = list()
+ req_access = list(pick(get_all_station_access()))
+ ..()
+
+/obj/structure/closet/proc/togglelock(mob/user as mob)
+ if(!secure)
+ return
+ if(opened)
+ to_chat(user, "Close the locker first.")
+ return
+ if(broken)
+ to_chat(user, "The locker appears to be broken.")
+ return
+ if(user.loc == src)
+ to_chat(user, "You can't reach the lock from inside.")
+ return
+ if(allowed(user))
+ locked = !locked
+ playsound(src, 'sound/machines/click.ogg', 15, 1, -3)
+ for(var/mob/O in viewers(user, 3))
+ if((O.client && !( O.blinded )))
+ to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].")
+ update_icon()
+ else
+ to_chat(user, "Access Denied")
+
+/obj/structure/closet/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "")
+ if(!broken && secure)
+ broken = 1
+ locked = 0
+ desc = "It appears to be broken."
+ update_icon()
+
+ if(visual_feedback)
+ visible_message(visual_feedback, audible_feedback)
+ else if(user && emag_source)
+ visible_message("\The [src] has been broken by \the [user] with \an [emag_source]!", "You hear a faint electrical spark.")
+ else
+ visible_message("\The [src] sparks and breaks open!", "You hear a faint electrical spark.")
+ return 1
diff --git a/code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm
new file mode 100644
index 000000000000..9cee5646abb7
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/_closet_appearance_definitions.dm
@@ -0,0 +1,987 @@
+//This is a straight port of the system from Nebula.
+
+/obj/structure/closet/debug/Initialize(var/maploading, var/newappearance)
+ closet_appearance = newappearance
+ . = ..(maploading)
+
+/singleton/closet_appearance
+ var/color = COLOR_GRAY40
+ var/decals = list(
+ "upper_vent",
+ "lower_vent"
+ )
+ var/list/extra_decals
+ var/icon/icon
+ var/base_icon = 'icons/obj/closets/bases/closet.dmi'
+ var/decal_icon = 'icons/obj/closets/decals/closet.dmi'
+ var/can_lock = FALSE
+
+/singleton/closet_appearance/Initialize()
+ . = ..()
+ // Build our colour and decal lists.
+ if(LAZYLEN(extra_decals))
+ if(!decals)
+ decals = list()
+ for(var/thing in extra_decals)
+ decals[thing] = extra_decals[thing]
+ for(var/thing in decals)
+ if(isnull(decals[thing]))
+ decals[thing] = color
+
+ // singletonare storage vars for icons.
+ var/icon/open_icon
+ var/icon/closed_emagged_icon
+ var/icon/closed_emagged_welded_icon
+ var/icon/closed_locked_icon
+ var/icon/closed_locked_welded_icon
+ var/icon/closed_unlocked_icon
+ var/icon/closed_unlocked_welded_icon
+
+ // Create open icon.
+ var/icon/new_icon = new
+ open_icon = icon(base_icon, "base")
+ open_icon.Blend(icon(base_icon, "open"), ICON_OVERLAY)
+ open_icon.Blend(color, BLEND_ADD)
+ open_icon.Blend(icon(base_icon, "interior"), ICON_OVERLAY)
+ if(decal_icon)
+ for(var/thing in decals)
+ var/icon/this_decal_icon = icon(decal_icon, "[thing]_open")
+ this_decal_icon.Blend(decals[thing], BLEND_ADD)
+ open_icon.Blend(this_decal_icon, ICON_OVERLAY)
+
+ // Generate basic closed icons.
+ closed_emagged_icon = icon(base_icon, "base")
+ if(can_lock)
+ closed_emagged_icon.Blend(icon(base_icon, "lock"), ICON_OVERLAY)
+ closed_emagged_icon.Blend(color, BLEND_ADD)
+ if(decal_icon)
+ for(var/thing in decals)
+ var/icon/this_decal_icon = icon(decal_icon, thing)
+ this_decal_icon.Blend(decals[thing], BLEND_ADD)
+ closed_emagged_icon.Blend(this_decal_icon, ICON_OVERLAY)
+ closed_locked_icon = icon(closed_emagged_icon)
+ closed_unlocked_icon = icon(closed_emagged_icon)
+
+ // Add lock lights.
+ if(can_lock)
+ var/icon/light = icon(base_icon, "light")
+ light.Blend(COLOR_RED, BLEND_ADD)
+ closed_locked_icon.Blend(light, ICON_OVERLAY)
+ light = icon(base_icon, "light")
+ light.Blend(COLOR_LIME, BLEND_ADD)
+ closed_unlocked_icon.Blend(light, ICON_OVERLAY)
+
+ // Add welded states.
+ var/icon/welded = icon(base_icon, "welded")
+ closed_locked_welded_icon = icon(closed_locked_icon)
+ closed_unlocked_welded_icon = icon(closed_unlocked_icon)
+ closed_emagged_welded_icon = icon(closed_emagged_icon)
+ closed_locked_welded_icon.Blend(welded, ICON_OVERLAY)
+ closed_unlocked_welded_icon.Blend(welded, ICON_OVERLAY)
+ closed_emagged_welded_icon.Blend(welded, ICON_OVERLAY)
+
+ // Finish up emagged icons.
+ var/icon/sparks = icon(base_icon, "sparks")
+ closed_emagged_icon.Blend(sparks, ICON_OVERLAY)
+ closed_emagged_welded_icon.Blend(sparks, ICON_OVERLAY)
+
+ // Insert our bevy of icons into the final icon file.
+ new_icon.Insert(open_icon, "open")
+ new_icon.Insert(closed_emagged_icon, "closed_emagged")
+ new_icon.Insert(closed_emagged_welded_icon, "closed_emagged_welded")
+ new_icon.Insert(closed_locked_icon, "closed_locked")
+ new_icon.Insert(closed_locked_welded_icon, "closed_locked_welded")
+ new_icon.Insert(closed_unlocked_icon, "closed_unlocked")
+ new_icon.Insert(closed_unlocked_welded_icon, "closed_unlocked_welded")
+
+ // Set icon!
+ icon = new_icon
+
+/singleton/closet_appearance/tactical
+ color = COLOR_RED_GRAY
+ extra_decals = list(
+ "inset" = COLOR_GRAY
+ )
+
+/singleton/closet_appearance/tactical/alt
+ color = COLOR_PALE_BTL_GREEN
+
+/singleton/closet_appearance/wardrobe
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_PALE_BLUE_GRAY,
+ "stripe_w" = COLOR_GRAY
+ )
+
+/singleton/closet_appearance/wardrobe/legal
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_BLUE,
+ "stripe_w" = COLOR_GRAY
+ )
+
+/singleton/closet_appearance/wardrobe/red
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_RED,
+ "stripe_w" = COLOR_GRAY
+ )
+
+/singleton/closet_appearance/wardrobe/janitor
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_PALE_PURPLE_GRAY,
+ "stripe_w" = COLOR_GRAY
+ )
+
+/singleton/closet_appearance/wardrobe/mixed
+ extra_decals = list(
+ "stripe_horizontal_upper" = COLOR_PURPLE_GRAY,
+ "stripe_horizontal_lower" = COLOR_PALE_RED_GRAY,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/orange
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_PALE_ORANGE,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/green
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_GREEN_GRAY,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/grey
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_GRAY,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/pink
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_PALE_PINK,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/black
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_GRAY20,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/yellow
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_PALE_YELLOW,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/red
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_RED_GRAY,
+ "stripe_w" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/wardrobe/white
+ extra_decals = list(
+ "stripe_horizontal" = COLOR_GRAY,
+ "stripe_w" = COLOR_OFF_WHITE,
+ )
+
+/singleton/closet_appearance/bio
+ color = COLOR_PALE_ORANGE
+ decals = list(
+ "l3" = COLOR_OFF_WHITE,
+ "stripe_horizontal_narrow" = COLOR_ORANGE
+ )
+ extra_decals = list(
+ "biohazard" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/bio/command
+ extra_decals = list(
+ "lower_half_solid" = COLOR_BLUE_GRAY,
+ "biohazard" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/bio/science
+ extra_decals = list(
+ "lower_half_solid" = COLOR_PALE_YELLOW,
+ "biohazard" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/bio/security
+ extra_decals = list(
+ "lower_half_solid" = COLOR_RED_GRAY,
+ "biohazard" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/bio/janitor
+ color = COLOR_PURPLE
+ decals = list(
+ "l3" = COLOR_OFF_WHITE,
+ )
+ extra_decals = list(
+ "stripe_horizontal_broad" = COLOR_ORANGE,
+ "biohazard" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/bio/virology
+ extra_decals = list(
+ "lower_half_solid" = COLOR_GREEN_GRAY,
+ "biohazard" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/emergency
+ color = COLOR_BABY_BLUE
+ extra_decals = list(
+ "vents",
+ "oxy" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/bio/medical
+ extra_decals = list(
+ "lower_half_solid" = COLOR_BABY_BLUE,
+ "vents"
+ )
+
+/singleton/closet_appearance/secure_closet
+ can_lock = TRUE
+
+/singleton/closet_appearance/secure_closet/engineering
+ can_lock = TRUE
+ color = COLOR_YELLOW_GRAY
+ decals = list(
+ "upper_side_vent",
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_right_partial" = COLOR_BEASTY_BROWN,
+ "stripe_vertical_left_partial" = COLOR_BEASTY_BROWN,
+ "eng" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/engineering/senior
+ can_lock = TRUE
+ color = COLOR_YELLOW_GRAY
+ decals = list(
+ "upper_side_vent",
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_right_partial" = COLOR_MAROON,
+ "stripe_vertical_left_partial" = COLOR_MAROON,
+ "eng" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/engineering/electrical
+ decals = list(
+ "lower_vent"
+ )
+ extra_decals = list(
+ "electric" = COLOR_BEASTY_BROWN,
+ "vertical_stripe_simple" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/engineering/atmos
+ extra_decals = list(
+ "stripe_vertical_right_partial" = COLOR_CYAN_BLUE,
+ "stripe_vertical_mid_partial" = COLOR_CYAN_BLUE,
+ "atmos" = COLOR_CYAN_BLUE
+ )
+
+/singleton/closet_appearance/secure_closet/engineering/welding
+ decals = list(
+ "lower_vent"
+ )
+ extra_decals = list(
+ "fire" = COLOR_BEASTY_BROWN,
+ "vertical_stripe_simple" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/engineering/tools
+ can_lock = FALSE
+ decals = list(
+ "lower_vent"
+ )
+ extra_decals = list(
+ "tool" = COLOR_BEASTY_BROWN,
+ "vertical_stripe_simple" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/engineering/tools/radiation
+ extra_decals = list(
+ "l2" = COLOR_BEASTY_BROWN,
+ "rads" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/engineering/ce
+ color = COLOR_OFF_WHITE
+ extra_decals = list(
+ "stripe_vertical_right_partial" = COLOR_CLOSET_GOLD,
+ "stripe_vertical_mid_partial" = COLOR_CLOSET_GOLD,
+ "eng_narrow" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/secure_closet/mining
+ color = COLOR_WARM_YELLOW
+ decals = list(
+ "upper_side_vent",
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_mid_partial" = COLOR_BEASTY_BROWN,
+ "stripe_vertical_left_partial" = COLOR_BEASTY_BROWN,
+ "mining" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/mining/sec
+ decals = list(
+ "stripe_vertical_mid_partial" = COLOR_MAROON,
+ "stripe_vertical_left_partial" = COLOR_MAROON,
+ "mining" = COLOR_MAROON
+ )
+
+/singleton/closet_appearance/secure_closet/command
+ color = COLOR_BLUE_GRAY
+ decals = list(
+ "lower_holes",
+ "upper_holes"
+ )
+ extra_decals = list(
+ "stripe_vertical_left_partial" = COLOR_CLOSET_GOLD,
+ "stripe_vertical_right_partial" = COLOR_CLOSET_GOLD,
+ "captain" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/secure_closet/command/hop
+ color = COLOR_PALE_BLUE_GRAY
+ extra_decals = list(
+ "stripe_vertical_mid_partial" = COLOR_CLOSET_GOLD,
+ "hop" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/secure_closet/cmo
+ color = COLOR_BABY_BLUE
+ decals = list(
+ "upper_side_vent",
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "medcircle" = COLOR_CLOSET_GOLD,
+ "stripe_vertical_right_partial" = COLOR_CLOSET_GOLD,
+ "stripe_vertical_mid_partial" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/secure_closet/medical
+ color = COLOR_OFF_WHITE
+ decals = null
+ extra_decals = list(
+ "circle" = COLOR_BLUE_GRAY,
+ "stripes_horizontal" = COLOR_BLUE_GRAY
+ )
+
+/singleton/closet_appearance/secure_closet/medical/paramedic
+ color = COLOR_OFF_WHITE
+ decals = null
+ extra_decals = list(
+ "circle" = COLOR_BLUE_GRAY,
+ "stripes_horizontal" = COLOR_GREEN
+ )
+
+/singleton/closet_appearance/secure_closet/medical/chemicals
+ color = COLOR_OFF_WHITE
+ decals = null
+ extra_decals = list(
+ "circle" = COLOR_SUN,
+ "stripes_horizontal" = COLOR_SUN
+ )
+
+/singleton/closet_appearance/secure_closet/medical/virology
+ decals = list(
+ "upper_side_vent",
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_right_partial" = COLOR_BOTTLE_GREEN,
+ "stripe_vertical_mid_partial" = COLOR_BOTTLE_GREEN,
+ "viro" = COLOR_BOTTLE_GREEN
+ )
+
+/singleton/closet_appearance/secure_closet/medical/alt
+ extra_decals = list(
+ "medcircle" =COLOR_BLUE_GRAY,
+ "stripe_vertical_right_partial" = COLOR_BLUE_GRAY,
+ "stripe_vertical_mid_partial" = COLOR_BLUE_GRAY
+ )
+
+/singleton/closet_appearance/secure_closet/cargo
+ color = COLOR_WARM_YELLOW
+ decals = list(
+ "upper_side_vent",
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "cargo" = COLOR_GRAY40,
+ "stripe_vertical_left_partial" = COLOR_GRAY40,
+ "stripe_vertical_mid_partial" = COLOR_GRAY40
+ )
+
+/singleton/closet_appearance/secure_closet/cargo/qm
+ extra_decals = list(
+ "cargo" = COLOR_BEASTY_BROWN,
+ "stripe_vertical_left_partial" = COLOR_BEASTY_BROWN,
+ "stripe_vertical_mid_partial" = COLOR_BEASTY_BROWN
+ )
+
+/singleton/closet_appearance/secure_closet/security
+ color = COLOR_MAROON
+ decals = list(
+ "lower_holes"
+ )
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_WARM_YELLOW,
+ "security" = COLOR_WARM_YELLOW
+ )
+
+/singleton/closet_appearance/secure_closet/security/weapons
+ color = COLOR_GRAY20
+ decals = list(
+ "lower_holes"
+ )
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_MAROON,
+ "security" = COLOR_WARM_YELLOW
+ )
+
+/singleton/closet_appearance/secure_closet/security/warden
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_WARM_YELLOW,
+ "stripe_vertical_right_full" = COLOR_WARM_YELLOW,
+ "security" = COLOR_WARM_YELLOW
+ )
+
+/singleton/closet_appearance/secure_closet/security/hos
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_WARM_YELLOW,
+ "stripe_vertical_right_full" = COLOR_WARM_YELLOW,
+ "stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
+ "security" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/secure_closet/blueshield
+ color = COLOR_WALL_GUNMETAL
+ decals = null
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_COMMAND_BLUE,
+ "stripe_vertical_right_full" = COLOR_COMMAND_BLUE,
+ "stripe_vertical_mid_full" = COLOR_COMMAND_BLUE,
+ "security" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/bomb
+ color = COLOR_DARK_GREEN_GRAY
+ decals = list(
+ "l4" = COLOR_OFF_WHITE
+ )
+ extra_decals = list(
+ "lower_half_solid" = COLOR_GREEN_GRAY
+ )
+
+/singleton/closet_appearance/bomb/security
+ extra_decals = list(
+ "lower_half_solid" = COLOR_WARM_YELLOW
+ )
+
+/singleton/closet_appearance/oxygen
+ color = COLOR_LIGHT_CYAN
+ decals = list(
+ "lower_vent"
+ )
+ extra_decals = list(
+ "oxy" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/oxygen/fire
+ color = COLOR_RED_GRAY
+ extra_decals = list(
+ "extinguisher" = COLOR_OFF_WHITE,
+ "vertical_stripe_simple" = COLOR_OFF_WHITE,
+ )
+
+/singleton/closet_appearance/alien
+ color = COLOR_PURPLE
+
+/singleton/closet_appearance/secure_closet/expedition
+ color = COLOR_BLUE_GRAY
+ decals = list(
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_PURPLE,
+ "security" = COLOR_PURPLE
+ )
+
+/singleton/closet_appearance/secure_closet/expedition/medic
+ color = COLOR_BLUE_GRAY
+ decals = list(
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_PURPLE,
+ "medical" = COLOR_BABY_BLUE
+ )
+
+/singleton/closet_appearance/secure_closet/expedition/pathfinder
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_PURPLE,
+ "stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
+ "stripe_vertical_right_full" = COLOR_PURPLE,
+ "security" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/secure_closet/expedition/science
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_PURPLE,
+ "research" = COLOR_PURPLE
+ )
+
+/singleton/closet_appearance/secure_closet/rd
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_CLOSET_GOLD,
+ "stripe_vertical_left_full" = COLOR_PURPLE,
+ "stripe_vertical_right_full" = COLOR_PURPLE,
+ "research" = COLOR_CLOSET_GOLD
+ )
+
+/singleton/closet_appearance/secure_closet/scientst
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_PURPLE,
+ "research" = COLOR_PURPLE
+ )
+
+/singleton/closet_appearance/secure_closet/hydroponics
+ color = COLOR_GREEN_GRAY
+ decals = list(
+ "lower_side_vent",
+ "upper_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_right_partial" = COLOR_DARK_GREEN_GRAY,
+ "stripe_vertical_mid_partial" = COLOR_DARK_GREEN_GRAY,
+ "hydro" = COLOR_DARK_GREEN_GRAY
+ )
+
+/singleton/closet_appearance/secure_closet/chaplain
+ decals = list(
+ "lower_side_vent",
+ "upper_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_right_full" = COLOR_GRAY20,
+ "stripe_vertical_mid_full" = COLOR_GRAY20
+ )
+
+/singleton/closet_appearance/secure_closet/sol
+ color = COLOR_BABY_BLUE
+ decals = list(
+ "lower_side_vent"
+ )
+ extra_decals = list(
+ "stripe_vertical_mid_full" = COLOR_BOTTLE_GREEN,
+ "security" = COLOR_BOTTLE_GREEN
+ )
+
+/singleton/closet_appearance/secure_closet/sol/two
+ extra_decals = list(
+ "stripe_vertical_left_full" = COLOR_BOTTLE_GREEN,
+ "stripe_vertical_right_full" = COLOR_BOTTLE_GREEN,
+ "security" = COLOR_BOTTLE_GREEN
+ )
+
+/singleton/closet_appearance/secure_closet/sol/two/dark
+ color = COLOR_DARK_BLUE_GRAY
+
+// Crates.
+/singleton/closet_appearance/crate
+ decals = null
+ extra_decals = null
+ base_icon = 'icons/obj/closets/bases/crate.dmi'
+ decal_icon = 'icons/obj/closets/decals/crate.dmi'
+ color = COLOR_GRAY40
+
+/singleton/closet_appearance/crate/plastic
+ color = COLOR_GRAY80
+
+/singleton/closet_appearance/crate/oxygen
+ color = COLOR_CYAN_BLUE
+ decals = list(
+ "crate_stripes" = COLOR_OFF_WHITE,
+ "crate_oxy" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/crate/medical
+ color = COLOR_GRAY80
+ decals = list(
+ "crate_stripe" = COLOR_WARM_YELLOW,
+ "crate_cross" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/crate/medical/trauma
+ decals = list(
+ "crate_stripe" = COLOR_MAROON,
+ "crate_cross" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/crate/medical/oxygen
+ decals = list(
+ "crate_stripe" = COLOR_BABY_BLUE,
+ "crate_cross" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/crate/medical/toxins
+ decals = list(
+ "crate_stripe" = COLOR_GREEN_GRAY,
+ "crate_cross" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/crate/hydroponics
+ decals = list(
+ "crate_stripe_left" = COLOR_GREEN_GRAY,
+ "crate_stripe_right" = COLOR_GREEN_GRAY
+ )
+
+/singleton/closet_appearance/crate/radiation
+ color = COLOR_BROWN_ORANGE
+ extra_decals = list(
+ "crate_radiation_left" = COLOR_WARM_YELLOW,
+ "crate_radiation_right" = COLOR_WARM_YELLOW,
+ "lid_stripes" = COLOR_MAROON
+ )
+
+/singleton/closet_appearance/crate/engineering
+ color = COLOR_BROWN_ORANGE
+ extra_decals = list(
+ "lid_stripes" = COLOR_MAROON
+ )
+
+/singleton/closet_appearance/crate/freezer
+ color = COLOR_BABY_BLUE
+
+/singleton/closet_appearance/crate/science
+ color = COLOR_OFF_WHITE
+ decals = list(
+ "crate_bracing"
+ )
+ extra_decals = list(
+ "crate_stripe_left" = COLOR_PALE_PURPLE_GRAY,
+ "crate_stripe_right" = COLOR_PALE_PURPLE_GRAY,
+ )
+
+/singleton/closet_appearance/crate/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/secure/engineering
+ color = COLOR_BROWN_ORANGE
+ extra_decals = list(
+ "lid_stripes" = COLOR_MAROON
+ )
+
+/singleton/closet_appearance/crate/secure/hazard
+ color = COLOR_MAROON
+ decals = list(
+ "crate_bracing"
+ )
+ extra_decals = list(
+ "crate_stripe_left" = COLOR_OFF_WHITE,
+ "crate_stripe_right" = COLOR_OFF_WHITE,
+ "toxin" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/crate/secure/weapon
+ color = COLOR_GREEN_GRAY
+ decals = list(
+ "crate_bracing"
+ )
+ extra_decals = list(
+ "crate_stripe_left" = COLOR_OFF_WHITE,
+ "crate_stripe_right" = COLOR_OFF_WHITE,
+ "hazard" = COLOR_OFF_WHITE
+ )
+
+/singleton/closet_appearance/crate/secure/hydroponics
+ extra_decals = list(
+ "crate_stripe_left" = COLOR_GREEN_GRAY,
+ "crate_stripe_right" = COLOR_GREEN_GRAY
+ )
+
+/singleton/closet_appearance/crate/secure/shuttle
+ extra_decals = list(
+ "crate_stripe_left" = COLOR_YELLOW_GRAY,
+ "crate_stripe_right" = COLOR_YELLOW_GRAY
+ )
+
+/singleton/closet_appearance/crate/branded/gilthari
+ decals = list(
+ "gilthari"
+ )
+
+/singleton/closet_appearance/crate/branded/gilthari/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/centauri
+ decals = list(
+ "centauri"
+ )
+
+/singleton/closet_appearance/crate/branded/einstein
+ decals = list(
+ "einstein"
+ )
+
+/singleton/closet_appearance/crate/branded/einstein/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/focal
+ decals = list(
+ "focal"
+ )
+
+/singleton/closet_appearance/crate/branded/focal/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/aether
+ decals = list(
+ "aether"
+ )
+
+/singleton/closet_appearance/crate/branded/aether/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/hephaestus
+ decals = list(
+ "heph"
+ )
+
+/singleton/closet_appearance/crate/branded/hephaestus/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/morpheus
+ decals = list(
+ "morpheus"
+ )
+
+/singleton/closet_appearance/crate/branded/morpheus/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/nanotrasen
+ decals = list(
+ "nt"
+ )
+
+/singleton/closet_appearance/crate/branded/nanotrasen/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/oculum
+ decals = list(
+ "oculum"
+ )
+
+/singleton/closet_appearance/crate/branded/oculum/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/veymed
+ decals = list(
+ "crate_bracing"
+ )
+
+/singleton/closet_appearance/crate/branded/ward
+ decals = list(
+ "wt"
+ )
+
+/singleton/closet_appearance/crate/branded/ward/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/xion
+ decals = list(
+ "xion"
+ )
+
+/singleton/closet_appearance/crate/branded/xion/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/zhenghu
+ decals = list(
+ "zhenghu"
+ )
+
+/singleton/closet_appearance/crate/branded/zhenghu/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/hedberg
+ decals = list(
+ "hedberg"
+ )
+
+/singleton/closet_appearance/crate/branded/hedberg/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/bishop
+ decals = list(
+ "bishop"
+ )
+
+/singleton/closet_appearance/crate/branded/bishop/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/grayson
+ decals = list(
+ "grayson"
+ )
+
+/singleton/closet_appearance/crate/branded/grayson/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/lawson
+ decals = list(
+ "lawson"
+ )
+
+/singleton/closet_appearance/crate/branded/lawson/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/crate/branded/oricon
+ decals = list(
+ "scg"
+ )
+
+/singleton/closet_appearance/crate/branded/oricon/secure
+ can_lock = TRUE
+
+
+// Large crates.
+/singleton/closet_appearance/large_crate
+ base_icon = 'icons/obj/closets/bases/large_crate.dmi'
+ decal_icon = 'icons/obj/closets/decals/large_crate.dmi'
+ decals = null
+ extra_decals = null
+
+/singleton/closet_appearance/large_crate/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/large_crate/critter
+ decals = list(
+ "airholes"
+ )
+ extra_decals = list(
+ "oxy" = COLOR_WHITE
+ )
+
+/singleton/closet_appearance/large_crate/hydroponics
+ extra_decals = list(
+ "stripes" = COLOR_GREEN_GRAY,
+ "text" = COLOR_GREEN_GRAY
+ )
+
+/singleton/closet_appearance/large_crate/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/large_crate/secure/hazard
+ color = COLOR_MAROON
+ decals = list(
+ "crate_bracing"
+ )
+ extra_decals = list(
+ "marking" = COLOR_OFF_WHITE,
+ "text_upper" = COLOR_OFF_WHITE
+ )
+
+// Cabinets.
+/singleton/closet_appearance/cabinet
+ base_icon = 'icons/obj/closets/bases/cabinet.dmi'
+ decal_icon = null
+ color = WOOD_COLOR_RICH
+ decals = null
+ extra_decals = null
+
+/singleton/closet_appearance/cabinet/secure
+ can_lock = TRUE
+
+// Wall lockers.
+/singleton/closet_appearance/wall
+ base_icon = 'icons/obj/closets/bases/wall.dmi'
+ decal_icon = 'icons/obj/closets/decals/wall.dmi'
+ decals = list(
+ "vent"
+ )
+ extra_decals = null
+
+/singleton/closet_appearance/wall/secure
+ base_icon = 'icons/obj/closets/bases/wall.dmi'
+ decal_icon = 'icons/obj/closets/decals/wall.dmi'
+ decals = list(
+ "vent"
+ )
+ extra_decals = null
+ can_lock = TRUE
+
+/singleton/closet_appearance/wall/emergency
+ decals = null
+ extra_decals = list(
+ "glass" = COLOR_WHITE
+ )
+
+/singleton/closet_appearance/wall/emergency/fire
+ decals = list(
+ "fire"
+ )
+ color = COLOR_MAROON
+
+/singleton/closet_appearance/wall/medical
+ decals = null
+ color = COLOR_OFF_WHITE
+ extra_decals = list(
+ "stripe_outer" = COLOR_BLUE_GRAY,
+ "stripe_inner" = COLOR_OFF_WHITE,
+ "cross" = COLOR_BLUE_GRAY
+ )
+
+/singleton/closet_appearance/wall/shipping
+ color = COLOR_WARM_YELLOW
+ decals = null
+ extra_decals = list(
+ "stripes" = COLOR_BEASTY_BROWN,
+ "glass" = COLOR_WHITE
+ )
+
+/singleton/closet_appearance/wall/hydrant
+ color = COLOR_MAROON
+ decals = null
+ extra_decals = list(
+ "stripes" = COLOR_OFF_WHITE,
+ "glass" = COLOR_WHITE
+ )
+
+// Carts
+/singleton/closet_appearance/cart
+ color = COLOR_GRAY20
+ base_icon = 'icons/obj/closets/bases/cart.dmi'
+ decal_icon = 'icons/obj/closets/decals/cart.dmi'
+ decals = null
+ extra_decals = null
+
+/singleton/closet_appearance/cart/secure
+ can_lock = TRUE
+
+/singleton/closet_appearance/cart/trash
+ color = COLOR_BOTTLE_GREEN
+
+/singleton/closet_appearance/cart/biohazard
+ can_lock = TRUE
+ decals = list(
+ "biohazard" = COLOR_GRAY80
+ )
+
+/singleton/closet_appearance/cart/biohazard/alt
+ color = COLOR_SURGERY_BLUE
+ decals = list(
+ "biohazard" = COLOR_RED_GRAY
+ )
diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
index b2baec0f5754..fb026f6af837 100644
--- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
@@ -1,6 +1,4 @@
/obj/structure/closet/crate/critter
name = "critter crate"
desc = "A crate which can sustain life for a while."
- icon_state = "critter"
- icon_opened = "critteropen"
- icon_closed = "critter"
+ closet_appearance = /singleton/closet_appearance/large_crate/critter
diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
index 1f124d7185ee..d3c14ab3a221 100644
--- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
@@ -6,7 +6,6 @@
density = 0 //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
icon_closed = "egg"
icon_opened = "egg_open"
- icon_locked = "egg"
open_sound = 'sound/vore/schlorp.ogg'
close_sound = 'sound/vore/schlorp.ogg'
opened = 0
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index f27ce50b3f65..ea81d91eda78 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -11,7 +11,6 @@
var/localopened = 0 //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
opened = 1
var/hitstaken = 0
- var/locked = 1
var/smashed = 0
/obj/structure/closet/fireaxecabinet/PopulateContents()
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index 0614307ea9fc..4334349e2a83 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -1,8 +1,7 @@
/obj/structure/closet/athletic_mixed
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
- icon_state = "mixed"
- icon_closed = "mixed"
+ closet_appearance = /singleton/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/shorts/grey,
@@ -45,8 +44,7 @@
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- icon_state = "red"
- icon_closed = "red"
+ closet_appearance = /singleton/closet_appearance/wardrobe/red
starts_with = list(
/obj/item/gun/energy/lasertag/red = 5,
@@ -56,8 +54,7 @@
/obj/structure/closet/lasertag/blue
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- icon_state = "blue"
- icon_closed = "blue"
+ closet_appearance = /singleton/closet_appearance/wardrobe/legal
starts_with = list(
/obj/item/gun/energy/lasertag/blue = 5,
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 8e0c3b78e29e..5bbbd74514d1 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -1,15 +1,7 @@
/obj/structure/closet/cabinet
name = "cabinet"
desc = "Old will forever be in fashion."
- icon_state = "cabinet_closed"
- icon_closed = "cabinet_closed"
- icon_opened = "cabinet_open"
-
-/obj/structure/closet/cabinet/update_icon()
- if(!opened)
- icon_state = icon_closed
- else
- icon_state = icon_opened
+ closet_appearance = /singleton/closet_appearance/cabinet
/obj/structure/closet/acloset
name = "strange closet"
@@ -18,7 +10,6 @@
icon_closed = "acloset"
icon_opened = "aclosetopen"
-
/obj/structure/closet/gimmick
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
@@ -94,6 +85,7 @@
icon_closed = "alien_locker"
icon_opened = "alien_locker_open"
anchored = TRUE
+
/obj/structure/closet/largecardboard
name = "Large Cardboard Box"
desc = "It was my destiny to be here."
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index acc09819d9c8..306bc5d8ce2f 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -11,8 +11,7 @@
/obj/structure/closet/gmcloset
name = "formal closet"
desc = "It's a storage unit for formal clothing."
- icon_state = "black"
- icon_closed = "black"
+ closet_appearance = /singleton/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/head/that = 2,
@@ -38,8 +37,7 @@
/obj/structure/closet/chefcloset
name = "chef's closet"
desc = "It's a storage unit for foodservice garments."
- icon_state = "black"
- icon_closed = "black"
+ closet_appearance = /singleton/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/under/sundress,
@@ -57,8 +55,7 @@
/obj/structure/closet/jcloset
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
- icon_state = "mixed"
- icon_closed = "mixed"
+ closet_appearance = /singleton/closet_appearance/wardrobe/janitor
starts_with = list(
/obj/item/clothing/under/rank/janitor,
@@ -84,8 +81,7 @@
/obj/structure/closet/lawcloset
name = "legal closet"
desc = "It's a storage unit for courtroom apparel and items."
- icon_state = "blue"
- icon_closed = "blue"
+ closet_appearance = /singleton/closet_appearance/wardrobe/legal
starts_with = list(
/obj/item/clothing/under/lawyer/female = 2,
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index 395fa61c5050..bc8574ac55ee 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -1,24 +1,16 @@
/obj/structure/closet/l3closet
name = "level-3 biohazard suit closet"
desc = "It's a storage unit for level-3 biohazard gear."
- icon_state = "bio"
- icon_closed = "bio"
- icon_opened = "bioopen"
+ closet_appearance = /singleton/closet_appearance/bio
/obj/structure/closet/l3closet/general
- icon_state = "bio_general"
- icon_closed = "bio_general"
- icon_opened = "bio_generalopen"
-
starts_with = list(
/obj/item/clothing/suit/bio_suit/general,
/obj/item/clothing/head/bio_hood/general)
/obj/structure/closet/l3closet/virology
- icon_state = "bio_virology"
- icon_closed = "bio_virology"
- icon_opened = "bio_virologyopen"
+ closet_appearance = /singleton/closet_appearance/bio/virology
starts_with = list(
/obj/item/clothing/suit/bio_suit/virology,
@@ -28,18 +20,14 @@
/obj/structure/closet/l3closet/security
- icon_state = "bio_security"
- icon_closed = "bio_security"
- icon_opened = "bio_securityopen"
+ closet_appearance = /singleton/closet_appearance/bio/security
starts_with = list(
/obj/item/clothing/suit/bio_suit/security,
/obj/item/clothing/head/bio_hood/security)
/obj/structure/closet/l3closet/janitor
- icon_state = "bio_janitor"
- icon_closed = "bio_janitor"
- icon_opened = "bio_janitoropen"
+ closet_appearance = /singleton/closet_appearance/bio/janitor
starts_with = list(
/obj/item/clothing/suit/bio_suit/janitor = 2,
@@ -49,9 +37,7 @@
/obj/structure/closet/l3closet/scientist
- icon_state = "bio_scientist"
- icon_closed = "bio_scientist"
- icon_opened = "bio_scientistopen"
+ closet_appearance = /singleton/closet_appearance/bio/science
starts_with = list(
/obj/item/clothing/suit/bio_suit/scientist,
@@ -64,9 +50,7 @@
/obj/structure/closet/l3closet/medical
- icon_state = "bio_scientist"
- icon_closed = "bio_scientist"
- icon_opened = "bio_scientistopen"
+ closet_appearance = /singleton/closet_appearance/bio/medical
starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 3,
diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
index 6cc3167ec807..e32be48a3b75 100644
--- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
+++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm
@@ -3,6 +3,7 @@
name = "autolok suit storage"
desc = "It's wall-mounted storage unit for an AutoLok suit."
store_mobs = FALSE
+ closet_appearance = /singleton/closet_appearance/wall/emergency
starts_with = list(
/obj/item/clothing/suit/space/void/autolok,
@@ -14,6 +15,7 @@
name = "emergency suit storage"
desc = "It's wall-mounted storage unit for an emergency suit."
store_mobs = FALSE
+ closet_appearance = /singleton/closet_appearance/wall/emergency
starts_with = list(
/obj/item/clothing/head/helmet/space/emergency,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 850fbe6a4f05..a24aaf1f665b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -1,24 +1,7 @@
/obj/structure/closet/secure_closet/bar
name = "booze closet"
req_access = list(ACCESS_GENERAL_BAR)
- icon_state = "cabinetdetective_locked"
- icon_closed = "cabinetdetective"
- icon_locked = "cabinetdetective_locked"
- icon_opened = "cabinetdetective_open"
- icon_broken = "cabinetdetective_broken"
- icon_off = "cabinetdetective_broken"
+ closet_appearance = /singleton/closet_appearance/cabinet/secure
starts_with = list(
/obj/item/reagent_containers/food/drinks/bottle/small/beer = 10)
-
-/obj/structure/closet/secure_closet/bar/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index e7df46f352ad..2f2e133086ac 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -1,12 +1,7 @@
/obj/structure/closet/secure_closet/cargotech
name = "cargo technician's locker"
req_access = list(ACCESS_SUPPLY_BAY)
- icon_state = "securecargo1"
- icon_closed = "securecargo"
- icon_locked = "securecargo1"
- icon_opened = "securecargoopen"
- icon_broken = "securecargobroken"
- icon_off = "securecargooff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/cargo
starts_with = list(
/obj/item/clothing/under/rank/cargotech,
@@ -37,12 +32,7 @@
/obj/structure/closet/secure_closet/quartermaster
name = "quartermaster's locker"
req_access = list(ACCESS_SUPPLY_QM)
- icon_state = "secureqm1"
- icon_closed = "secureqm"
- icon_locked = "secureqm1"
- icon_opened = "secureqmopen"
- icon_broken = "secureqmbroken"
- icon_off = "secureqmoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/cargo/qm
starts_with = list(
/obj/item/clothing/under/rank/cargo,
@@ -76,12 +66,7 @@
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
- icon_state = "miningsec1"
- icon_closed = "miningsec"
- icon_locked = "miningsec1"
- icon_opened = "miningsecopen"
- icon_broken = "miningsecbroken"
- icon_off = "miningsecoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/mining
req_access = list(ACCESS_SUPPLY_MINE)
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 9715cf931b90..64d5082a70c6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -1,11 +1,6 @@
/obj/structure/closet/secure_closet/engineering_chief
name = "chief engineer's locker"
- icon_state = "securece1"
- icon_closed = "securece"
- icon_locked = "securece1"
- icon_opened = "secureceopen"
- icon_broken = "securecebroken"
- icon_off = "secureceoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering/ce
req_access = list(ACCESS_ENGINEERING_CE)
starts_with = list(
@@ -52,12 +47,7 @@
/obj/structure/closet/secure_closet/engineering_electrical
name = "electrical supplies"
- icon_state = "secureengelec1"
- icon_closed = "secureengelec"
- icon_locked = "secureengelec1"
- icon_opened = "toolclosetopen"
- icon_broken = "secureengelecbroken"
- icon_off = "secureengelecoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering/electrical
req_access = list(ACCESS_ENGINEERING_ENGINE)
starts_with = list(
@@ -71,12 +61,7 @@
/obj/structure/closet/secure_closet/engineering_welding
name = "welding supplies"
- icon_state = "secureengweld1"
- icon_closed = "secureengweld"
- icon_locked = "secureengweld1"
- icon_opened = "toolclosetopen"
- icon_broken = "secureengweldbroken"
- icon_off = "secureengweldoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering/welding
req_access = list(ACCESS_ENGINEERING_CONSTRUCTION)
starts_with = list(
@@ -87,12 +72,7 @@
/obj/structure/closet/secure_closet/engineering_personal
name = "engineer's locker"
- icon_state = "secureeng1"
- icon_closed = "secureeng"
- icon_locked = "secureeng1"
- icon_opened = "secureengopen"
- icon_broken = "secureengbroken"
- icon_off = "secureengoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering
req_access = list(ACCESS_ENGINEERING_ENGINE)
starts_with = list(
@@ -127,12 +107,7 @@
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
- icon_state = "secureatm1"
- icon_closed = "secureatm"
- icon_locked = "secureatm1"
- icon_opened = "secureatmopen"
- icon_broken = "secureatmbroken"
- icon_off = "secureatmoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering/atmos
req_access = list(ACCESS_ENGINEERING_ATMOS)
starts_with = list(
@@ -167,12 +142,7 @@
/obj/structure/closet/secure_closet/senior_engineer
name = "Senior engineer's locker"
desc = "It looks like it has been stuffed to the brim with Space OSHA violation notices."
- icon_state = "secureeng1"
- icon_closed = "secureeng"
- icon_locked = "secureeng1"
- icon_opened = "secureengopen"
- icon_broken = "secureengbroken"
- icon_off = "secureengoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering/senior
req_access = list(ACCESS_ENGINEERING_ENGINE)
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm
index 9627f203ecf1..7680048ec7b4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/explorer.dm
@@ -1,13 +1,7 @@
//SC Exploration Secure Closets Port
/obj/structure/closet/secure_closet/explorer
name = "explorer locker"
- icon = 'icons/obj/closet.dmi'
- icon_state = "secureexp1"
- icon_closed = "secureexp"
- icon_locked = "secureexp1"
- icon_opened = "secureexpopen"
- icon_broken = "secureexpbroken"
- icon_off = "secureexpoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/expedition
req_access = list(ACCESS_GENERAL_EXPLORER)
starts_with = list(
@@ -42,7 +36,7 @@
//SC Misc_vr locker.
/obj/structure/closet/secure_closet/sar
name = "field medic locker"
-
+ closet_appearance = /singleton/closet_appearance/secure_closet/expedition/medic
starts_with = list(
/obj/item/storage/backpack/dufflebag/emt,
/obj/item/storage/box/autoinjectors,
@@ -81,6 +75,7 @@
//Pilot Locker
/obj/structure/closet/secure_closet/pilot
name = "pilot locker"
+ closet_appearance = /singleton/closet_appearance/secure_closet/expedition
req_access = list(ACCESS_GENERAL_PILOT)
/obj/structure/closet/secure_closet/pilot
@@ -118,13 +113,7 @@
//Pathfinder
/obj/structure/closet/secure_closet/pathfinder
name = "pathfinder locker"
- icon = 'icons/obj/closet.dmi'
- icon_state = "secureexp1"
- icon_closed = "secureexp"
- icon_locked = "secureexp1"
- icon_opened = "secureexpopen"
- icon_broken = "secureexpbroken"
- icon_off = "secureexpoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/expedition/pathfinder
req_access = list(ACCESS_GENERAL_GATEWAY)
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 7f533dd99cef..596f10bf90e9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -1,17 +1,3 @@
-/obj/structure/closet/secure_closet/freezer
-
-/obj/structure/closet/secure_closet/freezer/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
/obj/structure/closet/secure_closet/freezer/kitchen
name = "kitchen cabinet"
req_access = list(ACCESS_GENERAL_KITCHEN)
@@ -26,26 +12,12 @@
/obj/structure/closet/secure_closet/freezer/meat
name = "meat fridge"
- icon_state = "fridge1"
- icon_closed = "fridge"
- icon_locked = "fridge1"
- icon_opened = "fridgeopen"
- icon_broken = "fridgebroken"
- icon_off = "fridge1"
-
starts_with = list(
/obj/item/reagent_containers/food/snacks/meat/monkey = 10)
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
- icon_state = "fridge1"
- icon_closed = "fridge"
- icon_locked = "fridge1"
- icon_opened = "fridgeopen"
- icon_broken = "fridgebroken"
- icon_off = "fridge1"
-
starts_with = list(
/obj/item/reagent_containers/food/drinks/milk = 6,
/obj/item/reagent_containers/food/drinks/soymilk = 4,
@@ -55,12 +27,6 @@
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
- icon_state = "fridge1"
- icon_closed = "fridge"
- icon_locked = "fridge1"
- icon_opened = "fridgeopen"
- icon_broken = "fridgebroken"
- icon_off = "fridge1"
req_access = list(ACCESS_COMMAND_VAULT)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 721610fc1fb7..f830f2ac1877 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -1,10 +1,8 @@
/obj/structure/closet/secure_closet/guncabinet
name = "gun cabinet"
icon = 'icons/obj/guncabinet.dmi'
+ closet_appearance = null
icon_state = "base"
- icon_off ="base"
- icon_broken ="base"
- icon_locked ="base"
icon_closed ="base"
icon_opened = "base"
req_one_access = list(ACCESS_SECURITY_ARMORY)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index 757506e5a45a..c790c32d9dfb 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -1,12 +1,7 @@
/obj/structure/closet/secure_closet/hydroponics
name = "botanist's locker"
req_access = list(ACCESS_GENERAL_BOTANY)
- icon_state = "hydrosecure1"
- icon_closed = "hydrosecure"
- icon_locked = "hydrosecure1"
- icon_opened = "hydrosecureopen"
- icon_broken = "hydrosecurebroken"
- icon_off = "hydrosecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/hydroponics
starts_with = list(
/obj/item/storage/bag/plants,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index fbd71b7f7649..89f7c4a3ef97 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -1,12 +1,7 @@
/obj/structure/closet/secure_closet/medical1
name = "medicine closet"
desc = "Filled with medical junk."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/medical
req_access = list(ACCESS_MEDICAL_MAIN)
starts_with = list(
@@ -21,12 +16,7 @@
/obj/structure/closet/secure_closet/medical2
name = "anesthetics closet"
desc = "Used to knock people out."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/medical/alt
req_access = list(ACCESS_MEDICAL_SURGERY)
starts_with = list(
@@ -37,12 +27,7 @@
/obj/structure/closet/secure_closet/medical3
name = "medical doctor's locker"
req_access = list(ACCESS_MEDICAL_EQUIPMENT)
- icon_state = "securemed1"
- icon_closed = "securemed"
- icon_locked = "securemed1"
- icon_opened = "securemedopen"
- icon_broken = "securemedbroken"
- icon_off = "securemedoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/medical
starts_with = list(
/obj/item/clothing/under/rank/medical,
@@ -106,12 +91,7 @@
/obj/structure/closet/secure_closet/paramedic
name = "paramedic locker"
desc = "Supplies for a first responder."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/medical/paramedic
req_access = list(ACCESS_MEDICAL_EQUIPMENT)
starts_with = list(
@@ -150,12 +130,7 @@
/obj/structure/closet/secure_closet/CMO
name = "chief medical officer's locker"
req_access = list(ACCESS_MEDICAL_CMO)
- icon_state = "cmosecure1"
- icon_closed = "cmosecure"
- icon_locked = "cmosecure1"
- icon_opened = "cmosecureopen"
- icon_broken = "cmosecurebroken"
- icon_off = "cmosecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/cmo
starts_with = list(
/obj/item/clothing/under/rank/chief_medical_officer,
@@ -219,12 +194,7 @@
/obj/structure/closet/secure_closet/chemical
name = "chemical closet"
desc = "Store dangerous chemicals in here."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/medical/chemicals
req_access = list(ACCESS_MEDICAL_CHEMISTRY)
starts_with = list(
@@ -241,12 +211,7 @@
/obj/structure/closet/secure_closet/psych
name = "psychiatric closet"
desc = "Store psychology tools and medicines in here."
- icon_state = "medical1"
- icon_closed = "medical"
- icon_locked = "medical1"
- icon_opened = "medicalopen"
- icon_broken = "medicalbroken"
- icon_off = "medicaloff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/medical
req_access = list(ACCESS_MEDICAL_PSYCH)
starts_with = list(
@@ -268,12 +233,7 @@
/obj/structure/closet/secure_closet/medical_wall
name = "first aid closet"
desc = "It's a secure wall-mounted storage unit for first aid supplies."
- icon_state = "medical_wall_locked"
- icon_closed = "medical_wall_unlocked"
- icon_locked = "medical_wall_locked"
- icon_opened = "medical_wall_open"
- icon_broken = "medical_wall_spark"
- icon_off = "medical_wall_off"
+ closet_appearance = /singleton/closet_appearance/wall/medical
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
@@ -281,18 +241,6 @@
wall_mounted = 1
req_access = list(ACCESS_MEDICAL_EQUIPMENT)
-/obj/structure/closet/secure_closet/medical_wall/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
/obj/structure/closet/secure_closet/medical_wall/pills
name = "pill cabinet"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 5096b677de7a..ea8bff0dd72f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -1,6 +1,7 @@
/obj/structure/closet/secure_closet/personal
name = "personal closet"
desc = "It's a secure locker for personnel. The first card swiped gains control."
+ closet_appearance = /singleton/closet_appearance/secure_closet
req_access = list(ACCESS_COMMAND_LOCKERS)
var/registered_name = null
@@ -19,61 +20,43 @@
/obj/structure/closet/secure_closet/personal/cabinet
- icon_state = "cabinetdetective_locked"
- icon_closed = "cabinetdetective"
- icon_locked = "cabinetdetective_locked"
- icon_opened = "cabinetdetective_open"
- icon_broken = "cabinetdetective_broken"
- icon_off = "cabinetdetective_broken"
+ closet_appearance = /singleton/closet_appearance/cabinet/secure
starts_with = list(
/obj/item/storage/backpack/satchel/withwallet,
/obj/item/radio/headset
)
-/obj/structure/closet/secure_closet/personal/cabinet/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob)
- if (src.opened)
+ if (opened)
if (istype(W, /obj/item/grab))
var/obj/item/grab/G = W
- src.MouseDroppedOn(G.affecting, user) //act like they were dragged onto the closet
+ MouseDroppedOn(G.affecting, user) //act like they were dragged onto the closet
user.transfer_item_to_loc(W, loc)
else if(W.GetID())
var/obj/item/card/id/I = W.GetID()
- if(src.broken)
+ if(broken)
to_chat(user, "It appears to be broken.")
return
if(!I || !I.registered_name) return
- if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name)))
+ if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
//they can open all lockers, or nobody owns this, or they own this locker
- src.locked = !( src.locked )
- if(src.locked) src.icon_state = src.icon_locked
- else src.icon_state = src.icon_closed
+ locked = !locked
- if(!src.registered_name)
- src.registered_name = I.registered_name
- src.desc = "Owned by [I.registered_name]."
+ if(!registered_name)
+ registered_name = I.registered_name
+ desc = "Owned by [I.registered_name]."
+ update_icon()
else
to_chat(user, "Access Denied")
else if(istype(W, /obj/item/melee/energy/blade))
if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying."))
var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
- spark_system.set_up(5, 0, src.loc)
+ spark_system.set_up(5, 0, loc)
spark_system.start()
- playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(src.loc, "sparks", 50, 1)
+ playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(loc, "sparks", 50, 1)
else
to_chat(user, "Access Denied")
return
@@ -83,9 +66,9 @@
broken = 1
locked = 0
desc = "It appears to be broken."
- icon_state = src.icon_broken
if(visual_feedback)
visible_message("[visual_feedback]", "[audible_feedback]")
+ update_icon()
return 1
/obj/structure/closet/secure_closet/personal/verb/reset()
@@ -96,17 +79,17 @@
if(!CHECK_MOBILITY(usr, MOBILITY_CAN_USE)) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
return
if(ishuman(usr))
- src.add_fingerprint(usr)
- if (src.locked || !src.registered_name)
+ add_fingerprint(usr)
+ if (locked || !registered_name)
to_chat(usr, "You need to unlock it first.")
- else if (src.broken)
+ else if (broken)
to_chat(usr, "It appears to be broken.")
else
- if (src.opened)
- if(!src.close())
+ if (opened)
+ if(!close())
return
- src.locked = 1
- src.icon_state = src.icon_locked
- src.registered_name = null
- src.desc = "It's a secure locker for personnel. The first card swiped gains control."
+ locked = 1
+ registered_name = null
+ desc = "It's a secure locker for personnel. The first card swiped gains control."
+ update_icon()
return
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index e7f56c870f26..555ac7f92c63 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -1,11 +1,6 @@
/obj/structure/closet/secure_closet/scientist
name = "scientist's locker"
- icon_state = "secureres1"
- icon_closed = "secureres"
- icon_locked = "secureres1"
- icon_opened = "secureresopen"
- icon_broken = "secureresbroken"
- icon_off = "secureresoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/scientst
req_access = list(ACCESS_SCIENCE_TOXINS)
starts_with = list(
@@ -29,12 +24,7 @@
/obj/structure/closet/secure_closet/RD
name = "research director's locker"
- icon_state = "rdsecure1"
- icon_closed = "rdsecure"
- icon_locked = "rdsecure1"
- icon_opened = "rdsecureopen"
- icon_broken = "rdsecurebroken"
- icon_off = "rdsecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/rd
req_access = list(ACCESS_SCIENCE_RD)
starts_with = list(
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index c9811156d3da..5d5e9cd7a982 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -1,171 +1,12 @@
/obj/structure/closet/secure_closet
name = "secure locker"
desc = "It's an immobile card-locked storage unit."
- icon = 'icons/obj/closet.dmi'
- icon_state = "secure1"
+ closet_appearance = /singleton/closet_appearance/secure_closet
density = 1
opened = 0
- var/locked = 1
- var/broken = 0
- var/large = 1
- icon_closed = "secure"
- var/icon_locked = "secure1"
- icon_opened = "secureopen"
- var/icon_broken = "securebroken"
- var/icon_off = "secureoff"
wall_mounted = 0 //never solid (You can always pass over it)
health = 200
-// secure = TRUE
+ secure = TRUE
+ locked = TRUE
-/obj/structure/closet/secure_closet/can_open()
- if(src.locked)
- return 0
- return ..()
-/obj/structure/closet/secure_closet/close()
- if(..())
- if(broken)
- icon_state = src.icon_off
- return 1
- else
- return 0
-
-/obj/structure/closet/secure_closet/emp_act(severity)
- for(var/obj/O in src)
- O.emp_act(severity)
- if(!broken)
- if(prob(50/severity))
- src.locked = !src.locked
- src.update_icon()
- if(prob(20/severity) && !opened)
- if(!locked)
- open()
- else
- src.req_access = list()
- src.req_access += pick(get_all_station_access())
- ..()
-
-/obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob)
- if(src.opened)
- to_chat(user, "Close the locker first.")
- return
- if(src.broken)
- to_chat(user, "The locker appears to be broken.")
- return
- if(user.loc == src)
- to_chat(user, "You can't reach the lock from inside.")
- return
- if(src.allowed(user))
- src.locked = !src.locked
- playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
- for(var/mob/O in viewers(user, 3))
- if((O.client && !( O.blinded )))
- to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].")
- update_icon()
- else
- to_chat(user, "Access Denied")
-
-/obj/structure/closet/secure_closet/attackby(obj/item/W as obj, mob/user as mob)
- if(src.opened)
- if(istype(W, /obj/item/storage/laundry_basket))
- return ..(W,user)
- if(istype(W, /obj/item/grab))
- var/obj/item/grab/G = W
- if(src.large)
- src.MouseDroppedOn(G.affecting, user) //act like they were dragged onto the closet
- else
- to_chat(user, "The locker is too small to stuff [G.affecting] into!")
- if(isrobot(user))
- return
- if(W.loc != user) // This should stop mounted modules ending up outside the module.
- return
- user.transfer_item_to_loc(W, loc)
- else if(istype(W, /obj/item/melee/energy/blade))
- if(emag_act(INFINITY, user, "The locker has been sliced open by [user] with \an [W]!", "You hear metal being sliced and sparks flying."))
- var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
- spark_system.set_up(5, 0, src.loc)
- spark_system.start()
- playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(src.loc, "sparks", 50, 1)
- else if(W.is_wrench())
- if(sealed)
- if(anchored)
- user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
- else
- user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
- if(do_after(user, 20 * W.tool_speed))
- if(!src) return
- to_chat(user, "You [anchored? "un" : ""]secured \the [src]!")
- anchored = !anchored
- return
- else if(istype(W,/obj/item/packageWrap) || istype(W,/obj/item/weldingtool))
- return ..(W,user)
- else
- togglelock(user)
-
-/obj/structure/closet/secure_closet/emag_act(var/remaining_charges, var/mob/user, var/emag_source, var/visual_feedback = "", var/audible_feedback = "")
- if(!broken)
- broken = 1
- locked = 0
- desc = "It appears to be broken."
- icon_state = icon_off
- flick(icon_broken, src)
-
- if(visual_feedback)
- visible_message(visual_feedback, audible_feedback)
- else if(user && emag_source)
- visible_message("\The [src] has been broken by \the [user] with \an [emag_source]!", "You hear a faint electrical spark.")
- else
- visible_message("\The [src] sparks and breaks open!", "You hear a faint electrical spark.")
- return 1
-
-/obj/structure/closet/secure_closet/attack_hand(mob/user, list/params)
- src.add_fingerprint(user)
- if(src.locked)
- src.togglelock(user)
- else
- src.toggle(user)
-
-/obj/structure/closet/secure_closet/AltClick()
- ..()
- verb_togglelock()
-
-/obj/structure/closet/secure_closet/verb/verb_togglelock()
- set src in oview(1) // One square distance
- set category = "Object"
- set name = "Toggle Lock"
-
- if(!CHECK_MOBILITY(usr, MOBILITY_CAN_USE) || !Adjacent(usr)) // Don't use it if you're not able to! Checks for stuns, ghost and restrain
- return
-
- if(ishuman(usr) || isrobot(usr))
- src.add_fingerprint(usr)
- src.togglelock(usr)
- else
- to_chat(usr, "This mob type can't use this verb.")
-
-/obj/structure/closet/secure_closet/update_icon()//Putting the sealed stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
- cut_overlays()
-
- if(!opened)
- if(broken)
- icon_state = icon_off
- else if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- if(sealed)
- add_overlay("sealed")
- else
- icon_state = icon_opened
-
-/obj/structure/closet/secure_closet/req_breakout()
- if(!opened && locked)
- return 1
- return ..() //It's a secure closet, but isn't locked.
-
-/obj/structure/closet/secure_closet/break_open()
- desc += " It appears to be broken."
- broken = 1
- locked = 0
- ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 6a3f7cf48fda..92cd4508417a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -1,11 +1,6 @@
/obj/structure/closet/secure_closet/captains
name = "Facility Director's locker"
- icon_state = "capsecure1"
- icon_closed = "capsecure"
- icon_locked = "capsecure1"
- icon_opened = "capsecureopen"
- icon_broken = "capsecurebroken"
- icon_off = "capsecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/command
req_access = list(ACCESS_COMMAND_CAPTAIN)
starts_with = list(
@@ -28,12 +23,7 @@
/obj/structure/closet/secure_closet/hop
name = "head of personnel's locker"
- icon_state = "hopsecure1"
- icon_closed = "hopsecure"
- icon_locked = "hopsecure1"
- icon_opened = "hopsecureopen"
- icon_broken = "hopsecurebroken"
- icon_off = "hopsecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/command/hop
req_access = list(ACCESS_COMMAND_HOP)
starts_with = list(
@@ -52,12 +42,7 @@
/obj/structure/closet/secure_closet/hop2
name = "head of personnel's attire"
- icon_state = "hopsecure1"
- icon_closed = "hopsecure"
- icon_locked = "hopsecure1"
- icon_opened = "hopsecureopen"
- icon_broken = "hopsecurebroken"
- icon_off = "hopsecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/command/hop
req_access = list(ACCESS_COMMAND_HOP)
starts_with = list(
@@ -146,12 +131,7 @@
//_vr file contents:
/obj/structure/closet/secure_closet/hos
name = "head of security's attire"
- icon_state = "hossecure1"
- icon_closed = "hossecure"
- icon_locked = "hossecure1"
- icon_opened = "hossecureopen"
- icon_broken = "hossecurebroken"
- icon_off = "hossecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/security/hos
req_access = list(ACCESS_SECURITY_HOS)
storage_capacity = 2.5 * MOB_MEDIUM
@@ -180,12 +160,7 @@
/obj/structure/closet/secure_closet/hos2
name = "head of security's gear"
- icon_state = "hossecure1"
- icon_closed = "hossecure"
- icon_locked = "hossecure1"
- icon_opened = "hossecureopen"
- icon_broken = "hossecurebroken"
- icon_off = "hossecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/security/hos
req_access = list(ACCESS_SECURITY_HOS)
storage_capacity = 2.5 * MOB_MEDIUM
@@ -213,12 +188,7 @@
/obj/structure/closet/secure_closet/blueshield
name = "blueshield's locker"
- icon_state = "secC1"
- icon_closed = "secC"
- icon_locked = "secC1"
- icon_opened = "secCopen"
- icon_broken = "secCbroken"
- icon_off = "secCoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/blueshield
req_access = list(ACCESS_COMMAND_BLUESHIELD)
storage_capacity = 2.5 * MOB_MEDIUM
@@ -259,12 +229,7 @@
/obj/structure/closet/secure_closet/warden
name = "warden's locker"
- icon_state = "wardensecure1"
- icon_closed = "wardensecure"
- icon_locked = "wardensecure1"
- icon_opened = "wardensecureopen"
- icon_broken = "wardensecurebroken"
- icon_off = "wardensecureoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/security/warden
req_access = list(ACCESS_SECURITY_ARMORY)
starts_with = list(
@@ -311,12 +276,7 @@
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
- icon_state = "sec1"
- icon_closed = "sec"
- icon_locked = "sec1"
- icon_opened = "secopen"
- icon_broken = "secbroken"
- icon_off = "secoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/security
req_access = list(ACCESS_SECURITY_BRIG)
starts_with = list(
@@ -377,12 +337,7 @@
/obj/structure/closet/secure_closet/detective
name = "detective's cabinet"
- icon_state = "cabinetdetective_locked"
- icon_closed = "cabinetdetective"
- icon_locked = "cabinetdetective_locked"
- icon_opened = "cabinetdetective_open"
- icon_broken = "cabinetdetective_broken"
- icon_off = "cabinetdetective_broken"
+ closet_appearance = /singleton/closet_appearance/cabinet/secure
req_access = list(ACCESS_SECURITY_FORENSICS)
starts_with = list(
@@ -408,19 +363,6 @@
/obj/item/storage/bag/detective,
/obj/item/cassette_tape/random = 3)
-/obj/structure/closet/secure_closet/detective/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
-
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"
req_access = list(ACCESS_COMMAND_CAPTAIN)
@@ -467,40 +409,15 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/wall
name = "wall locker"
- icon_state = "wall-locker1"
- icon_closed = "wall-locker"
- icon_locked = "wall-locker1"
- icon_opened = "wall-lockeropen"
- icon_broken = "wall-lockerbroken"
- icon_off = "wall-lockeroff"
+ closet_appearance = /singleton/closet_appearance/wall/secure
req_access = list(ACCESS_SECURITY_EQUIPMENT)
density = 1
- //too small to put a man in
- large = 0
-
-/obj/structure/closet/secure_closet/wall/update_icon()
- if(broken)
- icon_state = icon_broken
- else
- if(!opened)
- if(locked)
- icon_state = icon_locked
- else
- icon_state = icon_closed
- else
- icon_state = icon_opened
-
//Custom NT Security Lockers, Only found at central command
/obj/structure/closet/secure_closet/nanotrasen_security
name = "NanoTrasen security officer's locker"
icon = 'icons/obj/closet.dmi'
- icon_state = "secC1"
- icon_closed = "secC"
- icon_locked = "secC1"
- icon_opened = "secCopen"
- icon_broken = "secCbroken"
- icon_off = "secCoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/sol
req_access = list(ACCESS_SECURITY_BRIG)
storage_capacity = 3.5 * MOB_MEDIUM
@@ -543,12 +460,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/nanotrasen_commander
name = "NanoTrasen commander's locker"
icon = 'icons/obj/closet.dmi'
- icon_state = "secC1"
- icon_closed = "secC"
- icon_locked = "secC1"
- icon_opened = "secCopen"
- icon_broken = "secCbroken"
- icon_off = "secCoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/sol/two/dark
req_access = list(ACCESS_SECURITY_BRIG)
storage_capacity = 3.5 * MOB_MEDIUM
@@ -597,12 +509,7 @@ GLOBAL_LIST_BOILERPLATE(all_brig_closets, /obj/structure/closet/secure_closet/br
/obj/structure/closet/secure_closet/nanotrasen_warden
name = "NanoTrasen warden's locker"
icon = 'icons/obj/closet.dmi'
- icon_state = "secC1"
- icon_closed = "secC"
- icon_locked = "secC1"
- icon_opened = "secCopen"
- icon_broken = "secCbroken"
- icon_off = "secCoff"
+ closet_appearance = /singleton/closet_appearance/secure_closet/sol/two
req_access = list(ACCESS_SECURITY_BRIG)
storage_capacity = 3.5 * MOB_MEDIUM
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index f1a06539b206..513d3867a2cc 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -1,9 +1,7 @@
/obj/structure/closet/syndicate
name = "armory closet"
desc = "Why is this here?"
- icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicateopen"
+ closet_appearance = /singleton/closet_appearance/tactical
/obj/structure/closet/syndicate/personal
desc = "It's a storage unit for operative gear."
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 644a8f54e2c1..803009c04cc6 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -15,9 +15,7 @@
/obj/structure/closet/emcloset
name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and O2 tanks."
- icon_state = "emergency"
- icon_closed = "emergency"
- icon_opened = "emergencyopen"
+ closet_appearance = /singleton/closet_appearance/oxygen
/obj/structure/closet/emcloset/Initialize(mapload)
switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10)))
@@ -61,9 +59,7 @@
/obj/structure/closet/firecloset
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
- icon_state = "firecloset"
- icon_closed = "firecloset"
- icon_opened = "fireclosetopen"
+ closet_appearance = /singleton/closet_appearance/oxygen/fire
starts_with = list(
/obj/item/clothing/suit/fire/firefighter,
@@ -104,9 +100,7 @@
/obj/structure/closet/toolcloset
name = "tool closet"
desc = "It's a storage unit for tools."
- icon_state = "toolcloset"
- icon_closed = "toolcloset"
- icon_opened = "toolclosetopen"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering/tools
/obj/structure/closet/toolcloset/Initialize(mapload)
starts_with = list()
@@ -150,9 +144,7 @@
/obj/structure/closet/radiation
name = "radiation suit closet"
desc = "It's a storage unit for rad-protective suits."
- icon_state = "radsuitcloset"
- icon_opened = "toolclosetopen"
- icon_closed = "radsuitcloset"
+ closet_appearance = /singleton/closet_appearance/secure_closet/engineering/tools/radiation
rad_flags = RAD_BLOCK_CONTENTS
starts_with = list(
@@ -166,9 +158,7 @@
/obj/structure/closet/bombcloset
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
- icon_state = "bombsuit"
- icon_closed = "bombsuit"
- icon_opened = "bombsuitopen"
+ closet_appearance = /singleton/closet_appearance/bomb
starts_with = list(
/obj/item/clothing/suit/bomb_suit,
@@ -186,9 +176,7 @@
/obj/structure/closet/bombclosetsecurity
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
- icon_state = "bombsuitsec"
- icon_closed = "bombsuitsec"
- icon_opened = "bombsuitsecopen"
+ closet_appearance = /singleton/closet_appearance/bomb/security
starts_with = list(
/obj/item/clothing/suit/bomb_suit/security,
@@ -202,9 +190,7 @@
/obj/structure/closet/hydrant //wall mounted fire closet
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
- icon_state = "hydrant"
- icon_closed = "hydrant"
- icon_opened = "hydrant_open"
+ closet_appearance = /singleton/closet_appearance/wall/emergency/fire
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
anchored = 1
@@ -227,15 +213,8 @@
/obj/structure/closet/medical_wall //wall mounted medical closet
name = "first-aid closet"
desc = "It's wall-mounted storage unit for first aid supplies."
- icon_state = "medical_wall"
- icon_closed = "medical_wall"
- icon_opened = "medical_wall_open"
+ closet_appearance = /singleton/closet_appearance/wall/medical
anchored = 1
density = 0
wall_mounted = 1
-/obj/structure/closet/medical_wall/update_icon()
- if(!opened)
- icon_state = icon_closed
- else
- icon_state = icon_opened
diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
index 77fe13df6396..4244755d37b4 100644
--- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
@@ -18,7 +18,7 @@
desc = "A wall mounted locker with emergency supplies."
var/list/spawnitems = list(/obj/item/tank/emergency/oxygen,/obj/item/clothing/mask/breath,/obj/item/tool/crowbar/red)
var/amount = 2 // spawns each items X times.
- icon_state = "emerg"
+ closet_appearance = /singleton/closet_appearance/wall/emergency //why aren't these real closets.
/obj/structure/closet/walllocker/emerglocker/toggle(mob/user as mob)
src.attack_hand(user)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 04cc8904b14d..c02d12e6266a 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -6,8 +6,7 @@
/obj/structure/closet/wardrobe/red
name = "security wardrobe"
- icon_state = "red"
- icon_closed = "red"
+ closet_appearance = /singleton/closet_appearance/wardrobe/red
starts_with = list(
/obj/item/clothing/under/rank/security = 3,
@@ -42,9 +41,7 @@
/obj/structure/closet/wardrobe/detective
name = "detective wardrobe"
- icon_state = "cabinet_closed"
- icon_closed = "cabinet_closed"
- icon_opened = "cabinet_open"
+ closet_appearance = /singleton/closet_appearance/cabinet
starts_with = list(
/obj/item/clothing/head/det = 2,
@@ -66,8 +63,7 @@
/obj/structure/closet/wardrobe/pink
name = "pink wardrobe"
- icon_state = "pink"
- icon_closed = "pink"
+ closet_appearance = /singleton/closet_appearance/wardrobe/pink
starts_with = list(
/obj/item/clothing/under/color/pink = 3,
@@ -76,8 +72,7 @@
/obj/structure/closet/wardrobe/black
name = "black wardrobe"
- icon_state = "black"
- icon_closed = "black"
+ closet_appearance = /singleton/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/under/color/black = 3,
@@ -92,8 +87,7 @@
/obj/structure/closet/wardrobe/chaplain_black
name = "chapel wardrobe"
desc = "It's a storage unit for approved religious attire."
- icon_state = "black"
- icon_closed = "black"
+ closet_appearance = /singleton/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/under/rank/chaplain,
@@ -119,8 +113,7 @@
/obj/structure/closet/wardrobe/green
name = "green wardrobe"
- icon_state = "green"
- icon_closed = "green"
+ closet_appearance = /singleton/closet_appearance/wardrobe/green
starts_with = list(
/obj/item/clothing/under/color/green = 3,
@@ -132,8 +125,7 @@
/obj/structure/closet/wardrobe/xenos
name = "xenos wardrobe"
- icon_state = "green"
- icon_closed = "green"
+ closet_appearance = /singleton/closet_appearance/wardrobe/green
starts_with = list(
/obj/item/clothing/suit/unathi/mantle,
@@ -147,8 +139,7 @@
/obj/structure/closet/wardrobe/orange
name = "prison wardrobe"
desc = "It's a storage unit for regulation prisoner attire."
- icon_state = "orange"
- icon_closed = "orange"
+ closet_appearance = /singleton/closet_appearance/wardrobe/orange
starts_with = list(
/obj/item/clothing/under/color/prison = 3,
@@ -158,8 +149,7 @@
/obj/structure/closet/wardrobe/yellow
name = "yellow wardrobe"
- icon_state = "yellow"
- icon_closed = "yellow"
+ closet_appearance = /singleton/closet_appearance/wardrobe/yellow
starts_with = list(
/obj/item/clothing/under/color/orange_skirt =3,
@@ -172,8 +162,7 @@
/obj/structure/closet/wardrobe/atmospherics_yellow
name = "atmospherics wardrobe"
- icon_state = "yellow"
- icon_closed = "yellow"
+ closet_appearance = /singleton/closet_appearance/wardrobe/yellow
starts_with = list(
/obj/item/clothing/under/rank/atmospheric_technician = 3,
@@ -188,8 +177,7 @@
/obj/structure/closet/wardrobe/engineering_yellow
name = "engineering wardrobe"
- icon_state = "yellow"
- icon_closed = "yellow"
+ closet_appearance = /singleton/closet_appearance/wardrobe/yellow
starts_with = list(
/obj/item/clothing/under/rank/engineer = 3,
@@ -207,8 +195,7 @@
/obj/structure/closet/wardrobe/white
name = "white wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/color/white = 3,
@@ -219,8 +206,7 @@
/obj/structure/closet/wardrobe/pjs
name = "pajama wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/pj/red = 2,
@@ -231,8 +217,7 @@
/obj/structure/closet/wardrobe/science_white
name = "science wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/rank/scientist = 3,
@@ -262,8 +247,7 @@
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
- icon_state = "black"
- icon_closed = "black"
+ closet_appearance = /singleton/closet_appearance/wardrobe/black
starts_with = list(
/obj/item/clothing/under/rank/roboticist = 2,
@@ -286,8 +270,7 @@
/obj/structure/closet/wardrobe/chemistry_white
name = "chemistry wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/rank/chemist = 2,
@@ -303,8 +286,7 @@
/obj/structure/closet/wardrobe/genetics_white
name = "genetics wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/rank/geneticist = 2,
@@ -319,8 +301,7 @@
/obj/structure/closet/wardrobe/virology_white
name = "virology wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/rank/virologist = 2,
@@ -336,8 +317,7 @@
/obj/structure/closet/wardrobe/medic_white
name = "medical wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/rank/medical = 2,
@@ -363,8 +343,7 @@
/obj/structure/closet/wardrobe/medic_gown
name = "cloning wardrobe"
- icon_state = "white"
- icon_closed = "white"
+ closet_appearance = /singleton/closet_appearance/wardrobe/white
starts_with = list(
/obj/item/clothing/under/medigown = 4)
@@ -372,8 +351,7 @@
/obj/structure/closet/wardrobe/grey
name = "grey wardrobe"
- icon_state = "grey"
- icon_closed = "grey"
+ closet_appearance = /singleton/closet_appearance/wardrobe/grey
starts_with = list(
/obj/item/clothing/under/color/grey = 3,
@@ -384,8 +362,7 @@
/obj/structure/closet/wardrobe/mixed
name = "mixed wardrobe"
- icon_state = "mixed"
- icon_closed = "mixed"
+ closet_appearance = /singleton/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/color/blue,
@@ -430,9 +407,7 @@
/obj/structure/closet/wardrobe/tactical
name = "tactical equipment"
- icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1open"
+ closet_appearance = /singleton/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/under/tactical,
@@ -457,9 +432,7 @@
/obj/structure/closet/wardrobe/ert
name = "emergency response team equipment"
- icon_state = "syndicate1"
- icon_closed = "syndicate1"
- icon_opened = "syndicate1open"
+ closet_appearance = /singleton/closet_appearance/tactical
starts_with = list(
/obj/item/clothing/under/rank/centcom,
@@ -476,8 +449,7 @@
/obj/structure/closet/wardrobe/suit
name = "suit locker"
- icon_state = "mixed"
- icon_closed = "mixed"
+ closet_appearance = /singleton/closet_appearance/wardrobe/mixed
starts_with = list(
/obj/item/clothing/under/assistantformal,
@@ -505,9 +477,7 @@
/obj/structure/closet/wardrobe/captain
name = "Facility Director's wardrobe"
- icon_state = "cabinet_closed"
- icon_closed = "cabinet_closed"
- icon_opened = "cabinet_open"
+ closet_appearance = /singleton/closet_appearance/cabinet
starts_with = list(
/obj/item/clothing/glasses/sunglasses,
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 2d16e18a1452..4b4f056bc44e 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -3,10 +3,7 @@
/obj/structure/closet/crate
name = "crate"
desc = "A rectangular steel crate."
- icon = 'icons/obj/storage.dmi'
- icon_state = "crate"
- icon_opened = "crateopen"
- icon_closed = "crate"
+ closet_appearance = /singleton/closet_appearance/crate
climbable = 1
var/points_per_crate = 5
// mouse_drag_pointer = MOUSE_ACTIVE_POINTER //???
@@ -134,39 +131,19 @@
/obj/structure/closet/crate/secure
desc = "A secure crate."
name = "Secure crate"
- icon_state = "securecrate"
- icon_opened = "securecrateopen"
- icon_closed = "securecrate"
- var/redlight = "securecrater"
- var/greenlight = "securecrateg"
- var/sparks = "securecratesparks"
- var/emag = "securecrateemag"
- var/broken = 0
- var/locked = 1
+ closet_appearance = /singleton/closet_appearance/crate/secure
var/tamper_proof = 0
-
-/obj/structure/closet/crate/secure/Initialize(mapload)
- . = ..()
-
- if(locked)
- set_overlays(redlight)
- else
- set_overlays(greenlight)
+ secure = TRUE
+ locked = TRUE
/obj/structure/closet/crate/secure/can_open()
return !locked
-/obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob)
- if(src.opened)
+/obj/structure/closet/crate/secure/togglelock(mob/user as mob)
+ . = ..()
+ if(opened)
to_chat(user, "Close the crate first.")
return
- if(src.broken)
- to_chat(user, "The crate appears to be broken.")
- return
- if(src.allowed(user))
- set_locked(!locked, user)
- else
- to_chat(user, "Access Denied")
/obj/structure/closet/crate/secure/proc/set_locked(var/newlocked, mob/user = null)
if(locked == newlocked)
@@ -177,9 +154,9 @@
for(var/mob/O in viewers(user, 3))
O.show_message( "The crate has been [locked ? null : "un"]locked by [user].", 1)
- set_overlays(locked ? redlight : greenlight)
+ update_icon()
-/obj/structure/closet/crate/secure/verb/verb_togglelock()
+/obj/structure/closet/crate/secure/verb_togglelock()
set src in oview(1) // One square distance
set category = "Object"
set name = "Toggle Lock"
@@ -212,37 +189,23 @@
/obj/structure/closet/crate/secure/emag_act(remaining_charges, mob/user)
if(!broken)
- cut_overlays()
- var/list/overlays_to_add = list()
- overlays_to_add += emag
- overlays_to_add += sparks
- add_overlay(overlays_to_add)
- compile_overlays()
- spawn(6)
- cut_overlay(sparks) //Tried lots of stuff but nothing works right. so i have to use this *sadface*
- compile_overlays()
playsound(src.loc, "sparks", 60, 1)
locked = 0
broken = 1
to_chat(user, "You unlock \the [src].")
+ update_icon()
return 1
/obj/structure/closet/crate/secure/emp_act(severity)
for(var/obj/O in src)
O.emp_act(severity)
if(!broken && !opened && prob(50/severity))
- cut_overlays()
if(!locked)
locked = 1
- add_overlay(redlight)
else
- add_overlay(list(emag, sparks))
- compile_overlays()
- spawn(6)
- cut_overlay(sparks) //Tried lots of stuff but nothing works right. so i have to use this *sadface*
- compile_overlays()
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
locked = 0
+ update_icon()
if(!opened && prob(20/severity))
if(!locked)
open()
@@ -287,25 +250,18 @@
/obj/structure/closet/crate/plastic
name = "plastic crate"
desc = "A rectangular plastic crate."
- icon_state = "plasticcrate"
- icon_opened = "plasticcrateopen"
- icon_closed = "plasticcrate"
+ closet_appearance = /singleton/closet_appearance/crate/plastic
points_per_crate = 1 //5 crates per ordered crate, +5 for the crate it comes in.
/obj/structure/closet/crate/internals
name = "internals crate"
desc = "A internals crate."
- icon_state = "o2crate"
- icon_opened = "o2crateopen"
- icon_closed = "o2crate"
+ closet_appearance = /singleton/closet_appearance/crate/oxygen
/obj/structure/closet/crate/trashcart
name = "trash cart"
desc = "A heavy, metal trashcart with wheels."
- icon_state = "trashcart"
- icon_opened = "trashcartopen"
- icon_closed = "trashcart"
-
+ closet_appearance = /singleton/closet_appearance/cart/trash
/*these aren't needed anymore
/obj/structure/closet/crate/hat
desc = "A crate filled with Valuable Collector's Hats!."
@@ -325,16 +281,12 @@
/obj/structure/closet/crate/medical
name = "medical crate"
desc = "A medical crate."
- icon_state = "medicalcrate"
- icon_opened = "medicalcrateopen"
- icon_closed = "medicalcrate"
+ closet_appearance = /singleton/closet_appearance/crate/medical
/obj/structure/closet/crate/rcd
name = "\improper RCD crate"
desc = "A crate with rapid construction device."
- icon_state = "engi_crate"
- icon_opened = "engi_crateopen"
- icon_closed = "engi_crate"
+ closet_appearance = /singleton/closet_appearance/crate/engineering
starts_with = list(
/obj/item/rcd_ammo = 3,
@@ -342,9 +294,7 @@
/obj/structure/closet/crate/solar
name = "solar pack crate"
- icon_state = "engi_crate"
- icon_opened = "engi_crateopen"
- icon_closed = "engi_crate"
+ closet_appearance = /singleton/closet_appearance/crate/engineering
starts_with = list(
/obj/item/solar_assembly = 21,
@@ -355,9 +305,7 @@
/obj/structure/closet/crate/freezer
name = "freezer"
desc = "A freezer."
- icon_state = "freezer"
- icon_opened = "freezeropen"
- icon_closed = "freezer"
+ closet_appearance = /singleton/closet_appearance/crate/freezer
var/target_temp = T0C - 40
var/cooling_power = 40
@@ -422,9 +370,7 @@
/obj/structure/closet/crate/radiation
name = "radioactive gear crate"
desc = "A crate with a radiation sign on it."
- icon_state = "radiation"
- icon_opened = "radiationopen"
- icon_closed = "radiation"
+ closet_appearance = /singleton/closet_appearance/crate/radiation
starts_with = list(
/obj/item/clothing/suit/radiation = 4,
@@ -434,71 +380,49 @@
/obj/structure/closet/crate/secure/weapon
name = "weapons crate"
desc = "A secure weapons crate."
- icon_state = "weaponcrate"
- icon_opened = "weaponcrateopen"
- icon_closed = "weaponcrate"
+ closet_appearance = /singleton/closet_appearance/crate/secure/weapon
/obj/structure/closet/crate/secure/phoron
name = "phoron crate"
desc = "A secure phoron crate."
- icon_state = "phoroncrate"
- icon_opened = "phoroncrateopen"
- icon_closed = "phoroncrate"
+ closet_appearance = /singleton/closet_appearance/crate/secure/hazard
/obj/structure/closet/crate/secure/gear
name = "gear crate"
desc = "A secure gear crate."
- icon_state = "secgearcrate"
- icon_opened = "secgearcrateopen"
- icon_closed = "secgearcrate"
+ closet_appearance = /singleton/closet_appearance/crate/secure/weapon
/obj/structure/closet/crate/secure/hydrosec
name = "secure hydroponics crate"
desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
- icon_state = "hydrosecurecrate"
- icon_opened = "hydrosecurecrateopen"
- icon_closed = "hydrosecurecrate"
+ closet_appearance = /singleton/closet_appearance/crate/secure/hydroponics
/obj/structure/closet/crate/secure/engineering
desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
name = "secure engineering crate"
- icon_state = "engi_secure_crate"
- icon_opened = "engi_secure_crateopen"
- icon_closed = "engi_secure_crate"
+ closet_appearance = /singleton/closet_appearance/crate/secure/engineering
/obj/structure/closet/crate/secure/science
name = "secure science crate"
desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
- icon_state = "scisecurecrate"
- icon_opened = "scisecurecrateopen"
- icon_closed = "scisecurecrate"
+ closet_appearance = /singleton/closet_appearance/crate/secure/hazard
/obj/structure/closet/crate/secure/bin
name = "secure bin"
desc = "A secure bin."
- icon = 'icons/obj/storage.dmi'
- icon_state = "largebins"
- icon_opened = "largebinsopen"
- icon_closed = "largebins"
- redlight = "largebinr"
- greenlight = "largebing"
- sparks = "largebinsparks"
- emag = "largebinemag"
-
+ closet_appearance = /singleton/closet_appearance/cart/secure
/obj/structure/closet/crate/large
name = "large crate"
desc = "A hefty metal crate."
icon = 'icons/obj/storage.dmi'
- icon_state = "largemetal"
- icon_opened = "largemetalopen"
- icon_closed = "largemetal"
+ closet_appearance = /singleton/closet_appearance/large_crate
/obj/structure/closet/crate/large/close()
@@ -523,12 +447,7 @@
/obj/structure/closet/crate/secure/large
name = "large crate"
desc = "A hefty metal crate with an electronic locking system."
- icon = 'icons/obj/storage.dmi'
- icon_state = "largemetalsecure"
- icon_opened = "largemetalsecureopen"
- icon_closed = "largemetalsecure"
- redlight = "largemetalr"
- greenlight = "largemetalg"
+ closet_appearance = /singleton/closet_appearance/large_crate/secure
/obj/structure/closet/crate/secure/large/close()
@@ -553,33 +472,22 @@
//fluff variant
/obj/structure/closet/crate/secure/large/reinforced
desc = "A hefty, reinforced metal crate with an electronic locking system."
- icon_state = "largermetal"
- icon_opened = "largermetalopen"
- icon_closed = "largermetal"
/obj/structure/closet/crate/engineering
name = "engineering crate"
- icon_state = "engi_crate"
- icon_opened = "engi_crateopen"
- icon_closed = "engi_crate"
+ closet_appearance = /singleton/closet_appearance/crate/engineering
/obj/structure/closet/crate/engineering/electrical
- icon_state = "engi_e_crate"
- icon_opened = "engi_crateopen"
- icon_closed = "engi_e_crate"
+ closet_appearance = /singleton/closet_appearance/crate/engineering
/obj/structure/closet/crate/science
name = "science crate"
- icon_state = "scicrate"
- icon_opened = "scicrateopen"
- icon_closed = "scicrate"
+ closet_appearance = /singleton/closet_appearance/crate/science
/obj/structure/closet/crate/hydroponics
name = "hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
- icon_state = "hydrocrate"
- icon_opened = "hydrocrateopen"
- icon_closed = "hydrocrate"
+ closet_appearance = /singleton/closet_appearance/crate/hydroponics
/obj/structure/closet/crate/hydroponics/prespawned
@@ -609,99 +517,78 @@
/obj/structure/closet/crate/aether
desc = "A crate painted in the colours of Aether Atmospherics and Recycling."
- icon_state = "aether"
- icon_opened = "aetheropen"
- icon_closed = "aether"
+ closet_appearance = /singleton/closet_appearance/crate/branded/aether
/obj/structure/closet/crate/centauri
desc = "A crate decorated with the logo of Centauri Provisions."
icon_state = "centauri"
icon_opened = "centauriopen"
icon_closed = "centauri"
+ closet_appearance = /singleton/closet_appearance/crate/branded/centauri
/obj/structure/closet/crate/einstein
desc = "A crate labelled with an Einstein Engines sticker, the company has since been bought out by Hephaestus Industries."
- icon_state = "ee"
- icon_opened = "eeopen"
- icon_closed = "ee"
+ closet_appearance = /singleton/closet_appearance/crate/branded/einstein
/obj/structure/closet/crate/focalpoint
desc = "A crate marked with the decal of Focal Point Energistics, now a subsidiary of Aether Atmospherics and Recycling."
- icon_state = "fp"
- icon_opened = "fpopen"
- icon_closed = "fp"
+ closet_appearance = /singleton/closet_appearance/crate/branded/focal
/obj/structure/closet/crate/gilthari
desc = "A crate embossed with the logo of Gilthari Exports."
- icon_state = "gilthari"
- icon_opened = "gilthariopen"
- icon_closed = "gilthari"
+ closet_appearance = /singleton/closet_appearance/crate/branded/gilthari
/obj/structure/closet/crate/grayson
desc = "A bare metal crate spraypainted with the decals of Grayson Manufactories an NT subsidiary. The purchase of Grayson by NT helped them secure their phoron monoply."
- icon_state = "grayson"
- icon_opened = "graysonopen"
- icon_closed = "grayson"
+ closet_appearance = /singleton/closet_appearance/crate/branded/grayson
/obj/structure/closet/crate/heph
desc = "A sturdy crate marked with the logo of Hephaestus Industries."
- icon_state = "heph"
- icon_opened = "hephopen"
- icon_closed = "heph"
+ closet_appearance = /singleton/closet_appearance/crate/branded/hephaestus
/obj/structure/closet/crate/morpheus
desc = "A crate crudely imprinted with 'MORPHEUS CYBERKINETICS' 'primier' off brand prosthetics manufactuer."
- icon_state = "morpheus"
- icon_opened = "morpheusopen"
- icon_closed = "morpheus"
+ closet_appearance = /singleton/closet_appearance/crate/branded/morpheus
/obj/structure/closet/crate/nanotrasen
desc = "A crate emblazoned with the standard NanoTrasen livery."
- icon_state = "nt"
- icon_opened = "ntopen"
- icon_closed = "nt"
+ closet_appearance = /singleton/closet_appearance/crate/branded/nanotrasen
+
/obj/structure/closet/crate/nanothreads
desc = "A crate emblazoned with the NanoThreads Garments livery, a subsidary of the NanoTrasen Corporation."
- icon_state = "nt"
- icon_opened = "ntopen"
- icon_closed = "nt"
+ closet_appearance = /singleton/closet_appearance/crate/branded/nanotrasen
+
/obj/structure/closet/crate/nanomed
desc = "A crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
- icon_state = "ntmed"
- icon_opened = "ntmedopen"
- icon_closed = "ntmed"
+ closet_appearance = /singleton/closet_appearance/crate/branded/nanotrasen
+
/obj/structure/closet/crate/oculum
desc = "A crate minimally decorated with the logo of media giant Oculum Broadcast."
- icon_state = "oculum"
- icon_opened = "oculumopen"
- icon_closed = "oculum"
+ closet_appearance = /singleton/closet_appearance/crate/branded/oculum
+
/obj/structure/closet/crate/veymed
desc = "A sterile crate extensively detailed in Veymed colours."
- icon_state = "vmed"
- icon_opened = "vmedopen"
- icon_closed = "vmed"
+ closet_appearance = /singleton/closet_appearance/crate/branded/veymed
+
/obj/structure/closet/crate/ward
desc = "A crate decaled with the logo of Ward-Takahashi."
- icon_state = "wt"
- icon_opened = "wtopen"
- icon_closed = "wt"
+ closet_appearance = /singleton/closet_appearance/crate/branded/ward
+
/obj/structure/closet/crate/xion
desc = "A crate painted in the orange of the former Xion Manufacturing Group, now a subsidiary of Aether Atmospherics and Recycling."
- icon_state = "xion"
- icon_opened = "xionopen"
- icon_closed = "xion"
+ closet_appearance = /singleton/closet_appearance/crate/branded/xion
+
/obj/structure/closet/crate/zenghu
desc = "A sterile crate marked with the logo of Zeng-Hu Pharmaceuticals."
- icon_state = "zh"
- icon_opened = "zhopen"
- icon_closed = "zh"
+ closet_appearance = /singleton/closet_appearance/crate/branded/zhenghu
+
// Brands/subsidiaries
@@ -720,18 +607,15 @@
/obj/structure/closet/crate/hedberg
name = "weapons crate"
desc = "A weapons crate stamped with the logo of Hedberg-Hammarstrom and the lock conspicuously absent."
+ closet_appearance = /singleton/closet_appearance/crate/branded/hedberg
/obj/structure/closet/crate/galaksi
desc = "A crate printed with the markings of Ward-Takahashi's Galaksi Appliance branding."
- icon_state = "wt"
- icon_opened = "wtopen"
- icon_closed = "wt"
+ closet_appearance = /singleton/closet_appearance/crate/branded/ward
/obj/structure/closet/crate/thinktronic
desc = "A crate printed with the markings of Thinktronic Systems."
- icon_state = "wt"
- icon_opened = "wtopen"
- icon_closed = "wt"
+ closet_appearance = /singleton/closet_appearance/crate/branded/ward
/obj/structure/closet/crate/ummarcar
desc = "A flimsy crate marked labelled 'UmMarcar Office Supply'."
@@ -755,111 +639,79 @@
/obj/structure/closet/crate/secure/aether
desc = "A secure crate painted in the colours of Aether Atmospherics and Recycling."
- icon_state = "aethersecure"
- icon_opened = "aethersecureopen"
- icon_closed = "aethersecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/aether/secure
/obj/structure/closet/crate/secure/bishop
desc = "A secure crate finely decorated with the emblem of Bishop Cybernetics, former Vey-Med rival now Vey-Med subsidiary."
- icon_state = "bishopsecure"
- icon_opened = "bishopsecureopen"
- icon_closed = "bishopsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/bishop
/obj/structure/closet/crate/secure/cybersolutions
desc = "An unadorned secure metal crate labelled 'Cyber Solutions'."
/obj/structure/closet/crate/secure/einstein
desc = "A secure crate labelled with an Einstein Engines sticker, the company has since been bought out by Hephaestus Industries."
- icon_state = "eesecure"
- icon_opened = "eesecureopen"
- icon_closed = "eesecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/einstein/secure
/obj/structure/closet/crate/secure/focalpoint
desc = "A secure crate marked with the decal of Focal Point Energistics, now a subsidiary of Aether Atmospherics and Recycling."
- icon_state = "fpsecure"
- icon_opened = "fpsecureopen"
- icon_closed = "fpsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/focal/secure
/obj/structure/closet/crate/secure/gilthari
desc = "A secure crate embossed with the logo of Gilthari Exports."
- icon_state = "giltharisecure"
- icon_opened = "giltharisecureopen"
- icon_closed = "giltharisecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/gilthari/secure
/obj/structure/closet/crate/secure/grayson
desc = "A secure bare metal crate spraypainted with decals of Grayson Manufactories an NT subsidiary. The purchase of Grayson by NT helped them secure their phoron monoply."
- icon_state = "graysonsecure"
- icon_opened = "graysonsecureopen"
- icon_closed = "graysonsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/grayson/secure
/obj/structure/closet/crate/secure/hedberg
name = "weapons crate"
desc = "A secure weapons crate stamped with the logo of Hedberg-Hammarstrom."
+ closet_appearance = /singleton/closet_appearance/crate/branded/hedberg/secure
/obj/structure/closet/crate/secure/heph
name = "weapons crate"
desc = "A secure weapons crate marked with the logo of Hephaestus Industries."
- icon_state = "hephsecure"
- icon_opened = "hephsecureopen"
- icon_closed = "hephsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/hephaestus/secure
/obj/structure/closet/crate/secure/lawson
name = "weapons crate"
desc = "A secure weapons crate marked with the logo of Lawson Arms."
+ closet_appearance = /singleton/closet_appearance/crate/branded/lawson/secure
/obj/structure/closet/crate/secure/morpheus
desc = "A secure crate crudely imprinted with 'MORPHEUS CYBERKINETICS', 'primier' off brand prosthetics manufactuer."
- icon_state = "morpheussecure"
- icon_opened = "morpheussecureopen"
- icon_closed = "morpheussecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/morpheus/secure
/obj/structure/closet/crate/secure/nanotrasen
desc = "A secure crate emblazoned with the standard NanoTrasen livery."
- icon_state = "ntsecure"
- icon_opened = "ntsecureopen"
- icon_closed = "ntsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/nanotrasen/secure
/obj/structure/closet/crate/secure/nanomed
desc = "A secure crate emblazoned with the NanoMed Medical livery, a subsidary of the NanoTrasen Corporation."
- icon_state = "ntmedsecure"
- icon_opened = "ntmedsecureopen"
- icon_closed = "ntmedsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/nanotrasen/secure
/obj/structure/closet/crate/secure/oricon
name = "weapons crate"
desc = "A secure crate in the official colours of the Orion Confederation."
- icon_state = "oriconsecure"
- icon_opened = "oriconsecureopen"
- icon_closed = "oriconsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/oricon/secure
/obj/structure/closet/crate/secure/saare
desc = "A secure weapons crate plainly stamped with the logo of Stealth Assault Enterprises. A Blackstar Legion susidiary that is one of the few groups that still transport \
hard currency."
- icon_state = "saaresecure"
- icon_opened = "saaresecureopen"
- icon_closed = "saaresecure"
/obj/structure/closet/crate/secure/veymed
desc = "A secure sterile crate extensively detailed in Veymed colours."
- icon_state = "vmedsecure"
- icon_opened = "vmedsecureopen"
- icon_closed = "vmedsecure"
/obj/structure/closet/crate/secure/ward
desc = "A secure crate decaled with the logo of Ward-Takahashi."
- icon_state = "wtsecure"
- icon_opened = "wtsecureopen"
- icon_closed = "wtsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/ward/secure
/obj/structure/closet/crate/secure/xion
desc = "A secure crate painted in the orange of the former Xion Manufacturing Group, now a subsidiary of Aether Atmospherics and Recycling."
- icon_state = "xionsecure"
- icon_opened = "xionsecureopen"
- icon_closed = "xionsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/xion/secure
/obj/structure/closet/crate/secure/zenghu
desc = "A secure sterile crate marked with the logo of Zeng-Hu Pharmaceuticals."
- icon_state = "zhsecure"
- icon_opened = "zhsecureopen"
- icon_closed = "zhsecure"
+ closet_appearance = /singleton/closet_appearance/crate/branded/zhenghu/secure
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index e102652d3d59..7a0999e4abac 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -27,7 +27,7 @@
/obj/structure/door_assembly/door_assembly_sec
base_icon_state = "sec"
base_name = "Security airlock"
- glass_type = "/glass_security"
+ glass_type = "/glass/security"
airlock_type = "/security"
/obj/structure/door_assembly/door_assembly_eng
@@ -69,7 +69,7 @@
/obj/structure/door_assembly/door_assembly_med
base_icon_state = "med"
base_name = "Medical airlock"
- glass_type = "/glass_medical"
+ glass_type = "/glass/medical"
airlock_type = "/medical"
/obj/structure/door_assembly/door_assembly_ext
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 35d3b6e644bd..3753afbba251 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -2,18 +2,21 @@
name = "grille"
desc = "A flimsy lattice of metal rods, with screws to secure it to the floor."
icon = 'icons/obj/structures/grille.dmi'
- icon_state = "grille"
+ icon_state = "grille-0"
+ base_icon_state = "grille"
density = TRUE
anchored = TRUE
pass_flags_self = ATOM_PASS_GRILLE
pressure_resistance = 5*ONE_ATMOSPHERE
rad_flags = RAD_BLOCK_CONTENTS
- layer = TABLE_LAYER
+ layer = GRILLE_LAYER
explosion_resistance = 1
+ color = COLOR_GRAY
- // smoothing_flags = SMOOTH_BITMASK
+ plane = OBJ_PLANE
+ smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_GRILLE)
- canSmoothWith = (SMOOTH_GROUP_GRILLE)
+ canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_GRILLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS )
var/health = 10
var/destroyed = 0
@@ -22,12 +25,6 @@
/obj/structure/grille/legacy_ex_act(severity)
qdel(src)
-/obj/structure/grille/update_icon()
- if(destroyed)
- icon_state = "[initial(icon_state)]-b"
- else
- icon_state = initial(icon_state)
-
/obj/structure/grille/Bumped(atom/user)
if(ismob(user)) shock(user, 70)
@@ -137,7 +134,7 @@
if (ST.use(2))
var/obj/structure/window/WD = new wtype(loc, 1)
to_chat(user, "You place the [WD] on [src].")
- WD.update_icon()
+ WD.update_appearance()
return
//window placing end
@@ -154,7 +151,6 @@
..()
return
-
/obj/structure/grille/proc/healthcheck()
if(health <= 0)
if(!destroyed)
@@ -210,6 +206,21 @@
spawn(1) healthcheck()
return 1
+/obj/structure/grille/proc/is_on_frame()
+ if(locate(/obj/structure/wall_frame) in loc)
+ return TRUE
+
+/proc/place_grille(mob/user, loc, obj/item/stack/rods/ST)
+ if(ST.in_use)
+ return
+ if(ST.get_amount() < 2)
+ to_chat(user, SPAN_WARNING("You need at least two rods to do this."))
+ return
+ user.visible_message(SPAN_NOTICE("\The [user] begins assembling a grille."))
+ if(do_after(user, 1 SECOND, ST) && ST.use(2))
+ var/obj/structure/grille/F = new(loc)
+ user.visible_message(SPAN_NOTICE("\The [user] finishes building \a [F]."))
+
// Used in mapping to avoid
/obj/structure/grille/broken
destroyed = TRUE
diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm
new file mode 100644
index 000000000000..a08ec2fc87c3
--- /dev/null
+++ b/code/game/objects/structures/low_wall.dm
@@ -0,0 +1,155 @@
+GLOBAL_LIST_INIT(wallframe_typecache, typecacheof(list(
+ /obj/structure/window/reinforced/tinted/full,
+ /obj/structure/window/reinforced/full,
+ /obj/structure/window/phoronreinforced/full,
+ /obj/structure/window/phoronbasic/full,
+ /obj/structure/window/basic/full,
+ /obj/structure/window/reinforced/polarized/full,
+ /obj/machinery/door/airlock,
+ /obj/structure/grille,
+ /obj/machinery/smartfridge,
+ /turf/simulated/wall,
+ )))
+
+/obj/structure/wall_frame
+ name = "low wall"
+ desc = "A low wall, with space to mount windows or grilles on top of it."
+ icon = 'icons/obj/structures/low_wall.dmi'
+ icon_state = "wall-0"
+ base_icon_state = "wall"
+ color = "#57575c" //To display in mapping softwares
+ density = TRUE
+ anchored = TRUE
+ pass_flags_self = ATOM_PASS_TABLE | ATOM_PASS_THROWN
+ layer = LOW_WALL_LAYER
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = (SMOOTH_GROUP_LOW_WALL)
+ canSmoothWith = (SMOOTH_GROUP_AIRLOCK+SMOOTH_GROUP_LOW_WALL+SMOOTH_GROUP_WALLS)
+ plane = OBJ_PLANE
+
+ var/default_material = MAT_STEEL
+ var/datum/material/const_material
+ var/paint_color
+ var/stripe_color
+ var/str
+ var/static/list/airlock_typecache
+ var/shiny_stripe
+ var/health
+ var/max_health
+ var/applies_material_colour = TRUE
+
+/obj/structure/wall_frame/prepainted
+ paint_color = COLOR_WALL_GUNMETAL
+ stripe_color = COLOR_WALL_GUNMETAL
+
+/obj/structure/wall_frame/Initialize(mapload, material_key)
+ . = ..()
+ if(!material_key)
+ material_key = default_material
+ set_material(material_key)
+ update_overlays()
+
+/obj/structure/wall_frame/Destroy()
+ if(const_material.products_need_process())
+ STOP_PROCESSING(SSobj, src)
+ . = ..()
+
+/obj/structure/wall_frame/process(delta_time)
+ if(!radiate())
+ STOP_PROCESSING(SSobj, src)
+ return
+
+/obj/structure/wall_frame/proc/radiate()
+ var/total_radiation = const_material.radioactivity
+ if(!total_radiation)
+ return
+
+ radiation_pulse(src, total_radiation)
+ return total_radiation
+
+/obj/structure/wall_frame/proc/set_material(var/new_material)
+ const_material = get_material_by_name(new_material)
+ if(!const_material)
+ qdel(src)
+ return
+ name = "[const_material.display_name] [initial(name)]"
+ max_health = round(const_material.integrity) //Should be 150 with default integrity (steel). Weaker than ye-olden Girders now.
+ health = max_health
+ if(applies_material_colour)
+ color = const_material.icon_colour
+ if(const_material.products_need_process()) //Am I radioactive or some other? Process me!
+ START_PROCESSING(SSobj, src)
+ else if(datum_flags & DF_ISPROCESSING) //If I happened to be radioactive or s.o. previously, and am not now, stop processing.
+ STOP_PROCESSING(SSobj, src)
+
+/obj/structure/wall_frame/update_overlays()
+ cut_overlays()
+
+ color = const_material.icon_colour
+
+ var/image/smoothed_stripe = image(const_material.wall_stripe_icon, icon_state, layer = ABOVE_WINDOW_LAYER)
+ smoothed_stripe.appearance_flags = RESET_COLOR
+ smoothed_stripe.color = stripe_color || const_material.icon_colour
+ add_overlay(smoothed_stripe)
+
+ if(!GLOB.wallframe_typecache)
+ GLOB.wallframe_typecache = typecacheof(list(/obj/machinery/door/airlock))
+ var/neighbor_stripe = NONE
+ for(var/cardinal in GLOB.cardinal)
+ var/turf/step_turf = get_step(src, cardinal)
+ var/obj/structure/wall_frame/neighbor = locate() in step_turf
+ if(neighbor)
+ continue
+ if(!can_area_smooth(step_turf))
+ continue
+ for(var/atom/movable/movable_thing as anything in step_turf)
+ if(GLOB.wallframe_typecache[movable_thing.type])
+ neighbor_stripe ^= cardinal
+ break
+ if(GLOB.wallframe_typecache[step_turf.type])
+ neighbor_stripe ^= cardinal
+
+ if(neighbor_stripe)
+ var/image/neighb_stripe_overlay = new ('icons/turf/walls/neighbor_stripe.dmi', "stripe-[neighbor_stripe]", layer = ABOVE_WINDOW_LAYER)
+ neighb_stripe_overlay.appearance_flags = RESET_COLOR
+ neighb_stripe_overlay.color = stripe_color || const_material.icon_colour
+ add_overlay(neighb_stripe_overlay)
+ if(shiny_stripe)
+ var/image/shine = image('icons/turf/walls/neighbor_stripe.dmi', "shine-[smoothing_junction]")
+ shine.appearance_flags = RESET_COLOR
+ add_overlay(shine)
+
+ return ..()
+
+/obj/structure/wall_frame/CanAllowThrough(atom/movable/mover, turf/target)
+ if(istype(mover,/obj/projectile))
+ return TRUE
+ if(istype(mover) && mover.check_pass_flags(ATOM_PASS_TABLE))
+ return TRUE
+
+/obj/structure/wall_frame/attackby(var/obj/item/I, var/mob/user)
+
+ . = ..()
+ if(!.)
+ //grille placing
+ if(istype(I, /obj/item/stack/rods))
+ for(var/obj/structure/window/WINDOW in loc)
+ if(WINDOW.dir == get_dir(src, user))
+ to_chat(user, SPAN_WARNING("There is a window in the way."))
+ return TRUE
+ place_grille(user, loc, I)
+ return TRUE
+
+ //window placing
+ if(istype(I,/obj/item/stack/material/glass))
+ var/obj/item/stack/material/ST = I
+ if(ST.material.opacity <= 0.7)
+ place_window(user, loc, SOUTHWEST, ST, TRUE)
+ return TRUE
+
+ if(I.is_wrench())
+ if(do_after(user,40 * I.tool_speed))
+ playsound(src, I.tool_sound, 100, 1)
+ new const_material.stack_type(get_turf(src), 2)
+ qdel(src)
+
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 919e4432e984..e420c9c91ac4 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -1,3 +1,5 @@
+#define FULLTILE_SMOOTHING (SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
+
/obj/structure/window
abstract_type = /obj/structure/window
@@ -14,6 +16,10 @@
w_class = ITEMSIZE_NORMAL
rad_flags = RAD_BLOCK_CONTENTS | RAD_NO_CONTAMINATE
+ plane = OBJ_PLANE
+ layer = WINDOW_LAYER
+ atom_flags = ATOM_BORDER
+
layer = WINDOW_LAYER
pressure_resistance = (4 * ONE_ATMOSPHERE)
anchored = TRUE
@@ -60,6 +66,14 @@
update_verbs()
health = maxhealth
AIR_UPDATE_ON_INITIALIZE_AUTO
+ if(fulltile)
+ if(considered_reinforced)
+ icon = 'icons/obj/structures/window_reinforced.dmi'
+ icon_state = "window-0"
+ else
+ icon = 'icons/obj/structures/window.dmi'
+ icon_state = "window-0"
+
/obj/structure/window/Destroy()
@@ -249,6 +263,9 @@
set_anchored(FALSE)
update_verbs()
step(src, get_dir(AM, src))
+ if(fulltile)
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
take_damage(tforce)
@@ -375,10 +392,11 @@
if (do_after(user, 20 * C.tool_speed, src) && construction_state == WINDOW_STATE_UNSECURED)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, TRUE)
- var/obj/structure/window/reinforced/polarized/P = new(loc, dir)
- if (fulltile)
- P.fulltile = TRUE
- P.icon_state = "fwindow"
+ var/obj/structure/window/reinforced/polarized/P
+ if(fulltile)
+ P = new /obj/structure/window/reinforced/polarized/full(loc)
+ else
+ P = new(loc, dir)
P.maxhealth = maxhealth
P.health = health
P.construction_state = construction_state
@@ -397,6 +415,9 @@
set_anchored(FALSE)
update_nearby_icons()
step(src, get_dir(user, src))
+ if(fulltile)
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
else
playsound(loc, 'sound/effects/Glasshit.ogg', 75, TRUE)
@@ -566,6 +587,9 @@
crack_overlay = mutable_appearance('icons/obj/structures/window_damage.dmi', "damage[ratio]", -(layer+0.1))
. += crack_overlay
+/obj/structure/window/proc/is_on_frame()
+ if(locate(/obj/structure/wall_frame) in loc)
+ return TRUE
/obj/structure/window/proc/check_fullwindow()
if (dir & (dir - 1)) // Diagonal!
@@ -659,6 +683,37 @@
add_obj_verb(src, /obj/structure/window/verb/rotate_counterclockwise)
add_obj_verb(src, /obj/structure/window/verb/rotate_clockwise)
+/proc/place_window(mob/user, loc, dir_to_set, obj/item/stack/material/ST, var/fulltile = FALSE)
+ var/required_amount = (dir_to_set & (dir_to_set - 1)) ? 4 : 1
+ if (!ST.can_use(required_amount))
+ to_chat(user, SPAN_NOTICE("You do not have enough sheets."))
+ return
+ for(var/obj/structure/window/W in loc)
+ if(W.dir == dir_to_set)
+ to_chat(user, SPAN_NOTICE("There is already a window facing this way there."))
+ return
+ if(W.check_fullwindow() && (dir_to_set & (dir_to_set - 1))) //two fulltile windows
+ to_chat(user, SPAN_NOTICE("There is already a window there."))
+ return
+ to_chat(user, SPAN_NOTICE("You start placing the window."))
+ if(do_after(user,20))
+ for(var/obj/structure/window/W in loc)
+ if(W.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting.
+ to_chat(user, SPAN_NOTICE("There is already a window facing this way there."))
+ return
+ if(W.check_fullwindow() && (dir_to_set & (dir_to_set - 1)))
+ to_chat(user, SPAN_NOTICE("There is already a window there."))
+ return
+
+ if (ST.use(required_amount))
+ var/obj/structure/window/WD = new(loc, dir_to_set, FALSE)
+ to_chat(user, SPAN_NOTICE("You place [WD]."))
+ WD.construction_state = 0
+ WD.set_anchored(FALSE)
+ else
+ to_chat(user, SPAN_NOTICE("You do not have enough sheets."))
+ return
+
/obj/structure/window/basic
desc = "It looks thin and flimsy. A few knocks with... almost anything, really should shatter it."
@@ -678,8 +733,10 @@
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE)
- canSmoothWith = (SMOOTH_GROUP_WINDOW_FULLTILE)
- // canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
+ canSmoothWith = FULLTILE_SMOOTHING
+ color = GLASS_COLOR
+ alpha = 180
+
maxhealth = 24
fulltile = TRUE
@@ -698,17 +755,20 @@
force_threshold = 5
+
/obj/structure/window/phoronbasic/full
icon = 'icons/obj/structures/window_full_phoron.dmi'
icon_state = "window-0"
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE)
- canSmoothWith = (SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = FULLTILE_SMOOTHING
// canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
maxhealth = 80
fulltile = TRUE
+ color = GLASS_COLOR_SILICATE
+ alpha = 180
@@ -733,11 +793,13 @@
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE)
- canSmoothWith = (SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = FULLTILE_SMOOTHING
// canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
maxhealth = 160
fulltile = TRUE
+ color = GLASS_COLOR_SILICATE
+ alpha = 180
/obj/structure/window/reinforced
@@ -760,18 +822,19 @@
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE)
- canSmoothWith = (SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = FULLTILE_SMOOTHING
// canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
maxhealth = 80
fulltile = TRUE
+ color = GLASS_COLOR
+ alpha = 180
/obj/structure/window/reinforced/tinted
name = "tinted window"
desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."
icon_state = "twindow"
-
opacity = TRUE
@@ -783,29 +846,33 @@
maxhealth = 80
fulltile = TRUE
- // smoothing_flags = SMOOTH_BITMASK
+ color = GLASS_COLOR_TINTED
+ smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE)
- canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
+ canSmoothWith = FULLTILE_SMOOTHING
/obj/structure/window/reinforced/tinted/frosted
name = "frosted window"
desc = "It looks rather strong and frosted over. Looks like it might take a few less hits then a normal reinforced window."
icon_state = "fwindow"
+ color = GLASS_COLOR_FROSTED
+
maxhealth = 30
force_threshold = 5
+ alpha = 180
// TODO: Recreate this.
/obj/structure/window/shuttle
name = "shuttle window"
desc = "It looks rather strong. Might take a few good hits to shatter it."
- icon = 'icons/obj/podwindows.dmi'
+ icon = 'icons/obj/structures/window.dmi'
icon_state = "window"
- // smoothing_flags = SMOOTH_BITMASK
+ smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE)
- canSmoothWith = (SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_SHUTTLE_PARTS)
+ canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
// canSmoothWith = (SMOOTH_GROUP_WALLS + SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_SHUTTLE_PARTS)
maxhealth = 40
@@ -826,11 +893,13 @@
icon = 'icons/obj/structures/window_full_reinforced.dmi'
icon_state = "window-0"
+ color = GLASS_COLOR
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WINDOW_FULLTILE)
- canSmoothWith = (SMOOTH_GROUP_WINDOW_FULLTILE)
+ canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
// canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
-
+ alpha = 180
+ color = GLASS_COLOR
maxhealth = 80
fulltile = TRUE
@@ -863,18 +932,10 @@
/obj/structure/window/reinforced/polarized/proc/toggle()
if (opacity)
- animate(
- src,
- color = "#FFFFFF",
- time = 5,
- )
+ animate(src, color = GLASS_COLOR, time=5)
set_opacity(FALSE)
else
- animate(
- src,
- color = "#222222",
- time = 5,
- )
+ animate(src, color = GLASS_COLOR_FROSTED, time=5)
set_opacity(TRUE)
diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm
index ff92a9a2f22f..d99751a22bf0 100644
--- a/code/game/objects/structures/window_spawner.dm
+++ b/code/game/objects/structures/window_spawner.dm
@@ -98,3 +98,4 @@
/obj/effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(var/obj/structure/window/reinforced/polarized/P)
if(id)
P.id = id
+
diff --git a/code/game/turfs/simulated/wall.dm b/code/game/turfs/simulated/wall.dm
index 714bf6faedc0..2178b84b3986 100644
--- a/code/game/turfs/simulated/wall.dm
+++ b/code/game/turfs/simulated/wall.dm
@@ -6,8 +6,8 @@
/turf/simulated/wall
name = "wall"
desc = "A huge chunk of iron used to separate rooms."
- icon = 'icons/turf/walls/solid.dmi'
- icon_state = "wall-0"
+ icon = 'icons/turf/walls/_previews.dmi'
+ icon_state = "solid"
base_icon_state = "wall"
color = "#666666"
@@ -18,6 +18,7 @@
opacity = TRUE
density = TRUE
blocks_air = TRUE
+ layer = WALL_LAYER
rad_insulation = RAD_INSULATION_EXTREME
// air_status = AIR_STATUS_BLOCK
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
@@ -27,7 +28,7 @@
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS)
- canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_LOW_WALL + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
+ canSmoothWith = (SMOOTH_GROUP_SHUTTERS_BLASTDOORS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_LOW_WALL + SMOOTH_GROUP_GRILLE + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS)
/// This is a var we are temporarily using until we have falsewall structures, until then we'll store our previous icon_state so we don't need to resmooth every time.
// TODO: Remove this when falsewalls are implemented.
@@ -47,6 +48,14 @@
var/last_state
var/construction_stage
+ /// Paint color of which the wall has been painted with.
+ var/paint_color
+ /// Paint color of which the stripe has been painted with. Will not overlay a stripe if no paint is applied
+ var/stripe_color
+ var/stripe_icon
+ var/cache_key
+ var/shiny_wall
+ var/shiny_stripe
// Walls always hide the stuff below them.
/turf/simulated/wall/levelupdate()
@@ -76,6 +85,9 @@
if(material?.radioactivity || reinf_material?.radioactivity || girder_material?.radioactivity)
START_PROCESSING(SSturfs, src)
+ stripe_icon = material.wall_stripe_icon
+ update_overlays()
+
/turf/simulated/wall/Destroy()
STOP_PROCESSING(SSturfs, src)
clear_plants()
diff --git a/code/game/turfs/simulated/wall_icon.dm b/code/game/turfs/simulated/wall_icon.dm
index 77249edd8d29..4ba18509ccef 100644
--- a/code/game/turfs/simulated/wall_icon.dm
+++ b/code/game/turfs/simulated/wall_icon.dm
@@ -1,6 +1,24 @@
/**
* generates damage overlays
*/
+
+GLOBAL_LIST_INIT(neighbor_typecache, typecacheof(list(
+ /obj/machinery/door/airlock,
+ /obj/machinery/door/firedoor,
+ /obj/machinery/door/blast,
+ /obj/structure/filler_object,
+ /obj/structure/window/reinforced/tinted/full,
+ /obj/structure/window/reinforced/full,
+ /obj/structure/window/phoronreinforced/full,
+ /obj/structure/window/phoronbasic/full,
+ /obj/structure/window/basic/full,
+ /obj/structure/window/reinforced/polarized/full,
+ /obj/structure/wall_frame,
+ /obj/machinery/smartfridge,
+ )))
+
+GLOBAL_LIST_EMPTY(wall_overlays_cache)
+
/turf/simulated/wall/proc/generate_wall_damage_overlays()
var/alpha_inc = 256 / damage_overlays.len
@@ -12,7 +30,7 @@
/turf/simulated/wall/proc/get_wall_icon()
- . = (istype(material) && material.icon_base) || 'icons/turf/walls/solid.dmi'
+ . = (istype(material) && material.icon_base) || 'icons/turf/walls/solid_wall.dmi'
/turf/simulated/wall/proc/apply_reinf_overlay()
@@ -24,15 +42,13 @@
if(!istype(material))
return
- color = material.icon_colour
+ if(!color)
+ color = material.icon_colour
/turf/simulated/wall/update_icon()
. = ..()
-
- if(icon == initial(icon))
- icon = get_wall_icon()
-
+ update_overlays()
/turf/simulated/wall/update_icon_state()
. = ..()
@@ -45,54 +61,75 @@
else if(icon_state == "fwall_open")
icon_state = cached_wall_state
+/turf/simulated/wall/proc/update_overlays_delayed()
+ update_overlays()
/turf/simulated/wall/update_overlays()
- . = ..()
-
- if(!damage_overlays[1]) // Our list hasn't been populated yet.
- generate_wall_damage_overlays()
-
- if(!istype(reinf_material))
- return
-
- // handle fakewalls
- // TODO: MAKE FAKEWALLS NOT TURFS WTF
- if(!density)
+ if (material == initial(material))
+ addtimer(CALLBACK(src, /turf/simulated/wall/proc/update_overlays_delayed), 1 SECOND) //our material datum has not been instanced, so we'll runtime about 2 lines down.
return
-
-
- //! Wall Overlays
- if (apply_reinf_overlay())
- // Reinforcement Construction
- if (construction_stage != null && construction_stage < 6)
- var/image/appearance = image('icons/turf/walls/_construction_overlays.dmi', "reinf_construct-[construction_stage]")
- appearance.appearance_flags = RESET_COLOR
- appearance.color = reinf_material.icon_colour
- . += appearance
-
- // Directional Reinforcements.
- else if(reinf_material.icon_reinf_directionals)
- var/image/appearance = image(reinf_material.icon_reinf, icon_state)
- appearance.appearance_flags = RESET_COLOR
- appearance.color = reinf_material.icon_colour
- . += appearance
-
- // Standard Reinforcements.
+ icon = material.icon_base
+ if(reinf_material)
+ icon = material.icon_reinf
+ var/plating_color = paint_color || material?.icon_colour || COLOR_WALL_GUNMETAL //fallback in case things are really fucked.
+ stripe_color = stripe_color || paint_color || material.icon_colour
+
+ var/neighbor_stripe = NONE
+ for (var/cardinal = NORTH; cardinal <= WEST; cardinal *= 2) //No list copy please good sir
+ var/turf/step_turf = get_step(src, cardinal)
+ if(!can_area_smooth(step_turf))
+ continue
+ for(var/atom/movable/movable_thing as anything in step_turf)
+ if(GLOB.neighbor_typecache[movable_thing.type])
+ neighbor_stripe ^= cardinal
+ break
+
+ var/old_cache_key = cache_key
+ cache_key = "[icon]:[smoothing_junction]:[plating_color]:[stripe_icon]:[stripe_color]:[neighbor_stripe]:[shiny_wall]:[shiny_stripe]:[construction_stage]"
+ if(!(old_cache_key == cache_key))
+
+ var/potential_overlays = GLOB.wall_overlays_cache[cache_key]
+ if(potential_overlays)
+ overlays = potential_overlays
+ color = plating_color
else
- var/image/appearance = image(reinf_material.icon_reinf, "reinforced")
- appearance.appearance_flags = RESET_COLOR
- appearance.color = reinf_material.icon_colour
- . += appearance
-
- // handle damage overlays
- if (damage != 0)
- var/integrity = material.integrity
- if (reinf_material)
- integrity += reinf_material.integrity
-
- var/overlay = round(damage / integrity * damage_overlays.len) + 1
- if (overlay > damage_overlays.len)
- overlay = damage_overlays.len
-
- damage_overlay = damage_overlays[overlay]
- . += damage_overlay
+ color = plating_color
+ //Updating the unmanaged wall overlays (unmanaged for optimisations)
+ overlays.len = 0
+ var/list/new_overlays = list()
+
+ if(shiny_wall)
+ var/image/shine = image(icon, "shine-[smoothing_junction]")
+ shine.appearance_flags = RESET_COLOR
+ new_overlays += shine
+
+ var/image/smoothed_stripe = image(stripe_icon, icon_state)
+ smoothed_stripe.appearance_flags = RESET_COLOR
+ smoothed_stripe.color = stripe_color
+ new_overlays += smoothed_stripe
+
+ if(shiny_stripe)
+ var/image/stripe_shine = image(stripe_icon, "shine-[smoothing_junction]")
+ stripe_shine.appearance_flags = RESET_COLOR
+ new_overlays += stripe_shine
+
+ if(neighbor_stripe)
+ var/image/neighb_stripe_overlay = image('icons/turf/walls/neighbor_stripe.dmi', "stripe-[neighbor_stripe]")
+ neighb_stripe_overlay.appearance_flags = RESET_COLOR
+ neighb_stripe_overlay.color = stripe_color
+ new_overlays += neighb_stripe_overlay
+ if(shiny_wall)
+ var/image/shine = image('icons/turf/walls/neighbor_stripe.dmi', "shine-[neighbor_stripe]")
+ shine.appearance_flags = RESET_COLOR
+ new_overlays += shine
+/*
+ if(construction_stage != 6)
+ var/image/decon_overlay = image('icons/turf/walls/decon_states.dmi', "[construction_stage]")
+ decon_overlay.appearance_flags = RESET_COLOR
+ new_overlays += decon_overlay
+*/
+ overlays = new_overlays
+ GLOB.wall_overlays_cache[cache_key] = new_overlays
+
+ //And letting anything else that may want to render on the wall to work (ie components)
+ return ..()
diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm
index bd6760ccab00..5ea2d44ee111 100644
--- a/code/game/turfs/simulated/wall_types.dm
+++ b/code/game/turfs/simulated/wall_types.dm
@@ -1,7 +1,7 @@
/turf/simulated/wall/r_wall
icon = 'icons/turf/walls/_previews.dmi'
- icon_state = "rgeneric"
- color = null
+ icon_state = "reinforced_solid"
+ color = "#666666"
rad_insulation = RAD_INSULATION_SUPER
material = /datum/material/plasteel
@@ -16,7 +16,6 @@
girder_material = /datum/material/steel/hull
/turf/simulated/wall/rshull
- icon = 'icons/turf/walls/hull.dmi'
color = "#666677"
material = /datum/material/steel/hull
reinf_material = /datum/material/steel/hull
@@ -146,7 +145,7 @@
girder_material = null
/turf/simulated/wall/sandstone
- icon = 'icons/turf/walls/stone.dmi'
+ icon = 'icons/turf/walls/stone_wall.dmi'
color = "#D9C179"
material = /datum/material/sandstone
@@ -154,7 +153,7 @@
girder_material = null
/turf/simulated/wall/bone
- icon = 'icons/turf/walls/stone.dmi'
+ icon = 'icons/turf/walls/stone_wall.dmi'
color = "#e6dfc8"
material = /datum/material/bone
@@ -186,7 +185,7 @@
girder_material = null
/turf/simulated/wall/sandstonediamond
- icon = 'icons/turf/walls/stone.dmi'
+ icon = 'icons/turf/walls/stone_wall.dmi'
color = "#D9C179"
material = /datum/material/sandstone
@@ -194,7 +193,7 @@
girder_material = null
/turf/simulated/wall/snowbrick
- icon = 'icons/turf/walls/stone.dmi'
+ icon = 'icons/turf/walls/stone_wall.dmi'
color = "#D8FDFF"
material = /datum/material/snowbrick
@@ -229,23 +228,22 @@
girder_material = null
/turf/simulated/wall/wood
- icon = 'icons/turf/walls/wood.dmi'
+ icon = 'icons/turf/walls/_previews.dmi'
+ icon_state = "wood"
color = "#9c5930"
material = /datum/material/wood
reinf_material = null
girder_material = null
-/turf/simulated/wall/sifwood
- icon = 'icons/turf/walls/wood.dmi'
+/turf/simulated/wall/wood/sifwood
color = "#0099cc"
material = /datum/material/wood/sif
reinf_material = null
girder_material = null
-/turf/simulated/wall/hardwood
- icon = 'icons/turf/walls/wood.dmi'
+/turf/simulated/wall/wood/hardwood
color = "#42291a"
material = /datum/material/wood/hardwood
@@ -436,3 +434,94 @@
var/image/I = image(icon = src.icon, icon_state = "o_[icon_state]")
I.color = stripe_color
add_overlay(I)
+
+/turf/simulated/wall/r_wall/prepainted
+ color = COLOR_WALL_GUNMETAL
+ paint_color = COLOR_WALL_GUNMETAL
+ icon_state = "reinforced_solid"
+
+/turf/simulated/wall/r_wall/prepainted/command
+ stripe_color = COLOR_COMMAND_BLUE
+ color = COLOR_COMMAND_BLUE
+
+/turf/simulated/wall/r_wall/prepainted/security
+ stripe_color = COLOR_MAROON
+ color = COLOR_MAROON
+
+/turf/simulated/wall/r_wall/prepainted/medical
+ paint_color = COLOR_GRAY80
+ stripe_color = COLOR_BABY_BLUE
+ color = COLOR_BABY_BLUE
+
+/turf/simulated/wall/r_wall/prepainted/engineering
+ stripe_color = COLOR_SUN
+ color = COLOR_SUN
+
+/turf/simulated/wall/r_wall/prepainted/engineering/atmos
+ stripe_color = COLOR_CYAN_DARK
+ color = COLOR_CYAN_DARK
+
+/turf/simulated/wall/r_wall/prepainted/civilian
+ stripe_color = COLOR_PALE_BTL_GREEN
+ color = COLOR_PALE_BTL_GREEN
+
+/turf/simulated/wall/r_wall/prepainted/exploration
+ stripe_color = COLOR_EXPLO_VIOLET
+ color = COLOR_EXPLO_VIOLET
+
+/turf/simulated/wall/r_wall/prepainted/science
+ paint_color = COLOR_GRAY80
+ stripe_color = COLOR_PURPLE_GRAY
+ color = COLOR_PURPLE_GRAY
+
+/turf/simulated/wall/r_wall/prepainted/cargo
+ stripe_color = COLOR_BEASTY_BROWN
+ color = COLOR_BEASTY_BROWN
+
+/turf/simulated/wall/prepainted
+ paint_color = COLOR_WALL_GUNMETAL
+ color = COLOR_WALL_GUNMETAL
+ icon_state = "solid"
+
+/turf/simulated/wall/prepainted/command
+ stripe_color = COLOR_COMMAND_BLUE
+ color = COLOR_COMMAND_BLUE
+
+/turf/simulated/wall/prepainted/command/alt
+ paint_color = COLOR_GRAY15
+ stripe_color = COLOR_GOLD
+ color = COLOR_GOLD
+
+/turf/simulated/wall/prepainted/security
+ stripe_color = COLOR_MAROON
+ color = COLOR_MAROON
+
+/turf/simulated/wall/prepainted/medical
+ paint_color = COLOR_GRAY80
+ stripe_color = COLOR_BABY_BLUE
+ color = COLOR_BABY_BLUE
+
+/turf/simulated/wall/prepainted/engineering
+ stripe_color = COLOR_SUN
+ color = COLOR_SUN
+
+/turf/simulated/wall/prepainted/engineering/atmos
+ stripe_color = COLOR_CYAN_DARK
+ color = COLOR_CYAN_DARK
+
+/turf/simulated/wall/prepainted/civilian
+ stripe_color = COLOR_PALE_BTL_GREEN
+ color = COLOR_PALE_BTL_GREEN
+
+/turf/simulated/wall/prepainted/exploration
+ stripe_color = COLOR_EXPLO_VIOLET
+ color = COLOR_EXPLO_VIOLET
+
+/turf/simulated/wall/prepainted/science
+ paint_color = COLOR_GRAY80
+ stripe_color = COLOR_PURPLE_GRAY
+ color = COLOR_PURPLE_GRAY
+
+/turf/simulated/wall/prepainted/cargo
+ stripe_color = COLOR_BEASTY_BROWN
+ color = COLOR_BEASTY_BROWN
diff --git a/code/game/turfs/unsimulated/planetary.dm b/code/game/turfs/unsimulated/planetary.dm
index e1a540cf957c..c9762efcb007 100644
--- a/code/game/turfs/unsimulated/planetary.dm
+++ b/code/game/turfs/unsimulated/planetary.dm
@@ -79,7 +79,13 @@
TRIUMPH_SET_ATMOS
/turf/unsimulated/wall/planetary/lythios43c
- name = "facility wall"
+ name = "glacial permafrost"
desc = "An eight-meter tall carbyne wall. For when the wildlife on your planet is mostly militant megacorps."
alpha = 0xFF
initial_gas_mix = ATMOSPHERE_ID_LYTHIOS43C
+ icon = 'icons/turf/walls/natural.dmi'
+ base_icon_state = "wall"
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = (SMOOTH_GROUP_WALLS+SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_MINERAL_WALLS)
+ canSmoothWith = (SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS+SMOOTH_GROUP_MINERAL_WALLS)
+ color = COLOR_OFF_WHITE
diff --git a/code/modules/cargo/supplypacks/recreation.dm b/code/modules/cargo/supplypacks/recreation.dm
index 26cdd8d3c8a6..a71776b5bdbb 100644
--- a/code/modules/cargo/supplypacks/recreation.dm
+++ b/code/modules/cargo/supplypacks/recreation.dm
@@ -65,8 +65,7 @@
container_type = /obj/structure/closet/crate
contains = list(
/obj/item/pipe_painter = 2,
- /obj/item/floor_painter = 2,
- /obj/item/closet_painter = 2
+ /obj/item/floor_painter = 2
)
/datum/supply_pack/recreation/cheapbait
diff --git a/code/modules/food/kitchen/smartfridge.dm b/code/modules/food/kitchen/smartfridge.dm
index 7dbd12ecb5c5..a3f79d0cf965 100644
--- a/code/modules/food/kitchen/smartfridge.dm
+++ b/code/modules/food/kitchen/smartfridge.dm
@@ -3,7 +3,7 @@
/obj/machinery/smartfridge
name = "\improper SmartFridge"
icon = 'icons/obj/vending.dmi'
- icon_state = "smartfridge"
+ icon_state = "fridge_sci"
density = 1
anchored = 1
use_power = USE_POWER_IDLE
@@ -13,9 +13,6 @@
pass_flags = NONE
CanAtmosPass = ATMOS_PASS_AIR_BLOCKED
var/max_n_of_items = 999 // Sorry but the BYOND infinite loop detector doesn't look things over 1000.
- var/icon_on = "smartfridge"
- var/icon_off = "smartfridge-off"
- var/icon_panel = "smartfridge-panel"
var/list/item_records = list()
var/datum/stored_item/currently_vending = null //What we're putting out of the machine.
var/seconds_electrified = 0;
@@ -24,7 +21,11 @@
var/scan_id = 1
var/is_secure = 0
var/wrenchable = TRUE
+ var/list/accepted_types = list(/obj/item/reagent_containers/food/snacks/grown/)
+ var/list/blacklisted_types = list()
var/datum/wires/smartfridge/wires = null
+ var/icon_contents = "food"
+ var/icon_base = "fridge_sci"
/obj/machinery/smartfridge/secure
is_secure = 1
@@ -49,180 +50,10 @@
. = ..()
AIR_UPDATE_ON_MOVED_AUTO
-/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj)
- if(istype(O,/obj/item/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/))
- return 1
- return 0
-
-/obj/machinery/smartfridge/seeds
- name = "\improper MegaSeed Servitor"
- desc = "When you need seeds fast!"
- icon = 'icons/obj/vending.dmi'
- icon_state = "seeds"
- icon_on = "seeds"
- icon_off = "seeds-off"
-
-/obj/machinery/smartfridge/seeds/accept_check(var/obj/item/O as obj)
- if(istype(O,/obj/item/seeds/))
- return 1
- return 0
-
-/obj/machinery/smartfridge/secure/extract
- name = "\improper Biological Sample Storage"
- desc = "A refrigerated storage unit for xenobiological samples."
- req_access = list(ACCESS_SCIENCE_MAIN)
-
-/obj/machinery/smartfridge/secure/extract/accept_check(var/obj/item/O as obj)
- if(istype(O, /obj/item/slime_extract))
- return TRUE
- if(istype(O, /obj/item/slimepotion))
- return TRUE
- return FALSE
-
-/obj/machinery/smartfridge/secure/medbay
- name = "\improper Refrigerated Medicine Storage"
- desc = "A refrigerated storage unit for storing medicine and chemicals."
- icon_state = "smartfridge" //To fix the icon in the map editor.
- icon_on = "smartfridge_chem"
- req_one_access = list(ACCESS_MEDICAL_MAIN,ACCESS_MEDICAL_CHEMISTRY)
-
-/obj/machinery/smartfridge/secure/medbay/accept_check(var/obj/item/O as obj)
- if(istype(O,/obj/item/reagent_containers/glass/))
- return 1
- if(istype(O,/obj/item/storage/pill_bottle/))
- return 1
- if(istype(O,/obj/item/reagent_containers/pill/))
- return 1
- return 0
-
-/obj/machinery/smartfridge/secure/virology
- name = "\improper Refrigerated Virus Storage"
- desc = "A refrigerated storage unit for storing viral material."
- req_access = list(ACCESS_MEDICAL_VIROLOGY)
- icon_state = "smartfridge_virology"
- icon_on = "smartfridge_virology"
- icon_off = "smartfridge_virology-off"
-
-/obj/machinery/smartfridge/secure/virology/accept_check(var/obj/item/O as obj)
- if(istype(O,/obj/item/reagent_containers/glass/beaker/vial/))
- return 1
- if(istype(O,/obj/item/virusdish/))
- return 1
- return 0
-
-/obj/machinery/smartfridge/chemistry
- name = "\improper Smart Chemical Storage"
- desc = "A refrigerated storage unit for medicine and chemical storage."
-
-/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj)
- if(istype(O,/obj/item/storage/pill_bottle) || istype(O,/obj/item/reagent_containers))
- return 1
- return 0
-
-/obj/machinery/smartfridge/chemistry/virology
- name = "\improper Smart Virus Storage"
- desc = "A refrigerated storage unit for volatile sample storage."
-
-
-/obj/machinery/smartfridge/drinks
- name = "\improper Drink Showcase"
- desc = "A refrigerated storage unit for tasty tasty alcohol."
-
-/obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj)
- if(istype(O,/obj/item/reagent_containers/glass) || istype(O,/obj/item/reagent_containers/food/drinks) || istype(O,/obj/item/reagent_containers/food/condiment))
- return 1
-
-/obj/machinery/smartfridge/food
- name = "\improper Hot Foods Display"
- desc = "A climated storage for dishes waiting to be eaten"
-
-/obj/machinery/smartfridge/food/accept_check(obj/item/O)
- if(istype(O,/obj/item/reagent_containers/food/snacks) && !istype(O,/obj/item/reagent_containers/food/snacks/grown))//No fruits
- return 1
- if(istype(O,/obj/item/reagent_containers/food/condiment))//condiments need storage as well
- return 1
-
-/obj/machinery/smartfridge/drying_rack
- name = "\improper Drying Rack"
- desc = "A machine for drying plants."
- wrenchable = 1
- icon_state = "drying_rack"
- icon_on = "drying_rack_on"
- icon_off = "drying_rack"
- icon_panel = "drying_rack-panel"
-
-/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj)
- if(istype(O, /obj/item/reagent_containers/food/snacks/))
- var/obj/item/reagent_containers/food/snacks/S = O
- if (S.dried_type)
- return 1
- if(istype(O, /obj/item/stack/wetleather))
- var/obj/item/stack/wetleather/WL = O
- if (WL.wetness == 30)
- return 1
- return 0
-
-/obj/machinery/smartfridge/drying_rack/process(delta_time)
- ..()
- if(machine_stat & (BROKEN|NOPOWER))
- return
- if(contents.len)
- dry()
- update_icon()
-
-/obj/machinery/smartfridge/drying_rack/update_icon()
- cut_overlays()
- var/list/overlays_to_add = list()
- var/not_working = machine_stat & (BROKEN|NOPOWER)
- if(not_working)
- icon_state = icon_off
- else
- icon_state = icon_on
- var/hasItems
- for(var/datum/stored_item/I in item_records)
- if(I.get_amount())
- hasItems = 1
- break
- if(hasItems)
- overlays_to_add += "drying_rack_filled"
- if(!not_working)
- overlays_to_add += "drying_rack_drying"
- add_overlay(overlays_to_add)
-
-/obj/machinery/smartfridge/drying_rack/attackby(var/obj/item/O as obj, mob/user)
- . = ..()
- if(istype(O, /obj/item/stack/wetleather/))
- var/obj/item/stack/wetleather/WL = O
- if(WL.amount > 2)
- to_chat("The rack can only fit one sheet at a time!")
- return 1
- else
- if(!user.attempt_insert_item_for_installation(WL, src))
- return
- stock(WL)
- user.visible_message("[user] has added \the [WL] to \the [src].", "You add \the [WL] to \the [src].")
-
-/obj/machinery/smartfridge/drying_rack/proc/dry()
- for(var/datum/stored_item/I in item_records)
- for(var/obj/item/reagent_containers/food/snacks/S in I.instances)
- if(S.dry) continue
- if(S.dried_type == S.type)
- S.dry = 1
- S.name = "dried [S.name]"
- S.color = "#AAAAAA"
- I.instances -= S
- S.forceMove(get_turf(src))
- else
- var/D = S.dried_type
- new D(get_turf(src))
- qdel(S)
- return
- for(var/obj/item/stack/wetleather/WL in I.instances)
- WL.use(1)
- I.instances -= WL
- var/L = /obj/item/stack/material/leather
- new L(get_turf(src))
- return
+/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj) //This isn't complex! You didn't need to override this for EVERY. SINGLE. SUBTYPE.
+ if(is_type_in_list(O, blacklisted_types))
+ return FALSE
+ return is_type_in_list(O, accepted_types)
/obj/machinery/smartfridge/process(delta_time)
if(machine_stat & (BROKEN|NOPOWER))
@@ -239,10 +70,41 @@
update_icon()
/obj/machinery/smartfridge/update_icon()
- if(machine_stat & (BROKEN|NOPOWER))
- icon_state = icon_off
+ overlays.Cut()
+ if(inoperable())
+ icon_state = "[icon_base]-off"
else
- icon_state = icon_on
+ icon_state = icon_base
+
+ if(is_secure)
+ add_overlay("[icon_base]-sidepanel")
+
+ if(panel_open)
+ add_overlay("[icon_base]-panel")
+
+ var/image/I
+ var/is_off = ""
+ if(inoperable())
+ is_off = "-off"
+
+ // Fridge contents
+ switch(length(contents))
+ if(0)
+ add_overlay("empty[is_off]")
+ if(1 to 2)
+ add_overlay("[icon_contents]-1[is_off]")
+ if(3 to 5)
+ add_overlay("[icon_contents]-2[is_off]")
+ if(6 to 8)
+ add_overlay("[icon_contents]-3[is_off]")
+ else
+ add_overlay("[icon_contents]-4[is_off]")
+
+ // Fridge top
+ I = image(icon, "[icon_base]-top")
+ I.pixel_z = 32
+ I.layer = ABOVE_WINDOW_LAYER
+ overlays += I
/obj/machinery/smartfridge/drying_rack/ashlander
name = "\improper Bone Drying Kiln"
@@ -258,9 +120,7 @@
panel_open = !panel_open
user.visible_message("[user] [panel_open ? "opens" : "closes"] the maintenance panel of \the [src].", "You [panel_open ? "open" : "close"] the maintenance panel of \the [src].")
playsound(src, O.tool_sound, 50, 1)
- cut_overlays()
- if(panel_open)
- add_overlay(image(icon, icon_panel))
+ update_icon()
SSnanoui.update_uis(src)
return
@@ -280,6 +140,7 @@
if(!user.attempt_insert_item_for_installation(O, src))
return
stock(O)
+ update_icon()
user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].")
@@ -434,3 +295,135 @@
to_chat(usr, "Access denied.")
return 0
return ..()
+
+//subtypes. I'm going to kill whoever decided to shove them right below the initial definition.
+
+/obj/machinery/smartfridge/seeds
+ name = "\improper MegaSeed Servitor"
+ desc = "When you need seeds fast!"
+ accepted_types = list(/obj/item/seeds/)
+
+/obj/machinery/smartfridge/secure/extract
+ name = "\improper Biological Sample Storage"
+ desc = "A refrigerated storage unit for xenobiological samples."
+ req_access = list(ACCESS_SCIENCE_MAIN)
+ icon_contents = "slime"
+ accepted_types = list(/obj/item/slime_extract/, /obj/item/slimepotion/)
+
+/obj/machinery/smartfridge/secure/medbay
+ name = "\improper Refrigerated Medicine Storage"
+ desc = "A refrigerated storage unit for storing medicine and chemicals."
+ req_one_access = list(ACCESS_MEDICAL_MAIN,ACCESS_MEDICAL_CHEMISTRY)
+ accepted_types = list(/obj/item/reagent_containers/glass/, /obj/item/storage/pill_bottle/, /obj/item/reagent_containers/pill/)
+
+/obj/machinery/smartfridge/secure/virology
+ name = "\improper Refrigerated Virus Storage"
+ desc = "A refrigerated storage unit for storing viral material."
+ req_access = list(ACCESS_MEDICAL_VIROLOGY)
+ accepted_types = list(/obj/item/reagent_containers/glass/beaker/vial/, /obj/item/virusdish/)
+
+/obj/machinery/smartfridge/chemistry
+ name = "\improper Smart Chemical Storage"
+ desc = "A refrigerated storage unit for medicine and chemical storage."
+ accepted_types = list(/obj/item/storage/pill_bottle/, /obj/item/reagent_containers/)
+
+/obj/machinery/smartfridge/chemistry/virology
+ name = "\improper Smart Virus Storage"
+ desc = "A refrigerated storage unit for volatile sample storage."
+
+/obj/machinery/smartfridge/drinks
+ name = "\improper Drink Showcase"
+ icon_state = "fridge_dark"
+ icon_base = "fridge_dark"
+ icon_contents = "drink"
+ desc = "A refrigerated storage unit for tasty tasty alcohol."
+ accepted_types = list(/obj/item/reagent_containers/glass/,/obj/item/reagent_containers/food/drinks/,/obj/item/reagent_containers/food/condiment/)
+
+/obj/machinery/smartfridge/food
+ name = "\improper Hot Foods Display"
+ icon_state = "fridge_food"
+ icon_state = "fridge_food"
+ desc = "A climated storage for dishes waiting to be eaten"
+ accepted_types = list(/obj/item/reagent_containers/food/snacks/, /obj/item/reagent_containers/food/condiment/)
+ blacklisted_types = list(/obj/item/reagent_containers/food/snacks/grown/)
+
+
+/obj/machinery/smartfridge/drying_rack
+ name = "\improper Drying Rack"
+ desc = "A machine for drying plants."
+ wrenchable = 1
+ icon_state = "drying_rack"
+
+/obj/machinery/smartfridge/drying_rack/accept_check(var/obj/item/O as obj)
+ if(istype(O, /obj/item/reagent_containers/food/snacks/))
+ var/obj/item/reagent_containers/food/snacks/S = O
+ if (S.dried_type)
+ return 1
+ if(istype(O, /obj/item/stack/wetleather))
+ var/obj/item/stack/wetleather/WL = O
+ if (WL.wetness == 30)
+ return 1
+ return 0
+
+/obj/machinery/smartfridge/drying_rack/process(delta_time)
+ ..()
+ if(machine_stat & (BROKEN|NOPOWER))
+ return
+ if(contents.len)
+ dry()
+ update_icon()
+
+/obj/machinery/smartfridge/drying_rack/update_icon()
+ cut_overlays()
+ var/list/overlays_to_add = list()
+ var/not_working = machine_stat & (BROKEN|NOPOWER)
+ if(not_working)
+ icon_state = "drying_rack-off"
+ else
+ icon_state = "drying_rack"
+ var/hasItems
+ for(var/datum/stored_item/I in item_records)
+ if(I.get_amount())
+ hasItems = 1
+ break
+ if(hasItems)
+ overlays_to_add += "drying_rack_filled"
+ if(!not_working)
+ overlays_to_add += "drying_rack_drying"
+ add_overlay(overlays_to_add)
+
+/obj/machinery/smartfridge/drying_rack/attackby(var/obj/item/O as obj, mob/user)
+ . = ..()
+ if(istype(O, /obj/item/stack/wetleather/))
+ var/obj/item/stack/wetleather/WL = O
+ if(WL.amount > 2)
+ to_chat("The rack can only fit one sheet at a time!")
+ return 1
+ else
+ if(!user.attempt_insert_item_for_installation(WL, src))
+ return
+ stock(WL)
+ user.visible_message("[user] has added \the [WL] to \the [src].", "You add \the [WL] to \the [src].")
+
+/obj/machinery/smartfridge/drying_rack/proc/dry()
+ for(var/datum/stored_item/I in item_records)
+ for(var/obj/item/reagent_containers/food/snacks/S in I.instances)
+ if(S.dry) continue
+ if(S.dried_type == S.type)
+ S.dry = 1
+ S.name = "dried [S.name]"
+ S.color = "#AAAAAA"
+ I.instances -= S
+ S.forceMove(get_turf(src))
+ else
+ var/D = S.dried_type
+ new D(get_turf(src))
+ qdel(S)
+ return
+ for(var/obj/item/stack/wetleather/WL in I.instances)
+ WL.use(1)
+ I.instances -= WL
+ var/L = /obj/item/stack/material/leather
+ new L(get_turf(src))
+ return
+
diff --git a/code/modules/mapping/paint.dm b/code/modules/mapping/paint.dm
new file mode 100644
index 000000000000..41b937b66875
--- /dev/null
+++ b/code/modules/mapping/paint.dm
@@ -0,0 +1,105 @@
+#define CREATE_PAINT(x, c) /obj/effect/paint/x/color=c
+#define CREATE_PAINT_STRIPE(x, c) /obj/effect/paint_stripe/x/color=c
+
+/obj/effect/paint
+ name = "coat of paint"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "wall_paint_effect"
+ layer = ABOVE_TURF_LAYER
+ blend_mode = BLEND_MULTIPLY
+
+/obj/effect/paint/Initialize()
+ . = ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/effect/paint/LateInitialize()
+ var/turf/simulated/wall/W = get_turf(src)
+ if(istype(W))
+ W.paint_color = color
+ W.stripe_color = color
+ W.update_overlays()
+ var/obj/structure/wall_frame/WF = locate() in loc
+ if(WF)
+ WF.paint_color = color
+ WF.stripe_color = color
+ WF.update_icon()
+ qdel(src)
+
+//Stripes the wall it spawns on, then dies
+/obj/effect/paint_stripe
+ name = "stripe of paint"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "paintdot"
+ layer = ABOVE_TURF_LAYER
+ blend_mode = BLEND_MULTIPLY
+
+/obj/effect/paint_stripe/Initialize()
+ . = ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/effect/paint_stripe/LateInitialize()
+ var/turf/simulated/wall/W = get_turf(src)
+ if(istype(W))
+ W.stripe_color = color
+ W.update_overlays()
+ var/obj/structure/wall_frame/WF = locate() in loc
+ if(WF)
+ WF.stripe_color = color
+ WF.update_icon()
+ qdel(src)
+
+//paint defines
+
+CREATE_PAINT(beastybrown, COLOR_BEASTY_BROWN)
+CREATE_PAINT(pipecyan, COLOR_CYAN_DARK)
+CREATE_PAINT(sun, COLOR_SUN)
+CREATE_PAINT(red, COLOR_RED)
+CREATE_PAINT(silver, COLOR_SILVER)
+CREATE_PAINT(black, COLOR_GRAY20)
+CREATE_PAINT(green, COLOR_GREEN)
+CREATE_PAINT(navy, COLOR_NAVY)
+CREATE_PAINT(eggshell, COLOR_EGGSHELL)
+CREATE_PAINT(beige, COLOR_BEIGE)
+CREATE_PAINT(darkred, COLOR_MAROON)
+CREATE_PAINT(cyanblue, COLOR_CYAN_BLUE)
+CREATE_PAINT(copper, COLOR_COPPER)
+CREATE_PAINT(amber, COLOR_AMBER)
+CREATE_PAINT(wallgunmetal, COLOR_WALL_GUNMETAL)
+CREATE_PAINT(bottlegreen, COLOR_BOTTLE_GREEN)
+CREATE_PAINT(palebottlegreen, COLOR_PALE_BTL_GREEN)
+CREATE_PAINT(pakistangreen, COLOR_PAKISTAN_GREEN)
+CREATE_PAINT(offwhite, COLOR_OFF_WHITE)
+CREATE_PAINT(violet, COLOR_EXPLO_VIOLET)
+CREATE_PAINT(gunmetal, COLOR_GUNMETAL)
+CREATE_PAINT(paleorange, COLOR_PALE_ORANGE)
+CREATE_PAINT(commandblue, COLOR_COMMAND_BLUE)
+CREATE_PAINT(purple, COLOR_PURPLE)
+CREATE_PAINT(purplegray, COLOR_PURPLE_GRAY)
+CREATE_PAINT(babyblue, COLOR_BABY_BLUE)
+
+CREATE_PAINT_STRIPE(beastybrown, COLOR_BEASTY_BROWN)
+CREATE_PAINT_STRIPE(sun, COLOR_SUN)
+CREATE_PAINT_STRIPE(red, COLOR_RED)
+CREATE_PAINT_STRIPE(silver, COLOR_SILVER)
+CREATE_PAINT_STRIPE(black, COLOR_GRAY20)
+CREATE_PAINT_STRIPE(green, COLOR_GREEN)
+CREATE_PAINT_STRIPE(navy, COLOR_NAVY)
+CREATE_PAINT_STRIPE(eggshell, COLOR_EGGSHELL)
+CREATE_PAINT_STRIPE(beige, COLOR_BEIGE)
+CREATE_PAINT_STRIPE(darkred, COLOR_MAROON)
+CREATE_PAINT_STRIPE(cyanblue, COLOR_CYAN_BLUE)
+CREATE_PAINT_STRIPE(copper, COLOR_COPPER)
+CREATE_PAINT_STRIPE(amber, COLOR_AMBER)
+CREATE_PAINT_STRIPE(wallgunmetal, COLOR_WALL_GUNMETAL)
+CREATE_PAINT_STRIPE(bottlegreen, COLOR_BOTTLE_GREEN)
+CREATE_PAINT_STRIPE(palebottlegreen, COLOR_PALE_BTL_GREEN)
+CREATE_PAINT_STRIPE(pakistangreen, COLOR_PAKISTAN_GREEN)
+CREATE_PAINT_STRIPE(offwhite, COLOR_OFF_WHITE)
+CREATE_PAINT_STRIPE(violet, COLOR_EXPLO_VIOLET)
+CREATE_PAINT_STRIPE(gunmetal, COLOR_GUNMETAL)
+CREATE_PAINT_STRIPE(paleorange, COLOR_PALE_ORANGE)
+CREATE_PAINT_STRIPE(commandblue, COLOR_COMMAND_BLUE)
+CREATE_PAINT_STRIPE(purple, COLOR_PURPLE)
+CREATE_PAINT_STRIPE(purplegray, COLOR_PURPLE_GRAY)
+CREATE_PAINT_STRIPE(babyblue, COLOR_BABY_BLUE)
+CREATE_PAINT_STRIPE(pipecyan, COLOR_CYAN_DARK)
diff --git a/code/modules/mapping/spawner/window.dm b/code/modules/mapping/spawner/window.dm
index 85654a7a2498..04d3d03495d7 100644
--- a/code/modules/mapping/spawner/window.dm
+++ b/code/modules/mapping/spawner/window.dm
@@ -7,14 +7,20 @@
var/full_window = FALSE
/// spawn grille at all?
var/spawn_grille = TRUE
+ /// spawn low wall?
+ var/spawn_low_wall = FALSE
/// full window path
var/window_full_path = /obj/structure/window/basic/full
/// pane path
var/window_pane_path = /obj/structure/window/basic
+ /// low wall path
+ var/low_wall_path = /obj/structure/wall_frame/prepainted
/// found dirs
var/found_dirs = NONE
/// spawn firedoors? fulltile and non-hidden only for now
var/firelocks = FALSE
+ /// id tag for electrochromics
+ var/id
/obj/spawner/window/Initialize(mapload)
if(!full_window)
@@ -29,9 +35,17 @@
/obj/spawner/window/Spawn()
if(spawn_grille)
- new /obj/structure/grille(loc)
+ if(locate(/obj/structure/grille) in loc)
+ warning("Window spawner at X [x] Y [y] Z [z] is set to spawn a grille, but found one already in it's loc.")
+ else
+ new /obj/structure/grille(loc)
if(full_window)
- new window_full_path(loc)
+ var/new_window = new window_full_path(loc)
+ if (spawn_low_wall)
+ new low_wall_path(loc)
+ if(id && istype(window_full_path, /obj/structure/window/reinforced/polarized))
+ var/obj/structure/window/reinforced/polarized/P = new_window
+ P.id = id
else
// spawn in dirs not in found dirs
var/obj/structure/window/W
@@ -41,7 +55,10 @@
W = new window_pane_path(loc)
W.setDir(d)
if(firelocks)
- new /obj/machinery/door/firedoor(loc)
+ if(locate(/obj/machinery/door/firedoor) in loc)
+ warning("Window spawner at X [x] Y [y] Z [z] is set to spawn firelocks, but found one already in it's loc.")
+ else
+ new /obj/machinery/door/firedoor(loc)
/obj/spawner/window/firelocks
icon_state = "window_grille_pane_fire"
@@ -123,3 +140,77 @@
icon_state = "rphoron_grille_full_fire"
firelocks = TRUE
+/obj/spawner/window/low_wall
+ spawn_low_wall = TRUE
+
+/obj/spawner/window/low_wall/borosillicate/full
+ icon_state = "phoron_grille_full"
+ full_window = TRUE
+ window_pane_path = /obj/structure/window/phoronbasic
+ window_full_path = /obj/structure/window/phoronbasic/full
+
+/obj/spawner/window/low_wall/borosillicate/full/firelocks
+ icon_state = "phoron_grille_full"
+ firelocks = TRUE
+
+/obj/spawner/window/low_wall/borosillicate/reinforced/full
+ icon_state = "rphoron_grille_full"
+ full_window = TRUE
+ window_pane_path = /obj/structure/window/phoronreinforced
+ window_full_path = /obj/structure/window/phoronreinforced/full
+
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks
+ icon_state = "rphoron_grille_full_fire"
+ firelocks = TRUE
+
+/obj/spawner/window/low_wall/reinforced/full
+ icon_state = "rwindow_grille_full"
+ full_window = TRUE
+ window_pane_path = /obj/structure/window/reinforced
+ window_full_path = /obj/structure/window/reinforced/full
+
+/obj/spawner/window/low_wall/reinforced/full/firelocks
+ icon_state = "rwindow_grille_full_fire"
+ firelocks = TRUE
+
+/obj/spawner/window/low_wall/reinforced/tinted/full
+ icon_state = "rwindow_grille_full"
+ full_window = TRUE
+ window_pane_path = /obj/structure/window/reinforced/tinted
+ window_full_path = /obj/structure/window/reinforced/tinted/full
+
+/obj/spawner/window/low_wall/reinforced/tinted/full/firelocks
+ icon_state = "rwindow_grille_full_fire"
+ firelocks = TRUE
+
+/obj/spawner/window/low_wall/reinforced/electrochromic/full
+ icon_state = "rwindow_grille_full"
+ full_window = TRUE
+ window_pane_path = /obj/structure/window/reinforced/polarized
+ window_full_path = /obj/structure/window/reinforced/polarized/full
+
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks
+ icon_state = "rwindow_grille_full_fire"
+ firelocks = TRUE
+
+/obj/spawner/window/low_wall/full
+ full_window = TRUE
+ icon_state = "window_grille_full"
+
+/obj/spawner/window/low_wall/full/firelocks
+ icon_state = "window_grille_full_fire"
+ firelocks = TRUE
+
+/obj/spawner/window/low_wall/full/nogrille/firelocks
+ full_window = TRUE
+ icon_state = "window_grille_full"
+ spawn_grille = FALSE
+ firelocks = TRUE
+
+/obj/spawner/window/low_wall/full/firelocks/nogrille
+ icon_state = "window_grille_full"
+ firelocks = TRUE
+ spawn_grille = FALSE
+
+
+
diff --git a/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm b/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm
index b815975fb8ba..8e02d42d5e69 100644
--- a/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm
+++ b/code/modules/maps/turf_makers/planet_station_turfs/_lythios43c.dm
@@ -59,6 +59,25 @@ LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/ignore_cavegen)
LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/floor/ignore_cavegen)
+/turf/simulated/mineral/icerock/lythios43c/make_floor()
+ if(!density && !opacity)
+ return
+ density = FALSE
+ opacity = FALSE
+ recalc_atom_opacity()
+ reconsider_lights()
+ regenerate_ao()
+ blocks_air = FALSE
+ can_build_into_floor = TRUE
+ smoothing_groups = (SMOOTH_GROUP_FLOOR_SNOW)
+ icon = 'icons/turf/flooring/asteroid.dmi'
+ icon_state = "asteroid"
+ color = LIGHT_COLOR_BLUE
+ queue_zone_update()
+ QUEUE_SMOOTH(src)
+ QUEUE_SMOOTH_NEIGHBORS(src)
+
+
/turf/simulated/open/lythios43c
edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf
@@ -85,11 +104,19 @@ LYTHIOS43C_TURF_CREATE_UN(/turf/simulated/mineral/icerock/floor/ignore_cavegen)
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors
outdoors = FALSE
+/turf/simulated/floor/outdoors/icesand/lythios43c/indoor
+ outdoors = FALSE
+ smoothing_groups = (SMOOTH_GROUP_FLOOR_SNOW)
+ icon = 'icons/turf/flooring/asteroid.dmi'
+ icon_state = "asteroid"
+ color = LIGHT_COLOR_BLUE
+
/turf/simulated/mineral/floor/icerock/lythios43c/indoors
outdoors = FALSE
/turf/simulated/mineral/floor/icerock/lythios43c/indoors/ignore_cavegen // I hate having to make such a long typepath for this, very annyoing -Bloop
ignore_cavegen = TRUE
+ smoothing_groups = (SMOOTH_GROUP_FLOOR_SNOW)
/turf/simulated/floor/lythios43c/indoors
outdoors = FALSE
diff --git a/code/modules/materials/_materials.dm b/code/modules/materials/_materials.dm
index e60bfd0a7c9f..49840c5127a2 100644
--- a/code/modules/materials/_materials.dm
+++ b/code/modules/materials/_materials.dm
@@ -91,9 +91,10 @@
/// Colour applied to products of this material.
var/icon_colour
/// Wall and table base icon tag. See header.
- var/icon_base = 'icons/turf/walls/solid.dmi'
+ var/icon_base = 'icons/turf/walls/solid_wall.dmi'
/// Overlay used.
- var/icon_reinf = 'icons/turf/walls/reinforced_metal.dmi'
+ var/icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
+ var/wall_stripe_icon = 'icons/turf/walls/wall_stripe.dmi'
/// Door base icon tag.
var/door_icon_base = "metal"
/// Table base icon tag.
diff --git a/code/modules/materials/definitions/unsorted_materials.dm b/code/modules/materials/definitions/unsorted_materials.dm
index 2f878a60fb41..13933590aeca 100644
--- a/code/modules/materials/definitions/unsorted_materials.dm
+++ b/code/modules/materials/definitions/unsorted_materials.dm
@@ -5,7 +5,7 @@
name = "uranium"
stack_type = /obj/item/stack/material/uranium
radioactivity = RAD_INTENSITY_MAT_URANIUM
- icon_base = 'icons/turf/walls/stone.dmi'
+ icon_base = 'icons/turf/walls/stone_wall.dmi'
icon_reinf = 'icons/turf/walls/reinforced_stone.dmi'
icon_reinf_directionals = TRUE
icon_colour = "#007A00"
@@ -67,7 +67,7 @@
radioactivity = RAD_INTENSITY_MAT_SUPERMATTER
luminescence = 3
ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE
- icon_base = 'icons/turf/walls/stone.dmi'
+ icon_base = 'icons/turf/walls/stone_wall.dmi'
shard_type = SHARD_SHARD
hardness = 30
door_icon_base = "stone"
@@ -81,7 +81,8 @@
name = "phoron"
stack_type = /obj/item/stack/material/phoron
ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE
- icon_base = 'icons/turf/walls/stone.dmi'
+ icon_base = 'icons/turf/walls/solid_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#FC2BC5"
shard_type = SHARD_SHARD
hardness = 30
@@ -111,7 +112,7 @@
id = "sandstone"
name = "sandstone"
stack_type = /obj/item/stack/material/sandstone
- icon_base = 'icons/turf/walls/stone.dmi'
+ icon_base = 'icons/turf/walls/stone_wall.dmi'
icon_reinf = 'icons/turf/walls/reinforced_stone.dmi'
icon_reinf_directionals = TRUE
icon_colour = "#D9C179"
@@ -142,8 +143,8 @@
integrity = 150
conductivity = 11 // Assuming this is carbon steel, it would actually be slightly less conductive than iron, but lets ignore that.
protectiveness = 10 // 33%
- icon_base = 'icons/turf/walls/solid.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_solid.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#666666"
table_icon_base = "metal"
@@ -153,8 +154,8 @@
stack_type = /obj/item/stack/material/steel/hull
integrity = 250
explosion_resistance = 10
- icon_base = 'icons/turf/walls/hull.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_mesh.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#666677"
/datum/material/steel/hull/place_sheet(var/turf/target) //Deconstructed into normal steel sheets.
@@ -188,8 +189,8 @@
stack_type = /obj/item/stack/material/plasteel
integrity = 400
melting_point = 6000
- icon_base = 'icons/turf/walls/solid.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_solid.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#777777"
explosion_resistance = 25
hardness = 80
@@ -206,8 +207,8 @@
name = MAT_PLASTEELHULL
stack_type = /obj/item/stack/material/plasteel/hull
integrity = 600
- icon_base = 'icons/turf/walls/hull.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_mesh.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#777788"
explosion_resistance = 40
@@ -221,8 +222,8 @@
stack_type = /obj/item/stack/material/durasteel
integrity = 600
melting_point = 7000
- icon_base = 'icons/turf/walls/metal.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_metal.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#6EA7BE"
explosion_resistance = 75
hardness = 100
@@ -236,8 +237,8 @@
/datum/material/durasteel/hull //The 'Hardball' of starship hulls.
id = "durasteel_hull"
name = MAT_DURASTEELHULL
- icon_base = 'icons/turf/walls/hull.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_mesh.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#45829a"
explosion_resistance = 90
reflectivity = 0.9
@@ -250,8 +251,8 @@
name = MAT_TITANIUM
stack_type = /obj/item/stack/material/titanium
conductivity = 2.38
- icon_base = 'icons/turf/walls/metal.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_metal.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
door_icon_base = "metal"
icon_colour = "#D1E6E3"
table_icon_base = "metal"
@@ -260,8 +261,8 @@
id = "titanium_hull"
name = MAT_TITANIUMHULL
stack_type = null
- icon_base = 'icons/turf/walls/hull.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_mesh.dmi'
+ icon_base = 'icons/turf/walls/metal_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
/datum/material/glass
id = "glass"
@@ -420,8 +421,8 @@
id = "plastic"
stack_type = /obj/item/stack/material/plastic
flags = MATERIAL_BRITTLE
- icon_base = 'icons/turf/walls/solid.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_solid.dmi'
+ icon_base = 'icons/turf/walls/solid_wall.dmi'
+ icon_reinf = 'icons/turf/walls/solid_wall_reinforced.dmi'
icon_colour = "#CCCCCC"
hardness = 10
weight = 12
@@ -567,7 +568,7 @@
name = MAT_VALHOLLIDE
id = "valhollide"
stack_type = /obj/item/stack/material/valhollide
- icon_base = 'icons/turf/walls/stone.dmi'
+ icon_base = 'icons/turf/walls/stone_wall.dmi'
door_icon_base = "stone"
icon_reinf = 'icons/turf/walls/reinforced_mesh.dmi'
icon_colour = "##FFF3B2"
@@ -671,7 +672,8 @@
stack_type = /obj/item/stack/material/wood
icon_colour = "#9c5930"
integrity = 50
- icon_base = 'icons/turf/walls/wood.dmi'
+ icon_base = 'icons/turf/walls/wood_wall.dmi'
+ wall_stripe_icon = 'icons/turf/walls/wood_wall_stripe.dmi'
explosion_resistance = 2
shard_type = SHARD_SPLINTER
shard_can_repair = 0 // you can't weld splinters back into planks
@@ -730,8 +732,8 @@
name = MAT_HARDWOOD
stack_type = /obj/item/stack/material/wood/hard
icon_colour = "#42291a"
- icon_base = 'icons/turf/walls/stone.dmi'
- icon_reinf = 'icons/turf/walls/reinforced_stone.dmi'
+ icon_base = 'icons/turf/walls/wood_wall.dmi'
+ wall_stripe_icon = 'icons/turf/walls/wood_wall_stripe.dmi'
icon_reinf_directionals = TRUE
integrity = 65 //a bit stronger than regular wood
hardness = 20
@@ -744,7 +746,7 @@
stack_type = /obj/item/stack/material/cardboard
flags = MATERIAL_BRITTLE
integrity = 10
- icon_base = 'icons/turf/walls/solid.dmi'
+ icon_base = 'icons/turf/walls/solid_wall.dmi'
icon_reinf = 'icons/turf/walls/reinforced_solid.dmi'
icon_colour = "#AAAAAA"
hardness = 1
@@ -764,7 +766,7 @@
name = MAT_SNOW
stack_type = /obj/item/stack/material/snow
flags = MATERIAL_BRITTLE
- icon_base = 'icons/turf/walls/solid.dmi'
+ icon_base = 'icons/turf/walls/solid_wall.dmi'
icon_reinf = 'icons/turf/walls/reinforced_solid.dmi'
icon_colour = "#FFFFFF"
integrity = 1
@@ -783,7 +785,7 @@
name = "packed snow"
flags = MATERIAL_BRITTLE
stack_type = /obj/item/stack/material/snowbrick
- icon_base = 'icons/turf/walls/stone.dmi'
+ icon_base = 'icons/turf/walls/stone_wall.dmi'
icon_reinf = 'icons/turf/walls/reinforced_stone.dmi'
icon_reinf_directionals = TRUE
icon_colour = "#D8FDFF"
@@ -873,7 +875,7 @@
name = "bone"
icon_colour = "#e6dfc8"
stack_type = /obj/item/stack/material/bone
- icon_base = 'icons/turf/walls/stone.dmi'
+ icon_base = 'icons/turf/walls/stone_wall.dmi'
icon_reinf = 'icons/turf/walls/reinforced_mesh.dmi'
melting_point = T0C+300
sheet_singular_name = "fragment"
diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index d42b5bd8a307..ca6197c28edc 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -23,6 +23,7 @@
recipes += new/datum/stack_recipe("[display_name] bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE)
recipes += new/datum/stack_recipe("[display_name] double bed", /obj/structure/bed/double, 4, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE)
recipes += new/datum/stack_recipe("[display_name] wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE)
+ recipes += new/datum/stack_recipe("[display_name] low walls", /obj/structure/wall_frame, 2, time = 25, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE)
if(hardness>50)
recipes += new/datum/stack_recipe("[display_name] fork", /obj/item/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE)
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 24cefbae5edf..5c74952d0f25 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -9,8 +9,9 @@
/turf/simulated/mineral //wall piece
name = "rock"
- icon = 'icons/turf/walls.dmi'
- icon_state = "rock"
+ icon = 'icons/turf/walls/natural.dmi'
+ icon_state = "preview"
+ base_icon_state = "wall"
smoothing_flags = SMOOTH_CUSTOM
initial_gas_mix = GAS_STRING_VACUUM
opacity = 1
@@ -18,10 +19,11 @@
blocks_air = 1
can_dirty = FALSE
has_resources = 1
+ color = COLOR_ASTEROID_ROCK
- // smoothing_flags = SMOOTH_BITMASK | SMOOTH_BORDER
- smoothing_groups = (SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_MINERAL_WALLS)
- canSmoothWith = (SMOOTH_GROUP_MINERAL_WALLS)
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = (SMOOTH_GROUP_WALLS+SMOOTH_GROUP_MINERAL_WALLS)
+ canSmoothWith = (SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS+SMOOTH_GROUP_MINERAL_WALLS)
var/sand_icon = 'icons/turf/flooring/asteroid.dmi'
var/rock_side_icon_state = "rock_side"
@@ -91,10 +93,7 @@
/turf/simulated/mineral/icerock
name = "icerock"
- icon_state = "icerock"
- rock_side_icon_state = "icerock_side"
- sand_icon_state = "ice"
- rock_icon_state = "icerock"
+ color = "#78a3b8"
random_icon = 1
/turf/simulated/mineral/icerock/airmix
@@ -102,8 +101,12 @@
/turf/unsimulated/mineral/icerock
name = "impassable icerock"
icon = 'icons/turf/walls.dmi'
- icon_state = "icerock-dark"
+ base_icon_state = "wall"
density = 1
+ smoothing_flags = SMOOTH_BITMASK
+ smoothing_groups = (SMOOTH_GROUP_WALLS+ SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_MINERAL_WALLS )
+ canSmoothWith = (SMOOTH_GROUP_WALLS+ SMOOTH_GROUP_CLOSED_TURFS + SMOOTH_GROUP_MINERAL_WALLS )
+ color = COLOR_OFF_WHITE
/turf/simulated/mineral/ignore_mapgen
ignore_mapgen = 1
@@ -188,8 +191,6 @@
. = ..()
if(prob(20))
overlay_detail = "asteroid[rand(0,9)]"
- if(random_icon)
- dir = pick(GLOB.alldirs)
if(mineral)
if(density)
MineralSpread()
@@ -218,8 +219,8 @@
else
name = "rock"
- icon = 'icons/turf/walls.dmi'
- icon_state = rock_icon_state
+ icon = 'icons/turf/walls/natural.dmi'
+// icon_state = rock_icon_state
//We are a sand floor
else
@@ -232,8 +233,9 @@
//We are a wall (why does this system work like this??)
// todo: refactor this shitheap because this is pants on fucking head awful
- if(density)
+ if(density)
+ /*
// TODO: Replace these layers with defines. (I have some being added in another PR) @Zandario
var/mutable_appearance/appearance
if(!(smoothing_junction & NORTH_JUNCTION))
@@ -252,7 +254,7 @@
appearance = mutable_appearance(icon, "[rock_side_icon_state]_w", layer = EDGE_LAYER)
appearance.pixel_x = 32
. += appearance
-
+ */
if(archaeo_overlay)
. += mutable_appearance(icon, archaeo_overlay)
if(excav_overlay)
diff --git a/code/modules/mining/shelter_atoms.dm b/code/modules/mining/shelter_atoms.dm
index 0a96d32f56d7..096bb5da05a3 100644
--- a/code/modules/mining/shelter_atoms.dm
+++ b/code/modules/mining/shelter_atoms.dm
@@ -227,8 +227,6 @@
desc = "A heated storage unit."
icon_state = "donkvendor"
icon = 'icons/obj/survival_pod_vend.dmi'
- icon_on = "donkvendor"
- icon_off = "donkvendor"
light_range = 5
light_power = 1.2
light_color = "#DDFFD3"
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
index 6c3fd2b91c47..180ba8ea0fed 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm
@@ -14,6 +14,7 @@
icon_state = "mimic"
icon_opened = "open"
icon_closed = "mimic"
+ closet_appearance = null
var/mimic_chance = 30
var/mimic_active = TRUE
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 0db7a42cf9f0..ca571af5932b 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -258,7 +258,7 @@ GLOBAL_LIST_EMPTY(apcs)
/obj/machinery/power/apc
name = "area power controller"
desc = "A control terminal for the area electrical systems."
- icon = 'icons/obj/power_vr.dmi'
+ icon = 'icons/obj/apc.dmi'
icon_state = "apc0"
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
@@ -376,6 +376,7 @@ GLOBAL_LIST_EMPTY(apcs)
name = "[area.name] APC"
machine_stat |= MAINT
src.update_icon()
+ setDir(dir)
/obj/machinery/power/apc/Destroy()
GLOB.apcs -= src
@@ -479,6 +480,8 @@ GLOBAL_LIST_EMPTY(apcs)
// update the APC icon to show the three base states
// also add overlays for indicator lights
/obj/machinery/power/apc/update_icon()
+
+
if (!status_overlays)
status_overlays = 1
status_overlays_lock = new
@@ -489,9 +492,9 @@ GLOBAL_LIST_EMPTY(apcs)
status_overlays_lock.len = 2
status_overlays_charging.len = 3
- status_overlays_equipment.len = 4
- status_overlays_lighting.len = 4
- status_overlays_environ.len = 4
+ status_overlays_equipment.len = 5
+ status_overlays_lighting.len = 5
+ status_overlays_environ.len = 5
status_overlays_lock[1] = image(icon, "apcox-0") // 0=blue 1=red
status_overlays_lock[2] = image(icon, "apcox-1")
@@ -500,24 +503,19 @@ GLOBAL_LIST_EMPTY(apcs)
status_overlays_charging[2] = image(icon, "apco3-1")
status_overlays_charging[3] = image(icon, "apco3-2")
- status_overlays_equipment[1] = image(icon, "apco0-0")
- status_overlays_equipment[2] = image(icon, "apco0-1")
- status_overlays_equipment[3] = image(icon, "apco0-2")
- status_overlays_equipment[4] = image(icon, "apco0-3")
-
- status_overlays_lighting[1] = image(icon, "apco1-0")
- status_overlays_lighting[2] = image(icon, "apco1-1")
- status_overlays_lighting[3] = image(icon, "apco1-2")
- status_overlays_lighting[4] = image(icon, "apco1-3")
-
- status_overlays_environ[1] = image(icon, "apco2-0")
- status_overlays_environ[2] = image(icon, "apco2-1")
- status_overlays_environ[3] = image(icon, "apco2-2")
- status_overlays_environ[4] = image(icon, "apco2-3")
+ var/list/channel_overlays = list(status_overlays_equipment, status_overlays_lighting, status_overlays_environ)
+ var/channel = 0
+ for(var/list/channel_leds in channel_overlays)
+ channel_leds[POWERCHAN_OFF + 1] = overlay_image(icon,"apco[channel]",COLOR_RED)
+ channel_leds[POWERCHAN_OFF_AUTO + 1] = overlay_image(icon,"apco[channel]",COLOR_ORANGE)
+ channel_leds[POWERCHAN_ON + 1] = overlay_image(icon,"apco[channel]",COLOR_LIME)
+ channel_leds[POWERCHAN_ON_AUTO + 1] = overlay_image(icon,"apco[channel]",COLOR_BLUE)
+ channel++
var/update = check_updates() //returns 0 if no need to update icons.
// 1 if we need to update the icon_state
// 2 if we need to update the overlays
+
if(!update)
return
@@ -525,7 +523,7 @@ GLOBAL_LIST_EMPTY(apcs)
if(update_state & UPDATE_ALLGOOD)
icon_state = "apc0"
else if(update_state & (UPDATE_OPENED1|UPDATE_OPENED2))
- var/basestate = "apc[ cell ? "2" : "1" ]"
+ var/basestate = "apc[ get_cell(FALSE) ? "2" : "1" ]"
if(update_state & UPDATE_OPENED1)
if(update_state & (UPDATE_MAINT|UPDATE_BROKE))
icon_state = "apcmaint" //disabled APC cannot hold cell
@@ -535,46 +533,61 @@ GLOBAL_LIST_EMPTY(apcs)
icon_state = "[basestate]-nocover"
else if(update_state & UPDATE_BROKE)
icon_state = "apc-b"
- else if(update_state & UPDATE_WIREEXP)
- icon_state = "apcewires"
else if(update_state & UPDATE_BLUESCREEN)
icon_state = "apcemag"
+ else if(update_state & UPDATE_WIREEXP)
+ icon_state = "apcewires"
if(!(update_state & UPDATE_ALLGOOD))
- if(overlays.len)
- cut_overlays()
- return
+ cut_overlays()
if(update & 2)
if(overlays.len)
- cut_overlays()
+ overlays.Cut()
if(!(machine_stat & (BROKEN|MAINT)) && update_state & UPDATE_ALLGOOD)
- var/list/overlays_to_add = list()
- overlays_to_add += status_overlays_lock[locked+1]
- overlays_to_add += status_overlays_charging[charging+1]
+ add_overlay(status_overlays_lock[locked+1])
+ add_overlay(status_overlays_charging[charging+1])
if(operating)
- overlays_to_add += status_overlays_equipment[equipment+1]
- overlays_to_add += status_overlays_lighting[lighting+1]
- overlays_to_add += status_overlays_environ[environ+1]
-
- add_overlay(overlays_to_add)
+ add_overlay(status_overlays_equipment[equipment+1])
+ add_overlay(status_overlays_lighting[lighting+1])
+ add_overlay(status_overlays_environ[environ+1])
if(update & 3)
- if(update_state & UPDATE_BLUESCREEN)
- set_light(l_range = 2, l_power = 0.25, l_color = "#0000FF")
+ if((update_state & (UPDATE_OPENED1|UPDATE_OPENED2|UPDATE_BROKE)))
+ set_light(0)
+ else if(update_state & UPDATE_BLUESCREEN)
+ set_light(l_range = 2, l_power = 0.5, l_color = "#00ecff")
else if(!(machine_stat & (BROKEN|MAINT)) && update_state & UPDATE_ALLGOOD)
var/color
switch(charging)
if(0)
- color = "#F86060"
+ color = "#f86060"
if(1)
- color = "#A8B0F8"
+ color = "#a8b0f8"
if(2)
- color = "#82FF4C"
- set_light(l_range = 2, l_power = 0.25, l_color = color)
+ color = "#82ff4c"
+ set_light(l_range = 2, l_power = 0.5, l_color = color)
else
set_light(0)
+/obj/machinery/power/apc/setDir(new_dir)
+ . = ..()
+ base_pixel_x = 0
+ base_pixel_y = 0
+ var/turf/T = get_step(get_turf(src), dir)
+ if(istype(T) && T.density)
+ switch(dir)
+ if(SOUTH)
+ base_pixel_y = -22
+ if(NORTH)
+ base_pixel_y = 22
+ if(EAST)
+ base_pixel_x = 22
+ if(WEST)
+ base_pixel_x = -22
+ reset_pixel_offsets()
+
+
/obj/machinery/power/apc/proc/check_updates()
var/last_update_state = update_state
diff --git a/code/modules/power/lighting/lighting.dm b/code/modules/power/lighting/lighting.dm
index b5bc3c0b6803..9f4280c226bc 100644
--- a/code/modules/power/lighting/lighting.dm
+++ b/code/modules/power/lighting/lighting.dm
@@ -229,8 +229,8 @@ var/global/list/light_type_cache = list()
/obj/machinery/light
name = "light fixture"
icon = 'icons/obj/lighting_vr.dmi'
- base_icon_state = "tube"
- icon_state = "tube1"
+ base_icon_state = "tube_empty"
+ icon_state = "tube_empty"
desc = "A lighting fixture."
anchored = 1
plane = MOB_PLANE
@@ -312,6 +312,23 @@ var/global/list/light_type_cache = list()
construct_type = /obj/machinery/light_construct/small
shows_alerts = FALSE
+/obj/machinery/light/small/update_icon()
+ switch(status) // set icon_states
+ if(LIGHT_OK)
+ if(shows_alerts && current_alert && on)
+ icon_state = "[base_icon_state]-alert-[current_alert]"
+ else
+ icon_state = "[base_icon_state][on]"
+ if(LIGHT_EMPTY)
+ icon_state = "[base_icon_state]-empty"
+ on = 0
+ if(LIGHT_BURNED)
+ icon_state = "[base_icon_state]-burned"
+ on = 0
+ if(LIGHT_BROKEN)
+ icon_state = "[base_icon_state]-broken"
+ on = 0
+
/obj/machinery/light/small/flicker
auto_flicker = TRUE
@@ -405,6 +422,7 @@ var/global/list/light_type_cache = list()
on = powered()
update(0)
+ setDir(dir)
/obj/machinery/light/Destroy()
var/area/A = get_area(src)
@@ -415,23 +433,46 @@ var/global/list/light_type_cache = list()
return ..()
/obj/machinery/light/update_icon()
+ cut_overlays()
switch(status) // set icon_states
if(LIGHT_OK)
if(shows_alerts && current_alert && on)
- icon_state = "[base_icon_state]-alert-[current_alert]"
+ var/addcolor
+ switch(current_alert)
+ if("atmos")
+ addcolor = COLOR_BLUE
+ if("fire")
+ addcolor = COLOR_ORANGE
+ var/image/I = image(icon, "tube1")
+ I.color = addcolor
+ add_overlay(I)
+
else
- icon_state = "[base_icon_state][on]"
+ add_overlay("tube1")
if(LIGHT_EMPTY)
- icon_state = "[base_icon_state]-empty"
on = 0
if(LIGHT_BURNED)
- icon_state = "[base_icon_state]-burned"
+ add_overlay("tube_burned")
on = 0
if(LIGHT_BROKEN)
- icon_state = "[base_icon_state]-broken"
+ add_overlay("tube_broken")
on = 0
- return
+
+/obj/machinery/light/setDir(ndir)
+ . = ..()
+ base_pixel_y = 0
+ base_pixel_x = 0
+ var/turf/T = get_step(get_turf(src), src.dir)
+ if(istype(T) && T.density)
+ switch(dir)
+ if(NORTH)
+ base_pixel_y = 21
+ if(EAST)
+ base_pixel_x = 10
+ if(WEST)
+ base_pixel_x = -10
+ reset_pixel_offsets()
/obj/machinery/light/flamp/update_icon()
if(lamp_shade)
diff --git a/code/modules/random_map/automata/map_specific/rift_automata.dm b/code/modules/random_map/automata/map_specific/rift_automata.dm
index 1601113341da..7cb425a86343 100644
--- a/code/modules/random_map/automata/map_specific/rift_automata.dm
+++ b/code/modules/random_map/automata/map_specific/rift_automata.dm
@@ -1,7 +1,8 @@
/datum/random_map/automata/cave_system/no_cracks/rift
wall_type = /turf/simulated/mineral/icerock/lythios43c
- floor_type = /turf/simulated/mineral/icerock/floor/lythios43c
- target_turf_type = /turf/simulated/mineral/icerock/floor/lythios43c
+ floor_type = /turf/simulated/floor/outdoors/icesand/lythios43c/indoor
+ target_turf_type = /turf/simulated/floor/outdoors/icesand/lythios43c/indoor
/datum/random_map/automata/cave_system/no_cracks/rift_nocaves
+ floor_type = /turf/simulated/floor/outdoors/icesand/lythios43c/indoor
initial_wall_cell = 100
diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
index 565b2ad9cbd3..06e121332be8 100644
--- a/code/modules/tables/tables.dm
+++ b/code/modules/tables/tables.dm
@@ -15,7 +15,7 @@ var/list/table_icon_cache = list()
// smoothing_flags = SMOOTH_BITMASK
smoothing_groups = (SMOOTH_GROUP_TABLES)
- canSmoothWith = (SMOOTH_GROUP_TABLES)
+ canSmoothWith = (SMOOTH_GROUP_TABLES + SMOOTH_GROUP_LOW_WALL)
var/flipped = 0
var/maxhealth = 10
diff --git a/code/modules/turbolift/turbolift_door.dm b/code/modules/turbolift/turbolift_door.dm
index a9e7f2896b87..31fa7de02fdd 100644
--- a/code/modules/turbolift/turbolift_door.dm
+++ b/code/modules/turbolift/turbolift_door.dm
@@ -1,11 +1,18 @@
/obj/machinery/door/airlock/lift
name = "Elevator Door"
+ airlock_type = "Lift"
desc = "Ding."
req_access = list(ACCESS_ENGINEERING_MAINT)
opacity = 0
autoclose = 0
glass = 1
- icon = 'icons/obj/doors/doorlift.dmi'
+ autoset_dir = FALSE
+ icon = 'icons/obj/doors/elevator/door.dmi'
+ fill_file = 'icons/obj/doors/elevator/fill_steel.dmi'
+ glass_file = 'icons/obj/doors/elevator/fill_glass.dmi'
+ bolts_file = 'icons/obj/doors/elevator/lights_bolts.dmi'
+ deny_file = 'icons/obj/doors/elevator/lights_deny.dmi'
+ lights_file = 'icons/obj/doors/elevator/lights_green.dmi'
var/datum/turbolift/lift
var/datum/turbolift_floor/floor
diff --git a/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm b/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm
new file mode 100644
index 000000000000..cf510ae99e53
--- /dev/null
+++ b/code/modules/unit_tests/wallmounted_obj_dirs/cameras.dm
@@ -0,0 +1,10 @@
+/datum/unit_test/camera_direction/Run()
+ var/list/bad_cameras
+ for(var/obj/machinery/camera/C in world)
+ if((C.dir == NORTHWEST || SOUTHWEST || NORTHEAST || NORTHWEST) || (C.dir != NORTH||SOUTH||EAST||WEST)) //specifically checking for non NESW dirs..
+ bad_cameras[C] = list("X"=C.x, "Y"=C.y, "Z"=C.z, "A"=C.loc.loc) // loc.loc is a lazy way of getting an area.
+ if(length(bad_cameras))
+ TEST_FAIL("One or more cameras had a non-cardinal direction!")
+ for(var/obj/I in bad_cameras)
+ TEST_FAIL("[I] at X [bad_cameras[I]["X"]] Y [bad_cameras[I]["Y"]] Z [bad_cameras[I]["Z"]] in area [bad_cameras[I]["A"]]")
+ Fail("There were [length(bad_cameras)] cameras with non-cardinal directions.")
diff --git a/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm b/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm
new file mode 100644
index 000000000000..5e17b8d2e28a
--- /dev/null
+++ b/code/modules/unit_tests/wallmounted_obj_dirs/fire_alarms.dm
@@ -0,0 +1,10 @@
+/datum/unit_test/fire_alarm_direction/proc/Run()
+ var/list/bad_alarms
+ for(var/obj/machinery/firealarm/C in world)
+ if((C.dir == NORTHWEST || SOUTHWEST || NORTHEAST || NORTHWEST) || (C.dir != NORTH||SOUTH||EAST||WEST)) //specifically checking for non NESW dirs..
+ bad_alarms[C] = list("X"=C.x, "Y"=C.y, "Z"=C.z, "A"=C.loc.loc) // loc.loc is a lazy way of getting an area.
+ if(length(bad_alarms))
+ TEST_FAIL("One or more alarms had a non-cardinal direction!")
+ for(var/obj/I in bad_alarms)
+ TEST_FAIL("[I] at X [bad_alarms[I]["X"]] Y [bad_alarms[I]["Y"]] Z [bad_alarms[I]["Z"]] in area [bad_alarms[I]["A"]]")
+ Fail("There were [length(bad_alarms)] alarms with non-cardinal directions.")
diff --git a/code/modules/xenoarcheaology/misc.dm b/code/modules/xenoarcheaology/misc.dm
index 8c27cc546fd8..cf32e87aa1c0 100644
--- a/code/modules/xenoarcheaology/misc.dm
+++ b/code/modules/xenoarcheaology/misc.dm
@@ -49,12 +49,6 @@
/obj/structure/closet/secure_closet/xenoarchaeologist
name = "Xenoarchaeologist Locker"
- icon_state = "secureres1"
- icon_closed = "secureres"
- icon_locked = "secureres1"
- icon_opened = "secureresopen"
- icon_broken = "secureresbroken"
- icon_off = "secureresoff"
req_access = list(ACCESS_SCIENCE_TOXINS)
starts_with = list(
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 74454026b68c..0dca1a9633c3 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/obj/apc.dmi b/icons/obj/apc.dmi
new file mode 100644
index 000000000000..7511f66aa463
Binary files /dev/null and b/icons/obj/apc.dmi differ
diff --git a/icons/obj/closets/bases/crate.dmi b/icons/obj/closets/bases/crate.dmi
index 83500acb3bd1..e8e26686fc61 100644
Binary files a/icons/obj/closets/bases/crate.dmi and b/icons/obj/closets/bases/crate.dmi differ
diff --git a/icons/obj/closets/bases/large_crate.dmi b/icons/obj/closets/bases/large_crate.dmi
index fd3400ed729f..1cdac2778348 100644
Binary files a/icons/obj/closets/bases/large_crate.dmi and b/icons/obj/closets/bases/large_crate.dmi differ
diff --git a/icons/obj/closets/bases/wall.dmi b/icons/obj/closets/bases/wall.dmi
index 730574ba5d88..6689e59cfce9 100644
Binary files a/icons/obj/closets/bases/wall.dmi and b/icons/obj/closets/bases/wall.dmi differ
diff --git a/icons/obj/closets/decals/closet.dmi b/icons/obj/closets/decals/closet.dmi
index a7bb7591b13e..ea42c1f5350f 100644
Binary files a/icons/obj/closets/decals/closet.dmi and b/icons/obj/closets/decals/closet.dmi differ
diff --git a/icons/obj/closets/decals/crate.dmi b/icons/obj/closets/decals/crate.dmi
index 1fce07d8820f..bbe97f73ce1e 100644
Binary files a/icons/obj/closets/decals/crate.dmi and b/icons/obj/closets/decals/crate.dmi differ
diff --git a/icons/obj/closets/decals/large_crate.dmi b/icons/obj/closets/decals/large_crate.dmi
index 4ced8d4f28a0..487657026599 100644
Binary files a/icons/obj/closets/decals/large_crate.dmi and b/icons/obj/closets/decals/large_crate.dmi differ
diff --git a/icons/obj/closets/decals/wall.dmi b/icons/obj/closets/decals/wall.dmi
index 8e5edd8148f5..b9b207407e87 100644
Binary files a/icons/obj/closets/decals/wall.dmi and b/icons/obj/closets/decals/wall.dmi differ
diff --git a/icons/obj/doors/centcomm/door.dmi b/icons/obj/doors/centcomm/door.dmi
new file mode 100644
index 000000000000..49f386ff3805
Binary files /dev/null and b/icons/obj/doors/centcomm/door.dmi differ
diff --git a/icons/obj/doors/centcomm/fill_steel.dmi b/icons/obj/doors/centcomm/fill_steel.dmi
new file mode 100644
index 000000000000..275b29a785a0
Binary files /dev/null and b/icons/obj/doors/centcomm/fill_steel.dmi differ
diff --git a/icons/obj/doors/double/color.dmi b/icons/obj/doors/double/color.dmi
new file mode 100644
index 000000000000..4981fc95e616
Binary files /dev/null and b/icons/obj/doors/double/color.dmi differ
diff --git a/icons/obj/doors/double/door.dmi b/icons/obj/doors/double/door.dmi
new file mode 100644
index 000000000000..7aec3b074f54
Binary files /dev/null and b/icons/obj/doors/double/door.dmi differ
diff --git a/icons/obj/doors/double/emag.dmi b/icons/obj/doors/double/emag.dmi
new file mode 100644
index 000000000000..ef65451a187c
Binary files /dev/null and b/icons/obj/doors/double/emag.dmi differ
diff --git a/icons/obj/doors/double/fill_color.dmi b/icons/obj/doors/double/fill_color.dmi
new file mode 100644
index 000000000000..d79f005dba8b
Binary files /dev/null and b/icons/obj/doors/double/fill_color.dmi differ
diff --git a/icons/obj/doors/double/fill_glass.dmi b/icons/obj/doors/double/fill_glass.dmi
new file mode 100644
index 000000000000..c0885e342cc5
Binary files /dev/null and b/icons/obj/doors/double/fill_glass.dmi differ
diff --git a/icons/obj/doors/double/fill_steel.dmi b/icons/obj/doors/double/fill_steel.dmi
new file mode 100644
index 000000000000..085ba6cc2769
Binary files /dev/null and b/icons/obj/doors/double/fill_steel.dmi differ
diff --git a/icons/obj/doors/double/fill_stripe.dmi b/icons/obj/doors/double/fill_stripe.dmi
new file mode 100644
index 000000000000..1341460eb94e
Binary files /dev/null and b/icons/obj/doors/double/fill_stripe.dmi differ
diff --git a/icons/obj/doors/double/lights_bolts.dmi b/icons/obj/doors/double/lights_bolts.dmi
new file mode 100644
index 000000000000..2446574687db
Binary files /dev/null and b/icons/obj/doors/double/lights_bolts.dmi differ
diff --git a/icons/obj/doors/double/lights_deny.dmi b/icons/obj/doors/double/lights_deny.dmi
new file mode 100644
index 000000000000..46a615d62009
Binary files /dev/null and b/icons/obj/doors/double/lights_deny.dmi differ
diff --git a/icons/obj/doors/double/lights_green.dmi b/icons/obj/doors/double/lights_green.dmi
new file mode 100644
index 000000000000..aa398415790a
Binary files /dev/null and b/icons/obj/doors/double/lights_green.dmi differ
diff --git a/icons/obj/doors/double/panel.dmi b/icons/obj/doors/double/panel.dmi
new file mode 100644
index 000000000000..1a5cd5f9b2ba
Binary files /dev/null and b/icons/obj/doors/double/panel.dmi differ
diff --git a/icons/obj/doors/double/stripe.dmi b/icons/obj/doors/double/stripe.dmi
new file mode 100644
index 000000000000..1867a15dea65
Binary files /dev/null and b/icons/obj/doors/double/stripe.dmi differ
diff --git a/icons/obj/doors/double/welded.dmi b/icons/obj/doors/double/welded.dmi
new file mode 100644
index 000000000000..78b40ad64d35
Binary files /dev/null and b/icons/obj/doors/double/welded.dmi differ
diff --git a/icons/obj/doors/elevator/door.dmi b/icons/obj/doors/elevator/door.dmi
new file mode 100644
index 000000000000..3cfbc002d33a
Binary files /dev/null and b/icons/obj/doors/elevator/door.dmi differ
diff --git a/icons/obj/doors/elevator/fill_glass.dmi b/icons/obj/doors/elevator/fill_glass.dmi
new file mode 100644
index 000000000000..97506255faa9
Binary files /dev/null and b/icons/obj/doors/elevator/fill_glass.dmi differ
diff --git a/icons/obj/doors/elevator/fill_steel.dmi b/icons/obj/doors/elevator/fill_steel.dmi
new file mode 100644
index 000000000000..2dcb67dce969
Binary files /dev/null and b/icons/obj/doors/elevator/fill_steel.dmi differ
diff --git a/icons/obj/doors/elevator/lights_bolts.dmi b/icons/obj/doors/elevator/lights_bolts.dmi
new file mode 100644
index 000000000000..682eecd4e9d6
Binary files /dev/null and b/icons/obj/doors/elevator/lights_bolts.dmi differ
diff --git a/icons/obj/doors/elevator/lights_deny.dmi b/icons/obj/doors/elevator/lights_deny.dmi
new file mode 100644
index 000000000000..bd9471fd4dcd
Binary files /dev/null and b/icons/obj/doors/elevator/lights_deny.dmi differ
diff --git a/icons/obj/doors/elevator/lights_green.dmi b/icons/obj/doors/elevator/lights_green.dmi
new file mode 100644
index 000000000000..faafc7836a07
Binary files /dev/null and b/icons/obj/doors/elevator/lights_green.dmi differ
diff --git a/icons/obj/doors/external/color.dmi b/icons/obj/doors/external/color.dmi
new file mode 100644
index 000000000000..7e3a25c72069
Binary files /dev/null and b/icons/obj/doors/external/color.dmi differ
diff --git a/icons/obj/doors/external/door.dmi b/icons/obj/doors/external/door.dmi
new file mode 100644
index 000000000000..2b861d13db81
Binary files /dev/null and b/icons/obj/doors/external/door.dmi differ
diff --git a/icons/obj/doors/external/emag.dmi b/icons/obj/doors/external/emag.dmi
new file mode 100644
index 000000000000..ace966c362d3
Binary files /dev/null and b/icons/obj/doors/external/emag.dmi differ
diff --git a/icons/obj/doors/external/fill_color.dmi b/icons/obj/doors/external/fill_color.dmi
new file mode 100644
index 000000000000..9af85cbde677
Binary files /dev/null and b/icons/obj/doors/external/fill_color.dmi differ
diff --git a/icons/obj/doors/external/fill_glass.dmi b/icons/obj/doors/external/fill_glass.dmi
new file mode 100644
index 000000000000..b0a4dbf860d4
Binary files /dev/null and b/icons/obj/doors/external/fill_glass.dmi differ
diff --git a/icons/obj/doors/external/fill_steel.dmi b/icons/obj/doors/external/fill_steel.dmi
new file mode 100644
index 000000000000..b0f7327dfb60
Binary files /dev/null and b/icons/obj/doors/external/fill_steel.dmi differ
diff --git a/icons/obj/doors/external/lights_bolts.dmi b/icons/obj/doors/external/lights_bolts.dmi
new file mode 100644
index 000000000000..3b0afea50812
Binary files /dev/null and b/icons/obj/doors/external/lights_bolts.dmi differ
diff --git a/icons/obj/doors/external/lights_deny.dmi b/icons/obj/doors/external/lights_deny.dmi
new file mode 100644
index 000000000000..38c652d9f69c
Binary files /dev/null and b/icons/obj/doors/external/lights_deny.dmi differ
diff --git a/icons/obj/doors/external/lights_green.dmi b/icons/obj/doors/external/lights_green.dmi
new file mode 100644
index 000000000000..b296a0925def
Binary files /dev/null and b/icons/obj/doors/external/lights_green.dmi differ
diff --git a/icons/obj/doors/hatch/door.dmi b/icons/obj/doors/hatch/door.dmi
new file mode 100644
index 000000000000..8e354cf3954d
Binary files /dev/null and b/icons/obj/doors/hatch/door.dmi differ
diff --git a/icons/obj/doors/hatch/emag.dmi b/icons/obj/doors/hatch/emag.dmi
new file mode 100644
index 000000000000..4fd7e141b3cc
Binary files /dev/null and b/icons/obj/doors/hatch/emag.dmi differ
diff --git a/icons/obj/doors/hatch/fill_steel.dmi b/icons/obj/doors/hatch/fill_steel.dmi
new file mode 100644
index 000000000000..88130eb05116
Binary files /dev/null and b/icons/obj/doors/hatch/fill_steel.dmi differ
diff --git a/icons/obj/doors/hatch/fill_stripe.dmi b/icons/obj/doors/hatch/fill_stripe.dmi
new file mode 100644
index 000000000000..7532ae2edfb8
Binary files /dev/null and b/icons/obj/doors/hatch/fill_stripe.dmi differ
diff --git a/icons/obj/doors/hatch/lights_bolts.dmi b/icons/obj/doors/hatch/lights_bolts.dmi
new file mode 100644
index 000000000000..1a17f01ca63a
Binary files /dev/null and b/icons/obj/doors/hatch/lights_bolts.dmi differ
diff --git a/icons/obj/doors/hatch/lights_deny.dmi b/icons/obj/doors/hatch/lights_deny.dmi
new file mode 100644
index 000000000000..1fe72d724f95
Binary files /dev/null and b/icons/obj/doors/hatch/lights_deny.dmi differ
diff --git a/icons/obj/doors/hatch/lights_green.dmi b/icons/obj/doors/hatch/lights_green.dmi
new file mode 100644
index 000000000000..508982d2d892
Binary files /dev/null and b/icons/obj/doors/hatch/lights_green.dmi differ
diff --git a/icons/obj/doors/hatch/panel.dmi b/icons/obj/doors/hatch/panel.dmi
new file mode 100644
index 000000000000..c204955aaaf0
Binary files /dev/null and b/icons/obj/doors/hatch/panel.dmi differ
diff --git a/icons/obj/doors/hatch/stripe.dmi b/icons/obj/doors/hatch/stripe.dmi
new file mode 100644
index 000000000000..859e9c374726
Binary files /dev/null and b/icons/obj/doors/hatch/stripe.dmi differ
diff --git a/icons/obj/doors/hatch/welded.dmi b/icons/obj/doors/hatch/welded.dmi
new file mode 100644
index 000000000000..a0a5f363442f
Binary files /dev/null and b/icons/obj/doors/hatch/welded.dmi differ
diff --git a/icons/obj/doors/hazard/door.dmi b/icons/obj/doors/hazard/door.dmi
new file mode 100644
index 000000000000..ed56c6ab18eb
Binary files /dev/null and b/icons/obj/doors/hazard/door.dmi differ
diff --git a/icons/obj/doors/hazard/door_border.dmi b/icons/obj/doors/hazard/door_border.dmi
new file mode 100644
index 000000000000..01ff17547a8f
Binary files /dev/null and b/icons/obj/doors/hazard/door_border.dmi differ
diff --git a/icons/obj/doors/hazard/panel.dmi b/icons/obj/doors/hazard/panel.dmi
new file mode 100644
index 000000000000..b9826327859d
Binary files /dev/null and b/icons/obj/doors/hazard/panel.dmi differ
diff --git a/icons/obj/doors/hazard/welded.dmi b/icons/obj/doors/hazard/welded.dmi
new file mode 100644
index 000000000000..7293d4144cca
Binary files /dev/null and b/icons/obj/doors/hazard/welded.dmi differ
diff --git a/icons/obj/doors/hazard/welded_border.dmi b/icons/obj/doors/hazard/welded_border.dmi
new file mode 100644
index 000000000000..4774fcd7d974
Binary files /dev/null and b/icons/obj/doors/hazard/welded_border.dmi differ
diff --git a/icons/obj/doors/rapid_pdoor.dmi b/icons/obj/doors/rapid_pdoor.dmi
index 01ab429f3222..3934a616da35 100644
Binary files a/icons/obj/doors/rapid_pdoor.dmi and b/icons/obj/doors/rapid_pdoor.dmi differ
diff --git a/icons/obj/doors/secure/door.dmi b/icons/obj/doors/secure/door.dmi
new file mode 100644
index 000000000000..0f8ca68dd2de
Binary files /dev/null and b/icons/obj/doors/secure/door.dmi differ
diff --git a/icons/obj/doors/secure/fill_steel.dmi b/icons/obj/doors/secure/fill_steel.dmi
new file mode 100644
index 000000000000..dcb42c609aba
Binary files /dev/null and b/icons/obj/doors/secure/fill_steel.dmi differ
diff --git a/icons/obj/doors/station/color.dmi b/icons/obj/doors/station/color.dmi
new file mode 100644
index 000000000000..09e824124eaa
Binary files /dev/null and b/icons/obj/doors/station/color.dmi differ
diff --git a/icons/obj/doors/station/door.dmi b/icons/obj/doors/station/door.dmi
new file mode 100644
index 000000000000..13740f961106
Binary files /dev/null and b/icons/obj/doors/station/door.dmi differ
diff --git a/icons/obj/doors/station/emag.dmi b/icons/obj/doors/station/emag.dmi
new file mode 100644
index 000000000000..90947fe3d045
Binary files /dev/null and b/icons/obj/doors/station/emag.dmi differ
diff --git a/icons/obj/doors/station/fill_color.dmi b/icons/obj/doors/station/fill_color.dmi
new file mode 100644
index 000000000000..969a399c83e0
Binary files /dev/null and b/icons/obj/doors/station/fill_color.dmi differ
diff --git a/icons/obj/doors/station/fill_glass.dmi b/icons/obj/doors/station/fill_glass.dmi
new file mode 100644
index 000000000000..47cf423b5f69
Binary files /dev/null and b/icons/obj/doors/station/fill_glass.dmi differ
diff --git a/icons/obj/doors/station/fill_steel.dmi b/icons/obj/doors/station/fill_steel.dmi
new file mode 100644
index 000000000000..f228b2d951f2
Binary files /dev/null and b/icons/obj/doors/station/fill_steel.dmi differ
diff --git a/icons/obj/doors/station/fill_stripe.dmi b/icons/obj/doors/station/fill_stripe.dmi
new file mode 100644
index 000000000000..63906a766b84
Binary files /dev/null and b/icons/obj/doors/station/fill_stripe.dmi differ
diff --git a/icons/obj/doors/station/lights_bolts.dmi b/icons/obj/doors/station/lights_bolts.dmi
new file mode 100644
index 000000000000..b8151373f238
Binary files /dev/null and b/icons/obj/doors/station/lights_bolts.dmi differ
diff --git a/icons/obj/doors/station/lights_deny.dmi b/icons/obj/doors/station/lights_deny.dmi
new file mode 100644
index 000000000000..fff1fd844594
Binary files /dev/null and b/icons/obj/doors/station/lights_deny.dmi differ
diff --git a/icons/obj/doors/station/lights_green.dmi b/icons/obj/doors/station/lights_green.dmi
new file mode 100644
index 000000000000..7ca2ce390686
Binary files /dev/null and b/icons/obj/doors/station/lights_green.dmi differ
diff --git a/icons/obj/doors/station/panel.dmi b/icons/obj/doors/station/panel.dmi
new file mode 100644
index 000000000000..08685c08d4a5
Binary files /dev/null and b/icons/obj/doors/station/panel.dmi differ
diff --git a/icons/obj/doors/station/sparks_broken.dmi b/icons/obj/doors/station/sparks_broken.dmi
new file mode 100644
index 000000000000..06ad95ef51d4
Binary files /dev/null and b/icons/obj/doors/station/sparks_broken.dmi differ
diff --git a/icons/obj/doors/station/sparks_damaged.dmi b/icons/obj/doors/station/sparks_damaged.dmi
new file mode 100644
index 000000000000..64c6f96f55d7
Binary files /dev/null and b/icons/obj/doors/station/sparks_damaged.dmi differ
diff --git a/icons/obj/doors/station/stripe.dmi b/icons/obj/doors/station/stripe.dmi
new file mode 100644
index 000000000000..8b5a90fa1628
Binary files /dev/null and b/icons/obj/doors/station/stripe.dmi differ
diff --git a/icons/obj/doors/station/welded.dmi b/icons/obj/doors/station/welded.dmi
new file mode 100644
index 000000000000..e79421af0c20
Binary files /dev/null and b/icons/obj/doors/station/welded.dmi differ
diff --git a/icons/obj/doors/vault/door.dmi b/icons/obj/doors/vault/door.dmi
new file mode 100644
index 000000000000..ee9e28036568
Binary files /dev/null and b/icons/obj/doors/vault/door.dmi differ
diff --git a/icons/obj/doors/vault/fill_steel.dmi b/icons/obj/doors/vault/fill_steel.dmi
new file mode 100644
index 000000000000..dcb42c609aba
Binary files /dev/null and b/icons/obj/doors/vault/fill_steel.dmi differ
diff --git a/icons/obj/firealarm.dmi b/icons/obj/firealarm.dmi
new file mode 100644
index 000000000000..26d4f3a9749d
Binary files /dev/null and b/icons/obj/firealarm.dmi differ
diff --git a/icons/obj/guncabinet.dmi b/icons/obj/guncabinet.dmi
index 49d7db0840d2..70fdb3ef190e 100644
Binary files a/icons/obj/guncabinet.dmi and b/icons/obj/guncabinet.dmi differ
diff --git a/icons/obj/intercom.dmi b/icons/obj/intercom.dmi
new file mode 100644
index 000000000000..5910a3cf361a
Binary files /dev/null and b/icons/obj/intercom.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index a49e964ffe09..6f347198ab10 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/lighting_vr.dmi b/icons/obj/lighting_vr.dmi
index 3efeac77841a..18eab420f386 100644
Binary files a/icons/obj/lighting_vr.dmi and b/icons/obj/lighting_vr.dmi differ
diff --git a/icons/obj/machines/timeclock_vr.dmi b/icons/obj/machines/timeclock_vr.dmi
index 164cd291234c..407e4e64362c 100644
Binary files a/icons/obj/machines/timeclock_vr.dmi and b/icons/obj/machines/timeclock_vr.dmi differ
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
index 268fa41af95f..2ae9e5a33811 100644
Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ
diff --git a/icons/obj/structures/grille.dmi b/icons/obj/structures/grille.dmi
index 6ae97766773c..33d63084ecda 100644
Binary files a/icons/obj/structures/grille.dmi and b/icons/obj/structures/grille.dmi differ
diff --git a/icons/obj/structures/low_wall.dmi b/icons/obj/structures/low_wall.dmi
new file mode 100644
index 000000000000..bf468aa66990
Binary files /dev/null and b/icons/obj/structures/low_wall.dmi differ
diff --git a/icons/obj/structures/window.dmi b/icons/obj/structures/window.dmi
new file mode 100644
index 000000000000..10553b3a17b6
Binary files /dev/null and b/icons/obj/structures/window.dmi differ
diff --git a/icons/obj/structures/window_reinforced.dmi b/icons/obj/structures/window_reinforced.dmi
new file mode 100644
index 000000000000..26824d02da5c
Binary files /dev/null and b/icons/obj/structures/window_reinforced.dmi differ
diff --git a/icons/obj/structures/wingrille_spawner.dmi b/icons/obj/structures/wingrille_spawner.dmi
new file mode 100644
index 000000000000..e6a6d8854f46
Binary files /dev/null and b/icons/obj/structures/wingrille_spawner.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index fa155e491736..278114c10f78 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/walls/_previews.dmi b/icons/turf/walls/_previews.dmi
index 56d2cdf74798..ae1ae4c51c8f 100644
Binary files a/icons/turf/walls/_previews.dmi and b/icons/turf/walls/_previews.dmi differ
diff --git a/icons/turf/walls/cult_wall.dmi b/icons/turf/walls/cult_wall.dmi
new file mode 100644
index 000000000000..14051316c531
Binary files /dev/null and b/icons/turf/walls/cult_wall.dmi differ
diff --git a/icons/turf/walls/decon_states.dmi b/icons/turf/walls/decon_states.dmi
new file mode 100644
index 000000000000..76c19f05d8b9
Binary files /dev/null and b/icons/turf/walls/decon_states.dmi differ
diff --git a/icons/turf/walls/metal_wall.dmi b/icons/turf/walls/metal_wall.dmi
new file mode 100644
index 000000000000..2ce2964513d3
Binary files /dev/null and b/icons/turf/walls/metal_wall.dmi differ
diff --git a/icons/turf/walls/natural.dmi b/icons/turf/walls/natural.dmi
new file mode 100644
index 000000000000..6d0e23b1659e
Binary files /dev/null and b/icons/turf/walls/natural.dmi differ
diff --git a/icons/turf/walls/neighbor_stripe.dmi b/icons/turf/walls/neighbor_stripe.dmi
new file mode 100644
index 000000000000..45a8e0e4179a
Binary files /dev/null and b/icons/turf/walls/neighbor_stripe.dmi differ
diff --git a/icons/turf/walls/plastic.dmi b/icons/turf/walls/plastic.dmi
new file mode 100644
index 000000000000..6ced8e4a53b0
Binary files /dev/null and b/icons/turf/walls/plastic.dmi differ
diff --git a/icons/turf/walls/reinforced.dmi b/icons/turf/walls/reinforced.dmi
new file mode 100644
index 000000000000..efb7a0da513a
Binary files /dev/null and b/icons/turf/walls/reinforced.dmi differ
diff --git a/icons/turf/walls/solid_wall.dmi b/icons/turf/walls/solid_wall.dmi
new file mode 100644
index 000000000000..cb68120cc269
Binary files /dev/null and b/icons/turf/walls/solid_wall.dmi differ
diff --git a/icons/turf/walls/solid_wall_reinforced.dmi b/icons/turf/walls/solid_wall_reinforced.dmi
new file mode 100644
index 000000000000..d92d558c3bdd
Binary files /dev/null and b/icons/turf/walls/solid_wall_reinforced.dmi differ
diff --git a/icons/turf/walls/stone_wall.dmi b/icons/turf/walls/stone_wall.dmi
new file mode 100644
index 000000000000..5e2e4da98c1c
Binary files /dev/null and b/icons/turf/walls/stone_wall.dmi differ
diff --git a/icons/turf/walls/stripes.dmi b/icons/turf/walls/stripes.dmi
new file mode 100644
index 000000000000..afef19a7e882
Binary files /dev/null and b/icons/turf/walls/stripes.dmi differ
diff --git a/icons/turf/walls/wall_stripe.dmi b/icons/turf/walls/wall_stripe.dmi
new file mode 100644
index 000000000000..6f0407b112ce
Binary files /dev/null and b/icons/turf/walls/wall_stripe.dmi differ
diff --git a/icons/turf/walls/wood_wall.dmi b/icons/turf/walls/wood_wall.dmi
new file mode 100644
index 000000000000..c72f87d282c8
Binary files /dev/null and b/icons/turf/walls/wood_wall.dmi differ
diff --git a/icons/turf/walls/wood_wall_stripe.dmi b/icons/turf/walls/wood_wall_stripe.dmi
new file mode 100644
index 000000000000..e539322de7cf
Binary files /dev/null and b/icons/turf/walls/wood_wall_stripe.dmi differ
diff --git a/maps/away_missions/140x140/zoo.dmm b/maps/away_missions/140x140/zoo.dmm
index 10423e9c698a..6bb737ee1231 100644
--- a/maps/away_missions/140x140/zoo.dmm
+++ b/maps/away_missions/140x140/zoo.dmm
@@ -1018,7 +1018,7 @@
/turf/simulated/shuttle/floor/black,
/area/awaymission/zoo/tradeship)
"de" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(160)
},
@@ -1937,7 +1937,7 @@
/turf/simulated/shuttle/floor/black,
/area/awaymission/zoo/tradeship)
"fO" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(160)
},
@@ -8346,7 +8346,7 @@
/turf/simulated/floor/tiled/dark,
/area/awaymission/zoo)
"wq" = (
-/obj/machinery/door/airlock/glass_medical,
+/obj/machinery/door/airlock/glass/medical,
/turf/simulated/floor/tiled/white,
/area/awaymission/zoo)
"wr" = (
diff --git a/maps/away_missions/archive/stationCollision.dmm b/maps/away_missions/archive/stationCollision.dmm
index 8fafad289aeb..c601894b97ce 100644
--- a/maps/away_missions/archive/stationCollision.dmm
+++ b/maps/away_missions/archive/stationCollision.dmm
@@ -2055,7 +2055,7 @@
/turf/simulated/floor/airless,
/area/awaymission/arrivalblock)
"if" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Glass Airlock"
},
/obj/structure/cable{
@@ -2433,7 +2433,7 @@
/turf/simulated/floor,
/area/awaymission/southblock)
"jw" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
id_tag = null;
name = "Glass Airlock"
},
diff --git a/maps/away_missions/archive/zresearchlabs.dmm b/maps/away_missions/archive/zresearchlabs.dmm
index 1429223ff17a..f837759dd81f 100644
--- a/maps/away_missions/archive/zresearchlabs.dmm
+++ b/maps/away_missions/archive/zresearchlabs.dmm
@@ -623,7 +623,7 @@
},
/area/awaymission/labs/researchdivision)
"cv" = (
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/turf/simulated/floor{
dir = 5
},
@@ -932,7 +932,7 @@
/turf/simulated/floor,
/area/awaymission/labs/researchdivision)
"dn" = (
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/turf/simulated/floor{
icon_state = "white"
},
@@ -1611,7 +1611,7 @@
},
/area/awaymission/labs/researchdivision)
"fj" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical"
},
/turf/simulated/floor{
@@ -1952,7 +1952,7 @@
/turf/simulated/floor,
/area/awaymission/labs/gateway)
"gb" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Storage"
},
/obj/structure/cable{
@@ -2051,7 +2051,7 @@
/turf/simulated/wall/r_wall,
/area/awaymission/labs/militarydivision)
"gm" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Armory Door"
},
/obj/effect/debris/cleanable/blood,
@@ -2071,7 +2071,7 @@
/turf/simulated/floor,
/area/awaymission/labs/gateway)
"gp" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Observation"
},
/obj/structure/cable{
@@ -2080,7 +2080,7 @@
/turf/simulated/floor,
/area/awaymission/labs/gateway)
"gq" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Experimental Weapons Range"
},
/turf/simulated/floor{
@@ -2471,7 +2471,7 @@
},
/area/awaymission/labs/researchdivision)
"hv" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Development Labs"
},
/turf/simulated/floor{
@@ -2533,7 +2533,7 @@
/turf/simulated/wall/r_wall,
/area/awaymission/labs/militarydivision)
"hD" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Briefing Room"
},
/turf/simulated/floor,
@@ -2782,7 +2782,7 @@
/turf/simulated/floor,
/area/awaymission/labs/researchdivision)
"il" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Cargo and Storage"
},
/turf/simulated/floor,
@@ -3384,7 +3384,7 @@
/turf/space,
/area/awaymission/labs/researchdivision)
"jW" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Thermal Suit Storage"
},
/turf/simulated/floor,
@@ -3475,7 +3475,7 @@
/turf/simulated/floor/plating,
/area/awaymission/labs/solars)
"kk" = (
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/turf/simulated/floor,
/area/awaymission/labs/militarydivision)
"kl" = (
@@ -5107,7 +5107,7 @@
/turf/simulated/floor,
/area/awaymission/labs/command)
"ot" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay"
},
/turf/simulated/floor,
@@ -5231,7 +5231,7 @@
/turf/simulated/floor,
/area/awaymission/labs/cargo)
"oN" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Excavation"
},
/obj/structure/cable{
@@ -5309,7 +5309,7 @@
/turf/simulated/floor,
/area/awaymission/labs/command)
"oW" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Bridge"
},
/obj/structure/cable{
@@ -5351,7 +5351,7 @@
/turf/simulated/floor,
/area/awaymission/labs/command)
"pb" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Bridge"
},
/turf/simulated/floor,
@@ -6541,13 +6541,13 @@
},
/area/awaymission/labs/medical)
"sO" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security"
},
/turf/simulated/floor,
/area/awaymission/labs/command)
"sP" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security"
},
/turf/simulated/floor,
@@ -6557,7 +6557,7 @@
/turf/simulated/floor,
/area/awaymission/labs/security)
"sS" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical"
},
/turf/simulated/floor{
@@ -6565,7 +6565,7 @@
},
/area/awaymission/labs/medical)
"sT" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical"
},
/turf/simulated/floor{
@@ -6618,7 +6618,7 @@
},
/area/awaymission/labs/medical)
"tc" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical"
},
/obj/structure/cable{
@@ -6638,7 +6638,7 @@
},
/area/awaymission/labs/medical)
"te" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical"
},
/obj/structure/cable{
@@ -6968,7 +6968,7 @@
/turf/simulated/wall/r_wall,
/area/awaymission/labs/security)
"ub" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Warden's Office"
},
/turf/simulated/floor,
@@ -6983,7 +6983,7 @@
/turf/simulated/floor,
/area/awaymission/labs/security)
"ue" = (
-/obj/machinery/door/airlock/glass_security,
+/obj/machinery/door/airlock/glass/security,
/turf/simulated/floor,
/area/awaymission/labs/security)
"uf" = (
@@ -7191,7 +7191,7 @@
},
/area/awaymission/labs/security)
"uJ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Armory"
},
/turf/simulated/floor,
diff --git a/maps/euthenia/levels/deck1.dmm b/maps/euthenia/levels/deck1.dmm
index 02d4b3f20437..8d6dde8ba541 100644
--- a/maps/euthenia/levels/deck1.dmm
+++ b/maps/euthenia/levels/deck1.dmm
@@ -733,7 +733,7 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/kitchen)
"ayH" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -818,7 +818,7 @@
/turf/simulated/floor/tiled/monotile,
/area/security/security_lockerroom)
"aBB" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/corner/paleblue{
@@ -1230,7 +1230,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -1312,7 +1312,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_8)
"aTo" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/cable/green{
@@ -2938,7 +2938,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -3871,7 +3871,7 @@
"cBF" = (
/obj/structure/table/marble,
/obj/item/storage/box/wings,
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters{
dir = 4;
id = "bar";
@@ -4533,7 +4533,7 @@
/turf/simulated/floor/tiled,
/area/space)
"ddk" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable/green{
@@ -5346,7 +5346,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/reception)
"dRj" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
@@ -6104,7 +6104,7 @@
/turf/simulated/floor/tiled/red,
/area/space)
"esx" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/airlock/glass,
@@ -6423,7 +6423,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/dark,
@@ -6546,7 +6546,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/space)
"eGe" = (
@@ -6826,7 +6826,7 @@
/turf/simulated/floor/tiled,
/area/space)
"ePH" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
id_tag = "MedbayEmergency";
name = "Medbay Emergency Access"
},
@@ -6966,7 +6966,7 @@
req_access = list(25);
req_one_access = list(25)
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/dark,
@@ -7024,7 +7024,7 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/iaa/officeb)
"eVN" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/techmaint,
@@ -7883,7 +7883,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/space)
"fDi" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medbay Reception";
req_access = list(5)
},
@@ -8126,7 +8126,7 @@
/turf/simulated/floor/carpet/bcarpet,
/area/space)
"fKr" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/wood,
@@ -8169,7 +8169,7 @@
/obj/machinery/alarm{
pixel_y = 30
},
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Locker Room";
req_one_access = list(2)
},
@@ -8383,7 +8383,7 @@
/turf/simulated/floor/plating,
/area/maintenance/deck_one/aft/port)
"fUI" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,47,77)
},
@@ -9143,7 +9143,7 @@
/turf/simulated/wall/rshull,
/area/space)
"gts" = (
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tag = "detdoor";
id_tint = "det_office";
name = "Detective's Office";
@@ -9216,7 +9216,7 @@
/area/security/detectives_office)
"gxe" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Locker Room";
req_one_access = list(2)
},
@@ -9362,7 +9362,7 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/iaa/officeb)
"gBi" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -9791,7 +9791,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/deck_one/forward/port)
"gQs" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Paramedic Storage"
},
/turf/simulated/floor/tiled,
@@ -10872,7 +10872,7 @@
/turf/simulated/floor/tiled/dark,
/area/security/tactical)
"hMl" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/steel_ridged,
/area/space)
"hMN" = (
@@ -11378,7 +11378,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay)
"ifZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11839,7 +11839,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/dark,
@@ -11942,7 +11942,7 @@
name = "Security Blast Doors";
opacity = 0
},
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "BrigFoyer";
layer = 2.8;
name = "Security";
@@ -12029,7 +12029,7 @@
/turf/simulated/floor/tiled/red,
/area/tether/surfacebase/security/hallway)
"iAt" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Locker Room";
req_one_access = list(2)
},
@@ -12438,7 +12438,7 @@
/area/maintenance/security/upper)
"iOE" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Locker Room";
req_one_access = list(2)
},
@@ -12638,7 +12638,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/wood,
@@ -12658,7 +12658,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_3)
"iXz" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/dark,
@@ -12976,7 +12976,7 @@
/obj/effect/floor_decal/industrial/danger{
dir = 8
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,47,77)
},
@@ -13033,7 +13033,7 @@
/turf/simulated/floor/tiled/dark,
/area/security/warden)
"jkM" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/steel_ridged,
/area/hallway/primary/fore)
"jkT" = (
@@ -13859,7 +13859,7 @@
"jXY" = (
/obj/structure/railing,
/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
@@ -15671,7 +15671,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_9)
"ljM" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/newscaster{
@@ -15864,7 +15864,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
@@ -16478,7 +16478,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_7)
"lTa" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -16528,7 +16528,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/space)
"lVO" = (
@@ -16612,7 +16612,7 @@
/turf/simulated/floor/tiled,
/area/medical/surgery2)
"lZV" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Paramedic Storage"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -16682,7 +16682,7 @@
/turf/simulated/floor/plating,
/area/tether/surfacebase/surface_three_hall)
"mfW" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -17131,7 +17131,7 @@
/turf/simulated/floor/tiled,
/area/hallway/primary/fore)
"mzv" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
id_tag = "MedbayFoyer";
name = "Treatment Center"
},
@@ -17235,7 +17235,7 @@
/turf/simulated/floor/tiled,
/area/medical/reception)
"mDY" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Locker Room";
req_one_access = list(2)
},
@@ -17330,7 +17330,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -18574,7 +18574,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_10)
"nxQ" = (
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tag = "detdoor";
id_tint = "det_office";
name = "Detective's Office";
@@ -19183,7 +19183,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/wood,
@@ -19668,7 +19668,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Chemistry";
req_one_access = list(33)
},
@@ -20117,7 +20117,7 @@
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/sleep/Dorm_1)
"oLZ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Light Armory";
req_access = list(3)
},
@@ -20528,7 +20528,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_9)
"paw" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/steel_ridged,
/area/tether/surfacebase/security/lobby)
"paS" = (
@@ -21473,7 +21473,7 @@
/turf/simulated/floor/plating,
/area/vacant/vacant_office)
"pTR" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Briefing Room";
req_access = list();
req_one_access = list(1,38)
@@ -21603,7 +21603,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_2)
"pYI" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Observation";
req_access = list(2)
},
@@ -21689,7 +21689,7 @@
/area/crew_quarters/sleep/Dorm_8)
"qcS" = (
/obj/effect/floor_decal/spline/fancy/wood,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/wood,
@@ -22334,7 +22334,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/space)
"qGG" = (
@@ -22407,7 +22407,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/chemistry)
"qIk" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
@@ -22931,7 +22931,7 @@
/turf/simulated/wall,
/area/crew_quarters/sleep/Dorm_9)
"rin" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -23156,7 +23156,7 @@
/turf/simulated/floor/plating,
/area/space)
"rrM" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
id_tag = "MedbayFoyer";
name = "Treatment Center"
},
@@ -23299,7 +23299,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/wood,
@@ -24158,7 +24158,7 @@
name = "Security Blast Doors";
opacity = 0
},
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "BrigFoyer";
layer = 2.8;
name = "Security";
@@ -24706,7 +24706,7 @@
/area/shuttle/escape)
"sAI" = (
/obj/effect/floor_decal/techfloor,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -24865,7 +24865,7 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -25031,7 +25031,7 @@
/area/security/warden)
"sQW" = (
/obj/structure/catwalk,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/airlock/maintenance/common,
@@ -25061,7 +25061,7 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/outfitting/storage)
"sRV" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Forensics Lab";
req_access = list(4)
@@ -26958,11 +26958,6 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/security/hallway)
-"uoY" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/obj/machinery/door/airlock/glass,
-/turf/simulated/floor/tiled/steel_ridged,
-/area/hallway/primary/fore)
"upV" = (
/obj/machinery/recharge_station,
/obj/machinery/light/no_nightshift,
@@ -27023,7 +27018,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
@@ -29074,7 +29069,7 @@
/turf/simulated/floor/carpet/purcarpet,
/area/crew_quarters/bar)
"vPC" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/window/westright{
name = "Bar";
req_access = list(25);
@@ -29380,7 +29375,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/rnd/research/researchdivision)
"vYK" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Warden's Office";
req_access = list(3)
},
@@ -29656,7 +29651,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay)
"wlh" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,47,77)
},
@@ -29665,7 +29660,7 @@
/area/rnd/xenobiology/xenoflora)
"wlo" = (
/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
@@ -30494,7 +30489,7 @@
req_access = list(25);
req_one_access = list(25)
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/dark,
@@ -32241,7 +32236,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/space)
"ylL" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/corner/paleblue{
dir = 6
},
@@ -51423,9 +51418,9 @@ ubF
ubF
ubF
ohx
-uoY
-uoY
-uoY
+kkI
+kkI
+kkI
qQk
izy
izy
diff --git a/maps/euthenia/levels/deck2.dmm b/maps/euthenia/levels/deck2.dmm
index c55a92e60f52..d1127231fca2 100644
--- a/maps/euthenia/levels/deck2.dmm
+++ b/maps/euthenia/levels/deck2.dmm
@@ -27,7 +27,7 @@
/obj/machinery/atmospherics/component/binary/pump,
/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/industrial/danger,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/atmos)
"abI" = (
@@ -141,7 +141,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/engine_smes)
"agd" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -435,7 +435,7 @@
/turf/simulated/floor/reinforced,
/area/space)
"aoM" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass,
/turf/simulated/floor/tiled/steel_ridged,
/area/hallway/primary/central_two)
@@ -933,7 +933,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/turf/simulated/floor/tiled/techmaint,
@@ -1364,14 +1364,14 @@
/turf/simulated/floor/tiled/techmaint,
/area/space)
"aUN" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/airlock/glass,
/turf/simulated/floor/tiled/steel_ridged,
/area/hallway/primary/central_two)
"aUO" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1547,7 +1547,7 @@
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
"baz" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Observation";
req_access = list(2)
},
@@ -1694,13 +1694,13 @@
/turf/simulated/floor/carpet/blucarpet,
/area/crew_quarters/fitness)
"bfJ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/catwalk,
/obj/machinery/door/window/brigdoor/eastleft,
/turf/simulated/floor/plating,
/area/security/brig)
"bfR" = (
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1711,7 +1711,7 @@
/turf/simulated/wall/r_wall,
/area/engineering/atmos/processing)
"bgh" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/techfloor/orange{
@@ -2660,7 +2660,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/engine_smes)
"bZc" = (
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/obj/machinery/door/firedoor/glass,
@@ -2750,7 +2750,7 @@
/turf/simulated/floor/tiled,
/area/rnd/rdoffice)
"cdp" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
@@ -3847,7 +3847,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/barrestroom)
"cUQ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -3906,7 +3906,6 @@
/area/maintenance/atmospheric_substation/medical)
"cXJ" = (
/obj/structure/table/reinforced,
-/obj/item/closet_painter,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/multitool{
pixel_x = 5
@@ -4892,7 +4891,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/space)
"dKj" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/corner/paleblue/border{
@@ -5727,7 +5726,7 @@
/area/space)
"eov" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -6117,7 +6116,7 @@
/turf/simulated/floor/tiled,
/area/space)
"eHb" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/airlock/maintenance/common,
@@ -6292,7 +6291,7 @@
/area/space)
"ePh" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/techfloor/grid,
@@ -6802,13 +6801,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Atmospherics"
},
/turf/simulated/floor/tiled/techmaint,
/area/space)
"fmN" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
@@ -6881,7 +6880,7 @@
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"fpv" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor/orange{
@@ -6978,7 +6977,7 @@
/turf/simulated/floor/plating,
/area/maintenance/substation/civilian)
"ftt" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Warehouse"
},
/obj/machinery/door/firedoor/border_only,
@@ -8043,7 +8042,7 @@
/area/maintenance/deck_two/port)
"gkt" = (
/obj/structure/catwalk,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -8224,7 +8223,7 @@
/turf/simulated/floor/tiled,
/area/crew_quarters/pool/changing_room)
"gtv" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/monotile,
@@ -8671,7 +8670,7 @@
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/central_two)
"gLR" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/techfloor/orange,
/obj/machinery/door/airlock/glass,
/turf/simulated/floor/tiled/steel_ridged,
@@ -8960,7 +8959,7 @@
/turf/simulated/floor/plating,
/area/space)
"hdn" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Robotics Lab";
req_access = list(29,47)
},
@@ -9229,7 +9228,7 @@
/area/engineering/atmos/gas_storage)
"hnb" = (
/obj/structure/catwalk,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9399,7 +9398,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/gas_storage)
"hvD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/airlock/hatch,
@@ -10569,7 +10568,7 @@
/turf/simulated/floor/tiled/dark,
/area/space)
"iwS" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Prep Room"
},
/obj/machinery/door/firedoor/border_only,
@@ -11020,7 +11019,7 @@
/turf/simulated/floor/tiled/steel_dirty,
/area/space)
"iQX" = (
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/hallway)
@@ -12122,7 +12121,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay2)
"jJp" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
req_one_access = list(18,47)
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -12483,7 +12482,7 @@
/turf/simulated/floor/plating,
/area/engineering/atmos)
"jVR" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -12578,7 +12577,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/turf/simulated/floor/tiled/techmaint,
@@ -13615,7 +13614,7 @@
/area/quartermaster/warehouse)
"kOB" = (
/obj/structure/catwalk,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14717,7 +14716,7 @@
/turf/simulated/floor/reinforced/airless,
/area/engineering/atmos)
"lBV" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/component/binary/pump{
@@ -15452,7 +15451,7 @@
/obj/machinery/door/window/brigdoor/westleft{
req_access = list(19)
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/techfloor/grid,
/area/bridge/bunker)
"mbO" = (
@@ -15490,7 +15489,7 @@
"mcA" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/atmos/gas_storage)
"mcO" = (
@@ -16218,7 +16217,7 @@
/turf/simulated/floor/reinforced/airless,
/area/engineering/atmos)
"mIl" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/spline/plain{
dir = 4
},
@@ -16396,7 +16395,7 @@
/obj/effect/floor_decal/industrial/danger{
dir = 8
},
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/atmos)
"mTh" = (
@@ -16439,7 +16438,7 @@
/turf/simulated/floor/tiled/monotile,
/area/rnd/research/researchdivision)
"mUi" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Warehouse"
},
/obj/machinery/door/firedoor/border_only,
@@ -16599,7 +16598,7 @@
/turf/simulated/floor/plating,
/area/maintenance/atmospheric_substation/medical)
"naW" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border{
@@ -16797,7 +16796,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/atmos)
"niM" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border,
@@ -17095,7 +17094,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos/gas_storage)
"nvN" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor/orange{
@@ -17485,7 +17484,7 @@
/turf/simulated/wall,
/area/medical/patient_b)
"nNs" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable/green{
@@ -17557,7 +17556,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/deck_two/aft)
"nRX" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay";
req_access = list(31);
req_one_access = list()
@@ -17570,7 +17569,7 @@
/area/quartermaster/hallway)
"nSV" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/effect/floor_decal/industrial/danger{
dir = 1
},
@@ -18464,7 +18463,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/deck_two/port)
"oDq" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/techfloor/orange,
@@ -18488,7 +18487,7 @@
/area/maintenance/tool_storage)
"oDB" = (
/obj/machinery/door/airlock/maintenance/sec,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -18519,7 +18518,7 @@
/area/rnd/rdoffice)
"oFF" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Reactor Control Room"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18828,7 +18827,7 @@
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
"oSA" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/steel_ridged,
/area/quartermaster/foyer)
"oSU" = (
@@ -19037,7 +19036,7 @@
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/atmos/storage)
"pan" = (
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Atmospherics"
},
/turf/simulated/floor/plating,
@@ -19323,7 +19322,7 @@
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"pjZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/cable{
@@ -20232,7 +20231,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/obj/machinery/door/firedoor/glass,
@@ -20881,7 +20880,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/deck_two/aft)
"qxB" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/spline/plain{
dir = 4
},
@@ -21916,7 +21915,7 @@
/turf/simulated/floor/plating,
/area/rnd/xenobiology/xenoflora_storage)
"rhN" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/catwalk,
@@ -22007,7 +22006,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/xenobiology/xenoflora_storage)
"rlC" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay";
req_access = list(31);
req_one_access = list()
@@ -22160,7 +22159,7 @@
/area/engineering/engine_gas)
"rqk" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/atmos)
"rqm" = (
@@ -22322,7 +22321,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_8)
"rxB" = (
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -22683,7 +22682,7 @@
"rJx" = (
/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/industrial/danger,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/atmos)
"rKv" = (
@@ -23018,7 +23017,7 @@
/turf/simulated/floor/tiled,
/area/space)
"rXS" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/corner/paleblue/border{
@@ -23045,7 +23044,7 @@
/turf/simulated/wall,
/area/medical/patient_d)
"rYY" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable/green{
@@ -23937,7 +23936,7 @@
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/sleep/Dorm_10)
"sNe" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/catwalk,
@@ -24268,7 +24267,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/storage)
"sYm" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -24407,7 +24406,7 @@
/area/engineering/engine_gas)
"tgk" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -24591,7 +24590,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/showers)
"tnK" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -25097,7 +25096,7 @@
/area/engineering/atmos)
"tFq" = (
/obj/machinery/atmospherics/pipe/simple/visible/red,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/engineering/engine_gas)
@@ -25189,7 +25188,7 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/cmo)
"tKe" = (
-/obj/machinery/door/airlock/glass_engineeringatmos,
+/obj/machinery/door/airlock/glass/engineeringatmos,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/engineering/engine_smes)
@@ -25329,7 +25328,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel_ridged,
@@ -25881,7 +25880,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/robotics)
"uoQ" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay";
req_access = list(31);
req_one_access = list()
@@ -25912,7 +25911,7 @@
/turf/simulated/open,
/area/quartermaster/hallway)
"upx" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
@@ -26009,7 +26008,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_9)
"uub" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -26173,7 +26172,7 @@
/area/maintenance/atmospheric_substation/civilian)
"uxJ" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 4
},
@@ -26200,7 +26199,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/space)
"uzi" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/sign/department/ass{
@@ -26334,7 +26333,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/rnd/anomaly_lab)
"uEQ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -26434,7 +26433,7 @@
/turf/simulated/floor/plating,
/area/maintenance/atmospheric_substation/command)
"uIm" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway"
},
/obj/machinery/door/firedoor/glass,
@@ -26564,7 +26563,7 @@
/area/space)
"uNG" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Robotics Lab";
req_access = list(29,47)
},
@@ -26700,7 +26699,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -27220,7 +27219,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_3)
"viD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/techfloor/orange{
@@ -27913,7 +27912,7 @@
"vLN" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay";
req_access = list(31);
req_one_access = list()
@@ -28358,7 +28357,7 @@
"wbi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable{
@@ -28434,7 +28433,7 @@
/area/hallway/primary/central_two)
"wdx" = (
/obj/structure/catwalk,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/window/brigdoor/southright,
@@ -28515,7 +28514,7 @@
/area/engineering/atmos/storage)
"whq" = (
/obj/structure/catwalk,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/window/brigdoor/westright,
@@ -28995,7 +28994,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_8)
"wsH" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/techfloor/orange{
@@ -29245,7 +29244,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/toilet)
"wBB" = (
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/obj/machinery/door/firedoor/glass,
@@ -29442,7 +29441,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/processing)
"wIP" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -29913,7 +29912,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/patient_b)
"xbb" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Observation";
req_access = list(2)
},
@@ -30712,7 +30711,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"xCL" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/component/binary/pump{
@@ -31247,7 +31246,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/gas_storage)
"xUA" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -31446,7 +31445,7 @@
"yeW" = (
/obj/machinery/atmospherics/pipe/simple/visible/green,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/turf/simulated/floor/tiled/techfloor,
/area/engineering/atmos/gas_storage)
"yfj" = (
diff --git a/maps/euthenia/levels/deck3.dmm b/maps/euthenia/levels/deck3.dmm
index 20caf3e15503..eca9917703ec 100644
--- a/maps/euthenia/levels/deck3.dmm
+++ b/maps/euthenia/levels/deck3.dmm
@@ -569,7 +569,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Patient Psychiatric Ward A"
},
/obj/machinery/door/blast/regular{
@@ -668,7 +668,7 @@
/turf/simulated/floor/bluegrid,
/area/space)
"aEQ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -1368,7 +1368,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Patient Psychiatric Ward B"
},
/obj/machinery/door/blast/regular{
@@ -1713,7 +1713,7 @@
/area/vacant/vacant_shop)
"bBW" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Detective";
req_access = list(4)
@@ -1755,7 +1755,7 @@
/turf/simulated/floor/tiled,
/area/medical/virologyaccess)
"bEB" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2954,7 +2954,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/rnd/storage)
"cGy" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
@@ -3013,11 +3013,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/primary/central_three)
-"cNc" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/obj/machinery/door/airlock/glass,
-/turf/simulated/floor/tiled/steel_ridged,
-/area/hallway/primary/central_three)
"cNd" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -3670,7 +3665,7 @@
/turf/simulated/floor/reinforced/airless,
/area/rnd/test_area)
"duH" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4123,7 +4118,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
"dNp" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
req_one_access = list(18,47)
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -5298,7 +5293,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 9
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -5806,7 +5801,7 @@
/area/crew_quarters/theatre)
"foe" = (
/obj/structure/fence/door,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable/green{
@@ -6661,7 +6656,7 @@
/turf/simulated/floor/wood,
/area/tether/exploration/pilot_office)
"fSB" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor{
@@ -8008,7 +8003,7 @@
/turf/simulated/floor/grass,
/area/medical/psych_ward)
"hbd" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/airlock/glass,
@@ -9096,7 +9091,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/medbay4)
"hVs" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/spline/plain{
dir = 8
},
@@ -9944,7 +9939,7 @@
dir = 4
},
/obj/machinery/meter,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -10415,7 +10410,7 @@
/obj/item/radio/intercom{
pixel_y = -24
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -11419,7 +11414,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Psychiatric Play-Area Access"
},
/turf/simulated/floor/tiled/white,
@@ -12377,7 +12372,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/plating,
@@ -13345,7 +13340,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/deck_three/aft/starboard)
"lqy" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass,
/turf/simulated/floor/tiled/steel_ridged,
/area/hydroponics/garden)
@@ -14287,7 +14282,7 @@
name = "Toxins Input Connector"
},
/obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -14324,7 +14319,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 6
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -14562,7 +14557,7 @@
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -15069,7 +15064,7 @@
/turf/simulated/floor/plating,
/area/shuttle/excursion/cockpit)
"mNf" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -17012,7 +17007,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/medical/virologyaccess)
"osk" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -17985,7 +17980,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/gravity_gen)
"plD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -20068,7 +20063,7 @@
/area/ai/foyer)
"rkl" = (
/obj/structure/fence/door,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/steel,
@@ -20207,7 +20202,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/rnd/research)
"rqb" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Robotics Lab";
req_access = list(29,47)
},
@@ -20940,7 +20935,7 @@
/turf/simulated/floor/tiled,
/area/medical/virology)
"rWo" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -21427,7 +21422,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "General Containment";
req_access = list(2)
},
@@ -23716,7 +23711,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Psychiatric Play-Area Access"
},
/obj/machinery/door/blast/regular{
@@ -25561,7 +25556,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/psych)
"vWD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor{
@@ -26328,7 +26323,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_monitoring)
"wEF" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Telecomms Control Room"
},
/obj/machinery/door/firedoor,
@@ -27000,7 +26995,7 @@
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/central_three)
"xjd" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/airlock/glass,
@@ -27199,7 +27194,7 @@
/turf/simulated/floor/reinforced,
/area/rnd/xenobiology)
"xrP" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/steel,
@@ -27566,7 +27561,7 @@
/obj/structure/fence{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/steel,
@@ -27606,7 +27601,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/camera/network/research,
@@ -27666,7 +27661,7 @@
/obj/structure/fence{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/monotile,
@@ -27797,7 +27792,7 @@
/area/security/brig)
"xQa" = (
/obj/structure/fence/door,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -27842,7 +27837,7 @@
/turf/simulated/floor/reinforced,
/area/rnd/rdoffice)
"xRW" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/spline/plain{
@@ -43966,9 +43961,9 @@ jdi
tob
eTY
wWQ
-cNc
-cNc
-cNc
+aCT
+aCT
+aCT
wWQ
jdi
xWr
diff --git a/maps/euthenia/levels/deck4.dmm b/maps/euthenia/levels/deck4.dmm
index 39406c57e25f..c5893214cc7c 100644
--- a/maps/euthenia/levels/deck4.dmm
+++ b/maps/euthenia/levels/deck4.dmm
@@ -827,7 +827,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1477,7 +1477,7 @@
/turf/simulated/floor/tiled/monotile,
/area/maintenance/deck_four/forward)
"kz" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/steel_ridged,
@@ -2355,7 +2355,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/lower)
@@ -3038,7 +3038,7 @@
/turf/simulated/floor/tiled/white,
/area/gateway)
"vE" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Entrance";
req_access = list(47)
},
@@ -4604,7 +4604,7 @@
/turf/simulated/floor/tiled,
/area/space)
"HQ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor{
@@ -5418,7 +5418,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/maintenance/deck_four/aft/port)
"NN" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor{
@@ -5781,7 +5781,7 @@
/area/space)
"PZ" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Weapons Testing Range";
req_access = list(47)
},
@@ -6137,7 +6137,7 @@
/turf/simulated/wall/r_wall,
/area/rnd/secure_storage/lower)
"Sz" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/steel_ridged,
diff --git a/maps/euthenia/levels/deck5.dmm b/maps/euthenia/levels/deck5.dmm
index 36b999c1c339..1b7e0331aa54 100644
--- a/maps/euthenia/levels/deck5.dmm
+++ b/maps/euthenia/levels/deck5.dmm
@@ -145,7 +145,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/space)
"lQ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "BrigFoyer";
layer = 2.8;
name = "Security";
@@ -343,7 +343,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Atmospherics"
},
/turf/simulated/floor/tiled/techmaint,
@@ -476,7 +476,7 @@
/turf/simulated/floor/plating,
/area/space)
"Fm" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Entrance";
req_access = list(47)
},
diff --git a/maps/map_levels/140x140/talon/talon1.dmm b/maps/map_levels/140x140/talon/talon1.dmm
index a9377d203ccb..08d474a75e1f 100644
--- a/maps/map_levels/140x140/talon/talon1.dmm
+++ b/maps/map_levels/140x140/talon/talon1.dmm
@@ -340,7 +340,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor/glass/talon,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(301)
},
/obj/structure/disposalpipe/segment{
@@ -678,7 +678,7 @@
/turf/simulated/floor/tiled/eris/dark/brown_perforated,
/area/talon/deckone/port_engine)
"gf" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(301)
},
/obj/machinery/door/firedoor/glass/talon,
@@ -3379,7 +3379,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor/glass/talon,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
req_one_access = list(301)
},
/obj/structure/disposalpipe/segment{
@@ -3406,7 +3406,7 @@
/area/talon/deckone/port_solar)
"Cr" = (
/obj/machinery/door/firedoor/glass/talon,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(301)
},
/turf/simulated/floor/tiled/eris/techmaint_panels,
@@ -6129,7 +6129,7 @@
/area/talon/deckone/port_eng)
"YM" = (
/obj/machinery/door/firedoor/glass/talon,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
req_one_access = list(301)
},
/turf/simulated/floor/tiled/eris/techmaint_panels,
diff --git a/maps/minitest/levels/minitest.dmm b/maps/minitest/levels/minitest.dmm
index ef9a36b0ac96..7dd44ea2f677 100644
--- a/maps/minitest/levels/minitest.dmm
+++ b/maps/minitest/levels/minitest.dmm
@@ -521,16 +521,6 @@
},
/area/tcommsat/chamber)
"bi" = (
-/obj/landmark/spawnpoint/overflow/station,
-/turf/simulated/floor/tiled,
-/area/bridge)
-"bj" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecoms Central Compartment North"
- },
/obj/structure/cable{
icon_state = "4-8"
},
@@ -539,7 +529,13 @@
initial_gas_mix = "n2=100;TEMP=80"
},
/area/tcommsat/chamber)
-"bk" = (
+"bj" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/camera/network/telecom{
+ c_tag = "Telecoms Central Compartment North"
+ },
/obj/structure/cable{
icon_state = "4-8"
},
@@ -744,20 +740,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/engine_room)
-"bI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_engineering,
-/turf/simulated/floor/plating,
-/area/engineering/engine_room)
-"bJ" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/glass_engineering,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plating,
-/area/engineering/engine_room)
"bK" = (
/obj/structure/grille,
/obj/structure/window/reinforced,
@@ -1226,6 +1208,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/medical/medbay)
+"cP" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/medical/medbay)
"cQ" = (
/obj/machinery/alarm{
pixel_y = 22
@@ -1867,12 +1855,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/crew_quarters/bar)
-"et" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled,
-/area/medical/medbay)
"eu" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 2;
@@ -3000,15 +2982,6 @@
/obj/structure/shuttle,
/turf/simulated/shuttle/wall/voidcraft/blue,
/area/shuttle/webdemo)
-"hx" = (
-/obj/machinery/computer/shuttle_control/web{
- dir = 2;
- my_doors = list("webdemo_docker_hatch"="Hatch");
- name = "Web-Demo Console";
- shuttle_tag = "Web-Demo"
- },
-/turf/simulated/shuttle/floor,
-/area/shuttle/webdemo)
"hy" = (
/obj/machinery/light{
dir = 4;
@@ -3049,6 +3022,10 @@
/turf/space,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/overmapdemo)
+"hH" = (
+/obj/landmark/spawnpoint/overflow/station,
+/turf/simulated/floor/tiled,
+/area/bridge)
"kU" = (
/obj/structure/shuttle,
/turf/simulated/shuttle/wall/voidcraft/green,
@@ -3099,6 +3076,15 @@
/obj/overmap/entity/visitable/sector/citadel_minitest/station,
/turf/space,
/area/space)
+"LJ" = (
+/obj/machinery/computer/shuttle_control/web{
+ dir = 2;
+ my_doors = list("webdemo_docker_hatch"="Hatch");
+ name = "Web-Demo Console";
+ shuttle_tag = "Web-Demo"
+ },
+/turf/simulated/shuttle/floor,
+/area/shuttle/webdemo)
"ML" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
id_tag = "station_dock2";
@@ -3119,11 +3105,25 @@
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/shuttle/overmapdemo)
+"Og" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/glass/engineering,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/engineering/engine_room)
"Pg" = (
/obj/structure/shuttle/engine/propulsion,
/turf/space,
/turf/simulated/shuttle/plating/carry,
/area/shuttle/multidemo)
+"RZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/glass/engineering,
+/turf/simulated/floor/plating,
+/area/engineering/engine_room)
"SN" = (
/obj/machinery/door/airlock/external{
frequency = 1379;
@@ -5168,7 +5168,7 @@ gz
gf
gf
gN
-hx
+LJ
hz
ht
gN
@@ -5265,7 +5265,7 @@ gj
gf
gr
gf
-bi
+hH
gz
gf
gf
@@ -5420,7 +5420,7 @@ aj
aj
aD
aR
-bk
+bi
bu
bu
bu
@@ -5624,7 +5624,7 @@ aj
aj
aF
aT
-bk
+bi
bu
bu
bu
@@ -6850,7 +6850,7 @@ aB
at
bs
by
-bI
+RZ
bN
cb
ch
@@ -6866,7 +6866,7 @@ cO
de
dr
dF
-et
+cP
eb
du
cM
@@ -6952,7 +6952,7 @@ aB
aZ
bs
bz
-bJ
+Og
bO
cc
ci
@@ -6962,19 +6962,19 @@ cz
cA
cc
cH
-et
-et
-et
+cP
+cP
+cP
df
ds
du
cM
ec
ek
-et
-et
+cP
+cP
df
-et
+cP
eG
eO
eO
@@ -7581,7 +7581,7 @@ dh
cM
dG
dF
-et
+cP
en
cM
cM
diff --git a/maps/rift/levels/rift-01-underground3.dmm b/maps/rift/levels/rift-01-underground3.dmm
index 9b5a0b08958d..6a1ba22b1bdb 100644
--- a/maps/rift/levels/rift-01-underground3.dmm
+++ b/maps/rift/levels/rift-01-underground3.dmm
@@ -131,7 +131,7 @@
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under1)
"hH" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/quartermaster/mining_airlock)
"hN" = (
/obj/structure/sign/mining{
@@ -171,7 +171,7 @@
/turf/simulated/floor/plating,
/area/quartermaster/mining_airlock)
"jJ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/mining_airlock)
"jV" = (
/turf/simulated/floor/holofloor/tiled/dark,
@@ -267,7 +267,7 @@
/area/rift/surfacebase/underground/under1)
"pd" = (
/obj/structure/sign/warning/radioactive,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/underground/under1)
"pj" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
@@ -435,7 +435,7 @@
/turf/simulated/floor/outdoors/gravsnow/lythios43c,
/area/rift/surfacebase/underground/under1)
"xo" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/engineering/engine_room)
"xs" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -445,7 +445,7 @@
/turf/simulated/floor/tiled/steel_dirty/lythios43c/indoors,
/area/quartermaster/mining_airlock)
"xK" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/underground/under1)
"yh" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
@@ -472,6 +472,9 @@
/obj/effect/zone_divider,
/turf/simulated/mineral/icerock/lythios43c,
/area/rift/surfacebase/underground/under1)
+"yX" = (
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/underground/under1)
"zx" = (
/obj/structure/sign/warning/bomb_range{
pixel_x = -32
@@ -566,9 +569,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/mining_airlock)
-"Fu" = (
-/turf/simulated/wall,
-/area/rift/surfacebase/underground/under1)
"FV" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -590,6 +590,10 @@
},
/turf/simulated/floor/plating,
/area/quartermaster/mining_airlock)
+"Hk" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/quartermaster/mining_airlock)
"Ho" = (
/obj/effect/overlay/snow/floor/grav_surround{
dir = 1
@@ -711,13 +715,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/mining_airlock)
-"Qt" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/mining_airlock)
"QE" = (
/obj/structure/sign/mining,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/mining_airlock)
"Ro" = (
/turf/unsimulated/wall/planetary/lythios43c{
@@ -15928,11 +15928,11 @@ dq
dq
dq
dq
-Fu
-Fu
-Fu
-Fu
-Fu
+yX
+yX
+yX
+yX
+yX
dq
dq
dq
@@ -16122,11 +16122,11 @@ dq
dq
dq
dq
-Fu
-Fu
-Fu
-Fu
-Fu
+yX
+yX
+yX
+yX
+yX
dq
dq
dq
@@ -16316,11 +16316,11 @@ dq
dq
dq
dq
-Fu
-Fu
-Fu
-Fu
-Fu
+yX
+yX
+yX
+yX
+yX
dq
dq
dq
@@ -16510,11 +16510,11 @@ dq
dq
dq
dq
-Fu
-Fu
-Fu
-Fu
-Fu
+yX
+yX
+yX
+yX
+yX
dq
dq
dq
@@ -16704,11 +16704,11 @@ dq
dq
dq
dq
-Fu
-Fu
-Fu
-Fu
-Fu
+yX
+yX
+yX
+yX
+yX
dq
dq
dq
@@ -18837,7 +18837,7 @@ Ws
yh
ZX
AB
-Qt
+Hk
KS
KS
KS
@@ -19219,7 +19219,7 @@ jJ
QE
jJ
gG
-Qt
+Hk
jJ
jJ
bX
@@ -20570,7 +20570,7 @@ KS
KS
KS
KS
-Qt
+Hk
jq
vr
zF
@@ -20579,7 +20579,7 @@ jJ
yS
LO
Ji
-Qt
+Hk
KS
KS
KS
@@ -20773,7 +20773,7 @@ wY
Nq
Mb
tB
-Qt
+Hk
KS
KS
KS
@@ -20961,13 +20961,13 @@ KS
jJ
QE
jJ
-hH
+jJ
QE
jJ
jJ
-Qt
-Qt
-hH
+Hk
+Hk
+jJ
Yr
KS
KS
diff --git a/maps/rift/levels/rift-02-underground2.dmm b/maps/rift/levels/rift-02-underground2.dmm
index 5149f0d0ec9f..6c44cdf4ff04 100644
--- a/maps/rift/levels/rift-02-underground2.dmm
+++ b/maps/rift/levels/rift-02-underground2.dmm
@@ -3,7 +3,7 @@
/turf/simulated/mineral/icerock/lythios43c,
/area/rift/surfacebase/underground/under2)
"ab" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/crew_quarters/public_bunker)
"ac" = (
/turf/simulated/shuttle/wall/voidcraft,
@@ -56,7 +56,8 @@
/obj/machinery/atmospherics/pipe/manifold/visible/green{
dir = 4
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_room)
"al" = (
@@ -90,11 +91,11 @@
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 9
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"ar" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/engine_room)
"as" = (
/obj/effect/floor_decal/borderfloor{
@@ -128,7 +129,8 @@
/area/crew_quarters/public_bunker)
"av" = (
/obj/effect/floor_decal/rust,
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor/plating/lythios43c{
outdoors = 0
},
@@ -151,10 +153,10 @@
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/public_bunker)
"ay" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/substation/atmos)
"aA" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/crew_quarters/heads/chief)
"aB" = (
/obj/structure/cable/yellow,
@@ -183,6 +185,11 @@
/obj/machinery/meter,
/turf/simulated/floor,
/area/engineering/engine_room)
+"aE" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/sun,
+/turf/simulated/floor/plating,
+/area/engineering/engine_airlock)
"aF" = (
/obj/machinery/computer/rcon,
/turf/simulated/floor/tiled,
@@ -261,7 +268,7 @@
/obj/machinery/atmospherics/pipe/manifold/visible/black{
dir = 1
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"aR" = (
@@ -621,7 +628,7 @@
/area/engineering/engine_smes)
"bD" = (
/obj/structure/sign/securearea,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/secure_storage/lower)
"bE" = (
/obj/structure/cable/cyan{
@@ -643,7 +650,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
"bG" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/turbolift/maint)
"bH" = (
/obj/structure/catwalk,
@@ -686,7 +693,7 @@
/turf/simulated/floor/plating,
/area/engineering/storage)
"bO" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/chapel)
"bP" = (
/obj/machinery/atmospherics/pipe/simple/visible/red,
@@ -696,7 +703,7 @@
/turf/simulated/floor,
/area/engineering/engine_room)
"bQ" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/engine_core)
"bT" = (
/obj/structure/table/steel_reinforced,
@@ -729,7 +736,8 @@
/area/engineering/engine_core)
"bV" = (
/obj/machinery/atmospherics/pipe/manifold/visible/green,
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_room)
"bW" = (
@@ -1009,26 +1017,11 @@
/area/engineering/engine_room)
"cR" = (
/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
-"cS" = (
-/obj/effect/floor_decal/techfloor{
- dir = 5
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/structure/bed/padded,
-/obj/item/bedsheet,
-/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/public_bunker)
"cT" = (
/obj/structure/catwalk,
/obj/machinery/light/small,
@@ -1044,25 +1037,6 @@
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/public_bunker)
-"cV" = (
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/structure/bed/padded,
-/obj/item/bedsheet,
-/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/public_bunker)
-"cW" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/workshop)
"cX" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -1077,7 +1051,7 @@
/turf/simulated/floor,
/area/engineering/engine_room)
"da" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/engine_smes)
"db" = (
/obj/machinery/atmospherics/pipe/manifold/visible/green{
@@ -1132,7 +1106,8 @@
/area/engineering/engine_room)
"dm" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_room)
"dp" = (
@@ -1172,7 +1147,7 @@
/turf/simulated/floor,
/area/engineering/engine_room)
"dw" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/maintenance/research/xenobio)
"dx" = (
/obj/machinery/atmospherics/pipe/manifold/visible/red,
@@ -1245,20 +1220,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
-"dH" = (
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/structure/toilet,
-/turf/simulated/floor/tiled/techfloor,
-/area/crew_quarters/public_bunker)
"dI" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 6
@@ -1309,7 +1270,7 @@
/obj/machinery/atmospherics/pipe/manifold/visible/black{
dir = 4
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"dQ" = (
@@ -1394,18 +1355,6 @@
},
/turf/simulated/floor/plating,
/area/rift/station/stairs_one)
-"ec" = (
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/railing,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/rift/turbolift/maint)
"ed" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -1672,7 +1621,7 @@
/area/rnd/secure_storage/critical/vault1)
"eE" = (
/obj/structure/sign/warning/secure_area,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/secure_storage/critical)
"eG" = (
/obj/structure/catwalk,
@@ -1721,6 +1670,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
},
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_core)
"eM" = (
@@ -1797,13 +1747,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/public_bunker)
-"eW" = (
-/obj/structure/window/reinforced/polarized/full{
- id = "ce_office"
- },
-/obj/structure/grille,
-/turf/simulated/floor,
-/area/crew_quarters/heads/chief)
"eX" = (
/obj/machinery/firealarm{
dir = 8;
@@ -1922,7 +1865,7 @@
/turf/simulated/floor,
/area/engineering/engine_smes)
"fr" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/secure_storage/critical/records)
"ft" = (
/obj/structure/table/steel,
@@ -1974,7 +1917,8 @@
/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
dir = 8
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_room)
"fH" = (
@@ -2055,6 +1999,13 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/public_bunker)
+"fR" = (
+/obj/structure/cable/cyan{
+ icon_state = "4-8"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/maintenance/substation/engineering)
"fT" = (
/obj/machinery/power/generator{
anchored = 1;
@@ -2102,8 +2053,8 @@
name = "north bump";
pixel_y = 24
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_one)
@@ -2158,8 +2109,8 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_one)
@@ -2207,7 +2158,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled/steel,
@@ -2263,7 +2214,7 @@
dir = 8
},
/obj/machinery/firealarm{
- dir = 4;
+ dir = 8;
pixel_x = -24
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -2377,6 +2328,9 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/cryo)
+"gJ" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/engineering/pumpstation)
"gK" = (
/obj/machinery/light/small{
dir = 1
@@ -2423,16 +2377,6 @@
/obj/machinery/disposal,
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/lower)
-"gO" = (
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/cryo)
"gP" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -2582,10 +2526,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
-"hk" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/engine_airlock)
+"hj" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/cryo)
"hm" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -2664,7 +2607,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/steel_grid,
@@ -2688,7 +2631,7 @@
/area/engineering/engine_smes)
"hC" = (
/obj/machinery/shield_diffuser,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/engine_core)
"hE" = (
/obj/structure/bed/chair/comfy/beige{
@@ -2715,8 +2658,8 @@
name = "north bump";
pixel_y = 24
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_one)
@@ -2921,6 +2864,7 @@
layer = 3.3;
name = "Reactor Blast Door"
},
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_core)
"it" = (
@@ -3103,7 +3047,8 @@
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
"jc" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_room)
"jd" = (
@@ -3191,7 +3136,7 @@
},
/area/engineering/engine_core)
"jk" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Operations";
req_access = list(31);
req_one_access = list()
@@ -3208,7 +3153,7 @@
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under2)
"jo" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/station/stairs_one)
"jp" = (
/obj/machinery/door/airlock/maintenance/common,
@@ -3322,7 +3267,7 @@
/turf/simulated/floor,
/area/engineering/engine_gas)
"jD" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/engine_gas)
"jE" = (
/obj/machinery/disposal,
@@ -3393,16 +3338,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/undertwo)
-"jL" = (
-/obj/effect/floor_decal/techfloor{
- dir = 5
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/cryo)
"jM" = (
/obj/machinery/cryopod/robot,
/turf/simulated/floor/tiled/techfloor,
@@ -3578,7 +3513,7 @@
/area/hallway/primary/undertwo)
"jX" = (
/obj/machinery/firealarm{
- dir = 8;
+ dir = 4;
pixel_x = 24
},
/obj/effect/floor_decal/techfloor{
@@ -3666,7 +3601,7 @@
/area/hallway/primary/undertwo)
"ki" = (
/obj/machinery/camera/network/engineering{
- dir = 6
+ dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -3827,7 +3762,7 @@
/area/engineering/locker_room)
"kF" = (
/obj/machinery/firealarm{
- dir = 4;
+ dir = 8;
pixel_x = -24
},
/obj/effect/floor_decal/techfloor{
@@ -3958,10 +3893,6 @@
},
/turf/simulated/floor,
/area/engineering/engine_room)
-"kZ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/engine_room)
"lb" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
@@ -4214,7 +4145,7 @@
dir = 4
},
/obj/machinery/camera/network/engineering{
- dir = 6
+ dir = 2
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -4245,6 +4176,13 @@
/obj/machinery/atmospherics/component/binary/pump,
/turf/simulated/floor,
/area/engineering/engine_room)
+"lV" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/engineering/foyer)
"lW" = (
/obj/structure/sink{
dir = 8;
@@ -4372,8 +4310,8 @@
/obj/structure/cable/green{
icon_state = "0-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2;
+/obj/machinery/door/firedoor/glass{
+ dir = 8;
req_one_access = list(18,47)
},
/obj/structure/disposalpipe/segment{
@@ -4466,7 +4404,7 @@
/turf/simulated/floor/tiled/steel,
/area/engineering/locker_room)
"ms" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/lower/atmos)
"mt" = (
/obj/structure/bed/chair{
@@ -4621,7 +4559,6 @@
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
@@ -4671,9 +4608,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
@@ -4683,9 +4617,6 @@
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/undertwo)
"mW" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
@@ -4720,7 +4651,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/public_bunker)
"nb" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/station/stairs_one)
"nc" = (
/obj/effect/floor_decal/techfloor{
@@ -4751,7 +4682,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
@@ -4808,9 +4738,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -4842,8 +4769,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2;
+/obj/machinery/door/firedoor/glass{
+ dir = 4;
req_one_access = list(18,47)
},
/obj/machinery/alarm{
@@ -4902,25 +4829,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/public_bunker)
-"ns" = (
-/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/machinery/computer/guestpass{
- dir = 3;
- pixel_y = 26
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/undertwo)
"nt" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -4985,9 +4893,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/camera/network/engineering{
- dir = 6
- },
+/obj/machinery/camera/network/engineering,
/obj/effect/floor_decal/borderfloor{
dir = 1
},
@@ -5072,8 +4978,8 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -5209,6 +5115,20 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/atmos)
+"of" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 9
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/structure/toilet,
+/turf/simulated/floor/tiled/techfloor,
+/area/crew_quarters/public_bunker)
"og" = (
/obj/structure/table/reinforced,
/obj/item/radio/off{
@@ -5454,7 +5374,7 @@
dir = 4;
id = "bunker"
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/crew_quarters/public_bunker)
"oW" = (
@@ -5500,7 +5420,7 @@
dir = 8;
id = "bunker"
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/crew_quarters/public_bunker)
"pb" = (
@@ -5548,6 +5468,9 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/public_bunker)
+"pg" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rnd/secure_storage/critical/records)
"ph" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5631,7 +5554,7 @@
dir = 4
},
/obj/machinery/firealarm{
- dir = 8;
+ dir = 4;
pixel_x = 24
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -5785,7 +5708,7 @@
/turf/simulated/floor/plating,
/area/rift/station/stairs_one)
"pJ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/atmos/locker_room)
"pK" = (
/obj/effect/floor_decal/borderfloor{
@@ -5934,7 +5857,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/foyer)
"qm" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/surfacebase/underground/under2)
"qo" = (
/obj/machinery/atmospherics/pipe/manifold/visible/red{
@@ -6465,6 +6388,21 @@
/obj/structure/cable,
/turf/simulated/floor,
/area/engineering/engine_smes)
+"rY" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 5
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/structure/bed/padded,
+/obj/item/bedsheet,
+/turf/simulated/floor/tiled/techfloor,
+/area/crew_quarters/public_bunker)
"sa" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/borderfloor/corner2{
@@ -6524,6 +6462,14 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
+"se" = (
+/obj/machinery/power/emitter,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/simulated/floor/plating,
+/area/engineering/storage)
"sg" = (
/obj/structure/table/reinforced,
/obj/item/storage/briefcase/inflatable{
@@ -6596,14 +6542,6 @@
"su" = (
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under2)
-"sv" = (
-/obj/structure/closet/secure_closet/atmos_personal,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/engineering/atmos/locker_room)
"sw" = (
/obj/machinery/atmospherics/pipe/simple/visible/red,
/obj/structure/cable/cyan{
@@ -6624,7 +6562,8 @@
/turf/simulated/floor,
/area/engineering/engine_airlock)
"sz" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_airlock)
"sA" = (
@@ -6754,7 +6693,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/structure/cable/cyan{
@@ -6782,7 +6721,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 1
@@ -6888,7 +6827,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/machinery/power/apc{
@@ -6987,7 +6926,7 @@
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/lower)
"tL" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Operations";
req_access = list(31);
req_one_access = list()
@@ -7095,6 +7034,9 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor,
/area/engineering/engine_gas)
+"uj" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/engineering/engine_room)
"uk" = (
/obj/structure/catwalk,
/obj/machinery/door/airlock/maintenance/common,
@@ -7112,7 +7054,7 @@
/area/maintenance/atmos)
"un" = (
/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -7149,7 +7091,7 @@
/turf/simulated/floor/tiled,
/area/quartermaster/miningdock)
"us" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/locker_room)
"ut" = (
/obj/machinery/mineral/equipment_vendor/engineering,
@@ -7177,7 +7119,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/miningdock)
"uy" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/effect/floor_decal/borderfloor,
@@ -7195,6 +7137,9 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/chapel/observation)
+"uB" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/secure_storage/critical/vault2)
"uD" = (
/obj/structure/foamedmetal,
/turf/simulated/floor,
@@ -7213,7 +7158,7 @@
/turf/simulated/floor,
/area/engineering/engine_gas)
"uG" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/quartermaster/belterdock/gear)
"uI" = (
/obj/structure/railing{
@@ -7452,7 +7397,7 @@
/turf/simulated/floor,
/area/engineering/engine_smes)
"vJ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/engine_waste)
"vK" = (
/obj/effect/floor_decal/borderfloor{
@@ -7511,9 +7456,12 @@
dir = 2;
id = "bunker"
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/crew_quarters/public_bunker)
+"vW" = (
+/turf/simulated/wall/prepainted/engineering,
+/area/maintenance/substation/atmos)
"vX" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -7611,7 +7559,9 @@
/area/engineering/foyer)
"wr" = (
/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/obj/structure/sign/department/eng{
pixel_y = -32
},
@@ -7930,7 +7880,7 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2;
req_one_access = list(18,47)
},
@@ -8034,7 +7984,7 @@
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
"xK" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
@@ -8454,8 +8404,18 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/engineering/break_room)
+"zx" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 5
+ },
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/cryo)
"zy" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/atmos)
"zC" = (
/obj/structure/cable/cyan{
@@ -8470,7 +8430,7 @@
/turf/simulated/floor/tiled/monotile,
/area/engineering/engine_room)
"zJ" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/engine_airlock)
"zO" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -8488,7 +8448,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/rnd/secure_storage/critical/records)
"zQ" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering EVA Storage";
req_one_access = list(11,24)
},
@@ -8496,7 +8456,7 @@
/turf/simulated/floor/tiled,
/area/engineering/engine_eva)
"zS" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/engine_airlock)
"zY" = (
/turf/simulated/floor/tiled/dark,
@@ -8565,6 +8525,9 @@
/obj/item/storage/bag/ore,
/turf/simulated/floor/tiled/techmaint,
/area/quartermaster/belterdock/gear)
+"Aq" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/miningdock)
"As" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -8594,12 +8557,8 @@
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
"Aw" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/chapel/chapel_morgue)
-"Ax" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/secure_storage/lower)
"Ay" = (
/obj/random/trash_pile,
/obj/structure/railing{
@@ -8720,12 +8679,27 @@
/obj/effect/blocker,
/turf/simulated/floor/sky/depths/lythios43c,
/area/rift/surfacebase/underground/under2)
+"AX" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/belterdock/gear)
"AZ" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/carpet/bcarpet,
/area/chapel/main)
+"Ba" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/rift/turbolift/maint)
"Bc" = (
/obj/structure/cable/cyan{
icon_state = "1-2"
@@ -8765,7 +8739,7 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"Bi" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rnd/secure_storage/critical)
"Bj" = (
/obj/structure/stairs/spawner/north,
@@ -8821,7 +8795,7 @@
/turf/simulated/floor,
/area/engineering/engine_room)
"Bq" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/secure_storage/critical/vault1)
"Bt" = (
/obj/machinery/light_switch{
@@ -8982,14 +8956,14 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
"Cc" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/lower)
@@ -9019,17 +8993,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
-"Ci" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/camera/network/engineering{
- dir = 6
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/engineering/locker_room)
"Cj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
@@ -9104,6 +9067,11 @@
/obj/item/storage/box/lights/mixed,
/turf/simulated/floor/tiled,
/area/quartermaster/miningdock)
+"CH" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/sun,
+/turf/simulated/floor,
+/area/crew_quarters/heads/chief)
"CI" = (
/obj/structure/closet/secure_closet/engineering_personal,
/obj/structure/window/reinforced{
@@ -9300,7 +9268,7 @@
/area/chapel/office)
"Dm" = (
/obj/machinery/mineral/processing_unit_console,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/quartermaster/belterdock/refinery)
"Dq" = (
/obj/structure/railing{
@@ -9351,7 +9319,7 @@
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"DB" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/break_room)
"DC" = (
/obj/effect/floor_decal/borderfloor{
@@ -9363,6 +9331,16 @@
/obj/structure/flora/grass/brown,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under2)
+"DF" = (
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/techfloor{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/cryo)
"DG" = (
/obj/machinery/light/small{
dir = 1
@@ -9373,6 +9351,10 @@
/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/techfloor,
/area/engineering/engine_waste)
+"DI" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/secure_storage/lower)
"DK" = (
/obj/structure/closet/crate,
/obj/item/stack/material/phoron{
@@ -9391,11 +9373,15 @@
/turf/simulated/floor/plating,
/area/engineering/storage)
"DL" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor/plating/lythios43c{
outdoors = 0
},
/area/engineering/engine_core)
+"DM" = (
+/turf/simulated/wall/r_wall/prepainted/civilian,
+/area/crew_quarters/public_bunker)
"DO" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
@@ -9517,8 +9503,8 @@
/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -9572,9 +9558,21 @@
/obj/random/maintenance/cargo,
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
-"EC" = (
-/turf/simulated/open,
-/area/turbolift/rmine/under2)
+"EA" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 9
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/structure/bed/padded,
+/obj/item/bedsheet,
+/turf/simulated/floor/tiled/techfloor,
+/area/crew_quarters/public_bunker)
"ED" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -9582,7 +9580,7 @@
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"EG" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/hallway)
"EI" = (
/obj/structure/cable/green{
@@ -9651,19 +9649,12 @@
},
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/lower)
-"EO" = (
-/obj/structure/cable/cyan{
- icon_state = "4-8"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/maintenance/substation/engineering)
"EP" = (
/obj/landmark/spawnpoint/job/shaft_miner,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"EQ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/quartermaster/miningdock)
"ER" = (
/obj/machinery/power/apc{
@@ -9684,6 +9675,13 @@
},
/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,
+/area/chapel/office)
"EU" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -9721,7 +9719,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/engi_wash)
"Fa" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/foyer)
"Fb" = (
/obj/effect/floor_decal/borderfloor{
@@ -9755,7 +9753,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
"Fh" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rnd/secure_storage/critical/vault2)
"Fi" = (
/obj/effect/floor_decal/industrial/warning{
@@ -9849,9 +9847,6 @@
/obj/structure/closet/firecloset/full,
/turf/simulated/floor/plating,
/area/maintenance/atmos)
-"FD" = (
-/turf/unsimulated/mineral/icerock/lythios43c,
-/area/rift/surfacebase/underground/under2)
"FF" = (
/obj/machinery/door/airlock/multi_tile/metal{
dir = 2;
@@ -9967,6 +9962,19 @@
/obj/random/maintenance/engineering,
/turf/simulated/floor/plating,
/area/maintenance/chapel)
+"Gc" = (
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/turf/simulated/floor/wood,
+/area/engineering/break_room)
"Gd" = (
/obj/effect/floor_decal/chapel{
dir = 8
@@ -9977,7 +9985,7 @@
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
"Gg" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Monitoring Room";
req_one_access = list(11,24)
},
@@ -9994,7 +10002,7 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Workshop";
req_access = list();
req_one_access = list(14,24)
@@ -10017,20 +10025,12 @@
},
/turf/simulated/floor/tiled/monotile,
/area/engineering/engine_room)
-"Gm" = (
-/obj/machinery/power/emitter,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/plating,
-/area/engineering/storage)
"Gp" = (
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/engineering/break_room)
"Gr" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Operations";
req_access = list(31);
req_one_access = list()
@@ -10123,7 +10123,6 @@
dir = 1
},
/obj/item/floor_painter,
-/obj/item/closet_painter,
/obj/item/pipe_painter,
/obj/item/hand_labeler,
/turf/simulated/floor/tiled,
@@ -10199,6 +10198,13 @@
},
/turf/simulated/floor/plating,
/area/rnd/secure_storage/critical)
+"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,
+/area/chapel/main)
"He" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -10232,7 +10238,7 @@
/turf/simulated/floor/plating,
/area/engineering/storage)
"Hp" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/engine_eva)
"Hq" = (
/obj/effect/floor_decal/industrial/halfstair,
@@ -10418,6 +10424,10 @@
/obj/machinery/camera/network/engineering,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
+"HY" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/engineering/workshop)
"Ib" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -10476,7 +10486,7 @@
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/lower)
"Im" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/maintenance/substation/engineering)
"Ip" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -10495,7 +10505,7 @@
/turf/simulated/floor,
/area/engineering/engine_smes)
"Ir" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/atmos/hallway)
"Iu" = (
/obj/effect/overlay/snow/floor,
@@ -10717,7 +10727,7 @@
/area/quartermaster/belterdock/refinery)
"Jo" = (
/obj/machinery/status_display,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/chapel/office)
"Jr" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
@@ -10847,7 +10857,7 @@
/turf/simulated/floor/plating,
/area/maintenance/atmos)
"JP" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/lower/mining)
"JQ" = (
/obj/machinery/door/airlock/command{
@@ -10906,10 +10916,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
-"JW" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/belterdock/refinery)
"JZ" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate/solar,
@@ -10963,12 +10969,17 @@
/obj/machinery/mech_recharger,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
+"Kh" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rnd/secure_storage/critical/vault1)
"Kk" = (
/mob/living/simple_mob/animal/icegoat,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under2)
"Km" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/undertwo)
"Kn" = (
@@ -11044,7 +11055,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/rnd/secure_storage/critical/vault1)
"Kw" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/civilian,
/area/cryo)
"Kx" = (
/obj/machinery/light{
@@ -11091,7 +11102,7 @@
/turf/simulated/floor/tiled,
/area/engineering/engine_eva)
"KF" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/storage)
"KH" = (
/turf/simulated/floor/tiled/steel_grid,
@@ -11148,7 +11159,7 @@
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
"KY" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/workshop)
"KZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11181,7 +11192,7 @@
/turf/simulated/floor/sky/depths/lythios43c,
/area/rift/surfacebase/underground/under2)
"Lj" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/maintenance/engineering/pumpstation)
"Lk" = (
/obj/effect/floor_decal/borderfloor/corner{
@@ -11221,7 +11232,7 @@
/area/engineering/engine_eva)
"Lu" = (
/obj/structure/sign/signnew/radiation,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/atmos/hallway)
"Lv" = (
/obj/structure/flora/ausbushes/sparsegrass,
@@ -11265,7 +11276,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel_grid,
@@ -11276,7 +11287,8 @@
id = "sm_monitor_blast";
name = "Engineering Engine Monitoring Blast Door"
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor,
/area/engineering/engine_room)
"LF" = (
@@ -11404,7 +11416,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
"Ma" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/chapel/main)
"Mb" = (
/obj/structure/table/reinforced,
@@ -11485,7 +11497,7 @@
dir = 1
},
/obj/machinery/camera/network/engineering{
- dir = 6
+ dir = 2
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
@@ -11559,7 +11571,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/atmos)
"MC" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/engineering/engineering_monitoring)
"MD" = (
/obj/item/paper_bin,
@@ -11616,7 +11628,7 @@
/turf/simulated/floor/carpet,
/area/engineering/break_room)
"ML" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/underground/under2)
"MN" = (
/obj/structure/railing{
@@ -11745,7 +11757,7 @@
/turf/simulated/floor/tiled/monotile,
/area/engineering/engine_room)
"Nk" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Operations";
req_access = list(31);
req_one_access = list()
@@ -11850,7 +11862,7 @@
/turf/simulated/floor/tiled,
/area/engineering/engineering_monitoring)
"NE" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Monitoring Room";
req_one_access = list(11,24)
},
@@ -12101,7 +12113,7 @@
/area/engineering/storage)
"OD" = (
/obj/structure/noticeboard,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/quartermaster/miningdock)
"OF" = (
/obj/effect/floor_decal/chapel{
@@ -12143,10 +12155,6 @@
},
/turf/simulated/floor/plating,
/area/quartermaster/belterdock/refinery)
-"ON" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/engineering_monitoring)
"OO" = (
/obj/structure/cable/cyan{
icon_state = "2-8"
@@ -12208,7 +12216,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
"Pa" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/engine_smes)
"Pc" = (
/obj/structure/disposalpipe/segment{
@@ -12329,6 +12337,17 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/chapel)
+"Py" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/machinery/camera/network/engineering{
+ dir = 2
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/engineering/locker_room)
"Pz" = (
/obj/structure/bed/chair/office/dark,
/turf/simulated/floor/tiled,
@@ -12364,7 +12383,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/camera/network/engineering{
dir = 5
},
@@ -12407,14 +12426,11 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
-"PO" = (
-/obj/structure/bed/chair/bay/chair/padded/yellow,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/foyer)
+"PM" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/miningdock)
"PP" = (
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/simulated/floor,
@@ -12536,6 +12552,10 @@
/obj/machinery/suit_cycler/mining,
/turf/simulated/floor/tiled/techmaint,
/area/quartermaster/belterdock/gear)
+"Qr" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/quartermaster/belterdock/refinery)
"Qt" = (
/obj/structure/curtain/open/bed{
name = "brown curtain"
@@ -12607,7 +12627,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
"QJ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/research/xenobio)
"QK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -12706,7 +12726,7 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
"Rm" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engine Monitoring Room";
req_one_access = list(11,24)
},
@@ -12812,7 +12832,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
"RP" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/crew_quarters/sleep/engi_wash)
"RQ" = (
/turf/simulated/floor/tiled,
@@ -12838,7 +12858,7 @@
/turf/simulated/floor/wood,
/area/chapel/observation)
"RU" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/quartermaster/belterdock/refinery)
"RV" = (
/obj/structure/catwalk,
@@ -12863,7 +12883,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12873,7 +12893,7 @@
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/lower)
"Se" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/chapel/office)
"Sf" = (
/obj/structure/railing{
@@ -12882,6 +12902,9 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
+"Sj" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/belterdock/refinery)
"Sl" = (
/obj/machinery/light/small{
dir = 4
@@ -12919,7 +12942,7 @@
/turf/simulated/floor/tiled,
/area/engineering/foyer)
"Sp" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Operations";
req_access = list(31);
req_one_access = list()
@@ -13022,14 +13045,6 @@
/obj/item/digestion_remains/skull/teshari,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under2)
-"SH" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "chapel_office"
- },
-/turf/simulated/floor/plating,
-/area/chapel/office)
"SK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance/common,
@@ -13038,6 +13053,14 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
+"SL" = (
+/obj/structure/bed/chair/bay/chair/padded/yellow,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/engineering/foyer)
"SP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -13182,6 +13205,9 @@
},
/turf/simulated/floor/carpet/oracarpet,
/area/crew_quarters/heads/chief)
+"Tr" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/secure_storage/critical)
"Ts" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
@@ -13198,6 +13224,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/foyer)
+"Tw" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/maintenance/lower/mining)
"Tx" = (
/obj/structure/cable/cyan{
icon_state = "2-8"
@@ -13271,6 +13300,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
+"TK" = (
+/turf/simulated/open,
+/area/turbolift/rmine/under2)
"TL" = (
/obj/structure/closet,
/obj/structure/railing{
@@ -13391,7 +13423,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/foyer)
"Un" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/chapel/observation)
"Uq" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -13442,7 +13474,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/engi_wash)
"UC" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/engineering/engine_room)
"UD" = (
/obj/structure/girder/reinforced,
@@ -13457,7 +13489,7 @@
/turf/simulated/floor/plating,
/area/chapel/observation)
"UG" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/engineering/atmos/hallway)
"UK" = (
/obj/effect/floor_decal/chapel{
@@ -13522,19 +13554,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
-"UQ" = (
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/engineering/break_room)
"US" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 6
@@ -13605,7 +13624,7 @@
/turf/simulated/floor/tiled,
/area/engineering/engine_eva)
"Vc" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Operations";
req_access = list(31);
req_one_access = list()
@@ -13816,6 +13835,11 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/underground/under2)
+"VV" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/miningdock)
"VW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -13860,13 +13884,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
-"Wi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/foyer)
+"Wh" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/maintenance/lower/atmos)
"Wk" = (
/obj/structure/bed/chair/pew/left{
dir = 1
@@ -14230,7 +14250,7 @@
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
"Xy" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/secure_storage/lower)
"Xz" = (
/obj/effect/floor_decal/borderfloor/corner,
@@ -14337,7 +14357,7 @@
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"XY" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering EVA Storage";
req_one_access = list(11,24)
},
@@ -14408,8 +14428,13 @@
/obj/structure/closet/crate/trashcart,
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
+"Yl" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/sun,
+/turf/simulated/floor/plating,
+/area/engineering/engine_room)
"Yo" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Monitoring Room";
req_one_access = list(11,24)
},
@@ -14461,6 +14486,25 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating,
/area/maintenance/atmos)
+"Yv" = (
+/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/machinery/computer/guestpass{
+ dir = 2;
+ pixel_y = 26
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/undertwo)
"Yx" = (
/obj/structure/closet/firecloset/full,
/obj/effect/floor_decal/rust,
@@ -14524,10 +14568,19 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/miningdock)
-"YL" = (
-/obj/spawner/window/reinforced/full/firelocks,
+"YJ" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/sun,
/turf/simulated/floor/plating,
-/area/quartermaster/miningdock)
+/area/engineering/engineering_monitoring)
+"YK" = (
+/obj/structure/closet/secure_closet/atmos_personal,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/engineering/atmos/locker_room)
"YM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -14717,22 +14770,14 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/hallway)
-"ZC" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "chapel_hall"
- },
-/turf/simulated/floor/plating,
-/area/chapel/main)
"ZE" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -14747,7 +14792,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled/steel_grid,
@@ -14757,6 +14802,9 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/lower/mining)
+"ZM" = (
+/turf/simulated/wall/prepainted,
+/area/engineering/break_room)
"ZN" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -22324,10 +22372,10 @@ Ic
Xy
Nu
Nu
-Bi
-Bi
-Bi
-Bi
+Tr
+Tr
+Tr
+Tr
Ub
Ub
Ub
@@ -22501,15 +22549,15 @@ Az
Ow
gN
bD
-Ax
+DI
MH
Jy
-Ax
+DI
Xy
-Ax
+DI
MH
Jy
-Ax
+DI
Xy
Xy
MH
@@ -22518,23 +22566,23 @@ Xy
Xy
iA
dw
-Bi
+Tr
GW
lp
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
-Bi
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
+Tr
Ub
Bi
aa
@@ -22728,7 +22776,7 @@ QS
Yc
SF
co
-Bi
+Tr
Ub
Bi
aa
@@ -22922,7 +22970,7 @@ wO
Qb
bW
uq
-Bi
+Tr
Ub
Bi
aa
@@ -23101,9 +23149,9 @@ Le
Le
BH
eE
-Bi
-Bi
-Bi
+Tr
+Tr
+Tr
TD
vf
TD
@@ -23116,7 +23164,7 @@ gR
TD
vf
rx
-Bi
+Tr
Ub
Bi
aa
@@ -23294,9 +23342,9 @@ Xy
Xy
Xy
Xy
-Bi
+Tr
Ub
-Bi
+Tr
hA
TD
vf
@@ -23310,7 +23358,7 @@ yp
TD
vf
TD
-Bi
+Tr
Bi
Bi
aa
@@ -23488,7 +23536,7 @@ aa
aa
aa
aa
-fr
+pg
mm
fr
fr
@@ -23501,10 +23549,10 @@ Bq
sI
Bq
Bq
-Fh
+uB
yS
-Fh
-Fh
+uB
+uB
UD
Fh
aa
@@ -23682,7 +23730,7 @@ aa
aa
aa
aa
-fr
+pg
mm
fr
ZS
@@ -23698,7 +23746,7 @@ Bq
TO
sS
TO
-Fh
+uB
UD
Fh
aa
@@ -23876,7 +23924,7 @@ aa
aa
aa
aa
-fr
+pg
mm
fr
Pd
@@ -23892,7 +23940,7 @@ Bq
ev
Os
qp
-Fh
+uB
UD
Fh
aa
@@ -24070,7 +24118,7 @@ aa
aa
aa
aa
-fr
+pg
mm
fr
ob
@@ -24086,7 +24134,7 @@ Bq
dY
CK
TO
-Fh
+uB
UD
Fh
aa
@@ -24264,7 +24312,7 @@ aa
aa
aa
aa
-fr
+pg
mm
fr
Uh
@@ -24277,10 +24325,10 @@ Bq
Bq
Bq
Bq
-Fh
-Fh
-Fh
-Fh
+uB
+uB
+uB
+uB
UD
Fh
aa
@@ -24458,7 +24506,7 @@ aa
aa
aa
aa
-fr
+pg
mm
fr
fr
@@ -24652,7 +24700,7 @@ aa
aa
aa
aa
-fr
+pg
mm
mm
mm
@@ -24660,11 +24708,11 @@ mm
mm
mm
mm
-Bq
+Kh
it
-Bq
-Bq
-Bq
+Kh
+Kh
+Kh
Fh
Fh
Fh
@@ -24846,17 +24894,17 @@ aa
aa
aa
aa
-fr
-fr
-fr
-fr
-fr
-fr
-fr
-fr
-Bq
-Bq
-Bq
+pg
+pg
+pg
+pg
+pg
+pg
+pg
+pg
+Kh
+Kh
+Kh
aa
aa
aa
@@ -25786,11 +25834,11 @@ aa
zy
oL
wG
-ar
-ar
-ar
-ar
-ar
+uj
+uj
+uj
+uj
+uj
sX
ai
ah
@@ -25980,7 +26028,7 @@ zy
zy
kx
wG
-ar
+uj
Xb
US
gT
@@ -26174,7 +26222,7 @@ kq
ks
kx
wG
-ar
+uj
Xb
Ne
Ne
@@ -26368,7 +26416,7 @@ oK
ks
ky
wG
-ar
+uj
Xb
Ne
vY
@@ -26543,7 +26591,7 @@ tx
UK
Xx
zY
-ZC
+Ha
jA
Nf
oj
@@ -26562,7 +26610,7 @@ wG
wG
wG
wG
-ar
+uj
Xb
Ne
US
@@ -26726,7 +26774,7 @@ Xq
wE
zk
dE
-SH
+ET
SP
Od
Jt
@@ -26737,18 +26785,18 @@ zr
ZW
zr
IQ
-ZC
+Ha
oz
YO
Ni
jv
Vo
-ay
-ay
-ay
+vW
+vW
+vW
ri
-ay
-ay
+vW
+vW
kj
ks
Uv
@@ -26756,7 +26804,7 @@ kr
kv
Mr
zt
-ar
+uj
Xb
vY
iz
@@ -26937,12 +26985,12 @@ Nv
Nv
Nv
oI
-ay
+vW
pn
re
gj
pV
-ay
+vW
KF
KF
KF
@@ -26952,7 +27000,7 @@ KF
KF
ar
ar
-ar
+uj
ar
aQ
dP
@@ -27109,10 +27157,10 @@ RT
Za
Se
Se
-SH
-SH
-SH
-SH
+ET
+ET
+ET
+ET
Se
Se
zY
@@ -27125,18 +27173,18 @@ zr
TW
zr
AZ
-ZC
+Ha
jU
ll
ll
PR
oJ
-ay
+vW
po
eX
js
fa
-ay
+vW
Iw
BF
BF
@@ -27319,7 +27367,7 @@ Wk
tP
Gd
SP
-ZC
+Ha
jU
ll
fY
@@ -27330,8 +27378,8 @@ sA
us
us
us
-ay
-Gm
+vW
+se
BF
BF
BF
@@ -27410,7 +27458,7 @@ aa
Xh
"}
(66,1,1) = {"
-FD
+Xh
aa
aa
aa
@@ -27887,12 +27935,12 @@ Aw
Td
xd
Kw
-Kw
+hj
gQ
gQ
gQ
gQ
-Kw
+hj
ms
wy
Qe
@@ -27906,7 +27954,7 @@ jV
ll
fY
us
-Ci
+Py
fi
wh
fM
@@ -28086,7 +28134,7 @@ oT
oT
oT
oT
-Kw
+hj
ms
mK
mZ
@@ -28275,12 +28323,12 @@ Oj
CZ
xd
Kw
-gO
+DF
ZE
rA
ZE
eB
-Kw
+hj
ms
NL
aP
@@ -28474,7 +28522,7 @@ iU
kI
kJ
pw
-Kw
+hj
ms
mM
aV
@@ -28662,7 +28710,7 @@ GI
xF
Sl
xd
-ab
+DM
ab
ab
ab
@@ -28853,10 +28901,10 @@ Bw
Bw
Aw
Aw
-ab
-ab
-ab
-ab
+DM
+DM
+DM
+DM
gK
kF
pi
@@ -29242,7 +29290,7 @@ Bw
Bw
Bw
ab
-cS
+rY
aj
ab
iX
@@ -29273,11 +29321,11 @@ eT
kz
Hr
MC
-ON
-ON
+YJ
+YJ
NE
-ON
-ON
+YJ
+YJ
MC
ZB
ZG
@@ -29466,13 +29514,13 @@ wp
Pr
kz
ce
-ON
+YJ
jY
nE
nE
Wt
cx
-ON
+YJ
eY
dT
da
@@ -29660,13 +29708,13 @@ Fa
Pj
ld
TG
-ON
+YJ
aZ
sm
di
nE
Ys
-ON
+YJ
eY
sD
da
@@ -29824,7 +29872,7 @@ ab
ab
ab
ab
-cS
+rY
cK
ab
pE
@@ -29836,7 +29884,7 @@ ab
pv
aX
bG
-ec
+Ba
TH
ac
ac
@@ -29854,13 +29902,13 @@ Ov
RR
nL
cR
-ON
+YJ
aF
nE
di
Wt
TM
-ON
+YJ
eY
sD
da
@@ -30054,7 +30102,7 @@ sm
tF
nE
lY
-ON
+YJ
eY
sD
da
@@ -30063,15 +30111,15 @@ da
yg
da
da
-kZ
-kZ
+Yl
+Yl
Rm
-kZ
-kZ
+Yl
+Yl
zS
-hk
+aE
Jl
-hk
+aE
aA
tt
lD
@@ -30233,7 +30281,7 @@ af
mW
lZ
Nc
-Wi
+lV
ve
QK
QK
@@ -30266,7 +30314,7 @@ PG
wb
BG
DC
-eW
+CH
lq
Vw
gS
@@ -30600,7 +30648,7 @@ ab
ab
ab
ab
-cV
+EA
cL
ab
xV
@@ -30630,31 +30678,31 @@ CQ
hf
xz
cR
-ON
+YJ
ml
nE
vq
fp
Zu
-ON
+YJ
NI
ce
Im
-EO
+fR
IG
KY
KY
-cW
-cW
+HY
+HY
Gh
-cW
-cW
-cW
+HY
+HY
+HY
KY
KY
jb
Qz
-eW
+CH
XH
ey
Tq
@@ -30824,13 +30872,13 @@ Fa
Ii
qO
TG
-ON
+YJ
IP
sm
nE
fp
gW
-ON
+YJ
eY
ce
Im
@@ -31010,7 +31058,7 @@ nn
ll
fY
Fa
-PO
+SL
qW
qW
wp
@@ -31019,11 +31067,11 @@ eT
xo
Ud
MC
-ON
-ON
+YJ
+YJ
NE
-ON
-ON
+YJ
+YJ
MC
gf
ce
@@ -31182,7 +31230,7 @@ Ze
Ze
Ze
ab
-dH
+of
eV
ab
gM
@@ -31394,7 +31442,7 @@ gk
nb
nb
nb
-ns
+Yv
ll
fY
Fa
@@ -31960,13 +32008,13 @@ Ze
Ze
Ze
Ze
-Kw
+hj
jH
mt
ps
pP
pk
-Kw
+hj
DG
mu
bf
@@ -32154,13 +32202,13 @@ JP
JP
Ze
Ze
-Kw
-jL
+hj
+zx
kJ
GP
kJ
pl
-Kw
+hj
mu
mu
bg
@@ -32348,13 +32396,13 @@ Tg
uK
Ze
Ze
-Kw
+hj
jM
kK
kK
kK
kK
-Kw
+hj
mu
mu
nk
@@ -32368,7 +32416,7 @@ jK
ll
fY
pJ
-sv
+YK
fn
uP
uP
@@ -32542,21 +32590,21 @@ Tg
JP
JP
JP
-Kw
-Kw
+hj
+hj
kM
kM
kM
kM
-Kw
+hj
Mn
-ms
-ms
-ms
-ms
-ms
+Wh
+Wh
+Wh
+Wh
+Wh
VC
-ms
+Wh
ms
jO
ll
@@ -32571,7 +32619,7 @@ pJ
bc
ce
DB
-UQ
+Gc
KZ
Qh
WM
@@ -32737,14 +32785,14 @@ JP
Ze
Ze
Ze
-Kw
-Kw
-Kw
-Kw
-Kw
-Kw
+hj
+hj
+hj
+hj
+hj
+hj
Ze
-uG
+AX
Gw
Gw
Gw
@@ -32938,7 +32986,7 @@ Ze
Ze
Ze
Hz
-uG
+AX
Sm
Jr
BP
@@ -33123,16 +33171,16 @@ Uf
Tg
JP
JP
-EQ
-EQ
-EQ
-EQ
-EQ
-EQ
-EQ
-EQ
-EQ
-uG
+Aq
+Aq
+Aq
+Aq
+Aq
+Aq
+Aq
+Aq
+Aq
+AX
Ap
KI
KI
@@ -33326,20 +33374,20 @@ Qg
Kq
JE
Nd
-EQ
-EQ
-YL
-YL
-EQ
+Aq
+Aq
+VV
+VV
+Aq
Gr
-EQ
+Aq
EQ
jP
ll
ll
ll
fY
-Lj
+gJ
dI
ee
el
@@ -33512,8 +33560,8 @@ Tg
JP
yG
GG
-EC
-EC
+TK
+TK
GG
GV
CC
@@ -33521,10 +33569,10 @@ CC
WZ
uR
Hs
-EQ
+Aq
XK
XK
-EQ
+Aq
cw
QH
jk
@@ -33533,7 +33581,7 @@ ll
ll
ll
fY
-Lj
+gJ
dJ
ef
le
@@ -33706,8 +33754,8 @@ ad
JP
CY
GG
-EC
-EC
+TK
+TK
NP
SR
Vj
@@ -33721,17 +33769,17 @@ FV
FV
Lq
CC
-YL
+PM
jQ
fo
Ni
lh
sa
-Lj
-Lj
-Lj
+gJ
+gJ
+gJ
en
-Lj
+gJ
DB
Df
SD
@@ -33900,8 +33948,8 @@ Tg
bz
EU
GT
-EC
-EC
+TK
+TK
GG
CC
WD
@@ -34103,10 +34151,10 @@ Kt
Qm
Ua
Xe
-EQ
+Aq
YH
AU
-EQ
+Aq
ux
DO
OD
@@ -34115,7 +34163,7 @@ mb
nZ
qC
sb
-Lj
+gJ
ea
eh
ep
@@ -34287,22 +34335,22 @@ vO
Tg
JP
JP
-EQ
-EQ
-EQ
-EQ
-EQ
-EQ
+Aq
+Aq
+Aq
+Aq
+Aq
+Aq
tL
-EQ
-EQ
-EQ
-EQ
+Aq
+Aq
+Aq
+Aq
Wy
CC
-EQ
-EQ
-JP
+Aq
+Aq
+Tw
JP
JP
JP
@@ -34311,14 +34359,14 @@ bF
JP
JP
rt
-Lj
-Lj
-Lj
-Lj
-DB
-DB
-DB
-DB
+gJ
+gJ
+gJ
+gJ
+ZM
+ZM
+ZM
+ZM
wG
MV
zy
@@ -34484,19 +34532,19 @@ Aj
tR
wL
xI
-EQ
+Aq
CF
Zk
LW
-RU
+Sj
Fr
HW
-RU
+Sj
Vc
Sp
-RU
-RU
-JP
+Sj
+Sj
+Tw
yl
Tg
Hq
@@ -34678,11 +34726,11 @@ Ze
Mc
JP
JP
-EQ
+Aq
Mj
Mj
ur
-RU
+Sj
MU
MU
Bt
@@ -34690,7 +34738,7 @@ FW
MU
Xm
AB
-JP
+Tw
OR
Tg
JP
@@ -35066,11 +35114,11 @@ JP
JP
JP
JP
-EQ
+Aq
Uw
Uw
Uw
-RU
+Sj
FX
YQ
Fe
@@ -35078,7 +35126,7 @@ An
EP
De
DZ
-JP
+Tw
JP
Ks
JP
@@ -35260,19 +35308,19 @@ JP
aO
aU
cj
-EQ
+Aq
Uw
RD
Uw
-RU
+Sj
Kc
-JW
+Qr
MU
tD
CB
-JW
+Qr
Pu
-RU
+Sj
ZH
Xk
JP
@@ -35454,19 +35502,19 @@ JP
aR
Ze
ek
-EQ
+Aq
Uw
Uw
Uw
-RU
+Sj
Yz
-JW
+Qr
Rl
FY
LQ
-JW
+Qr
vN
-RU
+Sj
Cl
Xk
MF
@@ -35648,11 +35696,11 @@ JP
aT
Ze
ft
-EQ
-EQ
+Aq
+Aq
vH
-EQ
-RU
+Aq
+Sj
XR
RU
EI
@@ -35660,7 +35708,7 @@ wI
Nx
RU
vN
-RU
+Sj
Cl
Xk
Pq
@@ -35846,15 +35894,15 @@ JP
Rb
OJ
La
-RU
+Sj
xt
-JW
-JW
+Qr
+Qr
Dm
-JW
-JW
+Qr
+Qr
vN
-RU
+Sj
Ze
Xk
Ln
@@ -36040,7 +36088,7 @@ Ff
JK
WB
kR
-RU
+Sj
Ur
tN
vZ
@@ -36048,7 +36096,7 @@ tU
OL
tN
IS
-RU
+Sj
AC
Xk
JP
@@ -36234,15 +36282,15 @@ ZN
yb
NS
TL
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
-RU
+Sj
+Sj
+Sj
+Sj
+Sj
+Sj
+Sj
+Sj
+Sj
ye
Xk
JP
diff --git a/maps/rift/levels/rift-03-underground1.dmm b/maps/rift/levels/rift-03-underground1.dmm
index fa269ac7fb3b..bc18f5df7229 100644
--- a/maps/rift/levels/rift-03-underground1.dmm
+++ b/maps/rift/levels/rift-03-underground1.dmm
@@ -32,7 +32,7 @@
/turf/simulated/floor/plating,
/area/storage/tech)
"ae" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/station/stairs_two)
"af" = (
/obj/structure/cable/green{
@@ -62,7 +62,7 @@
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_two)
"am" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering/pumpstation)
"an" = (
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -76,9 +76,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/public_bunker)
-"ao" = (
-/turf/simulated/open,
-/area/turbolift/runder/level1)
"ap" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 4
@@ -134,7 +131,7 @@
/turf/simulated/floor/plating,
/area/maintenance/public_bunker)
"au" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering/atmos,
/area/engineering/break_room)
"av" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
@@ -233,7 +230,7 @@
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_two)
"aG" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering/upper)
"aH" = (
/obj/structure/fans/tiny,
@@ -254,10 +251,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
-"aK" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/station/stairs_two)
"aL" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -367,7 +360,7 @@
/turf/simulated/floor/tiled/steel_ridged,
/area/hallway/primary/underone)
"aZ" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/public_bunker)
"ba" = (
/obj/effect/floor_decal/borderfloor/corner{
@@ -383,7 +376,7 @@
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_two)
"bb" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/turbolift/maint)
"bc" = (
/obj/machinery/door/airlock/maintenance/engi{
@@ -422,19 +415,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
-"bg" = (
-/obj/structure/ladder/up,
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/railing,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/rift/turbolift/maint)
"bh" = (
/obj/structure/railing{
dir = 4
@@ -609,20 +589,22 @@
/turf/simulated/floor/tiled/steel_ridged,
/area/hallway/primary/underone)
"bA" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering/atmos,
/area/hallway/primary/underone)
-"bB" = (
+"bC" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
/obj/machinery/button/remote/blast_door{
- dir = 8;
- id = "hammerheadtransportgarage";
- name = "Transport Tunnel Garage";
- pixel_x = 26;
- pixel_y = -5;
- req_one_access = list(1,38)
+ dir = 1;
+ id = "hammerheadtransport";
+ name = "Transport Tunnel";
+ pixel_x = 6;
+ pixel_y = -26;
+ req_one_access = list(1,29,38,47)
},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"bD" = (
/obj/structure/railing{
dir = 1
@@ -654,11 +636,23 @@
pixel_y = 24
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_two)
+"bG" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "fighterbaytransportexit";
+ name = "Transport Tunnel";
+ pixel_x = 27;
+ pixel_y = -5;
+ req_one_access = list(1,29,38,47)
+ },
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"bH" = (
/obj/machinery/atmospherics/component/binary/pump{
dir = 4
@@ -670,7 +664,7 @@
dir = 4
},
/obj/machinery/firealarm{
- dir = 8;
+ dir = 4;
pixel_x = 24
},
/obj/structure/sign/directions/cargo{
@@ -696,7 +690,7 @@
dir = 8
},
/obj/machinery/firealarm{
- dir = 4;
+ dir = 8;
pixel_x = -24
},
/obj/structure/sign/directions/medical{
@@ -784,6 +778,22 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"bQ" = (
+/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 4;
+ input_tag = "n2_in";
+ name = "Nitrogen Supply Control";
+ output_tag = "n2_out";
+ sensors = list("n2_sensor"="Tank")
+ },
+/obj/structure/window/reinforced,
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/black,
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"bR" = (
/obj/structure/railing{
dir = 8
@@ -839,7 +849,7 @@
dir = 1
},
/obj/effect/floor_decal/corner/lightorange/border,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled/steel,
@@ -952,7 +962,6 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
@@ -1058,23 +1067,17 @@
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
"cy" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
"cz" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
"cA" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/station/stairs_two)
"cB" = (
/obj/effect/floor_decal/borderfloor{
@@ -1090,7 +1093,6 @@
/turf/simulated/floor/tiled/steel,
/area/rift/station/stairs_two)
"cC" = (
-/obj/machinery/door/firedoor/glass/hidden,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
@@ -1100,9 +1102,6 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
@@ -1335,8 +1334,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
@@ -1383,8 +1382,14 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
"db" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/surfacebase/underground/under1)
+"dc" = (
+/obj/machinery/light/no_nightshift{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"dd" = (
/obj/machinery/alarm{
dir = 8;
@@ -1498,7 +1503,7 @@
"dp" = (
/obj/effect/floor_decal/borderfloor,
/obj/machinery/camera/network/civilian{
- dir = 10
+ dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
@@ -1623,12 +1628,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
-"dA" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"dB" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -1678,19 +1677,12 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
-"dG" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 4
- },
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"dH" = (
/obj/machinery/light{
dir = 1
@@ -1736,6 +1728,16 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"dN" = (
+/obj/structure/extinguisher_cabinet{
+ dir = 4;
+ pixel_x = -30
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"dO" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -1813,19 +1815,10 @@
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
/turf/simulated/floor/plating,
/area/engineering/atmos)
-"dZ" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/vehicle/ridden/cart/security{
- dir = 1
- },
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"ea" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -1843,7 +1836,7 @@
/area/hallway/primary/underone)
"eb" = (
/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -1885,7 +1878,7 @@
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
"ej" = (
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/door/firedoor/glass,
/obj/structure/cable{
icon_state = "1-2"
@@ -1907,6 +1900,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/elevator)
+"ep" = (
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"eq" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/catwalk,
@@ -1924,7 +1920,7 @@
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"es" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/underground/under1)
"et" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -1932,17 +1928,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
-"eu" = (
-/obj/structure/railing/grey,
-/obj/structure/railing/grey{
- dir = 8
- },
-/obj/structure/window/basic{
- dir = 8
- },
-/obj/structure/window/basic,
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/rift/surfacebase/underground/under1)
"ey" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -2031,21 +2016,18 @@
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
"eG" = (
-/obj/machinery/button/remote/blast_door{
- id = "hammerheadtransportgarage";
- name = "Transport Tunnel Garage";
- pixel_x = -6;
- pixel_y = 26;
- req_one_access = list(1,38)
+/obj/structure/cable/green{
+ icon_state = "2-8"
},
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 1
+/obj/structure/cable/green{
+ icon_state = "2-4"
},
-/obj/machinery/light/no_nightshift{
- dir = 1
+/obj/structure/cable/green{
+ icon_state = "0-2"
},
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/storage/tech)
"eI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -2060,12 +2042,6 @@
"eK" = (
/turf/simulated/floor/reinforced/airless,
/area/engineering/atmos)
-"eL" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"eN" = (
/obj/machinery/atmospherics/component/binary/pump{
dir = 4
@@ -2096,15 +2072,35 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
+"eS" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay)
"eT" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering/atmos,
/area/engineering/atmos)
+"eU" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "hammerheadtransport";
+ name = "Transport Tunnel";
+ pixel_x = -5;
+ pixel_y = -26;
+ req_one_access = list(1,29,38,47)
+ },
+/obj/machinery/light/no_nightshift,
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"eW" = (
/obj/machinery/atmospherics/pipe/simple/visible/blue{
dir = 4
},
-/obj/machinery/meter,
-/turf/simulated/floor/tiled,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
/area/engineering/atmos)
"eX" = (
/obj/machinery/atmospherics/pipe/simple/visible/blue{
@@ -2173,20 +2169,13 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
-"fh" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red{
- dir = 4
- },
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"fi" = (
/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow,
/obj/machinery/meter,
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
"fj" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/maintenance/research/xenobio)
"fk" = (
/obj/structure/catwalk,
@@ -2210,21 +2199,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/engineering)
-"fm" = (
-/obj/machinery/computer/general_air_control/large_tank_control{
- dir = 4;
- input_tag = "n2_in";
- name = "Nitrogen Supply Control";
- output_tag = "n2_out";
- sensors = list("n2_sensor"="Tank")
- },
-/obj/structure/window/reinforced,
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -22
- },
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
"fo" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
@@ -2234,12 +2208,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/public_bunker)
-"fp" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 6
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"fq" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
@@ -2256,7 +2224,7 @@
dir = 8
},
/obj/item/paper_bin,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
@@ -2277,7 +2245,7 @@
},
/obj/item/folder/yellow,
/obj/item/pen/red,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/item/pen/blue,
@@ -2345,7 +2313,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/item/storage/single_use/med_pouch/oxyloss,
@@ -2361,7 +2329,7 @@
},
/obj/item/packageWrap,
/obj/item/hand_labeler,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/item/toy/figure/engineer{
@@ -2388,7 +2356,7 @@
/obj/item/clipboard,
/obj/item/barrier_tape_roll/engineering,
/obj/item/barrier_tape_roll/atmos,
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/monotile,
/area/engineering/atmos/hallway)
"fL" = (
@@ -2473,7 +2441,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/machinery/computer/security/engineering{
@@ -2485,17 +2453,6 @@
/obj/item/beach_ball,
/turf/simulated/floor/water/deep/pool,
/area/crew_quarters/pool)
-"fX" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
-"fZ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos/hallway)
"ga" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -2547,7 +2504,7 @@
/obj/machinery/computer/atmos_alert{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/monotile,
/area/engineering/atmos/hallway)
"gk" = (
@@ -2569,9 +2526,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/primary/underone)
-"gm" = (
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"go" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
@@ -2579,7 +2533,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
@@ -2605,9 +2559,6 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
-"gt" = (
-/turf/simulated/wall/r_wall,
-/area/turbolift/rhammerhead/underground)
"gu" = (
/obj/machinery/atmospherics/pipe/simple/visible/red,
/turf/simulated/floor/tiled,
@@ -2623,12 +2574,28 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
-"gw" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 1
+"gy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "hangar_lockdown";
+ name = "Hangar Lockdown Blast Doors";
+ opacity = 0
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/station/fighter_bay)
"gz" = (
/obj/structure/barricade,
/obj/machinery/door/airlock/maintenance/engi,
@@ -2678,6 +2645,20 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/station/protean_nanite_room)
+"gJ" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "fighterbaytransport";
+ name = "Transport Tunnel";
+ pixel_x = 6;
+ pixel_y = -26;
+ req_one_access = list(1,29,38,47)
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"gK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/visible/black{
@@ -2801,6 +2782,21 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"hi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/rift/station/fighter_bay/hangar)
"hk" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -2832,7 +2828,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
@@ -2871,6 +2867,16 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
+"ht" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -32;
+ pixel_y = 30
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"hu" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 4
@@ -2931,30 +2937,23 @@
/turf/simulated/floor/tiled/techfloor,
/area/station/protean_nanite_room)
"hJ" = (
-/obj/machinery/button/remote/blast_door{
- dir = 8;
- id = "fighterbaytransportexit";
- name = "Transport Tunnel";
- pixel_x = 27;
- pixel_y = -5;
- req_one_access = list(1,29,38,47)
- },
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
-"hL" = (
/obj/machinery/alarm{
dir = 1;
pixel_y = -25
},
-/turf/simulated/floor/concrete/rng/indoors,
+/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/transport_tunnel)
+"hL" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/pool)
"hN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/meter{
pixel_y = -21
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
/turf/simulated/floor/plating,
/area/engineering/atmos)
"hO" = (
@@ -2982,6 +2981,12 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"hU" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 9
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"hV" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -2994,13 +2999,6 @@
/obj/structure/barricade/cutout/lusty,
/turf/simulated/floor/plating,
/area/engineering/atmos/hallway)
-"hY" = (
-/obj/structure/closet/hydrant{
- dir = 4;
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"ia" = (
/obj/structure/railing{
dir = 8
@@ -3015,7 +3013,7 @@
dir = 8
},
/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/machinery/computer/atmoscontrol{
@@ -3050,12 +3048,6 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"ij" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/blue{
- dir = 10
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/atmos)
"il" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
@@ -3111,6 +3103,12 @@
/obj/machinery/portable_atmospherics/canister/hydrogen,
/turf/simulated/floor/tiled,
/area/maintenance/engineering)
+"is" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"it" = (
/obj/structure/window/reinforced,
/obj/machinery/door/window/northright{
@@ -3128,7 +3126,8 @@
/obj/machinery/meter{
pixel_y = -21
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
/turf/simulated/floor/plating,
/area/engineering/atmos)
"iy" = (
@@ -3150,13 +3149,6 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
-"iA" = (
-/obj/machinery/atmospherics/pipe/simple/visible/blue{
- dir = 4
- },
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"iB" = (
/obj/structure/window/basic,
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -3175,7 +3167,7 @@
/turf/simulated/floor/wood/broken,
/area/maintenance/engineering)
"iF" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering,
/area/storage/tech)
"iG" = (
/obj/random/junk,
@@ -3267,6 +3259,9 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
+"ja" = (
+/turf/simulated/wall/r_wall/prepainted/engineering/atmos,
+/area/maintenance/engineering)
"jd" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/highsecurity{
@@ -3317,6 +3312,14 @@
},
/turf/simulated/floor/tiled/steel_ridged,
/area/engineering/atmos/hallway)
+"jm" = (
+/obj/machinery/door/blast/regular{
+ id = "fighterbaytransport";
+ name = "Transport Tunnel"
+ },
+/obj/machinery/atmospheric_field_generator/perma,
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"jn" = (
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
@@ -3365,7 +3368,7 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
"ju" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/substation/engineering)
"jv" = (
/obj/effect/floor_decal/borderfloor{
@@ -3409,15 +3412,12 @@
dir = 8
},
/obj/structure/window/reinforced,
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/camera/network/engineering{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/engineering/atmos/hallway)
-"jz" = (
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"jB" = (
/obj/machinery/door/window/brigdoor/eastright{
req_access = list(47)
@@ -3471,6 +3471,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
+"jJ" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"jK" = (
/obj/structure/table/steel,
/turf/simulated/floor/plating,
@@ -3478,6 +3485,9 @@
"jL" = (
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"jM" = (
+/turf/simulated/open,
+/area/turbolift/rmine/under1)
"jN" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
@@ -3524,6 +3534,14 @@
},
/turf/simulated/open,
/area/maintenance/engineering/pumpstation)
+"jS" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"jT" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -3538,7 +3556,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/engineering/atmos/hallway)
@@ -3597,13 +3615,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"kb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/blue{
- dir = 8
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/engineering)
"kd" = (
/obj/structure/railing{
dir = 1
@@ -3641,6 +3652,12 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"kj" = (
+/obj/machinery/light/no_nightshift{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"kk" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -3700,6 +3717,15 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
+"kw" = (
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 9
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"kx" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
dir = 4
@@ -3736,10 +3762,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
-"kJ" = (
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"kK" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 9
@@ -3770,15 +3792,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
-"kQ" = (
-/turf/simulated/wall/r_wall,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
-"kR" = (
-/obj/machinery/light/no_nightshift{
- dir = 4
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"kT" = (
/obj/structure/railing{
dir = 8
@@ -3815,10 +3828,11 @@
/turf/simulated/floor/reinforced/carbon_dioxide,
/area/engineering/atmos)
"kZ" = (
-/obj/structure/railing/grey,
-/obj/structure/window/basic,
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/rift/surfacebase/underground/under1)
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"la" = (
+/turf/simulated/wall/r_wall/prepainted/engineering/atmos,
+/area/space)
"lb" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -3830,6 +3844,40 @@
"lc" = (
/turf/simulated/floor/plating,
/area/storage/tech)
+"ld" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/maintenance/sec{
+ req_one_access = list(1,38)
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"lg" = (
+/obj/structure/cable/green{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/green{
+ icon_state = "16-0"
+ },
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"lh" = (
+/obj/machinery/light/no_nightshift,
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"li" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -3840,6 +3888,15 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"ll" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/structure/window/basic{
+ dir = 1
+ },
+/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
+/area/rift/surfacebase/underground/under1)
"lo" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -3962,13 +4019,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/elevator)
-"lJ" = (
-/obj/machinery/light/no_nightshift,
-/obj/effect/floor_decal/industrial/warning{
- dir = 6
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"lL" = (
/obj/machinery/door/window/brigdoor/eastright{
req_access = list(47)
@@ -4012,6 +4062,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
+"lT" = (
+/obj/machinery/light/no_nightshift,
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"lU" = (
/obj/structure/railing{
dir = 8
@@ -4119,7 +4173,7 @@
/turf/simulated/floor/tiled,
/area/rift/surfacebase/underground/under1)
"mj" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
"ml" = (
@@ -4152,16 +4206,12 @@
/turf/simulated/floor/tiled,
/area/rift/surfacebase/underground/under1)
"mn" = (
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "fighterbaytransportexit";
- name = "Transport Tunnel Exit"
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/blue{
+ dir = 8
},
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/hangar)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/engineering)
"mo" = (
/obj/machinery/atmospherics/component/binary/pump{
dir = 4
@@ -4221,12 +4271,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"mu" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"mw" = (
/obj/structure/window/basic{
dir = 4
@@ -4278,6 +4322,13 @@
/obj/item/deck/cards,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"mG" = (
+/obj/machinery/light/no_nightshift,
+/obj/effect/floor_decal/industrial/warning{
+ dir = 6
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"mH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -4286,8 +4337,14 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
+"mJ" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"mL" = (
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
@@ -4321,9 +4378,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/maintenance)
-"mZ" = (
-/turf/simulated/wall/r_wall,
-/area/rift/station/fighter_bay/transport_tunnel)
"na" = (
/obj/structure/table/rack,
/obj/random/maintenance/clean,
@@ -4360,7 +4414,7 @@
/area/maintenance/engineering)
"nh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
req_one_access = list(11,24)
},
/obj/structure/cable{
@@ -4422,10 +4476,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
-"nt" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/blue,
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/atmos)
"nu" = (
/obj/item/flame/candle/small{
pixel_x = 5;
@@ -4484,19 +4534,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"nA" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/button/remote/blast_door{
- id = "fighterbaytransport";
- name = "Transport Tunnel";
- pixel_x = -6;
- pixel_y = 26;
- req_one_access = list(1,29,38,47)
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"nC" = (
/obj/random/maintenance/clean,
/obj/structure/closet/crate/secure/science,
@@ -4530,6 +4567,9 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/engineering/atmos)
+"nJ" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/engineering/atmos)
"nK" = (
/obj/structure/table/rack/steel,
/obj/random/tech_supply/component,
@@ -4600,22 +4640,6 @@
/obj/machinery/meter,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"nZ" = (
-/obj/structure/window/reinforced,
-/obj/machinery/light/spot{
- dir = 8
- },
-/obj/machinery/computer/general_air_control/large_tank_control{
- dir = 4;
- frequency = 1443;
- input_tag = "air_in";
- name = "Mixed Air Supply Control";
- output_tag = "air_out";
- pressure_setting = 2000;
- sensors = list("air_sensor"="Tank")
- },
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
"oa" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 4;
@@ -4644,32 +4668,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"oe" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/button/remote/blast_door{
- id = "hammerheadtransport";
- name = "Transport Tunnel";
- pixel_x = -6;
- pixel_y = 26;
- req_one_access = list(1,29,38,47)
- },
-/obj/machinery/button/remote/blast_door{
- id = "hammerheadtransportgarage";
- name = "Transport Tunnel Garage";
- pixel_x = 5;
- pixel_y = 26;
- req_one_access = list(1,38)
- },
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 4
- },
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"of" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/structure/window/reinforced,
@@ -4678,13 +4676,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"oi" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"oj" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -4701,7 +4692,7 @@
/turf/simulated/floor/tiled/kafel_full/blue,
/area/crew_quarters/pool)
"ol" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/engineering)
"on" = (
/obj/machinery/atmospherics/component/binary/pump{
@@ -4713,8 +4704,23 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"op" = (
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/structure/window/basic{
+ dir = 8
+ },
+/obj/structure/window/basic{
+ dir = 1
+ },
+/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
+/area/rift/surfacebase/underground/under1)
"oq" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/engineering/drone_fabrication)
"os" = (
/obj/structure/window/basic{
@@ -4726,11 +4732,12 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
},
-/obj/machinery/meter,
-/turf/simulated/floor/tiled,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
/area/engineering/atmos)
"ow" = (
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/atmospherics/pipe/simple/hidden/red,
/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment,
@@ -4742,19 +4749,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"oz" = (
-/obj/machinery/button/remote/blast_door{
- id = "fighterbaytransportexit";
- name = "Transport Tunnel";
- pixel_x = 26;
- pixel_y = 26;
- req_one_access = list(1,29,38,47)
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/rift/station/fighter_bay/hangar)
"oA" = (
/obj/machinery/button/remote/blast_door{
dir = 1;
@@ -4762,8 +4756,13 @@
name = "Portables Garage Shutters";
pixel_y = -10
},
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering/atmos,
/area/hallway/primary/underone)
+"oB" = (
+/obj/structure/cable/green,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/storage/tech)
"oC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -4784,6 +4783,13 @@
},
/turf/simulated/floor/tiled/kafel_full/beige,
/area/crew_quarters/pool)
+"oG" = (
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"oJ" = (
/obj/structure/table/rack/steel,
/obj/item/computer_hardware/battery_module,
@@ -4807,13 +4813,6 @@
},
/turf/simulated/floor,
/area/storage/tech)
-"oK" = (
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"oM" = (
/obj/machinery/atmospherics/pipe/manifold/visible/blue{
dir = 1
@@ -4830,6 +4829,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
+"oO" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"oP" = (
/obj/map_helper/airlock/door/int_door,
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -4896,6 +4901,19 @@
},
/turf/simulated/floor/tiled,
/area/rift/surfacebase/underground/under1)
+"oZ" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/tcommsat/computer)
"pa" = (
/obj/machinery/button/remote/blast_door{
dir = 4;
@@ -4921,12 +4939,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"pe" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 9
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"pf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
@@ -4937,10 +4949,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
-"pg" = (
-/obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
+"ph" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/turbolift/rhammerhead/underground)
"pi" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -4975,6 +4986,10 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos)
+"po" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/engineering)
"pp" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -4986,7 +5001,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4997,15 +5012,17 @@
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
"pt" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 1
+/obj/structure/table/rack/shelf,
+/obj/item/key/security_cart{
+ pixel_x = 4;
+ pixel_y = -2
},
-/obj/structure/extinguisher_cabinet{
- pixel_x = -32;
- pixel_y = 30
+/obj/item/key/security_cart{
+ pixel_x = -1;
+ pixel_y = 4
},
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"pv" = (
/obj/item/book{
desc = "This rough leatherbound book contains the sigils of Unathi writing. The writing itself is smeared with weathering and debris.";
@@ -5020,6 +5037,15 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"px" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
+ },
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"py" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -5050,10 +5076,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
-"pA" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/black,
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
"pC" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -5088,21 +5110,35 @@
/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
/turf/simulated/floor/tiled,
/area/maintenance/engineering)
-"pI" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
+"pH" = (
+/obj/structure/grille,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/maintenance/sec{
- req_one_access = list(1,38)
+/obj/structure/window/reinforced/polarized/full{
+ id = "cmo_office"
},
/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"pJ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/structure/window/reinforced,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"pK" = (
+/obj/machinery/button/remote/blast_door{
+ id = "fighterbaytransportexit";
+ name = "Transport Tunnel";
+ pixel_x = 26;
+ pixel_y = 26;
+ req_one_access = list(1,29,38,47)
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/rift/station/fighter_bay/hangar)
+"pM" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"pO" = (
/obj/structure/railing{
dir = 8
@@ -5117,6 +5153,27 @@
},
/turf/simulated/floor/plating,
/area/rnd/secure_storage/upper)
+"pP" = (
+/obj/machinery/button/remote/blast_door{
+ id = "hangar_maint";
+ name = "Hangar Maintenance Shutter Control";
+ pixel_y = 28;
+ req_one_access = list(1,29,38,47)
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/mauve/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/mauve/bordercorner2{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/station/fighter_bay)
"pQ" = (
/obj/structure/railing{
dir = 8
@@ -5138,23 +5195,11 @@
},
/turf/simulated/floor/plating,
/area/maintenance/public_bunker)
-"pW" = (
-/obj/structure/railing/grey{
- dir = 1
- },
-/obj/structure/window/basic{
- dir = 1
- },
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/rift/surfacebase/underground/under1)
-"pY" = (
-/obj/effect/floor_decal/industrial/warning{
+"pX" = (
+/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
},
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/concrete/rng/lythios43c,
/area/rift/station/fighter_bay/transport_tunnel)
"pZ" = (
/obj/effect/floor_decal/borderfloor{
@@ -5162,6 +5207,14 @@
},
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"qa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos/hallway)
"qb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
@@ -5210,6 +5263,14 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"qj" = (
+/obj/machinery/atmospherics/pipe/simple/visible/black{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"ql" = (
/obj/structure/table/steel,
/obj/item/deck/tarot,
@@ -5226,19 +5287,9 @@
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
"qo" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/button/remote/blast_door{
- dir = 1;
- id = "fighterbaytransport";
- name = "Transport Tunnel";
- pixel_x = 6;
- pixel_y = -26;
- req_one_access = list(1,29,38,47)
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/hallway/primary/underone)
"qp" = (
/obj/machinery/atmospherics/component/unary/outlet_injector{
dir = 4;
@@ -5249,41 +5300,48 @@
},
/turf/simulated/floor/reinforced/nitrogen,
/area/engineering/atmos)
-"qr" = (
-/obj/structure/closet/medical_wall{
- pixel_x = 32
- },
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/single_use/med_pouch/trauma{
- pixel_x = -3;
- pixel_y = 3
- },
-/obj/item/storage/single_use/med_pouch/burn{
- pixel_x = 3;
- pixel_y = 3
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"qt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 8
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"qu" = (
-/obj/structure/table/rack/shelf,
-/obj/item/storage/toolbox/electrical{
- pixel_y = -4
+"qy" = (
+/obj/structure/cable/green{
+ icon_state = "0-4"
},
-/obj/item/storage/toolbox/mechanical{
- pixel_y = 10
+/obj/structure/cable/green{
+ icon_state = "0-2"
},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/storage/tech)
"qz" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering/atmos,
/area/engineering/atmos)
+"qA" = (
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/door/airlock/glass/research{
+ name = "Hangar Repair Bay";
+ req_one_access = list(1,29,38,47)
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/station/fighter_bay)
"qC" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -5291,17 +5349,8 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
-"qF" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 1
- },
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"qH" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"qK" = (
@@ -5309,7 +5358,7 @@
id = "portables_garage";
name = "Garage Door"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/steel,
@@ -5321,7 +5370,7 @@
/turf/simulated/floor/water/pool,
/area/crew_quarters/pool)
"qT" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"qU" = (
@@ -5345,8 +5394,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled/steel_grid,
@@ -5383,15 +5432,17 @@
},
/turf/simulated/floor/wood,
/area/rift/station/fighter_bay)
+"rb" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/table/rack/shelf,
+/obj/item/key/security_cart,
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"rc" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/lattice,
/turf/simulated/open,
/area/maintenance/public_bunker)
-"re" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/hallway/primary/underone)
"rh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 8
@@ -5425,16 +5476,24 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"rn" = (
-/obj/structure/cable/green,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/trade_shop)
"ro" = (
/obj/structure/table/steel,
/obj/item/deck/unus,
/turf/simulated/floor/wood,
/area/maintenance/engineering)
+"rp" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "fighterbaytransport";
+ name = "Transport Tunnel";
+ pixel_x = -6;
+ pixel_y = 26;
+ req_one_access = list(1,29,38,47)
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"rq" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 4;
@@ -5497,7 +5556,7 @@
dir = 8
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/blast/shutters{
dir = 2;
id = "scistorage_sidedoor"
@@ -5539,20 +5598,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/public_bunker)
-"rD" = (
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"rE" = (
/turf/simulated/floor/plating,
/area/maintenance/public_bunker)
@@ -5628,13 +5673,10 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"rQ" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
+"rS" = (
+/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"rT" = (
/obj/effect/floor_decal/borderfloor,
/turf/simulated/floor/tiled/steel,
@@ -5675,7 +5717,7 @@
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
"sa" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering)
"sd" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
@@ -5737,15 +5779,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
-"sm" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"sn" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -5976,32 +6009,10 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"tj" = (
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"tk" = (
-/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/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "hangar_lockdown";
- name = "Hangar Lockdown Blast Doors";
- opacity = 0
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/station/fighter_bay)
"tl" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -6074,13 +6085,8 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"ts" = (
-/obj/machinery/door/blast/regular{
- id = "hammerheadtransport";
- name = "Transport Tunnel"
- },
-/obj/machinery/atmospheric_field_generator/perma,
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
+/turf/simulated/wall/prepainted/engineering/atmos,
+/area/crew_quarters/pool)
"tt" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -6122,9 +6128,17 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 9
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"tz" = (
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "fighterbaytransportexit";
+ name = "Transport Tunnel Exit"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/hangar)
"tA" = (
/obj/structure/window/basic{
dir = 8
@@ -6159,14 +6173,14 @@
/area/maintenance/engineering)
"tF" = (
/obj/structure/sign/warning/biohazard,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/lower/trash_pit)
"tG" = (
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"tI" = (
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
req_one_access = list(11,24)
},
/obj/machinery/atmospherics/pipe/simple/hidden/red,
@@ -6219,6 +6233,12 @@
},
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"tQ" = (
+/obj/machinery/light/no_nightshift{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"tT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
@@ -6250,19 +6270,9 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
-"tY" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/button/remote/blast_door{
- id = "hammerheadtransport";
- name = "Transport Tunnel";
- pixel_x = 5;
- pixel_y = 26;
- req_one_access = list(1,29,38,47)
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
+"tZ" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rnd/secure_storage/upper)
"ub" = (
/obj/machinery/crystal/ice,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
@@ -6333,15 +6343,11 @@
/turf/simulated/floor/lythios43c/indoors,
/area/security/prison)
"uq" = (
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/atmospherics/pipe/simple/hidden/blue,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"ur" = (
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"ut" = (
/obj/structure/stairs/spawner/east,
/obj/structure/railing{
@@ -6367,7 +6373,7 @@
/area/rift/surfacebase/underground/under1)
"ux" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/storage/tech)
"uy" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -6384,7 +6390,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/maintenance)
"uA" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/secure_storage/upper)
"uB" = (
/obj/machinery/crystal/ice,
@@ -6434,6 +6440,9 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"uN" = (
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"uO" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -6454,6 +6463,13 @@
},
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/hangar)
+"uQ" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"uR" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/techfloor,
@@ -6504,15 +6520,19 @@
/turf/simulated/floor/tiled/kafel_full/blue,
/area/crew_quarters/pool)
"va" = (
-/obj/structure/disposalpipe/segment{
+/obj/machinery/alarm{
dir = 8;
- icon_state = "pipe-c"
+ pixel_x = 24
},
/obj/structure/cable/green{
- icon_state = "4-8"
+ icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
+ dir = 10
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8;
+ icon_state = "pipe-c"
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/maintenance)
@@ -6593,6 +6613,11 @@
special_temperature = 233
},
/area/rift/surfacebase/underground/under1)
+"vj" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"vk" = (
/obj/machinery/telecomms/processor/preset_three,
/turf/simulated/floor/tiled/dark,
@@ -6607,15 +6632,16 @@
},
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/hangar)
+"vm" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/rift/station/fighter_bay/hangar)
"vn" = (
/obj/machinery/pipedispenser/disposal,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"vo" = (
-/obj/structure/sign/electricshock,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/station/adherent_maintenance)
"vq" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
/obj/machinery/meter,
@@ -6671,6 +6697,15 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"vy" = (
+/obj/machinery/light/no_nightshift{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 9
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"vz" = (
/obj/machinery/door/blast/regular{
dir = 2;
@@ -6684,6 +6719,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
+"vC" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "hammerheadtransport";
+ name = "Transport Tunnel";
+ pixel_x = 5;
+ pixel_y = 26;
+ req_one_access = list(1,29,38,47)
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"vE" = (
/obj/item/storage/excavation,
/obj/structure/table/bench/wooden,
@@ -6703,13 +6751,6 @@
/obj/machinery/telecomms/server/presets/science,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
-"vI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos/hallway)
"vJ" = (
/obj/machinery/telecomms/bus/preset_four,
/turf/simulated/floor/tiled/dark,
@@ -6722,15 +6763,15 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/elevator)
-"vN" = (
-/obj/machinery/light/no_nightshift{
- dir = 8
+"vL" = (
+/obj/structure/railing{
+ dir = 4
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 9
+/obj/structure/railing{
+ dir = 8
},
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"vP" = (
/obj/item/stack/tile/floor,
/obj/machinery/light/small{
@@ -6778,11 +6819,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"vV" = (
-/obj/machinery/floodlight,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"vX" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -6821,7 +6857,7 @@
/area/maintenance/elevator)
"wf" = (
/obj/machinery/camera/network/civilian{
- dir = 10
+ dir = 1
},
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -6886,21 +6922,13 @@
/obj/item/storage/fancy/crayons,
/turf/simulated/floor/plating,
/area/rift/surfacebase/underground/under1)
-"wq" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/button/remote/blast_door{
- dir = 1;
- id = "hammerheadtransport";
- name = "Transport Tunnel";
- pixel_x = -5;
- pixel_y = -26;
- req_one_access = list(1,29,38,47)
+"ws" = (
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -24
},
-/obj/machinery/light/no_nightshift,
/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"wt" = (
/obj/structure/table/reinforced,
/obj/item/stack/tile/floor,
@@ -6910,6 +6938,11 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
+"ww" = (
+/obj/structure/sign/electricshock,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/station/adherent_maintenance)
"wx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -7056,7 +7089,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/dark,
@@ -7067,20 +7100,11 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"wO" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/button/remote/blast_door{
- dir = 1;
- id = "hammerheadtransport";
- name = "Transport Tunnel";
- pixel_x = 6;
- pixel_y = -26;
- req_one_access = list(1,29,38,47)
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
+"wQ" = (
+/obj/structure/sign/signnew/danger,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/station/adherent_maintenance)
"wR" = (
/obj/machinery/telecomms/hub/preset/rift,
/turf/simulated/floor/tiled/dark,
@@ -7133,7 +7157,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -7156,14 +7180,6 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/wood,
/area/rift/station/fighter_bay)
-"xi" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "cmo_office"
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"xj" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -7289,6 +7305,12 @@
/obj/machinery/telecomms/processor/preset_two,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
+"xx" = (
+/obj/machinery/light/no_nightshift,
+/obj/turbolift_map_holder/rift_fighterbay,
+/obj/effect/floor_decal/industrial/warning/corner,
+/turf/simulated/floor/tiled/techmaint,
+/area/turbolift/rhammerhead/underground)
"xy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -7360,11 +7382,17 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
+"xJ" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"xK" = (
/obj/effect/overlay/snow/floor/pointy,
/obj/effect/overlay/snow/floor/pointy{
@@ -7428,7 +7456,7 @@
/area/rnd/secure_storage/upper)
"xU" = (
/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/structure/cable{
@@ -7478,6 +7506,15 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/maintenance)
+"xY" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"xZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -7578,6 +7615,9 @@
/obj/machinery/telecomms/broadcaster/preset_right/rift,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
+"ys" = (
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"yt" = (
/obj/structure/closet/firecloset/full,
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
@@ -7640,10 +7680,6 @@
name = "Mainframe Base"
},
/area/tcommsat/chamber)
-"yA" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay)
"yB" = (
/obj/machinery/door/window/brigdoor/eastright{
req_access = list(47)
@@ -7667,6 +7703,14 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"yG" = (
+/obj/machinery/atmospherics/pipe/simple/visible{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"yH" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/obj/structure/cable/green{
@@ -7703,8 +7747,19 @@
},
/turf/simulated/floor/tiled/techfloor/grid/lythios43c,
/area/rift/surfacebase/underground/under1)
+"yP" = (
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"yS" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -7715,9 +7770,6 @@
"yU" = (
/turf/simulated/floor/reinforced/airmix,
/area/engineering/atmos)
-"yW" = (
-/turf/simulated/mineral/icerock/lythios43c,
-/area/space)
"yX" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -7928,7 +7980,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
"zz" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/station/adherent_maintenance)
"zB" = (
/obj/structure/ladder/up,
@@ -7954,7 +8006,7 @@
/obj/effect/floor_decal/corner/mauve/bordercorner2{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
"zG" = (
@@ -8019,6 +8071,17 @@
/obj/structure/bed/chair/sofa/black,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"zS" = (
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/structure/window/basic{
+ dir = 8
+ },
+/obj/structure/window/basic,
+/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
+/area/rift/surfacebase/underground/under1)
"zU" = (
/obj/machinery/button/remote/blast_door{
dir = 8;
@@ -8038,6 +8101,10 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
+"zV" = (
+/obj/effect/floor_decal/industrial/warning/corner,
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"zW" = (
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/tiled/kafel_full/blue,
@@ -8083,6 +8150,10 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/engineering)
+"Aj" = (
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"Ak" = (
/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/techfloor/grid,
@@ -8178,10 +8249,6 @@
/obj/machinery/holoplant,
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
-"Ay" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/red,
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
"AA" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/door/blast/regular{
@@ -8280,6 +8347,9 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
+"AS" = (
+/turf/simulated/wall/prepainted/engineering,
+/area/storage/tech)
"AU" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 5
@@ -8314,10 +8384,6 @@
/obj/item/hand_labeler,
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
-"Bd" = (
-/obj/machinery/light/no_nightshift,
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"Bf" = (
/obj/structure/bed/chair/sofa/black/corner{
dir = 8
@@ -8413,9 +8479,14 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
-"Bx" = (
-/turf/simulated/open,
-/area/turbolift/rmine/under1)
+"By" = (
+/turf/simulated/mineral/icerock/lythios43c,
+/area/space)
+"Bz" = (
+/obj/structure/railing/grey,
+/obj/structure/window/basic,
+/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
+/area/rift/surfacebase/underground/under1)
"BA" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 6
@@ -8510,10 +8581,10 @@
/area/rift/station/fighter_bay/maintenance)
"BV" = (
/obj/structure/sign/warning/server_room,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/command,
/area/tcommsat/computer)
"BX" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/station/fighter_bay)
"Ca" = (
/obj/machinery/portable_atmospherics/powered/scrubber,
@@ -8565,19 +8636,6 @@
/obj/structure/ladder/updown,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/elevator)
-"Cj" = (
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/storage/tech)
"Cl" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -8617,9 +8675,6 @@
/obj/random/junk,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
-"Cr" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/pool)
"Cs" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/structure/catwalk,
@@ -8634,7 +8689,7 @@
/area/rift/surfacebase/underground/under1)
"Cu" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos)
"Cw" = (
@@ -8678,7 +8733,7 @@
/turf/simulated/floor/reinforced/phoron,
/area/engineering/atmos)
"CC" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment{
dir = 8
},
@@ -8739,9 +8794,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"CL" = (
-/turf/simulated/mineral/icerock/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"CM" = (
/obj/machinery/atmospherics/component/quaternary/atmos_filter{
name = "Waste CO2 Filter";
@@ -8832,34 +8884,6 @@
/obj/structure/inflatable,
/turf/simulated/floor/plating,
/area/rift/surfacebase/underground/under1)
-"Db" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/door/airlock/glass_research{
- name = "Hangar Repair Bay";
- req_one_access = list(1,29,38,47)
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/station/fighter_bay)
-"Dc" = (
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "fighterbaytransportexit";
- name = "Transport Tunnel Exit"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/hangar)
"Dd" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -8886,8 +8910,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
@@ -8927,6 +8951,34 @@
/obj/random/tool,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
+"Dq" = (
+/obj/machinery/door/firedoor/multi_tile{
+ dir = 2
+ },
+/obj/machinery/door/airlock/multi_tile/metal{
+ dir = 1;
+ name = "Fighter Hangar";
+ req_one_access = list(1,19,29,38,43,47,63,67)
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "hangar_lockdown";
+ name = "Hangar Lockdown Blast Doors";
+ opacity = 0
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/station/fighter_bay)
+"Ds" = (
+/obj/structure/stairs/spawner/north,
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"Dt" = (
/obj/machinery/light/small{
dir = 1
@@ -8940,19 +8992,6 @@
/obj/effect/floor_decal/borderfloor,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
-"DA" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/obj/machinery/button/remote/blast_door{
- id = "fighterbaytransport";
- name = "Transport Tunnel";
- pixel_x = 5;
- pixel_y = 26;
- req_one_access = list(1,29,38,47)
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"DC" = (
/obj/machinery/door/airlock/glass_external{
req_one_access = list(47)
@@ -8966,6 +9005,22 @@
},
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/secure_storage/upper)
+"DD" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/rift/station/fighter_bay/hangar)
"DE" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -8994,10 +9049,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
-"DI" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"DK" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -9023,10 +9074,6 @@
/obj/machinery/telecomms/server/presets/command,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
-"DQ" = (
-/obj/machinery/light/no_nightshift,
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"DR" = (
/obj/effect/floor_decal/rust,
/obj/random/junk,
@@ -9056,10 +9103,6 @@
/obj/machinery/portable_atmospherics/powered/scrubber,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"Ea" = (
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/techmaint,
-/area/turbolift/rhammerhead/underground)
"Eb" = (
/obj/effect/floor_decal/rust,
/obj/structure/cable/green{
@@ -9136,18 +9179,28 @@
},
/turf/simulated/floor/reinforced/carbon_dioxide,
/area/engineering/atmos)
+"Ep" = (
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -24
+ },
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"Er" = (
/obj/structure/cable{
icon_state = "1-2"
},
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering/pumpstation)
"Et" = (
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos/hallway)
"Eu" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -9163,10 +9216,28 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
+"Ev" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"Ex" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"EA" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"EB" = (
/obj/structure/railing{
dir = 8
@@ -9196,6 +9267,12 @@
},
/turf/simulated/floor/crystal,
/area/rift/station/adherent_maintenance)
+"EE" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"EG" = (
/obj/machinery/door/airlock/multi_tile/metal/mait{
dir = 1;
@@ -9247,13 +9324,6 @@
/obj/machinery/light/small,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/underground/under1)
-"EQ" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/vehicle/ridden/cart/security{
- dir = 8
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"ER" = (
/obj/structure/flora/bush,
/turf/simulated/floor/outdoors/snow/lythios43c,
@@ -9298,8 +9368,9 @@
/area/rift/station/fighter_bay/hangar)
"EY" = (
/obj/structure/catwalk,
-/obj/structure/closet/crate/hydroponics,
-/obj/item/stack/material/algae,
+/obj/machinery/atmospherics/pipe/simple/hidden/blue{
+ dir = 10
+ },
/turf/simulated/floor/plating,
/area/engineering/atmos)
"EZ" = (
@@ -9339,12 +9410,17 @@
},
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
-"Ff" = (
-/obj/machinery/light/no_nightshift,
-/obj/turbolift_map_holder/rift_fighterbay,
-/obj/effect/floor_decal/industrial/warning/corner,
+"Fh" = (
+/obj/structure/table/rack/shelf,
+/obj/item/storage/toolbox/electrical{
+ pixel_y = -4
+ },
+/obj/item/storage/toolbox/mechanical{
+ pixel_y = 10
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/techmaint,
-/area/turbolift/rhammerhead/underground)
+/area/rift/station/fighter_bay/transport_tunnel)
"Fi" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -9354,6 +9430,11 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"Fj" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/tcommsat/computer)
"Fk" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/effect/floor_decal/industrial/warning{
@@ -9368,7 +9449,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 8
},
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
@@ -9395,6 +9476,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"Fq" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/window/reinforced/polarized/full{
+ id = "cmo_office"
+ },
+/turf/simulated/floor/plating,
+/area/turbolift/rhammerhead/underground)
"Fr" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 1;
@@ -9414,13 +9503,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/maintenance)
-"Ft" = (
-/obj/machinery/light/no_nightshift,
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 8
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/turbolift/rhammerhead/underground)
"Fu" = (
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 4
@@ -9577,12 +9659,31 @@
},
/turf/simulated/floor/wood,
/area/rift/station/fighter_bay)
+"FQ" = (
+/obj/structure/closet/medical_wall{
+ pixel_x = 32
+ },
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/single_use/med_pouch/trauma{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/item/storage/single_use/med_pouch/burn{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"FR" = (
/obj/structure/fence{
dir = 4
},
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"FS" = (
+/obj/machinery/light/no_nightshift,
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"FT" = (
/obj/structure/railing,
/obj/random/trash_pile,
@@ -9606,18 +9707,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
-"FZ" = (
-/obj/structure/table/rack/shelf,
-/obj/item/key/security_cart{
- pixel_x = 4;
- pixel_y = -2
- },
-/obj/item/key/security_cart{
- pixel_x = -1;
- pixel_y = 4
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"Ga" = (
/obj/machinery/camera/network/engineering{
dir = 4
@@ -9847,12 +9936,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/drone_fabrication)
-"GG" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/structure/table/rack/shelf,
-/obj/item/key/security_cart,
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"GH" = (
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
@@ -9878,7 +9961,7 @@
dir = 8;
pixel_x = 22
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/steel_grid,
@@ -10012,20 +10095,8 @@
},
/turf/simulated/floor/crystal,
/area/rift/station/adherent_maintenance)
-"Hk" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
-"Hm" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"Hn" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/engineering/atmos,
/area/engineering/atmos/hallway)
"Ho" = (
/obj/structure/table/rack,
@@ -10076,12 +10147,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"Hu" = (
-/obj/machinery/light/no_nightshift{
- dir = 8
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"Hw" = (
/obj/item/circuitboard/sleeper{
pixel_x = -3;
@@ -10123,6 +10188,11 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
+"Hy" = (
+/obj/structure/cable/green,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/trade_shop)
"Hz" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 8
@@ -10139,7 +10209,7 @@
/area/rift/station/fighter_bay)
"HC" = (
/obj/structure/sign/securearea,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/secure_storage/upper)
"HD" = (
/obj/structure/railing{
@@ -10179,6 +10249,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/blue,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"HM" = (
+/turf/simulated/floor/tiled/techmaint,
+/area/turbolift/rhammerhead/underground)
"HN" = (
/obj/structure/closet/crate/secure/science,
/turf/simulated/floor/tiled/dark,
@@ -10187,6 +10260,22 @@
/obj/item/stack/tile/floor,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"HP" = (
+/obj/machinery/button/remote/blast_door{
+ id = "fighterbaytransportexit";
+ name = "Transport Tunnel";
+ pixel_x = -27;
+ pixel_y = 26;
+ req_one_access = list(1,29,38,47)
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/rift/station/fighter_bay/hangar)
"HR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -10204,11 +10293,16 @@
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
"HV" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/secure_storage/upper)
"HW" = (
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/maintenance/engineering)
+"HX" = (
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"HY" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -10254,7 +10348,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/blast/shutters{
@@ -10263,16 +10357,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
-"Ie" = (
-/obj/structure/stairs/spawner/north,
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/railing{
- dir = 8
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"If" = (
/obj/structure/railing{
dir = 8
@@ -10409,7 +10493,7 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"IE" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/elevator)
"IF" = (
/obj/effect/floor_decal/techfloor,
@@ -10421,6 +10505,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/underone)
+"IH" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rift/surfacebase/underground/under1)
+"II" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 8;
+ id = "hammerheadtransportgarage";
+ name = "Transport Tunnel Garage";
+ pixel_x = 26;
+ pixel_y = -5;
+ req_one_access = list(1,38)
+ },
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"IJ" = (
/obj/machinery/light/small/emergency/flicker{
dir = 1
@@ -10444,6 +10543,12 @@
},
/turf/simulated/floor/plating,
/area/engineering/atmos/hallway)
+"IN" = (
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"IO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/floor_decal/borderfloor{
@@ -10484,6 +10589,19 @@
/obj/item/reagent_containers/spray/squirt,
/turf/simulated/floor/plating,
/area/maintenance/elevator)
+"IV" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "fighterbaytransport";
+ name = "Transport Tunnel";
+ pixel_x = 5;
+ pixel_y = 26;
+ req_one_access = list(1,29,38,47)
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"IW" = (
/obj/structure/bed/chair/sofa/black,
/turf/simulated/floor/wood,
@@ -10515,7 +10633,7 @@
/turf/simulated/floor/wood/broken,
/area/maintenance/engineering)
"Jb" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/engineering/drone_fabrication)
"Jc" = (
/obj/effect/floor_decal/borderfloor,
@@ -10563,6 +10681,10 @@
/obj/item/barrier_tape_segment/engineering,
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"Jh" = (
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/tiled/techmaint,
+/area/turbolift/rhammerhead/underground)
"Ji" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 8
@@ -10587,7 +10709,7 @@
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
"Jl" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/trade_shop)
"Jm" = (
/obj/machinery/door/airlock/multi_tile/glass{
@@ -10627,14 +10749,6 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
-"Js" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "cmo_office"
- },
-/turf/simulated/floor/plating,
-/area/turbolift/rhammerhead/underground)
"Jt" = (
/obj/machinery/air_sensor{
frequency = 1441;
@@ -10649,7 +10763,7 @@
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"Jy" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/security/prison)
"JB" = (
/obj/structure/bed/chair/bay{
@@ -10769,19 +10883,6 @@
/obj/item/stool,
/turf/simulated/floor/plating,
/area/storage/tech)
-"Kb" = (
-/obj/structure/bed/chair/office/dark{
- dir = 4
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/tcommsat/computer)
"Ke" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -10902,7 +11003,7 @@
id = "portables_garage";
name = "Garage Door"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/steel,
@@ -10922,14 +11023,6 @@
/obj/item/towel/random,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"Kw" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 1
- },
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"Ky" = (
/obj/machinery/light{
dir = 4
@@ -10944,24 +11037,6 @@
/obj/item/clothing/suit/tajaran/furs,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"KB" = (
-/obj/machinery/door/firedoor/multi_tile{
- dir = 2
- },
-/obj/machinery/door/airlock/multi_tile/metal{
- dir = 1;
- name = "Fighter Hangar";
- req_one_access = list(1,19,29,38,43,47,63,67)
- },
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "hangar_lockdown";
- name = "Hangar Lockdown Blast Doors";
- opacity = 0
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/station/fighter_bay)
"KC" = (
/obj/machinery/atmospherics/component/binary/pump{
dir = 1
@@ -10974,6 +11049,16 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"KE" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/vehicle/ridden/cart/security{
+ dir = 1
+ },
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"KG" = (
/obj/machinery/power/apc{
dir = 8;
@@ -11034,6 +11119,12 @@
/obj/item/pen/fountain,
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
+"KO" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"KP" = (
/obj/machinery/telecomms/relay/preset/rift/base_mid,
/turf/simulated/floor/tiled/dark,
@@ -11059,12 +11150,7 @@
/area/rift/station/fighter_bay/maintenance)
"KW" = (
/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -24
+ icon_state = "1-8"
},
/turf/simulated/floor/concrete/rng/indoors,
/area/rift/station/fighter_bay/transport_tunnel_garage)
@@ -11142,18 +11228,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
-"Lb" = (
-/obj/machinery/light/small{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"Ld" = (
/obj/structure/sign/signnew/cryogenics,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering)
"Le" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -11193,7 +11270,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
"Lk" = (
@@ -11214,9 +11291,6 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
-"Ll" = (
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"Lm" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -11242,15 +11316,14 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos/hallway)
-"Lq" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
+"Lp" = (
+/obj/structure/cable/green,
/obj/structure/cable/green{
- icon_state = "2-8"
+ icon_state = "0-2"
},
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/storage/tech)
"Lr" = (
/obj/structure/railing{
dir = 4
@@ -11353,6 +11426,15 @@
/obj/structure/bed/chair/bay,
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
+"LQ" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"LS" = (
/obj/machinery/light{
dir = 8
@@ -11381,6 +11463,13 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"LW" = (
+/obj/machinery/atmospherics/pipe/simple/visible/blue{
+ dir = 10
+ },
+/obj/machinery/meter,
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"LX" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -11438,14 +11527,13 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/primary/underone)
+"Md" = (
+/turf/simulated/wall/prepainted,
+/area/hallway/primary/underone)
"Mg" = (
/obj/item/arrow/rod,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"Mh" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"Ml" = (
/obj/structure/closet/hydrant{
pixel_y = -32
@@ -11477,13 +11565,8 @@
},
/turf/simulated/floor/plating,
/area/storage/tech)
-"Mr" = (
-/obj/machinery/door/blast/regular{
- id = "fighterbaytransport";
- name = "Transport Tunnel"
- },
-/obj/machinery/atmospheric_field_generator/perma,
-/turf/simulated/floor/tiled/techmaint,
+"Mq" = (
+/turf/simulated/floor/concrete/rng/lythios43c,
/area/rift/station/fighter_bay/transport_tunnel)
"Mt" = (
/obj/effect/floor_decal/borderfloorblack/corner,
@@ -11503,13 +11586,21 @@
/area/engineering/atmos/hallway)
"Mw" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/lower/trash_pit)
"Mx" = (
-/obj/machinery/light/no_nightshift,
-/turf/simulated/floor/concrete/rng/indoors,
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "fighterbaytransport";
+ name = "Transport Tunnel";
+ pixel_x = -5;
+ pixel_y = -26;
+ req_one_access = list(1,29,38,47)
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
/area/rift/station/fighter_bay/transport_tunnel)
"My" = (
/obj/structure/railing,
@@ -11616,19 +11707,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/drone_fabrication)
-"MR" = (
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/storage/tech)
"MS" = (
/obj/machinery/door/airlock{
name = "Toilet"
@@ -11656,24 +11734,6 @@
},
/turf/simulated/floor/wood/broken,
/area/maintenance/engineering)
-"MV" = (
-/obj/structure/window/reinforced,
-/obj/machinery/light/spot{
- dir = 8
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/computer/general_air_control/large_tank_control{
- dir = 4;
- input_tag = "o2_in";
- name = "Oxygen Supply Control";
- output_tag = "o2_out";
- sensors = list("o2_sensor"="Tank")
- },
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
"MW" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -11682,7 +11742,7 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"MY" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/station/protean_nanite_room)
"MZ" = (
/obj/structure/table/steel,
@@ -11770,10 +11830,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
-"Np" = (
-/obj/machinery/door/airlock/lift,
-/turf/simulated/floor/tiled/techmaint,
-/area/turbolift/rhammerhead/underground)
+"No" = (
+/turf/simulated/mineral/icerock/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"Nt" = (
/obj/machinery/holopad,
/obj/structure/cable/green{
@@ -11891,7 +11950,7 @@
dir = 1
},
/obj/machinery/camera/network/civilian{
- dir = 10
+ dir = 1
},
/obj/machinery/atmospherics/portables_connector{
dir = 1
@@ -11933,6 +11992,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 9
},
+/obj/structure/closet/crate/hydroponics,
+/obj/item/stack/material/algae,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos)
"NN" = (
@@ -11974,7 +12035,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -11997,7 +12058,7 @@
/obj/machinery/atmospherics/pipe/manifold/visible/red{
dir = 8
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
"NU" = (
@@ -12052,10 +12113,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"Oe" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/pool)
"Of" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -12098,6 +12155,14 @@
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/plating,
/area/storage/tech)
+"Oi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 8
+ },
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"Oj" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
@@ -12114,8 +12179,18 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
+"Ok" = (
+/obj/structure/cable/green{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/green{
+ icon_state = "2-8"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/trade_shop)
"Ol" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/lower/trash_pit)
"Om" = (
/obj/structure/inflatable/door,
@@ -12132,6 +12207,12 @@
},
/turf/simulated/floor/crystal,
/area/rift/station/adherent_maintenance)
+"Oq" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux,
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"Or" = (
/obj/machinery/computer/general_air_control/large_tank_control{
dir = 8;
@@ -12155,12 +12236,6 @@
"Ot" = (
/turf/simulated/floor/reinforced/carbon_dioxide,
/area/engineering/atmos)
-"Ou" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"Ov" = (
/obj/effect/overlay/snow/floor/pointy,
/obj/effect/overlay/snow/floor/pointy{
@@ -12175,6 +12250,17 @@
/obj/item/barrier_tape_segment/engineering,
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
+"Ow" = (
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "fighterbaytransportexit";
+ name = "Transport Tunnel Exit"
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/hangar)
"Oy" = (
/obj/effect/floor_decal/techfloor{
dir = 9
@@ -12284,29 +12370,6 @@
/obj/structure/catwalk/plank,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/underground/under1)
-"OU" = (
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 9
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
-"OV" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/obj/machinery/button/remote/blast_door{
- dir = 1;
- id = "fighterbaytransport";
- name = "Transport Tunnel";
- pixel_x = -5;
- pixel_y = -26;
- req_one_access = list(1,29,38,47)
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"OW" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -12385,15 +12448,6 @@
},
/turf/simulated/floor/tiled/kafel_full/blue,
/area/crew_quarters/pool)
-"Pg" = (
-/obj/machinery/light/no_nightshift{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 6
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"Ph" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -12443,10 +12497,6 @@
/obj/structure/barricade,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/elevator)
-"Pq" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/tcommsat/computer)
"Pr" = (
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/white,
@@ -12463,12 +12513,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
-"Pu" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"Pw" = (
/obj/structure/musician/piano/unanchored,
/turf/simulated/floor/plating,
@@ -12500,27 +12544,6 @@
/obj/structure/snowman,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/underground/under1)
-"PA" = (
-/obj/machinery/button/remote/blast_door{
- id = "hangar_maint";
- name = "Hangar Maintenance Shutter Control";
- pixel_y = 28;
- req_one_access = list(1,29,38,47)
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/mauve/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/mauve/bordercorner2{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/station/fighter_bay)
"PC" = (
/obj/machinery/alarm{
dir = 4;
@@ -12544,7 +12567,8 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
/turf/simulated/floor/plating,
/area/engineering/atmos)
"PF" = (
@@ -12556,6 +12580,12 @@
"PH" = (
/turf/simulated/floor/crystal,
/area/rift/station/adherent_maintenance)
+"PI" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"PJ" = (
/obj/machinery/light{
dir = 4
@@ -12595,6 +12625,19 @@
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/plating,
/area/storage/tech)
+"PP" = (
+/obj/structure/closet/hydrant{
+ dir = 4;
+ pixel_x = -32
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
+"PQ" = (
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"PS" = (
/obj/machinery/atmospherics/portables_connector{
dir = 4
@@ -12619,14 +12662,6 @@
/obj/machinery/telecomms/relay/preset/rift/under_deep,
/turf/simulated/floor/tiled/dark,
/area/tcommsat/chamber)
-"PX" = (
-/obj/machinery/door/blast/shutters{
- dir = 2;
- id = "hammerheadtransportgarage";
- name = "Transport Tunnel Garage"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"PY" = (
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating,
@@ -12674,6 +12709,20 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Qi" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/secure_storage/upper)
+"Qj" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"Ql" = (
/obj/machinery/atmospherics/component/unary/outlet_injector{
dir = 8;
@@ -12685,6 +12734,15 @@
},
/turf/simulated/floor/reinforced/n20,
/area/engineering/atmos)
+"Qm" = (
+/obj/machinery/light/no_nightshift{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"Qn" = (
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/steel_grid/lythios43c,
@@ -12730,16 +12788,6 @@
},
/turf/simulated/floor,
/area/storage/tech)
-"Qv" = (
-/turf/simulated/floor/tiled/techmaint,
-/area/turbolift/rhammerhead/underground)
-"Qw" = (
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -25
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"Qx" = (
/obj/structure/flora/ausbushes/lavendergrass,
/turf/simulated/floor/outdoors/snow/lythios43c,
@@ -12765,39 +12813,25 @@
/obj/structure/grille,
/turf/simulated/floor/outdoors/safeice/lythios43c,
/area/rift/surfacebase/underground/under1)
-"QI" = (
-/obj/machinery/button/remote/blast_door{
- id = "fighterbaytransportexit";
- name = "Transport Tunnel";
- pixel_x = -27;
- pixel_y = 26;
- req_one_access = list(1,29,38,47)
+"QG" = (
+/obj/structure/cable/green{
+ icon_state = "0-8"
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/structure/cable/green{
+ icon_state = "0-2"
},
/obj/structure/cable/green{
- icon_state = "1-2"
+ icon_state = "2-8"
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/rift/station/fighter_bay/hangar)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/storage/tech)
"QJ" = (
/obj/effect/map_effect/portal/line/side_a{
dir = 4
},
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/underground/under1)
-"QL" = (
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -24
- },
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"QM" = (
/obj/item/digestion_remains/skull/tajaran,
/turf/simulated/floor/plating,
@@ -12826,12 +12860,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/station/protean_nanite_room)
-"QT" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/engineering/atmos)
"QU" = (
/obj/effect/floor_decal/spline/plain,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -12860,15 +12888,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"QY" = (
-/obj/machinery/light/no_nightshift{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"QZ" = (
/obj/effect/map_effect/portal/line/side_a{
dir = 4
@@ -12881,6 +12900,23 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
+"Rc" = (
+/obj/structure/window/reinforced,
+/obj/machinery/light/spot{
+ dir = 8
+ },
+/obj/machinery/computer/general_air_control/large_tank_control{
+ dir = 4;
+ frequency = 1443;
+ input_tag = "air_in";
+ name = "Mixed Air Supply Control";
+ output_tag = "air_out";
+ pressure_setting = 2000;
+ sensors = list("air_sensor"="Tank")
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/red,
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"Rd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -12951,40 +12987,20 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/drone_fabrication)
-"Rm" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/mauve/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/mauve/bordercorner2{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/station/fighter_bay)
"Rn" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"Rr" = (
-/obj/structure/cable/green{
- icon_state = "1-8"
+"Rp" = (
+/obj/machinery/atmospherics/pipe/simple/visible/cyan{
+ dir = 4
},
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"Rs" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -13017,6 +13033,14 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/lythios43c/indoors,
/area/security/prison)
+"Rz" = (
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "hammerheadtransportgarage";
+ name = "Transport Tunnel Garage"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"RA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red,
/turf/simulated/floor/tiled,
@@ -13076,7 +13100,7 @@
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"RH" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/station/fighter_bay/maintenance)
"RI" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
@@ -13169,13 +13193,6 @@
/obj/structure/filingcabinet/chestdrawer,
/turf/simulated/floor/tiled/white,
/area/rnd/secure_storage/upper)
-"RY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 8
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"RZ" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
@@ -13209,6 +13226,10 @@
/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,
+/area/rnd/secure_storage/upper)
"Sk" = (
/obj/structure/table/rack,
/obj/random/maintenance/clean,
@@ -13216,21 +13237,6 @@
/obj/random/maintenance/engineering,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"Sm" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/rift/station/fighter_bay/hangar)
"Sn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 9
@@ -13255,7 +13261,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled/steel,
@@ -13295,6 +13301,12 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/wood,
/area/rift/station/fighter_bay)
+"Sw" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 6
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"Sx" = (
/obj/machinery/door/airlock{
name = "Liquid Sports"
@@ -13341,17 +13353,8 @@
},
/turf/simulated/floor/plating,
/area/engineering/atmos/hallway)
-"SH" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 4
- },
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"SI" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/station/fighter_bay)
"SM" = (
/obj/effect/floor_decal/industrial/warning{
@@ -13368,23 +13371,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
-"SO" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/rift/station/fighter_bay/hangar)
-"SP" = (
-/turf/simulated/wall/r_wall,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
-"SR" = (
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/turf/simulated/floor/concrete/rng/indoors,
+"ST" = (
+/obj/machinery/floodlight,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/tiled/techmaint,
/area/rift/station/fighter_bay/transport_tunnel)
"SV" = (
/obj/structure/cable/green{
@@ -13414,13 +13404,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/station/fighter_bay/maintenance)
-"SY" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"SZ" = (
/obj/machinery/door/airlock/glass_external/public{
name = "Mining Outpost Airlock"
@@ -13433,10 +13416,6 @@
},
/turf/simulated/floor,
/area/hallway/primary/underone)
-"Tb" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/engineering)
"Tc" = (
/obj/item/digestion_remains/skull/teshari,
/turf/simulated/floor/plating,
@@ -13469,10 +13448,6 @@
/obj/machinery/pipedispenser,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"Ti" = (
-/obj/structure/closet/secure_closet/guncabinet/robotics,
-/turf/simulated/floor/tiled/steel,
-/area/rift/station/fighter_bay/maintenance)
"Tk" = (
/obj/random/junk,
/obj/structure/cable/green{
@@ -13480,6 +13455,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/elevator)
+"Tl" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/station/fighter_bay/transport_tunnel)
"Tm" = (
/obj/effect/floor_decal/rust,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13489,17 +13467,26 @@
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
"Tn" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
+/obj/machinery/door/blast/regular{
+ id = "hammerheadtransport";
+ name = "Transport Tunnel"
},
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+/obj/machinery/atmospheric_field_generator/perma,
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
"Tp" = (
/obj/structure/table/rack/shelf/steel,
/obj/random/maintenance/cargo,
/obj/random/maintenance/clean,
/turf/simulated/floor/plating,
/area/maintenance/elevator)
+"Tq" = (
+/obj/machinery/light/no_nightshift,
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/turbolift/rhammerhead/underground)
"Tr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -13540,26 +13527,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
-"Tx" = (
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/trade_shop)
-"Tz" = (
-/obj/structure/extinguisher_cabinet{
- dir = 4;
- pixel_x = -30
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/transport_tunnel)
"TB" = (
/obj/effect/alien/weeds,
/obj/structure/barricade/cutout/fukken_xeno,
@@ -13593,16 +13560,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"TK" = (
-/obj/machinery/power/apc{
- dir = 4;
- pixel_x = 24
- },
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/rift/station/fighter_bay/maintenance)
"TN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
@@ -13615,8 +13572,18 @@
"TO" = (
/obj/structure/grille,
/obj/structure/foamedmetal,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering)
+"TP" = (
+/obj/structure/cable/green{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/storage/tech)
"TQ" = (
/obj/effect/map_effect/portal/line/side_a{
dir = 4
@@ -13647,19 +13614,6 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
-"TU" = (
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/storage/tech)
"TW" = (
/obj/structure/railing{
dir = 1
@@ -13675,6 +13629,15 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"TY" = (
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"Ub" = (
/obj/effect/floor_decal/rust,
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -13711,12 +13674,6 @@
},
/turf/simulated/floor,
/area/hallway/primary/underone)
-"Uk" = (
-/obj/machinery/light/no_nightshift{
- dir = 8
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"Ul" = (
/obj/machinery/space_heater,
/obj/structure/railing,
@@ -13743,9 +13700,17 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/pipecyan,
/turf/simulated/floor/plating,
/area/engineering/atmos)
+"Us" = (
+/obj/structure/closet/hydrant{
+ dir = 4;
+ pixel_x = 32
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"Ut" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -13758,6 +13723,28 @@
},
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"Uv" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/mauve/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/mauve/bordercorner2{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/station/fighter_bay)
"Uw" = (
/obj/random/cigarettes,
/obj/random/junk,
@@ -13811,7 +13798,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
"UF" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/research/xenobio)
"UH" = (
/turf/simulated/floor/plating,
@@ -13823,10 +13810,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/tcommsat/computer)
-"UK" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/secure_storage/upper)
"UL" = (
/obj/structure/railing{
dir = 4
@@ -13838,14 +13821,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/hangar)
-"UM" = (
-/obj/structure/cable/green,
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/storage/tech)
"UN" = (
/obj/effect/floor_decal/rust,
/obj/structure/sink{
@@ -13878,9 +13853,7 @@
/area/tcommsat/computer)
"UQ" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/elevator)
"US" = (
/obj/machinery/door/window/brigdoor/westleft{
@@ -13899,11 +13872,21 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/upper)
+"UV" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 4;
+ id = "hammerheadtransportgarage";
+ name = "Transport Tunnel Garage";
+ pixel_x = -26;
+ pixel_y = -6;
+ req_one_access = list(1,38)
+ },
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage)
"UX" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering/upper)
"UY" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
@@ -13969,11 +13952,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/fighter_bay)
-"Vk" = (
-/obj/structure/sign/signnew/danger,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/station/adherent_maintenance)
"Vl" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -14055,7 +14033,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Fighter Bay";
req_one_access = list(19,29,38,43,47,63,67)
},
@@ -14066,33 +14044,25 @@
/obj/machinery/atmospherics/component/binary/passive_gate/on,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
-"Vz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+"VA" = (
+/obj/structure/window/reinforced,
+/obj/machinery/light/spot{
dir = 8
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "1-4"
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/rift/station/fighter_bay/hangar)
-"VA" = (
-/obj/machinery/button/remote/blast_door{
+/obj/machinery/computer/general_air_control/large_tank_control{
dir = 4;
- id = "hammerheadtransportgarage";
- name = "Transport Tunnel Garage";
- pixel_x = -26;
- pixel_y = -6;
- req_one_access = list(1,38)
+ input_tag = "o2_in";
+ name = "Oxygen Supply Control";
+ output_tag = "o2_out";
+ sensors = list("o2_sensor"="Tank")
},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
+/obj/machinery/atmospherics/pipe/simple/visible/black,
+/turf/simulated/floor/tiled,
+/area/engineering/atmos)
"VB" = (
/obj/effect/floor_decal/borderfloor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -14160,13 +14130,19 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/storage/tech)
-"VQ" = (
-/obj/structure/closet/hydrant{
- dir = 4;
- pixel_x = 32
+"VR" = (
+/obj/structure/ladder/up,
+/obj/effect/floor_decal/techfloor{
+ dir = 9
},
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing,
+/obj/machinery/firealarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/rift/turbolift/maint)
"VT" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -14195,15 +14171,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/trash_pit)
-"VX" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel)
"VY" = (
/obj/effect/debris/cleanable/blood/gibs/robot/up,
/turf/simulated/floor/plating,
@@ -14301,37 +14268,12 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
-"Wr" = (
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/obj/structure/cable/green{
- icon_state = "16-0"
- },
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/railing,
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"Wt" = (
/obj/structure/transit_tube/high_velocity{
icon_state = "W-SE"
},
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/underground/under1)
-"Wu" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"Wv" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -14363,22 +14305,6 @@
/obj/item/multitool,
/turf/simulated/floor/plating,
/area/storage/tech)
-"Wx" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/rift/station/fighter_bay/hangar)
"Wy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 8
@@ -14467,21 +14393,32 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos)
-"WJ" = (
-/obj/structure/railing/grey{
- dir = 1
- },
-/obj/structure/railing/grey{
+"WI" = (
+/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/obj/structure/window/basic{
- dir = 8
+/obj/machinery/button/remote/blast_door{
+ id = "hammerheadtransport";
+ name = "Transport Tunnel";
+ pixel_x = -6;
+ pixel_y = 26;
+ req_one_access = list(1,29,38,47)
},
-/obj/structure/window/basic{
+/obj/machinery/button/remote/blast_door{
+ id = "hammerheadtransportgarage";
+ name = "Transport Tunnel Garage";
+ pixel_x = 5;
+ pixel_y = 26;
+ req_one_access = list(1,38)
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/obj/machinery/light/no_nightshift{
dir = 1
},
-/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
-/area/rift/surfacebase/underground/under1)
+/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.";
@@ -14501,6 +14438,13 @@
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
"WO" = (
+/obj/machinery/power/apc{
+ dir = 4;
+ pixel_x = 24
+ },
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel_grid,
/area/rift/station/fighter_bay/maintenance)
@@ -14514,18 +14458,13 @@
/turf/simulated/floor,
/area/storage/tech)
"WT" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/storage/tech)
"WU" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/tiled/techfloor/grid,
/area/rift/station/fighter_bay/hangar)
-"WV" = (
-/obj/structure/cable/green,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/storage/tech)
"WW" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -14533,15 +14472,6 @@
/obj/effect/floor_decal/borderfloor,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/underone)
-"WY" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/railing{
- dir = 8
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage)
"WZ" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -14551,6 +14481,15 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/primary/underone)
+"Xa" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"Xc" = (
/obj/structure/table/standard,
/obj/machinery/light{
@@ -14565,15 +14504,18 @@
/area/tcommsat/computer)
"Xf" = (
/obj/machinery/light/no_nightshift{
- dir = 1
+ dir = 4
},
-/turf/simulated/floor/tiled/techmaint,
-/area/turbolift/rhammerhead/underground)
+/obj/effect/floor_decal/industrial/warning{
+ dir = 6
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"Xg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/blue{
dir = 8
},
-/obj/machinery/door/airlock/glass_atmos,
+/obj/machinery/door/airlock/glass/atmos,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_grid,
/area/engineering/atmos)
@@ -14611,8 +14553,21 @@
/obj/machinery/nanite_chamber,
/turf/simulated/floor/tiled/techfloor/grid,
/area/station/protean_nanite_room)
+"Xp" = (
+/turf/simulated/wall/prepainted/engineering/atmos,
+/area/engineering/atmos/hallway)
+"Xq" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/vehicle/ridden/cart/security{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/rift/station/fighter_bay/transport_tunnel)
+"Xr" = (
+/turf/simulated/open,
+/area/turbolift/runder/level1)
"Xs" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/command,
/area/tcommsat/chamber)
"Xu" = (
/obj/structure/catwalk,
@@ -14663,16 +14618,10 @@
},
/turf/simulated/floor/tiled/kafel_full/beige,
/area/crew_quarters/pool)
-"XE" = (
-/obj/machinery/light/no_nightshift{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"XF" = (
/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
@@ -14698,6 +14647,12 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
+"XJ" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"XL" = (
/obj/machinery/light/small,
/turf/simulated/floor/wood,
@@ -14711,8 +14666,14 @@
"XN" = (
/turf/simulated/floor/wood,
/area/maintenance/engineering)
+"XO" = (
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/turbolift/rhammerhead/underground)
"XQ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/crew_quarters/pool)
"XS" = (
/obj/machinery/atmospherics/pipe/simple/visible/green{
@@ -14726,7 +14687,7 @@
/area/engineering/atmos)
"XU" = (
/obj/structure/sign/department/telecoms,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/command,
/area/tcommsat/computer)
"XV" = (
/obj/random/trash_pile,
@@ -14749,7 +14710,7 @@
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/turbolift/rmine/under1)
"Ya" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/command,
/area/tcommsat/computer)
"Yb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14768,7 +14729,7 @@
/area/maintenance/research/xenobio)
"Ye" = (
/obj/structure/sign/warning/siphon_valve,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/command,
/area/tcommsat/chamber)
"Yf" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -14784,15 +14745,10 @@
/turf/simulated/floor/plating,
/area/engineering/atmos)
"Yh" = (
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/storage/tech)
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/pipecyan,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"Yi" = (
/obj/machinery/light/small{
dir = 1
@@ -14814,6 +14770,20 @@
/obj/machinery/camera/network/research,
/turf/simulated/floor/tiled,
/area/rnd/secure_storage/upper)
+"Yn" = (
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"Yp" = (
/obj/machinery/vending/assist,
/turf/simulated/floor/plating,
@@ -14838,7 +14808,7 @@
/turf/simulated/floor/crystal,
/area/rift/station/adherent_maintenance)
"Yu" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/station/fighter_bay/hangar)
"Yv" = (
/obj/structure/cable/green{
@@ -14847,13 +14817,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/drone_fabrication)
-"Yw" = (
-/obj/machinery/atmospherics/pipe/simple/visible/black{
- dir = 4
- },
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/atmos)
"Yx" = (
/obj/machinery/atmospherics/component/unary/vent_pump{
dir = 4;
@@ -14886,9 +14849,11 @@
},
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/hangar)
-"Yz" = (
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
+"YA" = (
+/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden/blue,
+/turf/simulated/floor/plating,
+/area/engineering/atmos)
"YB" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -14941,6 +14906,13 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/secure_storage/upper)
+"YN" = (
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -25
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"YO" = (
/obj/machinery/telecomms/bus/preset_two/rift,
/turf/simulated/floor/tiled/dark,
@@ -14967,12 +14939,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/elevator)
-"YU" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel)
"YV" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -15084,24 +15050,15 @@
},
/turf/simulated/floor/tiled,
/area/maintenance/elevator)
-"Zg" = (
-/obj/machinery/alarm{
- dir = 8;
- pixel_x = 24
- },
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/rift/station/fighter_bay/maintenance)
"Zh" = (
/obj/item/digestion_remains/skull/tajaran,
/obj/item/arrow/rod,
/turf/simulated/floor/plating,
/area/maintenance/engineering)
+"Zj" = (
+/obj/machinery/door/airlock/lift,
+/turf/simulated/floor/tiled/techmaint,
+/area/turbolift/rhammerhead/underground)
"Zk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/tiled/techfloor/grid,
@@ -15132,7 +15089,7 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
"Zq" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/engineering/atmos/hallway)
"Zr" = (
/turf/simulated/floor/reinforced/n20,
@@ -15176,6 +15133,12 @@
"Zx" = (
/turf/simulated/floor/tiled,
/area/engineering/atmos)
+"Zy" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel)
"Zz" = (
/obj/effect/floor_decal/borderfloor,
/obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -15263,6 +15226,22 @@
},
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos)
+"ZP" = (
+/obj/machinery/button/remote/blast_door{
+ id = "hammerheadtransportgarage";
+ name = "Transport Tunnel Garage";
+ pixel_x = -6;
+ pixel_y = 26;
+ req_one_access = list(1,38)
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
+ },
+/obj/machinery/light/no_nightshift{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel)
"ZQ" = (
/obj/structure/railing{
dir = 1
@@ -15283,6 +15262,10 @@
/obj/machinery/disposal,
/turf/simulated/floor/wood,
/area/rift/station/fighter_bay)
+"ZS" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/station/stairs_two)
"ZT" = (
/obj/machinery/light/small,
/turf/simulated/floor/wood/broken,
@@ -15303,6 +15286,21 @@
},
/turf/simulated/floor/tiled/kafel_full/blue,
/area/crew_quarters/pool)
+"ZX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/rift/station/fighter_bay/hangar)
"ZY" = (
/obj/machinery/button/remote/blast_door{
dir = 8;
@@ -21103,9 +21101,9 @@ WR
WR
WR
WR
-uA
-uA
-uA
+tZ
+tZ
+tZ
Va
WR
Va
@@ -21282,6 +21280,7 @@ UF
UF
UF
UF
+tZ
uA
uA
uA
@@ -21297,9 +21296,8 @@ uA
uA
uA
uA
-uA
-uA
-uA
+tZ
+tZ
Va
Va
WR
@@ -21492,8 +21490,8 @@ lX
uA
lX
uA
-uA
-uA
+tZ
+tZ
WR
Va
Va
@@ -21641,11 +21639,11 @@ OI
AO
xS
Yu
-bA
+Md
Wc
Uh
-bA
-bA
+Md
+Md
OO
Ss
OO
@@ -21688,7 +21686,7 @@ iz
uA
uA
uA
-UK
+Qi
uA
uA
WR
@@ -21839,7 +21837,7 @@ VM
Mc
Wv
TW
-bA
+Md
Gt
rv
OO
@@ -22033,11 +22031,11 @@ Ul
SB
WZ
CP
-bA
-bA
+Md
+Md
uF
-re
-bA
+qo
+Md
aa
WR
WR
@@ -22080,7 +22078,7 @@ oT
UH
uA
uA
-UK
+Sj
uA
uA
WR
@@ -22199,13 +22197,13 @@ jL
jL
jL
jL
-mZ
-mZ
-mZ
-mZ
-mZ
-mZ
-mZ
+Tl
+Tl
+Tl
+Tl
+Tl
+Tl
+Tl
aa
aa
aa
@@ -22227,11 +22225,11 @@ Sy
FF
DK
TW
-bA
+Md
Qs
Nk
dP
-bA
+Md
aa
WR
sV
@@ -22393,20 +22391,20 @@ jL
jL
jL
aa
-mZ
-qu
-hY
-Hu
-QL
-vV
-mZ
-mZ
-mZ
-mZ
-mZ
-mZ
-mZ
-mZ
+Tl
+Fh
+PP
+tQ
+Ep
+ST
+Tl
+Tl
+Tl
+Tl
+Tl
+Tl
+Tl
+Tl
Yu
xt
Xh
@@ -22417,15 +22415,15 @@ vQ
zm
tc
Yu
-bA
+Md
KH
SZ
-bA
-bA
+Md
+Md
Qs
yI
SA
-bA
+Md
aa
aa
sV
@@ -22587,25 +22585,25 @@ jL
jL
aa
aa
-mZ
-SR
-mu
-mu
-Lq
-VX
-VX
-pY
-QY
-Pu
-Pu
-Tz
-QY
-SY
-mn
-QI
-SO
-SO
-Vz
+Tl
+TY
+mJ
+mJ
+Qj
+LQ
+LQ
+Ev
+Qm
+PI
+PI
+dN
+Qm
+oG
+Ow
+HP
+vm
+vm
+ZX
Zk
WU
lz
@@ -22619,7 +22617,7 @@ dP
dP
Pd
Pd
-bA
+Md
aa
WR
sV
@@ -22781,25 +22779,25 @@ jL
jL
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Ll
-Ll
-Ll
-Ll
-hJ
-Dc
-oz
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+uN
+uN
+uN
+uN
+bG
+tz
+pK
Gn
Gn
-Sm
+hi
Gn
OI
AO
@@ -22813,7 +22811,7 @@ dP
et
dP
dP
-bA
+Md
aa
aa
sV
@@ -22826,10 +22824,10 @@ WR
WR
WR
WR
-es
-es
-es
-es
+IH
+IH
+IH
+IH
fj
oW
uA
@@ -22975,25 +22973,25 @@ jL
jL
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Ll
-mZ
-mZ
-mZ
-mZ
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+uN
+Tl
+Tl
+Tl
+Tl
Yu
Yy
uP
Oj
-Wx
+DD
wD
Oz
XW
@@ -23007,7 +23005,7 @@ IG
LY
Vc
dP
-bA
+Md
aa
aa
sV
@@ -23020,7 +23018,7 @@ WR
WR
WR
WR
-es
+IH
HF
Hc
XY
@@ -23169,17 +23167,17 @@ jL
aa
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Qw
-mZ
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+hJ
+Tl
WM
RE
cK
@@ -23187,21 +23185,21 @@ SI
SI
SI
SI
-tk
-KB
+gy
+Dq
SI
SI
SI
SI
SI
BX
-bA
+Md
Le
Jm
-bA
+Md
FE
-bA
-bA
+Md
+Md
aa
aa
aa
@@ -23214,7 +23212,7 @@ WR
WR
WR
WR
-es
+IH
Pr
XY
qV
@@ -23363,17 +23361,17 @@ jL
aa
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Ll
-mZ
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+uN
+Tl
ra
Zw
xh
@@ -23388,11 +23386,11 @@ CV
EK
LS
Wg
-yA
+eS
zb
FK
wf
-bA
+Md
Mu
PL
sa
@@ -23408,7 +23406,7 @@ WR
WR
WR
WR
-es
+IH
Pr
XY
Xl
@@ -23557,17 +23555,17 @@ aa
aa
aa
aa
-mZ
-Et
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Bd
-mZ
+Tl
+PQ
+ys
+ys
+ys
+ys
+ys
+is
+uN
+lh
+Tl
yi
FN
Sv
@@ -23602,14 +23600,14 @@ WR
ER
WR
hq
-es
-es
-es
-es
-es
-es
-es
-es
+IH
+IH
+IH
+IH
+IH
+IH
+IH
+IH
uA
Ax
JE
@@ -23628,7 +23626,7 @@ Ys
uA
uA
uA
-UK
+Qi
uA
uA
WR
@@ -23751,32 +23749,32 @@ aa
aa
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Ll
-mZ
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+uN
+Tl
ZR
YW
GY
SI
SI
-yA
-yA
+eS
+eS
AH
LJ
-yA
-Db
+eS
+qA
SI
-Rm
+Uv
Sq
-yA
+eS
RN
DW
WW
@@ -23788,7 +23786,7 @@ my
my
my
sR
-Tb
+po
WR
WR
WR
@@ -23803,7 +23801,7 @@ WR
WR
WR
WR
-es
+IH
uA
uA
Bc
@@ -23820,8 +23818,8 @@ MZ
JE
JE
uA
-uA
-uA
+tZ
+tZ
Lv
Lv
Va
@@ -23945,17 +23943,17 @@ aa
aa
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Ll
-mZ
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+uN
+Tl
eY
zP
JY
@@ -23974,7 +23972,7 @@ Vh
Hg
eg
rT
-bA
+Md
sR
zH
tG
@@ -23982,7 +23980,7 @@ sR
sR
my
sR
-Tb
+po
WR
WR
WR
@@ -23997,10 +23995,8 @@ WR
WR
WR
WR
-es
-uA
-uA
-uA
+IH
+tZ
uA
uA
uA
@@ -24016,6 +24012,8 @@ uA
uA
uA
uA
+tZ
+tZ
Va
Lv
Va
@@ -24139,17 +24137,17 @@ aa
aa
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-fX
-mZ
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+uQ
+Tl
Sr
HB
QU
@@ -24176,7 +24174,7 @@ pT
sS
my
sR
-Tb
+po
WR
WR
WR
@@ -24207,9 +24205,9 @@ WR
WR
WR
WR
-uA
-uA
-uA
+tZ
+tZ
+tZ
Va
Lv
Va
@@ -24275,8 +24273,8 @@ Jl
Jl
Jl
Jl
-Tx
-rn
+Ok
+Hy
Jl
Jl
Zu
@@ -24333,17 +24331,17 @@ aa
aa
aa
aa
-mZ
-jz
-jz
-jz
-jz
-jz
-jz
-Hm
-Ll
-Ll
-mZ
+Tl
+ys
+ys
+ys
+ys
+ys
+ys
+is
+uN
+uN
+Tl
BT
Je
OQ
@@ -24356,7 +24354,7 @@ VF
Hd
Rf
RH
-PA
+pP
Ze
BX
Nb
@@ -24370,7 +24368,7 @@ MY
Gr
my
sR
-Tb
+po
WR
WR
WR
@@ -24527,17 +24525,17 @@ aa
aa
aa
aa
-mZ
-Et
-jz
-jz
-jz
-Mx
-mZ
-Kw
-EQ
-GG
-mZ
+Tl
+PQ
+ys
+ys
+ys
+FS
+Tl
+jS
+Xq
+rb
+Tl
SI
SI
MS
@@ -24721,17 +24719,17 @@ aa
aa
aa
aa
-mZ
-DA
-Hk
-Hk
-Hk
-qo
-mZ
-mZ
-mZ
-mZ
-mZ
+Tl
+IV
+EE
+EE
+EE
+gJ
+Tl
+Tl
+Tl
+Tl
+Tl
SI
CG
MJ
@@ -24740,9 +24738,9 @@ RH
uE
WO
va
-BU
-uz
-uz
+KU
+Fs
+Fs
RH
SI
SI
@@ -24915,13 +24913,13 @@ aa
aa
aa
aa
-mZ
-Mr
-Mr
-Mr
-Mr
-Mr
-mZ
+Tl
+jm
+jm
+jm
+jm
+jm
+Tl
aa
aa
aa
@@ -24931,12 +24929,12 @@ SI
SI
SI
RH
-Ti
-TK
-Zg
-KU
-Fs
-Fs
+RH
+RH
+RH
+RH
+RH
+RH
RH
MC
lc
@@ -25109,13 +25107,13 @@ aa
aa
aa
aa
-mZ
-nA
-Ou
-Ou
-Ou
-OV
-mZ
+Tl
+rp
+xJ
+xJ
+xJ
+Mx
+Tl
aa
aa
aa
@@ -25132,9 +25130,9 @@ iF
iF
iF
iF
-WT
-WT
-WT
+AS
+AS
+AS
Cl
eg
rT
@@ -25302,15 +25300,15 @@ jL
jL
aa
aa
-kZ
-Uk
-Yz
-Yz
-Yz
-Yz
-Yz
-Uk
-pW
+Bz
+dc
+Mq
+Mq
+Mq
+Mq
+Mq
+dc
+ll
jL
jL
jL
@@ -25328,7 +25326,7 @@ KG
lc
UA
MI
-WT
+AS
Dg
NQ
XF
@@ -25497,13 +25495,13 @@ jL
jL
jL
jL
-eu
-Yz
-Yz
-Yz
-Yz
-Yz
-WJ
+zS
+Mq
+Mq
+Mq
+Mq
+Mq
+op
jL
jL
jL
@@ -25522,7 +25520,7 @@ Li
ta
Zn
Yp
-WT
+AS
Cl
eg
rT
@@ -25691,22 +25689,22 @@ jL
jL
jL
jL
-kZ
-Yz
-Yz
-Yz
-Yz
-Yz
-pW
+Bz
+Mq
+Mq
+Mq
+Mq
+Mq
+ll
jL
aa
aa
jL
jL
jL
-TU
-UM
-WV
+qy
+Lp
+oB
iF
iF
ac
@@ -25716,11 +25714,11 @@ Lm
Oh
VO
WT
-WT
+AS
Ke
eg
Jk
-Vk
+wQ
He
Yb
Rs
@@ -25885,20 +25883,20 @@ aa
aa
jL
aa
-mZ
-Yz
-Yz
-Yz
-Yz
-Yz
-mZ
+Tl
+Mq
+Mq
+Mq
+Mq
+Mq
+Tl
aa
aa
aa
aa
jL
jL
-Yh
+TP
yh
Dk
iF
@@ -25910,7 +25908,7 @@ Mp
OM
Zn
lc
-WT
+AS
xj
Tr
ru
@@ -26079,20 +26077,20 @@ aa
aa
aa
aa
-mZ
-Yz
-Yz
-Yz
-Yz
-Yz
-mZ
+Tl
+Mq
+Mq
+Mq
+Mq
+Mq
+Tl
aa
aa
aa
aa
aa
jL
-MR
+eG
cq
ve
jd
@@ -26108,7 +26106,7 @@ Gj
Vm
NA
fO
-vo
+ww
xy
Wd
zM
@@ -26273,20 +26271,20 @@ aa
aa
aa
aa
-mZ
-Yz
-Yz
-Yz
-Yz
-Yz
-mZ
+Tl
+Mq
+Mq
+Mq
+Mq
+Mq
+Tl
aa
aa
aa
aa
aa
jL
-Yh
+TP
cH
RD
iF
@@ -26298,7 +26296,7 @@ lc
PO
lc
lc
-WT
+AS
Cy
eg
rT
@@ -26467,22 +26465,22 @@ aa
aa
aa
aa
-mZ
-XE
-Yz
-Yz
-Yz
-DQ
-mZ
+Tl
+IN
+Mq
+Mq
+Mq
+lT
+Tl
aa
aa
aa
aa
aa
jL
-Cj
-UM
-WV
+QG
+Lp
+oB
iF
iF
oJ
@@ -26492,7 +26490,7 @@ lc
Qr
AX
WT
-WT
+AS
Rk
eg
rT
@@ -26661,13 +26659,13 @@ aa
aa
aa
aa
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+No
aa
aa
aa
@@ -26686,7 +26684,7 @@ lc
lc
lc
Ww
-WT
+AS
Rk
qC
Tt
@@ -26855,13 +26853,13 @@ aa
aa
aa
aa
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Ol
Ol
Ol
@@ -26880,7 +26878,7 @@ NX
Qt
WS
WD
-WT
+AS
Eu
et
Jc
@@ -27049,13 +27047,13 @@ aa
aa
aa
aa
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Ol
QV
UE
@@ -27066,15 +27064,15 @@ Ol
aG
aG
aG
-WT
-WT
-WT
+AS
+AS
+AS
ux
-WT
-WT
-WT
-WT
-WT
+AS
+AS
+AS
+AS
+AS
La
ey
wA
@@ -27243,13 +27241,13 @@ aa
aa
aa
aa
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Ol
Ra
EB
@@ -27287,23 +27285,23 @@ QP
sa
sa
sa
-kb
+mn
sa
sa
sa
sa
-kb
+mn
sa
sa
aa
sa
sa
-kb
+mn
sa
sa
sa
sa
-kb
+mn
sa
sa
sa
@@ -27315,7 +27313,7 @@ sa
vU
sa
sa
-Tb
+po
sa
tf
sa
@@ -27437,13 +27435,13 @@ aa
aa
aa
aa
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Ol
io
Ux
@@ -27630,14 +27628,14 @@ aa
aa
aa
aa
-CL
-mZ
-XE
-Yz
-Yz
-Yz
-DQ
-mZ
+No
+Tl
+IN
+Mq
+Mq
+Mq
+lT
+Tl
Ol
VV
HD
@@ -27824,14 +27822,14 @@ aa
aa
aa
aa
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Ol
VV
DG
@@ -28018,14 +28016,14 @@ aa
aa
aa
aa
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Ol
Ol
Ol
@@ -28209,17 +28207,17 @@ aa
aa
aa
aa
-CL
-CL
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+No
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+No
aa
aa
aa
@@ -28362,58 +28360,58 @@ Zu
Zu
Zu
Zu
-mZ
-mZ
-mZ
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-pg
-mZ
+Tl
+Tl
+Tl
+No
+No
+No
+Tl
+No
+No
+No
+No
+No
+No
+No
+No
+No
+Tl
+No
+No
+No
+No
+No
+No
+No
+Tl
+No
+No
+No
+No
+No
+No
+No
+Tl
+No
+No
+No
+No
+No
+No
+No
+No
+Tl
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+zV
+Tl
aa
aa
aa
@@ -28443,7 +28441,7 @@ CN
ok
ni
CN
-Oe
+hL
BB
ML
ML
@@ -28490,7 +28488,7 @@ ID
sa
HI
HI
-Tb
+po
HI
KA
aa
@@ -28554,60 +28552,60 @@ Zu
Zu
Zu
Zu
-mZ
-mZ
-mZ
-pe
-gw
-Yz
-Yz
-Yz
-Uk
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Uk
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Uk
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Uk
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Uk
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-pg
-fp
-mZ
+Tl
+Tl
+Tl
+hU
+pX
+Mq
+Mq
+Mq
+dc
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+dc
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+dc
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+dc
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+dc
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+zV
+Sw
+Tl
aa
aa
aa
@@ -28684,7 +28682,7 @@ sa
sa
sR
HO
-Tb
+po
gP
Gq
sa
@@ -28747,61 +28745,61 @@ Zu
Zu
Zu
Zu
-mZ
-mZ
-vN
-Ou
-gw
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-ur
-mZ
-mZ
+Tl
+Tl
+vy
+xJ
+pX
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Aj
+Tl
+Tl
aa
aa
aa
@@ -28831,7 +28829,7 @@ CN
rO
RZ
CN
-Oe
+hL
iB
ML
ML
@@ -28878,7 +28876,7 @@ wX
sa
vP
Mg
-Tb
+po
Mg
iQ
sa
@@ -28941,60 +28939,60 @@ Zu
Zu
Zu
Zu
-mZ
-OU
-pt
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-pg
-lJ
-mZ
+Tl
+kw
+ht
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+zV
+mG
+Tl
aa
aa
aa
@@ -29134,61 +29132,61 @@ Zu
Zu
Zu
Zu
-mZ
-mZ
-dA
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-pg
-YU
-Pg
-mZ
-mZ
+Tl
+Tl
+Zy
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+zV
+oO
+Xf
+Tl
+Tl
aa
aa
aa
@@ -29232,13 +29230,13 @@ XC
tA
OZ
fa
-Cr
-qz
-qz
-zr
-qz
-qz
-qz
+XQ
+tG
+my
+il
+ID
+sR
+sa
sR
TX
sR
@@ -29328,60 +29326,60 @@ Zu
Zu
Zu
Zu
-mZ
-pe
-gw
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-kR
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-kR
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-kR
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-kR
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-kR
-Yz
-Yz
-Yz
-pg
-fp
-mZ
-mZ
-mZ
+Tl
+hU
+pX
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+kj
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+kj
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+kj
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+kj
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+kj
+Mq
+Mq
+Mq
+zV
+Sw
+Tl
+Tl
+Tl
aa
aa
aa
@@ -29411,28 +29409,28 @@ XQ
XQ
XQ
XQ
-CN
zW
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-NU
-NU
-ij
-nt
-vZ
-nI
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+XQ
+qz
+qz
+zr
+qz
+qz
+qz
sR
TX
sR
@@ -29522,58 +29520,58 @@ Zu
Zu
Zu
Zu
-mZ
-gw
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-CL
-mZ
-CL
-CL
-CL
-mZ
-mZ
-mZ
+Tl
+pX
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Tl
+No
+No
+No
+No
+No
+No
+No
+No
+No
+Tl
+No
+No
+No
+No
+No
+No
+No
+Tl
+No
+No
+No
+No
+No
+No
+No
+Tl
+No
+No
+No
+No
+No
+No
+No
+No
+Tl
+No
+No
+No
+Tl
+Tl
+Tl
aa
aa
aa
@@ -29604,29 +29602,29 @@ gv
jv
kh
mg
-XQ
-CN
-zW
+Md
+Md
+Md
eT
-AV
-yU
eT
-iW
-nV
eT
-Iy
-XT
eT
-eK
-ne
-eK
eT
-NU
+eT
+eT
+eT
+eT
+eT
+eT
+eT
+eT
+eT
+la
eE
EY
-eE
-mP
-qz
+YA
+vZ
+nI
sR
TX
sR
@@ -29716,17 +29714,17 @@ Zu
Zu
Zu
Zu
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
-CL
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+No
+No
+No
Zu
Zu
Zu
@@ -29790,7 +29788,7 @@ YD
al
bE
aF
-aK
+ZS
di
eP
Pb
@@ -29798,22 +29796,22 @@ gR
NF
ga
mC
-XQ
-CN
-zW
+Md
+Md
+Md
eT
-Zv
-iO
+AV
+yU
eT
-Yx
-qp
+iW
+nV
eT
-oa
-mh
+Iy
+XT
eT
-CE
eK
-rq
+ne
+eK
eT
At
Cs
@@ -29910,15 +29908,15 @@ Zu
Zu
Zu
Zu
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+No
+No
Zu
Zu
Zu
@@ -29984,7 +29982,7 @@ YD
al
bI
rN
-aK
+ZS
dw
dP
wj
@@ -29992,22 +29990,22 @@ sg
GP
em
fP
-XQ
-CN
-zW
+Md
+Md
+Md
eT
-dG
-oi
+Zv
+iO
eT
-fh
-oi
+Yx
+qp
eT
-iA
-oi
+oa
+mh
eT
-Yw
-Mh
-Yw
+CE
+eK
+rq
eT
lN
Cs
@@ -30104,14 +30102,14 @@ Zu
Zu
Zu
Zu
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Zu
Zu
Zu
@@ -30177,7 +30175,7 @@ cA
cA
cA
cA
-aK
+ZS
cA
du
dP
@@ -30186,23 +30184,23 @@ eh
fR
mp
mr
-XQ
-XQ
-XQ
+ts
+ts
+ts
+eT
+Rp
+yG
eT
-IP
-VH
-nZ
ou
-VH
-fm
+yG
+eT
eW
-VH
-MV
-pl
-vG
-hu
-DI
+yG
+eT
+qj
+HX
+qj
+eT
lN
Cs
ih
@@ -30298,14 +30296,14 @@ Zu
Zu
Zu
Zu
-mZ
-XE
-Yz
-Yz
-Yz
-DQ
-mZ
-CL
+Tl
+IN
+Mq
+Mq
+Mq
+lT
+Tl
+No
Zu
Zu
Zu
@@ -30365,7 +30363,7 @@ cm
aZ
aM
bb
-bg
+VR
SW
ai
ai
@@ -30386,16 +30384,16 @@ mQ
eT
tw
Zb
-gu
-Ay
+Rc
+pk
WE
-dK
+bQ
hd
LU
-dK
-pA
-Zx
-pl
+VA
+fx
+vG
+hu
Cu
wg
NU
@@ -30486,19 +30484,19 @@ Zu
Zu
Zu
Zu
-SP
-SP
-SP
-SP
-SP
+kZ
+kZ
+kZ
+kZ
+kZ
Zu
-CL
-Yz
-Yz
-Yz
-Yz
-Yz
-CL
+No
+Mq
+Mq
+Mq
+Mq
+Mq
+No
Zu
Zu
Zu
@@ -30561,9 +30559,9 @@ aN
bb
bl
ai
-ao
-ao
-ao
+Xr
+Xr
+Xr
ai
cy
dP
@@ -30578,8 +30576,8 @@ jl
mQ
mQ
tj
-QT
-eX
+IP
+LW
AN
Gy
GI
@@ -30591,8 +30589,8 @@ pl
Zx
nL
eT
-RY
-DI
+Oi
+Yh
Xg
eT
eT
@@ -30680,19 +30678,19 @@ Zu
Zu
Zu
Zu
-SP
-rD
-sm
-Lb
-SP
+kZ
+Yn
+EA
+xY
+kZ
Zu
-mZ
-tY
-YU
-YU
-YU
-wO
-mZ
+Tl
+vC
+oO
+oO
+oO
+bC
+Tl
Zu
Zu
Zu
@@ -30755,9 +30753,9 @@ aO
bb
bo
ai
-ao
-ao
-ao
+Xr
+Xr
+Xr
aP
cz
dP
@@ -30792,7 +30790,7 @@ gb
FC
AN
Jx
-DI
+vj
Ei
DX
Th
@@ -30874,19 +30872,19 @@ Zu
Zu
Zu
Zu
-SP
-Wr
-FZ
-Tn
-SP
+kZ
+lg
+pt
+XJ
+kZ
Zu
-mZ
-ts
-ts
-ts
-ts
-ts
-mZ
+Tl
+Tn
+Tn
+Tn
+Tn
+Tn
+Tl
Zu
Zu
Zu
@@ -30949,9 +30947,9 @@ aS
bc
bp
ai
-ao
-ao
-ao
+Xr
+Xr
+Xr
ai
cC
dP
@@ -30978,7 +30976,7 @@ Zx
mD
Zx
uU
-DI
+Yh
av
oM
nO
@@ -30986,7 +30984,7 @@ QX
Cg
Zx
LO
-DI
+vj
Ei
DX
nv
@@ -31068,19 +31066,19 @@ Zu
Zu
Zu
Zu
-SP
-SP
-SP
-pI
-SP
-kQ
-kQ
-oe
-mu
-mu
-mu
-wq
-mZ
+kZ
+kZ
+kZ
+ld
+kZ
+pM
+pM
+WI
+mJ
+mJ
+mJ
+eU
+Tl
Zu
Zu
Zu
@@ -31172,7 +31170,7 @@ Zx
mD
Zx
av
-DI
+Yh
xP
Fk
yE
@@ -31262,19 +31260,19 @@ Zu
Zu
Zu
Zu
-kQ
-dZ
+pM
+KE
+yP
KW
-Rr
-oK
-VA
-PX
-eL
-jz
-jz
-jz
-jz
-mZ
+ws
+UV
+Rz
+KO
+ys
+ys
+ys
+ys
+Tl
Zu
Zu
Zu
@@ -31341,7 +31339,7 @@ cA
cA
cA
cA
-aK
+ZS
cA
dv
dP
@@ -31350,7 +31348,7 @@ cG
ez
fL
gl
-Zq
+Xp
TN
YC
hN
@@ -31366,7 +31364,7 @@ bW
mD
Zx
av
-DI
+Yh
av
fC
Zx
@@ -31374,7 +31372,7 @@ KD
ye
gV
fx
-DI
+vj
Hp
DX
EU
@@ -31456,19 +31454,19 @@ Zu
Zu
Zu
Zu
-kQ
-Ie
-WY
-gm
-gm
-kJ
-PX
-eL
-jz
-jz
-jz
-hL
-mZ
+pM
+Ds
+vL
+ep
+ep
+rS
+Rz
+KO
+ys
+ys
+ys
+YN
+Tl
Zu
Zu
Zu
@@ -31536,7 +31534,7 @@ YD
al
bJ
rU
-aK
+ZS
NK
mH
kH
@@ -31544,7 +31542,7 @@ oj
HR
mc
eC
-vI
+qa
qW
go
Ur
@@ -31650,19 +31648,19 @@ Zu
Zu
Zu
Zu
-kQ
-dZ
-gm
-gm
-gm
-bB
-PX
-eL
-jz
-jz
-jz
-jz
-mZ
+pM
+KE
+ep
+ep
+ep
+II
+Rz
+KO
+ys
+ys
+ys
+ys
+Tl
Zu
Zu
Zu
@@ -31730,7 +31728,7 @@ YD
al
md
aR
-aK
+ZS
df
QO
ZH
@@ -31754,7 +31752,7 @@ co
mD
Zx
av
-DI
+Yh
qt
fC
Zx
@@ -31762,7 +31760,7 @@ BE
ye
KC
fx
-DI
+vj
ym
DX
kB
@@ -31844,19 +31842,19 @@ Zu
Zu
Zu
Zu
-kQ
-kQ
-xi
-xi
-xi
-kQ
-kQ
-eG
-jz
-jz
-jz
-Mx
-mZ
+pM
+pM
+pH
+pH
+pH
+pM
+pM
+ZP
+ys
+ys
+ys
+FS
+Tl
Zu
Zu
Zu
@@ -31932,7 +31930,7 @@ cJ
eD
fM
hB
-fZ
+Et
tT
iC
eT
@@ -31948,7 +31946,7 @@ ly
iI
ly
gT
-Wu
+Oq
rh
xF
fI
@@ -32038,23 +32036,23 @@ Zu
Zu
Zu
Zu
-gt
-gt
-Js
-Js
-Js
-gt
-gt
-jz
-jz
-jz
-jz
-jz
-mZ
-yW
-yW
-yW
-yW
+ph
+ph
+Fq
+Fq
+Fq
+ph
+ph
+ys
+ys
+ys
+ys
+ys
+Tl
+By
+By
+By
+By
Zu
Zu
sj
@@ -32126,7 +32124,7 @@ bA
bA
bA
bA
-Zq
+Xp
Bv
mQ
eT
@@ -32142,7 +32140,7 @@ Zx
lo
Zx
av
-DI
+Yh
qt
eX
nq
@@ -32150,7 +32148,7 @@ UY
PS
Zx
Oc
-DI
+vj
xb
DX
Ca
@@ -32232,19 +32230,19 @@ Zu
Zu
Zu
Zu
-gt
-Xf
-Qv
-Qv
-Qv
-Ff
-gt
-SH
-jz
-jz
-jz
-Mx
-mZ
+ph
+XO
+HM
+HM
+HM
+xx
+ph
+Xa
+ys
+ys
+ys
+FS
+Tl
Zu
Zu
Zu
@@ -32320,7 +32318,7 @@ qK
Ao
kF
ns
-Zq
+Xp
yl
CJ
ow
@@ -32336,7 +32334,7 @@ RW
jp
AD
Sn
-DI
+Yh
WH
RA
RA
@@ -32344,7 +32342,7 @@ Mz
ko
hx
kK
-DI
+vj
xb
DX
DZ
@@ -32426,19 +32424,19 @@ Zu
Zu
Zu
Zu
-gt
-Qv
-Qv
-Qv
-Qv
-Ea
-Np
-eL
-jz
-jz
-jz
-jz
-mZ
+ph
+HM
+HM
+HM
+HM
+Jh
+Zj
+KO
+ys
+ys
+ys
+ys
+Tl
Zu
Zu
Zu
@@ -32530,12 +32528,12 @@ Zx
Zx
Zx
Zx
-DI
-DI
-DI
-DI
+Yh
+Yh
+Yh
+Yh
Fm
-DI
+Yh
eT
eT
eT
@@ -32620,19 +32618,19 @@ Zu
Zu
Zu
Zu
-gt
-Qv
-Qv
-Qv
-Qv
-Ea
-Np
-eL
-jz
-jz
-jz
-rQ
-mZ
+ph
+HM
+HM
+HM
+HM
+Jh
+Zj
+KO
+ys
+ys
+ys
+jJ
+Tl
Zu
Zu
Zu
@@ -32708,7 +32706,7 @@ qK
BI
BI
BI
-Zq
+Xp
mQ
if
eT
@@ -32814,19 +32812,19 @@ Zu
Zu
Zu
Zu
-gt
-Qv
-Qv
-Qv
-Qv
-Ea
-Np
-eL
-jz
-jz
-jz
-Mx
-mZ
+ph
+HM
+HM
+HM
+HM
+Jh
+Zj
+KO
+ys
+ys
+ys
+FS
+Tl
Zu
Zu
Zu
@@ -32899,10 +32897,10 @@ dh
tg
Ic
oA
-re
-re
-re
-Zq
+qo
+qo
+qo
+Xp
mQ
if
eT
@@ -33008,19 +33006,19 @@ Zu
Zu
Zu
Zu
-gt
-Qv
-Qv
-Qv
-Qv
-Ea
-Np
-eL
-jz
-jz
-jz
-jz
-mZ
+ph
+HM
+HM
+HM
+HM
+Jh
+Zj
+KO
+ys
+ys
+ys
+ys
+Tl
Zu
Zu
Zu
@@ -33096,17 +33094,17 @@ qK
Gg
Gg
Gg
-Zq
+Xp
mQ
if
eT
-oi
-oi
+yG
+yG
eT
-oi
+yG
PE
eT
-oi
+yG
dX
eT
eT
@@ -33121,7 +33119,7 @@ Zx
Hn
Hn
Hn
-Zq
+Xp
mO
hX
mO
@@ -33202,19 +33200,19 @@ Zu
Zu
Zu
Zu
-gt
-Qv
-Qv
-Qv
-Qv
-Ea
-Np
-eL
-jz
-jz
-jz
-jz
-mZ
+ph
+HM
+HM
+HM
+HM
+Jh
+Zj
+KO
+ys
+ys
+ys
+ys
+Tl
Zu
Zu
Zu
@@ -33312,10 +33310,10 @@ ii
it
hv
rx
-ol
+ja
Um
Um
-Zq
+Xp
mO
TB
mO
@@ -33396,19 +33394,19 @@ Zu
Zu
Zu
Zu
-gt
-Xf
-Qv
-Qv
-Qv
-Ft
-gt
-qF
-jz
-jz
-jz
-Mx
-mZ
+ph
+XO
+HM
+HM
+HM
+Tq
+ph
+px
+ys
+ys
+ys
+FS
+Tl
Zu
Zu
Zu
@@ -33484,7 +33482,7 @@ qK
Bs
sy
Bs
-Zq
+Xp
Mv
gL
eT
@@ -33506,10 +33504,10 @@ FG
sM
ir
pG
-ol
+ja
Um
Um
-Zq
+Xp
mO
mO
mO
@@ -33590,19 +33588,19 @@ Zu
Zu
Zu
Zu
-gt
-gt
-gt
-gt
-gt
-gt
-gt
-jz
-VQ
-jz
-qr
-jz
-mZ
+ph
+ph
+ph
+ph
+ph
+ph
+ph
+ys
+Us
+ys
+FQ
+ys
+Tl
Zu
Zu
Zu
@@ -33678,8 +33676,8 @@ au
au
au
au
-Zq
-Zq
+Xp
+Xp
sJ
eT
eT
@@ -33692,15 +33690,15 @@ eT
eT
eT
eT
-ol
-ol
-ol
-ol
-ol
-ol
+ja
+ja
+ja
+ja
+ja
+ja
ZV
-ol
-ol
+ja
+ja
sa
sa
sa
@@ -33790,13 +33788,13 @@ Zu
Zu
Zu
Zu
-mZ
-mZ
-mZ
-mZ
-mZ
-mZ
-mZ
+Tl
+Tl
+Tl
+Tl
+Tl
+Tl
+Tl
Zu
Zu
Zu
@@ -33875,17 +33873,17 @@ ip
jR
am
my
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
-eT
+nJ
+nJ
+nJ
+nJ
+nJ
+nJ
+nJ
+nJ
+nJ
+nJ
+nJ
FT
Xu
pp
@@ -34041,8 +34039,8 @@ Ee
IE
Wf
Bj
-Bx
-Bx
+jM
+jM
Bj
vT
wd
@@ -34235,8 +34233,8 @@ IF
IE
Wf
Bj
-Bx
-Bx
+jM
+jM
Uf
AZ
xL
@@ -34429,8 +34427,8 @@ OE
UQ
Wf
Bj
-Bx
-Bx
+jM
+jM
Bj
xL
xL
@@ -35609,7 +35607,7 @@ hO
sa
RF
Ya
-Kb
+oZ
Mt
yZ
Fc
@@ -35998,11 +35996,11 @@ sa
RF
Ya
BV
-Pq
+Fj
Ya
wM
Ya
-Pq
+Fj
BV
Ya
RL
diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm
index d52697f13356..6443e199d0b5 100644
--- a/maps/rift/levels/rift-04-surface1.dmm
+++ b/maps/rift/levels/rift-04-surface1.dmm
@@ -25,21 +25,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
-"abm" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "cargo_line_shutter";
- name = "Cargo Line shutter";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/foyer)
"aby" = (
/obj/structure/table/wooden_reinforced,
/obj/item/clothing/suit/storage/vest/press,
@@ -116,6 +101,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/prison)
+"adg" = (
+/turf/simulated/wall/prepainted/science,
+/area/maintenance/research/lower)
"adq" = (
/obj/structure/table/rack,
/obj/item/weldingtool/mini{
@@ -214,7 +202,7 @@
icon_state = "shock";
name = "HIGH VOLTAGE"
},
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/substation/surfaceservicesubstation)
"agI" = (
/obj/effect/floor_decal/borderfloor{
@@ -223,8 +211,8 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -287,15 +275,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/entertainment)
-"aiT" = (
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"ajh" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -385,12 +364,8 @@
/turf/simulated/floor/plating,
/area/maintenance/substation/research/xenobiology_lab)
"aml" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/security,
/area/security/security_cell_hallway)
-"amO" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/research/xenobio)
"anT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -447,7 +422,7 @@
/turf/simulated/floor/plating,
/area/medical/virologymaint)
"apR" = (
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/blast/regular/open{
id = "main_ext_blast";
name = "Surface External Blast Door"
@@ -504,7 +479,7 @@
/turf/simulated/floor/wood,
/area/library)
"aqK" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Airlock";
req_one_access = list(31)
},
@@ -518,7 +493,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
"ara" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/stairwell/primary/surfaceone)
"arS" = (
/obj/structure/metal_edge,
@@ -566,7 +541,7 @@
/area/crew_quarters/heads/cmo)
"atq" = (
/obj/machinery/newscaster,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_breakroom)
"atw" = (
/obj/structure/table/wooden_reinforced,
@@ -698,7 +673,7 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
"ayM" = (
-/turf/simulated/wall/hardwood,
+/turf/simulated/wall/wood/hardwood,
/area/rift/surfacebase/outside/outside1)
"azh" = (
/obj/effect/floor_decal/spline/plain{
@@ -711,7 +686,7 @@
/turf/simulated/floor/wood,
/area/tether/surfacebase/medical/mentalhealth)
"azs" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/surfaceeva/airlock/main)
"azA" = (
/obj/machinery/light/small/emergency{
@@ -819,10 +794,11 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/white,
/area/rift/trade_shop)
-"aCt" = (
-/obj/spawner/window/reinforced/full/firelocks,
+"aCD" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
/turf/simulated/floor/plating,
-/area/storage/tools)
+/area/rnd/hallway)
"aDo" = (
/obj/machinery/r_n_d/server/core,
/obj/effect/floor_decal/techfloor{
@@ -881,6 +857,12 @@
/obj/item/reagent_containers/food/snacks/sliceable/chocolatecake,
/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,
+/area/crew_quarters/heads/cmo)
"aGd" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -913,6 +895,15 @@
},
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
+"aGS" = (
+/obj/machinery/door/blast/regular/open{
+ id = "virolockdown";
+ name = "Virology Blast Door"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/virology)
"aIk" = (
/obj/effect/debris/cleanable/spiderling_remains,
/turf/simulated/floor/plating,
@@ -953,20 +944,6 @@
},
/turf/simulated/floor/plating,
/area/medical/virologymaint)
-"aJk" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/washing_machine,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/hallway)
"aJo" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -1067,7 +1044,7 @@
dir = 2;
id = "cargo_garage1"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor/orange{
@@ -1089,10 +1066,6 @@
},
/turf/simulated/floor/plating,
/area/medical/virologymaint)
-"aOn" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/surfaceeva/airlock/main)
"aOz" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -1214,6 +1187,9 @@
dir = 1;
pixel_y = -24
},
+/obj/machinery/light{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/security/security_cell_hallway)
"aVh" = (
@@ -1239,11 +1215,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel,
/area/security/prison)
-"aVS" = (
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/library)
"aWl" = (
/turf/simulated/open/lythios43c/indoors,
/area/rift/surfacebase/outside/outside1)
@@ -1370,6 +1341,10 @@
/obj/structure/flora/pottedplant/stoutbush,
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
+"baL" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/stairwell/primary/surfaceone)
"baN" = (
/obj/machinery/light/fairy{
dir = 8
@@ -1398,7 +1373,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/game_room)
"bbD" = (
-/turf/simulated/wall,
+/turf/simulated/wall/wood/hardwood,
/area/crew_quarters/game_room)
"bbE" = (
/obj/machinery/door/airlock/research{
@@ -1552,7 +1527,7 @@
/area/rift/station/public_garden)
"bgv" = (
/obj/structure/sign/warning/lethal_turrets,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfaceeva/aa/surface_south)
"bhp" = (
/obj/structure/bed/padded,
@@ -1773,9 +1748,6 @@
/obj/item/flashlight/lamp,
/turf/simulated/floor/carpet/bcarpet,
/area/library)
-"bmv" = (
-/turf/simulated/wall/r_wall,
-/area/security/checkpoint)
"bmG" = (
/obj/effect/floor_decal/rust,
/obj/machinery/portable_atmospherics/hydroponics,
@@ -1822,6 +1794,11 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry_lab)
+"bnS" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/rift/surfaceeva/cargodock)
"bnY" = (
/obj/item/circuitboard/microwave,
/turf/simulated/floor/plating,
@@ -1958,6 +1935,23 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
+"bqy" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "sfc_check_shutter";
+ name = "Surface Checkpoint Shutter";
+ opacity = 0
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/checkpoint)
"bqE" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/machinery/camera/network/medbay{
@@ -2016,6 +2010,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
+"brB" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/virologyisolation)
"brW" = (
/obj/effect/debris/cleanable/blood/drip{
icon_state = "3"
@@ -2205,9 +2204,6 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/rnd/testingroom)
-"bzQ" = (
-/turf/simulated/open,
-/area/turbolift/rmine/surface)
"bzV" = (
/obj/structure/table/hardwoodtable,
/obj/machinery/chemical_dispenser/catering/bar_coffee,
@@ -2218,7 +2214,7 @@
/area/maintenance/starboard)
"bAb" = (
/obj/item/radio/intercom,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_decon)
"bAl" = (
/obj/machinery/door/airlock/maintenance/common,
@@ -2228,8 +2224,8 @@
/turf/simulated/floor/plating,
/area/rift/trade_shop)
"bAm" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
@@ -2306,6 +2302,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
+"bCI" = (
+/obj/structure/flora/ausbushes/grassybush,
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"bDq" = (
/obj/machinery/light/small{
dir = 4
@@ -2329,6 +2329,11 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"bEY" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_main)
"bFm" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -2439,6 +2444,9 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/delivery)
+"bKN" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/medbreak)
"bLe" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -2644,12 +2652,15 @@
},
/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)
"bQz" = (
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
"bQA" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/central_heating/surface_one)
"bQK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -2674,7 +2685,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/main)
"bRs" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfaceeva/aa/surface_south)
"bRY" = (
/obj/structure/table/woodentable,
@@ -2754,6 +2765,14 @@
},
/turf/simulated/open,
/area/maintenance/engineering/pumpstation)
+"bUk" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_first_aid)
"bUG" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
@@ -2903,10 +2922,10 @@
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"bXZ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/cargo)
"bYi" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -2964,7 +2983,7 @@
dir = 8
},
/obj/machinery/camera/network/civilian{
- dir = 10
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
@@ -2989,7 +3008,7 @@
},
/area/server)
"cbL" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor/orange{
@@ -3003,10 +3022,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/garage)
-"cbU" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/surfaceeva/cargodock)
"cbV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
@@ -3019,14 +3034,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/qm)
-"cbY" = (
-/obj/structure/lattice,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "32-4"
- },
-/turf/simulated/open,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"ccj" = (
/obj/machinery/light/small{
dir = 4
@@ -3055,7 +3062,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/security/lower)
"ccK" = (
/obj/structure/cable/green{
@@ -3087,6 +3094,18 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/library)
+"cdH" = (
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfaceone)
"cdP" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/structure/flora/ausbushes/brflowers,
@@ -3106,6 +3125,12 @@
},
/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)
"cec" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
@@ -3141,7 +3166,7 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_south_airlock)
"cfn" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -3255,7 +3280,7 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
"cjy" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/janitor)
"cjK" = (
/obj/machinery/light,
@@ -3267,7 +3292,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
"cjZ" = (
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/blast/regular/open{
id = "main_ext_blast";
name = "Surface External Blast Door"
@@ -3287,6 +3312,13 @@
},
/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)
"cmb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -3469,7 +3501,7 @@
/turf/simulated/floor/plating,
/area/maintenance/library)
"crn" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Xenobiology First Aid";
req_one_access = list(5,47)
},
@@ -3530,10 +3562,12 @@
/obj/structure/window/reinforced/tinted/frosted,
/turf/simulated/floor/carpet/blucarpet,
/area/lawoffice)
-"ctY" = (
-/obj/spawner/window/reinforced/full/firelocks,
+"ctO" = (
+/obj/machinery/door/firedoor/glass,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_breakroom)
+/area/medical/patient_a)
"cuR" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -3541,6 +3575,14 @@
},
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
+"cvv" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/window/reinforced/polarized/full{
+ id = "cmo_office"
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"cvB" = (
/obj/machinery/door/window{
dir = 8
@@ -3634,7 +3676,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"cxQ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Forensics Lab";
req_access = list(4)
@@ -3732,6 +3774,12 @@
},
/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,
+/area/medical/exam_room)
"czN" = (
/obj/structure/railing{
dir = 8
@@ -3743,6 +3791,22 @@
"cAm" = (
/turf/simulated/floor/wood,
/area/rift/surfacebase/outside/outside1)
+"cAs" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/rnd/hallway)
"cAK" = (
/obj/structure/table/steel,
/obj/item/clothing/accessory/shiny/socks,
@@ -3783,9 +3847,7 @@
/turf/simulated/floor/plating,
/area/medical/virologypurge)
"cBk" = (
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/maint_bar)
"cBm" = (
/obj/structure/disposalpipe/segment{
@@ -3802,13 +3864,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
-"cBn" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/qm)
"cBA" = (
/obj/item/storage/box/beakers{
pixel_x = 2;
@@ -3883,7 +3938,7 @@
/turf/simulated/floor/plating,
/area/maintenance/security/lower)
"cEL" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/evahallway)
"cEY" = (
/obj/effect/floor_decal/borderfloor,
@@ -3897,6 +3952,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/tether/station/public_meeting_room)
+"cFz" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_office)
"cFW" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -4042,7 +4102,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/psych)
"cKp" = (
-/turf/simulated/wall,
+/turf/simulated/wall/wood/hardwood,
/area/tether/surfacebase/entertainment/backstage)
"cKz" = (
/obj/structure/table/woodentable,
@@ -4063,8 +4123,11 @@
/turf/simulated/floor/tiled/steel,
/area/storage/tools)
"cKY" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/crew_quarters/medical_restroom)
+"cLy" = (
+/turf/simulated/open,
+/area/turbolift/rmine/surface)
"cMh" = (
/obj/structure/railing{
dir = 1
@@ -4087,7 +4150,9 @@
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside1)
"cNc" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
@@ -4331,6 +4396,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
+"cUv" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/surfaceeva/airlock/main)
"cUI" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -4369,10 +4438,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
-"cXe" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/research/lower)
"cXr" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/machinery/atmospherics/pipe/simple/visible/supply,
@@ -4406,7 +4471,7 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/testingroom)
"cYM" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/testingroom)
"cYR" = (
/obj/effect/floor_decal/borderfloor{
@@ -4451,16 +4516,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
-"cZK" = (
-/obj/structure/stairs/spawner/south,
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"cZS" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -4507,7 +4562,7 @@
/area/library)
"das" = (
/obj/effect/floor_decal/rust,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/steel,
@@ -4599,8 +4654,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
@@ -4617,7 +4672,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Paramedic Storage"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -4739,6 +4794,9 @@
},
/turf/simulated/floor/wood,
/area/lawoffice)
+"did" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/maintenance/substation/cargo)
"die" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -4842,9 +4900,6 @@
},
/turf/simulated/floor/lino,
/area/security/detectives_office)
-"dkv" = (
-/turf/simulated/wall,
-/area/maintenance/maint_bar)
"dky" = (
/obj/machinery/door/airlock{
name = "Internal Affairs";
@@ -5189,7 +5244,7 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/cmo)
"dsd" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/security,
/area/security/forensics)
"dsf" = (
/obj/effect/floor_decal/borderfloor/corner{
@@ -5232,9 +5287,7 @@
/area/rnd/testingroom)
"dtp" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall/r_wall{
- can_open = 1
- },
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/outside/outside1)
"dtv" = (
/obj/machinery/light,
@@ -5287,7 +5340,7 @@
/turf/simulated/floor/tiled/monotile,
/area/janitor)
"dwP" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/recoveryrestroom)
"dwR" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -5308,14 +5361,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/game_room)
-"dxM" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "iaa"
- },
-/turf/simulated/floor/plating,
-/area/lawoffice)
"dyB" = (
/obj/structure/closet/secure_closet/paramedic,
/obj/item/stack/medical/splint,
@@ -5341,7 +5386,7 @@
/turf/simulated/floor/plating,
/area/maintenance/security/lower)
"dzt" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -5379,6 +5424,22 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
+"dAx" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/effect/floor_decal/corner/brown/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfaceone)
"dAB" = (
/obj/structure/table/rack/steel,
/obj/random/maintenance/clean,
@@ -5429,19 +5490,6 @@
},
/turf/simulated/floor/tiled,
/area/medical/virology)
-"dDr" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/brown/border{
- dir = 8
- },
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
-/turf/simulated/floor/tiled/steel,
-/area/quartermaster/qm)
"dEP" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -5489,8 +5537,8 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
"dFk" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/machinery/light{
dir = 8;
@@ -5606,12 +5654,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/main/secondary)
-"dHW" = (
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"dHX" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -5650,7 +5692,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/medical/medbay_emt_bay)
"dIS" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/patient_wing)
"dJu" = (
/obj/effect/floor_decal/spline/plain{
@@ -5812,7 +5854,7 @@
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
"dNx" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/qm)
"dNB" = (
/obj/structure/fitness/punchingbag,
@@ -5968,7 +6010,7 @@
/area/medical/virologymaint)
"dRx" = (
/obj/machinery/newscaster,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"dRA" = (
/obj/structure/table/standard,
@@ -6031,7 +6073,7 @@
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"dTo" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_first_aid)
"dTx" = (
/obj/structure/bed/chair/comfy/brown{
@@ -6216,10 +6258,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
-"dXb" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/library)
"dXh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -6233,7 +6271,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/psych)
"dXv" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/crew_quarters/heads/cmo)
"dYd" = (
/obj/effect/floor_decal/corner/paleblue{
@@ -6395,7 +6433,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
"eck" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Psychiatric Recreation Access"
},
/obj/machinery/door/blast/regular{
@@ -6733,6 +6771,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
+"emM" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_hallway)
"enu" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -6810,7 +6855,7 @@
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_decon)
"eqx" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_hallway)
"eqQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -6888,7 +6933,7 @@
/turf/simulated/floor/tiled/steel,
/area/security/security_cell_hallway)
"esZ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/delivery)
"etU" = (
/obj/machinery/power/breakerbox/activated{
@@ -6944,6 +6989,9 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
+"euZ" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/engineering/engine_eva)
"evh" = (
/obj/machinery/light,
/obj/machinery/firealarm{
@@ -7051,16 +7099,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/maint_bar)
-"eyf" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "test_chamber_blast";
- name = "Testing Chamber Blast Door"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/testingroom)
"eym" = (
/obj/machinery/door/airlock/medical{
name = "Patient Room B";
@@ -7099,6 +7137,9 @@
},
/turf/simulated/floor/plating,
/area/rift/surfaceeva/airlock/main/secondary)
+"eAg" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/turbolift/rhammerhead/midpoint)
"eAs" = (
/obj/machinery/door/airlock/external,
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
@@ -7143,7 +7184,7 @@
/turf/simulated/floor/tiled,
/area/medical/virologypurge)
"eBp" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/warehouse)
"eBC" = (
/obj/effect/floor_decal/borderfloor{
@@ -7231,7 +7272,7 @@
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
"eFp" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/engineering/pumpstation)
"eFz" = (
/obj/machinery/light{
@@ -7365,22 +7406,6 @@
},
/turf/simulated/floor/water/deep/indoors,
/area/rift/station/public_garden)
-"eIx" = (
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfaceone)
"eIC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -7523,7 +7548,7 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"ePm" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/station/public_garden)
"eRx" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
@@ -7575,9 +7600,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
-"eTL" = (
-/turf/simulated/wall/r_wall,
-/area/turbolift/rhammerhead/midpoint)
"eTN" = (
/obj/machinery/door/airlock/maintenance/medical{
name = "Medical Maintenance Access";
@@ -7621,6 +7643,11 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/tether/surfacebase/funny/mimeoffice)
+"eVW" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/xenoarch_storage)
"eWb" = (
/obj/structure/sink/puddle,
/turf/simulated/floor/outdoors/safeice/indoors,
@@ -7722,7 +7749,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/light{
dir = 8
},
@@ -7775,6 +7802,26 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
+"fbH" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "cargo_line_shutter";
+ name = "Cargo Line shutter";
+ opacity = 0
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/foyer)
+"fcq" = (
+/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";
@@ -7801,7 +7848,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
"fdt" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Psychiatric Wing"
},
/obj/machinery/door/firedoor/glass,
@@ -7938,19 +7985,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
-"fka" = (
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/obj/structure/cable/green{
- icon_state = "16-0"
- },
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/structure/window/reinforced/tinted/frosted{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"fkT" = (
/obj/structure/bed/chair/sofa/beige{
dir = 8
@@ -7986,6 +8020,12 @@
/obj/machinery/computer/arcade/orion_trail,
/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)
"fmu" = (
/obj/machinery/bookbinder,
/obj/machinery/light/small{
@@ -8043,10 +8083,10 @@
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"foD" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/chemistry_lab)
"foY" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Operations";
req_access = list(31);
req_one_access = list()
@@ -8226,16 +8266,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora)
-"fuf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_south_airlock)
"fuk" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/cable/green{
@@ -8259,6 +8289,16 @@
/obj/map_helper/airlock/atmos/chamber_pump,
/turf/simulated/floor/plating,
/area/rift/surfaceeva/airlock/main)
+"fvO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_south_airlock)
"fvP" = (
/obj/machinery/papershredder,
/obj/effect/floor_decal/borderfloorblack{
@@ -8285,6 +8325,10 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/medical/virologymaint)
+"fwp" = (
+/obj/structure/flora/ausbushes/sparsegrass,
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"fwr" = (
/obj/structure/table/woodentable,
/obj/item/book/manual/the_humanized_mice,
@@ -8334,7 +8378,7 @@
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside1)
"fxo" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Confinement Processing";
req_access = list(2)
},
@@ -8342,6 +8386,16 @@
/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";
+ name = "Warehouse Shutters"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/quartermaster/warehouse)
"fxS" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -8373,7 +8427,7 @@
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
"fyf" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_decon)
"fyC" = (
/obj/effect/floor_decal/borderfloor{
@@ -8430,6 +8484,10 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"fAI" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/library)
"fBk" = (
/obj/structure/closet/crate,
/obj/item/grenade/chem_grenade,
@@ -8465,7 +8523,7 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/cmo)
"fCX" = (
-/turf/simulated/wall,
+/turf/simulated/wall/wood/hardwood,
/area/library)
"fDe" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -8508,6 +8566,9 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
+"fFd" = (
+/turf/simulated/open,
+/area/turbolift/rsurface/level1)
"fFt" = (
/obj/structure/table/standard,
/obj/item/toy/plushie/purple_fox,
@@ -8708,9 +8769,6 @@
},
/turf/simulated/floor/plating,
/area/medical/virologytransiteast)
-"fLw" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfaceeva)
"fLN" = (
/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{
on = 1
@@ -8724,9 +8782,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/maint_bar)
"fMu" = (
/obj/effect/debris/cleanable/molten_item,
@@ -8809,11 +8865,11 @@
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"fNU" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfaceeva/airlock/main)
"fNY" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/structure/disposalpipe/segment,
@@ -8894,7 +8950,7 @@
/obj/effect/floor_decal/corner/brown/border{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
@@ -8951,9 +9007,7 @@
/area/medical/patient_a)
"fSj" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/central_heating/surface_one)
"fSN" = (
/obj/machinery/light/small{
@@ -9004,12 +9058,12 @@
/turf/simulated/floor/wood,
/area/rift/surfacebase/outside/outside1)
"fUY" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/medbay_emt_bay)
"fVb" = (
/obj/machinery/cryopod,
/obj/machinery/camera/network/security{
- dir = 10
+ dir = 4
},
/obj/machinery/computer/cryopod{
pixel_x = -32
@@ -9028,8 +9082,8 @@
/turf/simulated/floor/tiled,
/area/medical/virologytransiteast)
"fVs" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -9052,7 +9106,7 @@
/turf/simulated/floor/outdoors/safeice/indoors,
/area/maintenance/research/lower)
"fVw" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/tether/surfacebase/medical/mentalhealth)
"fVJ" = (
/obj/machinery/vending/loadout/accessory,
@@ -9122,7 +9176,7 @@
/turf/simulated/floor/carpet/bcarpet,
/area/tether/surfacebase/funny/mimeoffice)
"fYd" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/stairwell/primary/surfaceone)
"fZh" = (
/obj/effect/floor_decal/industrial/warning/dust{
@@ -9317,7 +9371,7 @@
/turf/simulated/floor/wood/broken,
/area/maintenance/maint_bar)
"ghF" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Paramedic Storage"
},
/turf/simulated/floor/tiled/steel_grid,
@@ -9381,7 +9435,7 @@
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"gkg" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/psych/psych_1)
"gkq" = (
/obj/structure/window/reinforced/tinted/frosted,
@@ -9449,6 +9503,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/delivery)
+"gmT" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/office)
"gmY" = (
/obj/machinery/door/airlock/lift,
/turf/simulated/floor/holofloor/tiled/dark,
@@ -9587,6 +9646,11 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/garage)
+"gsS" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"gsT" = (
/obj/machinery/door/airlock/maintenance/rnd,
/obj/machinery/door/firedoor/glass,
@@ -9641,8 +9705,8 @@
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
"gtI" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/structure/cable{
icon_state = "1-2"
@@ -9840,6 +9904,12 @@
"gzd" = (
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/outside/outside1)
+"gzo" = (
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"gAw" = (
/obj/structure/bed/chair{
dir = 1
@@ -9853,18 +9923,22 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/red,
/area/prison/solitary)
-"gDH" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/brown/border{
+"gBQ" = (
+/obj/structure/railing,
+/obj/structure/railing{
dir = 4
},
-/obj/structure/bed/chair{
- dir = 8
+/obj/random/trash_pile,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
},
-/turf/simulated/floor/tiled/steel,
-/area/quartermaster/qm)
+/turf/simulated/floor/plating,
+/area/maintenance/library)
+"gCZ" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/tether/station/public_meeting_room)
"gDI" = (
/obj/structure/grille,
/obj/structure/railing{
@@ -9996,6 +10070,19 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/surface_one)
+"gJa" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "cargo_line_shutter";
+ name = "Cargo Line shutter";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/delivery)
"gJs" = (
/obj/structure/closet/wardrobe/chemistry_white,
/obj/effect/floor_decal/borderfloor{
@@ -10232,7 +10319,7 @@
/turf/simulated/floor/tiled/monotile,
/area/rnd/hallway)
"gNz" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/lowmedbaymaint)
"gNH" = (
/obj/effect/floor_decal/spline/plain{
@@ -10379,10 +10466,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/chemistry_lab)
-"gSh" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/medbay_emt_bay)
"gSl" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 4
@@ -10426,7 +10509,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/qm)
"gTC" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/lowmedbaymaint)
"gTG" = (
/obj/effect/floor_decal/borderfloor{
@@ -10463,6 +10546,9 @@
/area/rnd/hallway)
"gTL" = (
/obj/machinery/atmospheric_field_generator/perma,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/turf/simulated/floor/tiled/techfloor/grid,
/area/quartermaster/garage)
"gTM" = (
@@ -10581,7 +10667,7 @@
/area/rnd/hallway)
"gXe" = (
/obj/structure/railing,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/outside/outside1)
"gXg" = (
/obj/machinery/light,
@@ -10692,7 +10778,7 @@
/turf/simulated/floor/reinforced,
/area/rnd/testingroom)
"haw" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/xenobiology/xenoflora)
"hax" = (
/obj/effect/floor_decal/rust,
@@ -10716,8 +10802,8 @@
/turf/simulated/floor/plating,
/area/quartermaster/garage)
"haT" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/turf/simulated/floor/tiled/steel_ridged,
/area/rnd/outpost/xenobiology/outpost_hallway)
@@ -10929,7 +11015,7 @@
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
"heY" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/virologytransiteast)
"hff" = (
/obj/effect/floor_decal/spline/plain{
@@ -10956,7 +11042,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
"hgc" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/patient_a)
"hgp" = (
/obj/effect/floor_decal/borderfloor/corner{
@@ -11104,7 +11190,7 @@
/area/medical/virologytransitwest)
"hiW" = (
/obj/machinery/camera/network/civilian{
- dir = 10
+ dir = 1
},
/obj/machinery/vending/giftvendor,
/turf/simulated/floor/tiled/steel_ridged,
@@ -11123,7 +11209,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/structure/disposalpipe/segment{
dir = 8
},
@@ -11191,6 +11277,15 @@
/obj/map_helper/airlock/door/simple,
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/cargodock)
+"hkM" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"hkO" = (
/obj/structure/flora/pottedplant/tall,
/obj/effect/floor_decal/borderfloor{
@@ -11249,9 +11344,7 @@
/area/maintenance/security/lower)
"hmK" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall/r_wall{
- can_open = 1
- },
+/turf/simulated/wall/r_wall/prepainted/security,
/area/security/security_cell_hallway)
"hnh" = (
/obj/structure/table/wooden_reinforced,
@@ -11273,10 +11366,6 @@
/obj/structure/transit_tube/high_velocity,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/medical/virologytransiteast)
-"hoj" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/garage)
"hoH" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
@@ -11378,6 +11467,11 @@
},
/turf/simulated/floor/wood,
/area/library)
+"hrN" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
+/turf/simulated/floor/plating,
+/area/storage/surface_eva)
"hsd" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -11403,10 +11497,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/testingroom)
-"hsM" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/station/public_garden)
"htj" = (
/obj/machinery/camera/network/medbay{
dir = 8
@@ -11498,15 +11588,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych)
-"hxK" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/railing{
- dir = 8
- },
-/turf/simulated/open,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"hyf" = (
/obj/machinery/atmospherics/tvalve/digital/mirrored/bypass{
dir = 4
@@ -11629,6 +11710,17 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
+"hCl" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
"hCu" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -11680,7 +11772,7 @@
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/cmo)
"hDN" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/tool_storage)
"hDS" = (
/obj/structure/extinguisher_cabinet{
@@ -11717,10 +11809,23 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/warehouse)
"hEV" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/substation/research/xenobiology_lab)
+"hFb" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "cargo_line_shutter";
+ name = "Cargo Line shutter";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/office)
"hFE" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/security/security_cell_hallway)
"hFH" = (
/obj/effect/floor_decal/borderfloorwhite{
@@ -11855,7 +11960,7 @@
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
"hIo" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/psych_ward)
"hIz" = (
/obj/machinery/autolathe,
@@ -11863,7 +11968,7 @@
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"hIF" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfaceeva/airlock/main/secondary)
"hIG" = (
/obj/structure/toilet{
@@ -11976,7 +12081,7 @@
/turf/simulated/floor/water/deep/indoors,
/area/rift/station/public_garden)
"hMb" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
"hMm" = (
@@ -11990,6 +12095,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/tankstorage)
+"hMq" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/station/public_garden)
"hMx" = (
/obj/structure/stairs/spawner/east,
/obj/structure/railing,
@@ -12099,6 +12208,14 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"hPI" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/machinery/holopad,
+/turf/simulated/floor/wood,
+/area/lawoffice)
"hPJ" = (
/obj/structure/railing,
/obj/effect/floor_decal/industrial/halfstair{
@@ -12353,7 +12470,7 @@
/area/rnd/outpost/xenobiology/outpost_south_airlock)
"hWQ" = (
/obj/structure/sign/department/medbay,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/hallway)
"hXF" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
@@ -12423,10 +12540,6 @@
},
/turf/simulated/floor/lino,
/area/tether/surfacebase/entertainment)
-"hZd" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/security_cell_hallway)
"hZe" = (
/obj/structure/table/steel,
/obj/random/maintenance/research,
@@ -12434,7 +12547,7 @@
/area/maintenance/research/lower)
"hZu" = (
/obj/structure/sign/department/xenolab,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_office)
"hZx" = (
/obj/effect/floor_decal/borderfloorwhite{
@@ -12493,6 +12606,24 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/security/prison)
+"ial" = (
+/obj/structure/table/standard,
+/obj/item/storage/toolbox/electrical{
+ pixel_y = 4
+ },
+/obj/item/storage/toolbox/mechanical,
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/mauve/border{
+ dir = 5
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rnd/testingroom)
"iaF" = (
/obj/structure/table/glass,
/obj/item/paper_bin,
@@ -12635,6 +12766,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/bed/chair,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/qm)
"ift" = (
@@ -12672,10 +12804,6 @@
/obj/structure/transit_tube/high_velocity,
/turf/simulated/floor/plating,
/area/medical/virologytransiteast)
-"igy" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"igE" = (
/obj/structure/table/rack/shelf,
/obj/item/cell,
@@ -12708,21 +12836,6 @@
/obj/item/clothing/mask/gas/clear,
/turf/simulated/floor/tiled/steel,
/area/storage/surface_eva)
-"ihd" = (
-/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/zpipe/up/supply,
-/obj/structure/cable/green{
- icon_state = "16-0"
- },
-/obj/structure/disposalpipe/down{
- dir = 1
- },
-/obj/structure/cable/green,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_stairs)
"iie" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12791,15 +12904,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/garage)
-"ilj" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/concrete/rng/lythios43c,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"ilP" = (
/obj/structure/table/woodentable,
/obj/item/storage/box/donkpockets,
@@ -12968,6 +13072,18 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak)
+"iqL" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/tether/station/public_meeting_room)
"iqR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -13044,7 +13160,7 @@
/turf/simulated/floor/wood,
/area/maintenance/research/lower)
"isB" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/virologyaccess)
"itf" = (
/obj/effect/floor_decal/borderfloor{
@@ -13275,7 +13391,7 @@
/area/maintenance/evahallway)
"izR" = (
/obj/effect/floor_decal/rust,
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/security/prison)
"izU" = (
@@ -13376,7 +13492,7 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"iBT" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/substation/surface_one)
"iCo" = (
/turf/simulated/floor/reinforced,
@@ -13643,12 +13759,29 @@
},
/turf/simulated/floor/plating,
/area/storage/tools)
+"iIp" = (
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"iIv" = (
/obj/structure/table/steel_reinforced,
/obj/item/key/quadbike,
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/garage)
"iJb" = (
+/obj/structure/table/reinforced,
+/obj/item/pen/red{
+ pixel_x = -2;
+ pixel_y = 2
+ },
+/obj/item/pen,
+/obj/item/folder/yellow,
+/obj/item/stamp/qm,
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
},
@@ -13872,7 +14005,7 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
"iQT" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Confinement Processing";
req_access = list(2)
},
@@ -13912,7 +14045,7 @@
/obj/effect/floor_decal/corner/brown/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -13982,7 +14115,7 @@
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
"iTr" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/cargo,
/area/rift/surfaceeva/cargodock)
"iTx" = (
/obj/effect/floor_decal/industrial/warning,
@@ -14004,10 +14137,10 @@
/turf/simulated/floor/tiled/white,
/area/medical/patient_b)
"iTF" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/security/prison)
"iUb" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"iUf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14140,7 +14273,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/structure/cable{
@@ -14169,22 +14302,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyaccess)
-"jaC" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "sfc_check_shutter";
- name = "Surface Checkpoint Shutter";
- opacity = 0
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/cable,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/checkpoint)
"jaP" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -14267,7 +14384,7 @@
/turf/simulated/floor/plating,
/area/medical/psych)
"jcI" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -14510,9 +14627,7 @@
/area/maintenance/tool_storage)
"jiM" = (
/obj/effect/floor_decal/rust,
-/obj/machinery/camera/network/security{
- dir = 6
- },
+/obj/machinery/camera/network/security,
/turf/simulated/floor/tiled/steel,
/area/security/prison)
"jjg" = (
@@ -14634,7 +14749,7 @@
/area/maintenance/library)
"jlx" = (
/obj/structure/sign/department/xenolab,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_decon)
"jlF" = (
/turf/simulated/floor/plating,
@@ -14647,7 +14762,7 @@
/turf/simulated/floor/tiled,
/area/medical/virologyaccess)
"jnd" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/tankstorage)
"jne" = (
/obj/structure/reagent_dispensers/fueltank,
@@ -14723,10 +14838,15 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/library)
+"jrc" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"jrz" = (
/obj/structure/bookcase/legal/combo,
/obj/item/book/manual/legal/sop_vol1,
@@ -14760,7 +14880,7 @@
/obj/effect/floor_decal/corner/red{
dir = 6
},
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tint = "solitary";
name = "Solitary Confinement";
req_one_access = list(2)
@@ -14847,13 +14967,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/delivery)
-"jvA" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"jvY" = (
/obj/machinery/light{
dir = 4
@@ -14870,15 +14983,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
-"jwS" = (
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"jxa" = (
/obj/structure/table/hardwoodtable,
/turf/simulated/floor/wood/broken,
/area/maintenance/maint_bar)
"jxb" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Airlock";
req_one_access = list(31)
},
@@ -14970,6 +15080,11 @@
/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,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_first_aid)
"jzv" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -14998,6 +15113,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/medical/virologytransiteast)
+"jAs" = (
+/obj/machinery/atmospherics/component/binary/pump/high_power/on,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/medical/virologypurge)
"jAJ" = (
/obj/machinery/light{
dir = 1
@@ -15170,11 +15290,6 @@
},
/turf/simulated/floor/tiled,
/area/medical/virologyaccess)
-"jFw" = (
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/evahallway)
"jGd" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -15247,14 +15362,6 @@
/obj/machinery/light/flamp,
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/rift/station/public_garden)
-"jIY" = (
-/obj/machinery/door/firedoor,
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized/full{
- id = "det_office"
- },
-/turf/simulated/floor/plating,
-/area/security/forensics)
"jJy" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/techfloor{
@@ -15321,8 +15428,13 @@
/turf/simulated/floor/plating,
/area/rift/station/public_garden)
"jLF" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/virologyisolation)
+"jLK" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
+/turf/simulated/floor/plating,
+/area/storage/tools)
"jLP" = (
/obj/machinery/firealarm{
dir = 4;
@@ -15389,8 +15501,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
@@ -15453,13 +15565,8 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/medical/virologyaccess)
"jPz" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_breakroom)
-"jPD" = (
-/obj/effect/floor_decal/rust,
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"jPV" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -15479,10 +15586,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/xenoarch_storage)
-"jQZ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/xenobiology/xenoflora/lab_atmos)
"jRt" = (
/obj/effect/floor_decal/rust,
/obj/structure/catwalk,
@@ -15704,7 +15807,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
"jYF" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/virology)
"jYM" = (
/obj/machinery/dnaforensics,
@@ -15716,6 +15819,21 @@
},
/turf/simulated/floor/tiled/white,
/area/security/forensics)
+"jZc" = (
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfaceone)
"jZR" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -15752,13 +15870,13 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
"kaF" = (
-/turf/simulated/wall,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/security/checkpoint)
"kbe" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/starboard)
"kbr" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -16095,6 +16213,12 @@
},
/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,
+/area/medical/patient_b)
"kku" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -16103,10 +16227,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
-"kkw" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_first_aid)
"kkQ" = (
/obj/machinery/door/airlock/maintenance/rnd,
/obj/structure/disposalpipe/segment,
@@ -16314,19 +16434,8 @@
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_first_aid)
"kqq" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/surfaceeva/aa/surface_south)
-"kqP" = (
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/maintenance/cargo)
"krr" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -16430,23 +16539,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
-"kvi" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/corner/brown/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfaceone)
"kvs" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
@@ -16514,8 +16606,8 @@
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
"kwC" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
@@ -16619,28 +16711,11 @@
/obj/machinery/holopad,
/turf/simulated/floor/tiled/monotile,
/area/janitor)
-"kyN" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/corner/brown/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfaceone)
"kzX" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/security/lower)
"kAb" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/trade_shop)
"kAd" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
@@ -16663,6 +16738,10 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
+"kBr" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/tankstorage)
"kCu" = (
/obj/structure/bed/padded,
/obj/item/bedsheet/medical,
@@ -16701,6 +16780,9 @@
"kDP" = (
/turf/simulated/floor/plating,
/area/maintenance/central_heating/surface_one)
+"kDS" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/substation/surface_one)
"kDV" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -16713,14 +16795,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
-"kEb" = (
-/obj/machinery/door/blast/regular/open{
- id = "virolockdown";
- name = "Virology Blast Door"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/virology)
"kEq" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -16991,7 +17065,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Patient Psychiatric Ward A"
},
/obj/machinery/door/blast/regular{
@@ -17194,6 +17268,11 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
+"kPk" = (
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/machinery/light,
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"kQb" = (
/obj/random/trash_pile,
/obj/effect/floor_decal/rust,
@@ -17288,6 +17367,17 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"kTn" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "test_chamber_blast";
+ name = "Testing Chamber Blast Door"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/reinforced,
+/area/rnd/testingroom)
"kTI" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
@@ -17352,7 +17442,7 @@
/turf/simulated/floor/tiled,
/area/medical/virology)
"kUL" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_south_airlock)
"kUO" = (
/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
@@ -17366,11 +17456,6 @@
/obj/item/pen,
/turf/simulated/floor/carpet/bcarpet,
/area/library)
-"kVw" = (
-/obj/machinery/atmospherics/component/binary/pump/high_power/on,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/virologypurge)
"kVA" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
@@ -17416,8 +17501,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfaceone)
@@ -17425,14 +17510,10 @@
/obj/structure/table/steel,
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
/obj/machinery/light/small,
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -24
- },
/turf/simulated/floor/tiled/steel,
/area/security/prison)
"kWq" = (
-/turf/simulated/wall,
+/turf/simulated/wall/wood/hardwood,
/area/tether/surfacebase/entertainment)
"kWH" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
@@ -17591,33 +17672,6 @@
"lcc" = (
/turf/simulated/floor/wood/broken,
/area/maintenance/library)
-"lcp" = (
-/obj/structure/table/reinforced,
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/mauve/border{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/item/paper{
- info = "Use of this facility is strictly limited to scientific endeavors only. Chemicals produced here are not covered for adverse affects and reactions like Chemistry.";
- name = "note from CentCom about the chemlab";
- pixel_x = -6;
- pixel_y = -4
- },
-/obj/item/tool/screwdriver,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/dropper,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/white,
-/area/rnd/chemistry_lab)
"lcC" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
@@ -17653,10 +17707,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/central_heating/surface_one)
-"lei" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/xenoarch_storage)
"lel" = (
/obj/machinery/vending/tool,
/obj/effect/floor_decal/borderfloor{
@@ -17905,7 +17955,7 @@
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
"llC" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/prison/solitary)
"llZ" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -18015,7 +18065,7 @@
dir = 8;
pixel_x = 10
},
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_breakroom)
"lrc" = (
/obj/effect/floor_decal/borderfloor,
@@ -18094,7 +18144,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
@@ -18118,7 +18168,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/machinery/light{
@@ -18167,7 +18217,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
"lvy" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/substation/cargo)
"lvE" = (
/obj/structure/table/hardwoodtable,
@@ -18195,10 +18245,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
-"lwS" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/surfacebase/outside/outside1)
"lxw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -18320,6 +18366,10 @@
/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)
"lCg" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -18351,15 +18401,18 @@
/turf/simulated/floor/lino,
/area/security/detectives_office)
"lCp" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/virologypurge)
+"lCB" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/research/lower)
"lCW" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"lDv" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/lawoffice)
"lEa" = (
/obj/structure/bed/chair/wood{
@@ -18474,10 +18527,10 @@
/turf/simulated/floor/tiled/steel,
/area/security/prison)
"lHl" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/medical/virologymaint)
"lHm" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/hallway/secondary/civilian_hallway_mid)
"lHH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
@@ -18489,14 +18542,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel,
/area/security/prison)
-"lHX" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "exam_room"
- },
-/turf/simulated/floor/plating,
-/area/medical/exam_room)
"lIg" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -18596,7 +18641,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/surface_north)
"lLp" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/security/brig/bathroom)
"lLs" = (
/obj/effect/floor_decal/borderfloorwhite{
@@ -18787,7 +18832,7 @@
/turf/simulated/floor/tiled,
/area/rnd/xenoarch_storage)
"lQP" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/server)
"lRd" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
@@ -18801,6 +18846,28 @@
},
/turf/simulated/floor/tiled,
/area/medical/virologypurge)
+"lRy" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/brown/border{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/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/steel,
+/area/quartermaster/hallway)
"lRL" = (
/obj/structure/table/wooden_reinforced,
/obj/item/flashlight/lamp,
@@ -18942,9 +19009,7 @@
/area/security/prison)
"lYg" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/starboard)
"lYS" = (
/obj/structure/cable/green{
@@ -19044,8 +19109,8 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
@@ -19161,6 +19226,11 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
+"mex" = (
+/obj/machinery/atmospherics/pipe/simple/visible/purple,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/medical/virologypurge)
"mfm" = (
/turf/simulated/floor/carpet/sblucarpet,
/area/crew_quarters/heads/cmo)
@@ -19219,28 +19289,6 @@
},
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"mgh" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/brown/border{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/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/steel,
-/area/quartermaster/hallway)
"mgE" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -19326,8 +19374,22 @@
/obj/vehicle_old/train/trolley,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/hallway)
+"miT" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/washing_machine,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/hallway)
"miX" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/patient_wing)
"mjk" = (
/obj/structure/railing{
@@ -19359,6 +19421,10 @@
},
/turf/simulated/floor/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"mkq" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/medical/virologypurge)
"mkE" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -19499,6 +19565,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
+"mna" = (
+/obj/structure/flora/ausbushes/fernybush,
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"mnd" = (
/obj/machinery/light_construct/small,
/obj/structure/bed/chair/sofa/black/right{
@@ -19668,7 +19738,7 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"mqK" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/testingroom)
"mqS" = (
/obj/machinery/door/airlock/silver{
@@ -19954,15 +20024,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/rnd/chemistry_lab)
-"mwF" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"mwN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -19993,18 +20054,6 @@
},
/turf/simulated/floor/lino,
/area/tether/surfacebase/entertainment)
-"mys" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "cargo_line_shutter";
- name = "Cargo Line shutter";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/delivery)
"myy" = (
/obj/structure/railing{
dir = 8
@@ -20025,7 +20074,7 @@
/area/medical/virology)
"mzj" = (
/obj/structure/sign/xenobio,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_hallway)
"mAc" = (
/obj/structure/bed/chair,
@@ -20078,6 +20127,11 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"mBd" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_hallway)
"mBo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -20089,21 +20143,20 @@
/obj/effect/debris/cleanable/blood/drip,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
-"mBI" = (
+"mCe" = (
+/obj/structure/reagent_dispensers/fueltank,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"mCK" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/regular{
dir = 4;
id = "test_chamber_blast";
name = "Testing Chamber Blast Door"
},
-/obj/structure/disposalpipe/segment,
-/obj/spawner/window/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/reinforced,
/area/rnd/testingroom)
-"mCe" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
"mCV" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -20138,8 +20191,12 @@
/area/rnd/outpost/xenobiology/outpost_hallway)
"mDS" = (
/obj/item/radio/intercom,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_autopsy)
+"mEV" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/medical/psych)
"mEY" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -20370,6 +20427,9 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"mNL" = (
+/turf/simulated/wall/prepainted,
+/area/medical/psych_ward)
"mNV" = (
/obj/structure/table/standard,
/obj/item/flashlight/pen,
@@ -20468,6 +20528,19 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint)
+"mRW" = (
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
+/obj/structure/cable/green{
+ icon_state = "16-0"
+ },
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/structure/window/reinforced/tinted/frosted{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"mSg" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -20606,6 +20679,15 @@
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop)
+"mTX" = (
+/obj/machinery/door/blast/shutters{
+ dir = 4;
+ id = "main_ext_shutter";
+ name = "Surface External Shutter"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/surfaceeva)
"mUb" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/floor_decal/borderfloor{
@@ -20648,7 +20730,7 @@
/turf/simulated/floor/outdoors/snow/noblend/lythios43c,
/area/rift/surfacebase/outside/outside1)
"mUU" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/crew_quarters/medbreak)
"mUV" = (
/obj/structure/disposalpipe/segment{
@@ -20682,6 +20764,14 @@
/obj/machinery/holopad,
/turf/simulated/floor/tiled/monotile,
/area/security/security_cell_hallway)
+"mWg" = (
+/obj/structure/lattice,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "32-4"
+ },
+/turf/simulated/open,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"mWj" = (
/obj/random/trash_pile,
/turf/simulated/floor/plating,
@@ -20690,7 +20780,7 @@
/obj/machinery/holosign/bar{
id = "iceshopsign"
},
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/trade_shop)
"mWv" = (
/obj/structure/cable{
@@ -20865,7 +20955,7 @@
icon_state = "shock";
name = "HIGH VOLTAGE"
},
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/maintenance/substation/medical)
"naC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -20900,6 +20990,11 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/maintenance/tool_storage)
+"nci" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/machinery/light,
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"ncj" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
@@ -21054,6 +21149,14 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
+"niI" = (
+/obj/structure/sign/warning{
+ desc = "Hazardous cryogenic temperatures beyond this point!";
+ pixel_x = -32
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/surfaceeva/airlock/main)
"niP" = (
/obj/machinery/door/airlock/research{
name = "Toxins Storage";
@@ -21170,7 +21273,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/game_room)
"nkJ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/engineering,
/area/maintenance/substation/medical)
"nkL" = (
/obj/structure/reagent_dispensers/beerkeg,
@@ -21264,10 +21367,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/game_room)
-"nnS" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/trade_shop)
"noc" = (
/obj/structure/grille,
/obj/structure/railing,
@@ -21362,7 +21461,7 @@
/turf/simulated/floor/lino,
/area/security/detectives_office)
"nqs" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/security/detectives_office)
"nqB" = (
/obj/machinery/door/window{
@@ -21386,7 +21485,7 @@
/turf/simulated/floor/tiled/steel,
/area/storage/surface_eva)
"nqL" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/hallway)
"nrZ" = (
/obj/machinery/door/morgue{
@@ -21489,6 +21588,11 @@
},
/turf/simulated/floor/tiled,
/area/medical/virology)
+"num" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_storage)
"nwc" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -21501,8 +21605,8 @@
dir = 8;
pixel_y = 26
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/effect/floor_decal/corner/lightgrey/border{
@@ -21537,7 +21641,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Isolation";
req_one_access = list(39)
},
@@ -21602,11 +21706,12 @@
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
"nyx" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
+ dir = 4;
req_one_access = list(18,47)
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
+ dir = 8
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
@@ -21729,6 +21834,14 @@
},
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"nBB" = (
+/obj/structure/cable/heavyduty{
+ icon_state = "4-8"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_hallway)
"nCD" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -21807,10 +21920,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/security_cell_hallway)
-"nEx" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/storage/surface_eva)
"nEH" = (
/obj/structure/sink/kitchen{
dir = 4;
@@ -22304,28 +22413,28 @@
},
/turf/simulated/floor/tiled/monotile,
/area/medical/virology)
-"nTo" = (
-/obj/structure/cable/green{
- icon_state = "2-8"
+"nSO" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
},
-/turf/simulated/floor/tiled/steel,
-/area/quartermaster/warehouse)
-"nTS" = (
/obj/machinery/firealarm{
- dir = 3;
pixel_y = 24
},
-/obj/machinery/light{
- dir = 1
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
-/obj/effect/floor_decal/borderfloorwhite{
+/obj/effect/floor_decal/corner/brown/border{
dir = 1
},
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 1
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfaceone)
+"nTo" = (
+/obj/structure/cable/green{
+ icon_state = "2-8"
},
-/turf/simulated/floor/tiled/white,
-/area/rnd/hallway)
+/turf/simulated/floor/tiled/steel,
+/area/quartermaster/warehouse)
"nTW" = (
/obj/machinery/light/small{
dir = 4
@@ -22436,7 +22545,7 @@
"nXP" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Paramedic Storage"
},
/obj/structure/cable/green{
@@ -22495,10 +22604,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
-"nYM" = (
-/obj/structure/sink/puddle,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"nYU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -23076,7 +23181,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Break Room";
req_one_access = list(39)
},
@@ -23221,10 +23326,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/janitor)
-"osx" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_office)
"osC" = (
/obj/structure/catwalk,
/obj/structure/disposalpipe/segment{
@@ -23287,17 +23388,9 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/security/lower)
-"ouW" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized/full{
- id = "patient_room_a"
- },
-/turf/simulated/floor/plating,
-/area/medical/patient_b)
"ouY" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/obj/effect/floor_decal/borderfloor,
/obj/machinery/light,
@@ -23322,7 +23415,7 @@
/turf/simulated/floor/tiled/monotile,
/area/rnd/xenobiology/xenoflora)
"ovn" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/security,
/area/security/forensics)
"ovz" = (
/obj/structure/railing{
@@ -23399,7 +23492,7 @@
/area/maintenance/research/lower)
"oyK" = (
/obj/structure/sign/warning/nosmoking_2,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/tankstorage)
"ozb" = (
/obj/effect/floor_decal/techfloor{
@@ -23452,6 +23545,13 @@
/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,
+/area/security/forensics)
"oBO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -23486,8 +23586,8 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
"oDa" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -23621,15 +23721,14 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/surfaceeva)
+"oFp" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/garage)
"oFG" = (
/turf/simulated/floor/outdoors/gravsnow/lythios43c,
/area/rift/surfacebase/outside/outside1)
-"oFO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/garage)
"oGF" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/psych/psych_2)
"oGP" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -23718,10 +23817,6 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
-"oJL" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/virologypurge)
"oKE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
@@ -23808,10 +23903,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_south_airlock)
-"oNv" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/chemistry_lab)
"oNz" = (
/turf/simulated/floor/lino,
/area/tether/surfacebase/entertainment/backstage)
@@ -24156,6 +24247,10 @@
"oVB" = (
/turf/simulated/floor/carpet,
/area/rift/surfacebase/outside/outside1)
+"oVH" = (
+/obj/structure/sign/xenobio,
+/turf/simulated/wall/r_wall/prepainted,
+/area/rnd/outpost/xenobiology/outpost_hallway)
"oVJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
@@ -24166,7 +24261,7 @@
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
"oWj" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/storage/tools)
"oWl" = (
/obj/structure/cable/green{
@@ -24276,10 +24371,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/testingroom)
-"oYJ" = (
-/obj/structure/flora/ausbushes/grassybush,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"oYT" = (
/obj/structure/bed/chair,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -24348,14 +24439,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/library)
-"oZG" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "cmo_office"
- },
-/turf/simulated/floor/plating,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"oZM" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
@@ -24384,7 +24467,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/garage)
"paX" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/hallway)
"paY" = (
/obj/effect/floor_decal/industrial/warning{
@@ -24842,11 +24925,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
-"pnO" = (
-/obj/machinery/atmospherics/pipe/simple/visible/purple,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/virologypurge)
"pok" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -24894,10 +24972,6 @@
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/red,
/area/security/security_cell_hallway)
-"ppV" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/tether/station/public_meeting_room)
"ppX" = (
/obj/structure/table/woodentable,
/obj/item/tape_recorder{
@@ -25183,7 +25257,7 @@
/turf/simulated/floor/plating,
/area/maintenance/library)
"pwU" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Psychiatric Recreation Access"
},
/obj/machinery/door/firedoor/glass,
@@ -25262,14 +25336,6 @@
/obj/item/flame/candle/candelabra/everburn,
/turf/simulated/floor/carpet,
/area/rift/surfacebase/outside/outside1)
-"pAz" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized/full{
- id = "QM_office"
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/quartermaster/qm)
"pAQ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -25347,21 +25413,6 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"pDg" = (
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/railing,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/structure/ladder{
- pixel_y = 10
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/rift/turbolift/maint)
"pDh" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -25459,6 +25510,18 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled/monowhite,
/area/medical/psych)
+"pGE" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/alarm{
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled,
+/area/rnd/outpost/xenobiology/outpost_main)
"pHc" = (
/obj/structure/catwalk,
/obj/structure/disposalpipe/segment{
@@ -25524,7 +25587,7 @@
/turf/simulated/floor/carpet/bcarpet,
/area/lawoffice)
"pIp" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/substation/surfaceservicesubstation)
"pIu" = (
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -25576,11 +25639,6 @@
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
-"pJH" = (
-/obj/structure/flora/ausbushes/grassybush,
-/obj/machinery/light,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"pKb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
@@ -25665,9 +25723,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/cargo)
-"pNg" = (
-/turf/simulated/open,
-/area/turbolift/rhammerhead/midpoint)
"pNv" = (
/obj/structure/table/reinforced,
/obj/fiftyspawner/rods,
@@ -25764,10 +25819,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/tether/station/public_meeting_room)
-"pQH" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/office)
"pQL" = (
/obj/structure/table/standard{
name = "plastic table frame"
@@ -25888,7 +25939,7 @@
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/tankstorage)
"pUa" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/cargo,
/area/quartermaster/hallway)
"pUt" = (
/obj/machinery/photocopier/faxmachine{
@@ -25944,7 +25995,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/medical/psych_ward)
"pVU" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/tankstorage)
"pWm" = (
/obj/machinery/light/small{
@@ -25966,10 +26017,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
-"pXj" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/delivery)
"pXE" = (
/obj/structure/table/woodentable,
/obj/effect/floor_decal/spline/plain{
@@ -26013,10 +26060,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"qaT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/garage)
"qaV" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -26158,6 +26201,15 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
+"qfY" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/open,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"qgb" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26315,6 +26367,9 @@
},
/turf/simulated/floor/tiled,
/area/medical/virologypurge)
+"qkC" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/maintenance/cargo)
"qkF" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 4
@@ -26339,6 +26394,11 @@
/obj/structure/flora/pottedplant/fern,
/turf/simulated/floor/grass,
/area/medical/psych)
+"qkT" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/xenobiology/xenoflora/lab_atmos)
"qkU" = (
/turf/simulated/floor/tiled/monowhite,
/area/medical/patient_wing)
@@ -26518,8 +26578,11 @@
/turf/simulated/floor/wood,
/area/maintenance/starboard)
"qqW" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_hallway)
+"qqZ" = (
+/turf/simulated/open,
+/area/turbolift/rhammerhead/midpoint)
"qro" = (
/obj/machinery/alarm{
dir = 8;
@@ -26624,11 +26687,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych)
-"qua" = (
-/turf/simulated/wall{
- can_open = 1
- },
-/area/medical/psych)
"qug" = (
/obj/structure/table/wooden_reinforced,
/obj/item/flame/candle/everburn,
@@ -26689,7 +26747,7 @@
/turf/simulated/floor/plating,
/area/medical/virologymaint)
"qvB" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/engineering/engine_eva)
"qvM" = (
/obj/effect/floor_decal/borderfloor{
@@ -26873,6 +26931,9 @@
},
/obj/effect/floor_decal/borderfloor/corner2,
/obj/effect/floor_decal/corner/red/bordercorner2,
+/obj/machinery/light{
+ dir = 4
+ },
/turf/simulated/floor/tiled/steel,
/area/security/security_cell_hallway)
"qCA" = (
@@ -26901,18 +26962,6 @@
/obj/structure/flora/ausbushes/fullgrass,
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/rift/station/public_garden)
-"qDq" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/brown/border{
- dir = 4
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/garage)
"qDy" = (
/obj/effect/floor_decal/borderfloorwhite/cee{
dir = 8
@@ -26968,7 +27017,7 @@
/turf/simulated/floor/outdoors/gravsnow/lythios43c,
/area/rift/surfacebase/outside/outside1)
"qGS" = (
-/turf/simulated/wall,
+/turf/simulated/wall/wood/hardwood,
/area/library/study)
"qHm" = (
/obj/structure/closet/crate/freezer/rations,
@@ -26983,6 +27032,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/medical/virology)
+"qHS" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/research/xenobio)
"qIp" = (
/obj/effect/floor_decal/techfloor/orange{
dir = 4
@@ -27002,7 +27055,7 @@
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
/obj/machinery/camera/network/security{
- dir = 10
+ dir = 1
},
/obj/machinery/power/apc{
name = "south bump";
@@ -27030,10 +27083,6 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/entertainment)
-"qJn" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_storage)
"qJB" = (
/obj/structure/bed/chair/comfy/beige{
dir = 1
@@ -27115,7 +27164,7 @@
/obj/effect/floor_decal/corner/purple/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -27123,14 +27172,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
-"qNA" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "cmo_office"
- },
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/cmo)
"qNR" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate,
@@ -27269,6 +27310,10 @@
},
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"qRr" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/medbreak)
"qRt" = (
/obj/structure/mirror/long/left_broke{
pixel_y = -28
@@ -27384,10 +27429,6 @@
},
/turf/simulated/floor/plating,
/area/medical/virologymaint)
-"qUk" = (
-/obj/structure/bed/chair,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/qm)
"qUN" = (
/obj/structure/bookcase{
name = "bookcase (Reference)"
@@ -27473,7 +27514,7 @@
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
"qXo" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Airlock";
req_one_access = list(31)
},
@@ -27563,10 +27604,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych)
-"qZe" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/psych)
"qZu" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 4
@@ -27817,7 +27854,7 @@
/area/medical/psych_ward)
"rkR" = (
/obj/machinery/newscaster,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_decon)
"rld" = (
/obj/machinery/power/apc{
@@ -27839,13 +27876,6 @@
/obj/machinery/portable_atmospherics/canister/nitrogen,
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/tankstorage)
-"rlZ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_hallway)
"rmq" = (
/obj/effect/floor_decal/corner/beige{
dir = 5
@@ -27854,15 +27884,14 @@
/obj/structure/flora/pottedplant/decorative,
/turf/simulated/floor/tiled/white,
/area/medical/psych)
+"rmE" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/chemistry_lab)
"rmQ" = (
/obj/structure/sign/department/prison,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/security,
/area/security/security_cell_hallway)
-"rnh" = (
-/obj/structure/disposalpipe/segment,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/cargo)
"rnp" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
@@ -27903,6 +27932,9 @@
/obj/item/book/bundle/custom_library/nonfiction,
/turf/simulated/floor/wood,
/area/library)
+"rnK" = (
+/turf/simulated/wall/prepainted/medical,
+/area/maintenance/lowmedbaymaint)
"rnP" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -27922,7 +27954,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
"roa" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Confinement Processing";
req_access = list(2)
},
@@ -27984,7 +28016,7 @@
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/cable{
@@ -27993,7 +28025,7 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
"rrk" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/exam_room)
"rrt" = (
/obj/item/reagent_containers/glass/bucket/wood,
@@ -28014,7 +28046,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/medical/medbay_emt_bay)
"rsQ" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/turbolift/maint)
"rsR" = (
/obj/machinery/atmospherics/portables_connector{
@@ -28190,10 +28222,6 @@
/obj/item/mass_spectrometer/adv,
/turf/simulated/floor/tiled/white,
/area/security/forensics)
-"rwR" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/medbreak)
"rxj" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -28201,8 +28229,8 @@
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/outside/outside1)
"rxp" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/borderfloor,
/obj/machinery/light,
@@ -28370,8 +28398,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
@@ -28434,10 +28462,6 @@
/obj/machinery/light,
/turf/simulated/floor/reinforced,
/area/rnd/xenoarch_storage)
-"rEi" = (
-/obj/structure/flora/ausbushes/fernybush,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"rEy" = (
/obj/effect/floor_decal/industrial/warning{
dir = 5
@@ -28529,8 +28553,8 @@
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"rGQ" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/obj/effect/floor_decal/borderfloor,
/obj/machinery/light,
@@ -28594,6 +28618,18 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/library)
+"rHM" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"rIt" = (
/obj/machinery/power/apc{
dir = 8;
@@ -28748,14 +28784,6 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_autopsy)
-"rNo" = (
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/holopad,
-/turf/simulated/floor/wood,
-/area/lawoffice)
"rNH" = (
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/snow,
@@ -28818,6 +28846,33 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/checkpoint)
+"rOR" = (
+/obj/structure/table/reinforced,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/mauve/border{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/item/paper{
+ info = "Use of this facility is strictly limited to scientific endeavors only. Chemicals produced here are not covered for adverse affects and reactions like Chemistry.";
+ name = "note from CentCom about the chemlab";
+ pixel_x = -6;
+ pixel_y = -4
+ },
+/obj/item/tool/screwdriver,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/glass/beaker/large,
+/obj/item/reagent_containers/dropper,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/rnd/chemistry_lab)
"rPa" = (
/obj/structure/railing,
/turf/simulated/floor/reinforced/lythios43c,
@@ -28899,6 +28954,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
+"rQq" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/trade_shop)
"rQu" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -29073,7 +29132,7 @@
/area/quartermaster/foyer)
"rYs" = (
/obj/structure/sign/warning/biohazard,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/hallway)
"rZr" = (
/obj/effect/floor_decal/borderfloor{
@@ -29087,18 +29146,6 @@
"rZs" = (
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
-"rZD" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/concrete/rng/indoors,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"rZO" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/obj/structure/disposalpipe/segment{
@@ -29127,7 +29174,7 @@
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
"rZY" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/research/lower)
"sax" = (
/obj/structure/bed/chair/comfy/teal{
@@ -29160,16 +29207,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/tether/station/public_meeting_room)
-"scC" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/shutters{
- dir = 8;
- id = "warehouse";
- name = "Warehouse Shutters"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/warehouse)
"scF" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/machinery/light{
@@ -29183,13 +29220,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/game_room)
-"sdx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_first_aid)
"sdN" = (
/obj/machinery/door/airlock/maintenance/int{
name = "Emergency Storage"
@@ -29355,11 +29385,26 @@
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Telescience Wing"
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_hallway)
+"shK" = (
+/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/zpipe/up/supply,
+/obj/structure/cable/green{
+ icon_state = "16-0"
+ },
+/obj/structure/disposalpipe/down{
+ dir = 1
+ },
+/obj/structure/cable/green,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_stairs)
"shL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 5
@@ -29372,6 +29417,18 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/evahallway)
+"sib" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/machinery/space_heater,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/plating,
+/area/engineering/engine_eva)
"sir" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -29509,7 +29566,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
"sku" = (
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tag = "detdoor";
id_tint = "det_office";
name = "Detective's Office";
@@ -29604,7 +29661,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/exam_room)
"slF" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/research/xenobio)
"slX" = (
/obj/structure/closet/secure_closet/personal/patient,
@@ -29613,6 +29670,20 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
+"smJ" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/structure/ladder{
+ pixel_y = 10
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/rift/turbolift/maint)
"smO" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -29634,7 +29705,7 @@
/turf/simulated/floor/plating,
/area/lawoffice)
"smW" = (
-/obj/machinery/door/airlock/glass_security,
+/obj/machinery/door/airlock/glass/security,
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/shutters{
density = 0;
@@ -29710,7 +29781,7 @@
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
"snT" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/library)
"soS" = (
/obj/structure/extinguisher_cabinet{
@@ -29725,6 +29796,9 @@
},
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"spy" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/engineering/pumpstation)
"spM" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -29890,12 +29964,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
+"stE" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rift/surfacebase/outside/outside1)
"stI" = (
/obj/effect/floor_decal/techfloor{
dir = 6
@@ -30033,6 +30110,10 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
+"sxf" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/entertainment)
"sxj" = (
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/outdoors/grass/heavy/interior,
@@ -30121,6 +30202,11 @@
/obj/random/junk,
/turf/simulated/floor/wood/broken,
/area/maintenance/maint_bar)
+"sBt" = (
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/cargo)
"sBy" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
@@ -30172,7 +30258,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
"sDY" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/psych)
"sEE" = (
/obj/machinery/door/airlock/research{
@@ -30254,7 +30340,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -30601,6 +30687,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
+"sOh" = (
+/turf/simulated/wall/prepainted/cargo,
+/area/quartermaster/foyer)
"sPz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -30676,6 +30765,11 @@
},
/turf/simulated/floor/tiled,
/area/medical/virology)
+"sRG" = (
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"sRR" = (
/obj/structure/cable/green{
icon_state = "2-4"
@@ -30794,13 +30888,8 @@
/area/quartermaster/hallway)
"sVi" = (
/obj/structure/sign/redcross,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_first_aid)
-"sVq" = (
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/lowmedbaymaint)
"sVG" = (
/obj/structure/catwalk,
/obj/structure/railing{
@@ -30884,7 +30973,7 @@
/turf/simulated/floor/tiled/white,
/area/security/forensics)
"sXZ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/surfaceeva)
"sYX" = (
/obj/structure/disposalpipe/segment{
@@ -30932,7 +31021,7 @@
/turf/simulated/floor/wood,
/area/tether/surfacebase/medical/mentalhealth)
"tak" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfaceeva/aa/surface_north)
"taz" = (
/obj/structure/disposalpipe/segment{
@@ -30966,7 +31055,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Patient Psychiatric Isolation Cell"
},
/turf/simulated/floor/tiled/white,
@@ -31015,7 +31104,7 @@
/turf/simulated/floor/lino,
/area/tether/surfacebase/entertainment/backstage)
"tdI" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/security/lower)
"tee" = (
/obj/structure/cable/green{
@@ -31038,7 +31127,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"tep" = (
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/obj/machinery/door/blast/regular/open{
id = "main_ext_blast";
name = "Surface External Blast Door"
@@ -31450,7 +31539,7 @@
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"tpH" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/maintenance/research/lower)
"tqg" = (
/obj/machinery/door/airlock/research{
@@ -31536,9 +31625,6 @@
/obj/effect/floor_decal/corner/lightgrey/border,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfaceone)
-"ttM" = (
-/turf/simulated/open,
-/area/turbolift/rsurface/level1)
"tuj" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/tinted/frosted{
@@ -31633,7 +31719,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
"twG" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/psych_ward)
"txE" = (
/obj/effect/floor_decal/borderfloor{
@@ -31720,7 +31806,7 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/structure/disposalpipe/segment,
@@ -31777,14 +31863,14 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/server)
-"tAP" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/machinery/light,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"tBf" = (
/turf/simulated/floor/tiled/steel,
/area/rnd/xenobiology/xenoflora/lab_atmos)
+"tBg" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/security_cell_hallway)
"tBl" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/random/trash_pile,
@@ -32020,14 +32106,14 @@
/obj/effect/floor_decal/corner/purple/border{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 4
},
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
"tHa" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"tHe" = (
/obj/effect/floor_decal/borderfloorwhite{
@@ -32071,19 +32157,8 @@
},
/turf/simulated/floor/outdoors/grass/heavy/interior,
/area/rift/station/public_garden)
-"tHR" = (
-/obj/structure/table/reinforced,
-/obj/item/pen/red{
- pixel_x = -2;
- pixel_y = 2
- },
-/obj/item/pen,
-/obj/item/folder/yellow,
-/obj/item/stamp/qm,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/qm)
"tHW" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Permanent Confinement";
req_access = list(2)
},
@@ -32372,6 +32447,9 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/library)
+"tSh" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/crew_quarters/heads/cmo)
"tSj" = (
/turf/simulated/floor/wood,
/area/rnd/outpost/xenobiology/outpost_office)
@@ -32775,13 +32853,6 @@
/obj/structure/closet/l3closet/janitor,
/turf/simulated/floor/tiled/steel,
/area/janitor)
-"ucY" = (
-/obj/structure/cable/heavyduty{
- icon_state = "4-8"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_hallway)
"udl" = (
/obj/machinery/conveyor{
dir = 4;
@@ -32804,12 +32875,8 @@
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_decon)
"ueA" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/tether/station/public_meeting_room)
-"ueP" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/stairwell/primary/surfaceone)
"ueT" = (
/obj/structure/closet/l3closet/virology,
/obj/structure/window/reinforced{
@@ -32957,15 +33024,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"ujt" = (
-/obj/machinery/door/blast/shutters{
- dir = 4;
- id = "main_ext_shutter";
- name = "Surface External Shutter"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/surfaceeva)
"ujw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -32992,7 +33050,7 @@
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint)
"ujT" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/surfacebase/outside/outside1)
"ukm" = (
/obj/structure/table/alien/blue{
@@ -33116,7 +33174,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
"und" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/effect/floor_decal/borderfloor/corner,
@@ -33243,6 +33301,9 @@
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/rift/trade_shop)
+"upz" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/tool_storage)
"upJ" = (
/turf/simulated/floor/plating,
/area/medical/psych)
@@ -33295,7 +33356,7 @@
/turf/simulated/floor/plating,
/area/rift/surfaceeva)
"uqR" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Science First Aid";
req_one_access = list(5,47)
},
@@ -33311,8 +33372,8 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
@@ -33344,7 +33405,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Patient Psychiatric Ward B"
},
/obj/machinery/door/blast/regular{
@@ -33581,24 +33642,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/starboard)
-"uwX" = (
-/obj/structure/table/standard,
-/obj/item/storage/toolbox/electrical{
- pixel_y = 4
- },
-/obj/item/storage/toolbox/mechanical,
-/obj/effect/floor_decal/borderfloor{
- dir = 5
- },
-/obj/effect/floor_decal/corner/mauve/border{
- dir = 5
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/steel,
-/area/rnd/testingroom)
"uxG" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 10
@@ -33667,6 +33710,10 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/garage)
+"uyG" = (
+/obj/structure/flora/ausbushes/palebush,
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"uyU" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -33784,7 +33831,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/medical/virologyaccess)
"uBo" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/tether/surfacebase/funny/clownoffice)
"uBK" = (
/obj/structure/railing{
@@ -33794,7 +33841,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"uBP" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/xenoarch_storage)
"uBT" = (
/obj/effect/debris/cleanable/mucus,
@@ -33891,7 +33938,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/maintenance/security/lower)
"uEs" = (
/obj/structure/bed/chair{
@@ -34049,8 +34096,8 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
/obj/structure/cable{
@@ -34072,10 +34119,6 @@
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/floor/plating,
/area/medical/virologymaint)
-"uLr" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/virologyisolation)
"uLP" = (
/obj/machinery/alarm{
dir = 8;
@@ -34164,9 +34207,6 @@
/obj/effect/floor_decal/corner/red/border{
dir = 4
},
-/obj/machinery/light{
- dir = 4
- },
/turf/simulated/floor/tiled/steel,
/area/security/security_cell_hallway)
"uPk" = (
@@ -34328,8 +34368,8 @@
"uVg" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
@@ -34351,7 +34391,7 @@
/turf/simulated/floor/plating,
/area/maintenance/starboard)
"uWy" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/quartermaster/foyer)
"uWW" = (
/obj/effect/floor_decal/borderfloor{
@@ -34465,6 +34505,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
+"uZm" = (
+/turf/simulated/wall/prepainted/science,
+/area/rnd/outpost/xenobiology/outpost_stairs)
"uZR" = (
/obj/machinery/door/airlock/silver{
name = "Entertainment Backroom";
@@ -34558,7 +34601,7 @@
/turf/simulated/floor/tiled/steel_ridged,
/area/hallway/primary/surfaceone)
"vbN" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/virologytransitwest)
"vca" = (
/obj/machinery/door/firedoor/glass,
@@ -34610,6 +34653,16 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
+"vdq" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8;
+ req_one_access = list(18,47)
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfaceone)
"vdS" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 8
@@ -34634,10 +34687,6 @@
/obj/machinery/portable_atmospherics/canister/air/airlock,
/turf/simulated/floor/plating,
/area/quartermaster/garage)
-"vep" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/tankstorage)
"ves" = (
/obj/structure/railing{
dir = 4
@@ -34675,6 +34724,11 @@
/obj/structure/railing,
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/outside/outside1)
+"vfP" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rift/surfacebase/outside/outside1)
"vgo" = (
/obj/structure/cable/green{
icon_state = "0-4"
@@ -34706,7 +34760,7 @@
/turf/simulated/floor/tiled/steel_dirty,
/area/rnd/tankstorage)
"vgL" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/quartermaster/garage)
"vgN" = (
/obj/structure/filingcabinet/filingcabinet,
@@ -34747,26 +34801,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/lower)
-"vhu" = (
-/obj/structure/sign/warning{
- desc = "Hazardous cryogenic temperatures beyond this point!";
- pixel_x = -32
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/surfaceeva/airlock/main)
-"vhD" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/space_heater,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/plating,
-/area/engineering/engine_eva)
"vhM" = (
/obj/item/stool/padded,
/turf/simulated/floor/tiled,
@@ -34967,10 +35001,6 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/security/prison)
-"vsC" = (
-/obj/structure/flora/ausbushes/palebush,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"vtt" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/green/border,
@@ -35017,6 +35047,11 @@
/obj/effect/floor_decal/corner/lightgrey/border,
/turf/simulated/floor/tiled/steel,
/area/rift/surfaceeva)
+"vuL" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/garage)
"vvx" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -35086,13 +35121,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
-"vwG" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_south_airlock)
"vwR" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
@@ -35156,6 +35184,11 @@
/obj/structure/table/hardwoodtable,
/turf/simulated/floor/plating,
/area/maintenance/starboard)
+"vAc" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_breakroom)
"vAe" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -35281,7 +35314,7 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"vDU" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Airlock";
req_one_access = list(31)
},
@@ -35292,19 +35325,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/office)
-"vEa" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/tiled/steel,
-/area/tether/station/public_meeting_room)
+"vEh" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/research/lower)
"vEs" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -35369,22 +35393,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/garage)
-"vGZ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_hallway)
-"vHp" = (
-/obj/structure/railing,
-/obj/structure/railing{
- dir = 4
- },
-/obj/random/trash_pile,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/turf/simulated/floor/plating,
-/area/maintenance/library)
"vIa" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/reagentgrinder,
@@ -35398,7 +35406,7 @@
/turf/simulated/floor/wood,
/area/library)
"vIx" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/patient_b)
"vJf" = (
/obj/structure/table/wooden_reinforced,
@@ -35418,7 +35426,7 @@
/turf/simulated/floor/tiled,
/area/medical/virology)
"vJJ" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -35542,7 +35550,7 @@
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
/obj/machinery/camera/network/civilian{
- dir = 10
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
@@ -35554,7 +35562,7 @@
/area/hallway/secondary/civilian_hallway_mid)
"vOH" = (
/obj/structure/sign/department/xenolab,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_breakroom)
"vOK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -35788,7 +35796,7 @@
/turf/simulated/floor/tiled,
/area/medical/virology)
"vUA" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/outside/outside1)
"vVs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -35849,7 +35857,7 @@
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/outside/outside1)
"vWP" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Chemical Research"
},
/obj/structure/cable/green{
@@ -35943,7 +35951,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
"vZx" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/civilian,
/area/storage/surface_eva)
"vZB" = (
/obj/effect/floor_decal/borderfloor{
@@ -35965,7 +35973,7 @@
/turf/simulated/floor/tiled/monowhite,
/area/rnd/chemistry_lab)
"waO" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/machinery/door/window/southleft{
@@ -36115,7 +36123,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/virologyisolation)
"wes" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/maintenance/evahallway)
"weE" = (
/obj/machinery/holopad,
@@ -36197,6 +36205,10 @@
/obj/structure/bed/chair{
dir = 4
},
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -24
+ },
/turf/simulated/floor/tiled/steel,
/area/security/prison)
"whS" = (
@@ -36211,19 +36223,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/psych_ward)
-"wis" = (
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfaceone)
"wjj" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -36234,7 +36233,7 @@
/obj/effect/floor_decal/corner/purple/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/button/remote/blast_door{
@@ -36270,7 +36269,7 @@
dir = 1
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Telescience Wing"
},
/turf/simulated/floor/tiled,
@@ -36446,8 +36445,22 @@
/turf/simulated/floor/carpet,
/area/library)
"woJ" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/engineering/engine_eva)
+"wpM" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "sfc_check_shutter";
+ name = "Surface Checkpoint Shutter";
+ opacity = 0
+ },
+/obj/structure/cable,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/checkpoint)
"wpT" = (
/turf/unsimulated/wall/planetary/lythios43c{
desc = "Glacial permafrost, compacted harder than stone.";
@@ -36460,6 +36473,16 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/research/lower)
+"wqy" = (
+/obj/structure/stairs/spawner/south,
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/rng/lythios43c,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"wqA" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -36487,7 +36510,7 @@
/area/rift/stairwell/primary/surfaceone)
"wrm" = (
/obj/structure/sign/department/xenolab,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"wrw" = (
/obj/effect/floor_decal/borderfloor{
@@ -36635,7 +36658,7 @@
dir = 8
},
/obj/machinery/camera/network/civilian{
- dir = 10
+ dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
@@ -36814,19 +36837,26 @@
/obj/structure/curtain/open/shower,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_south_airlock)
+"wzP" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "cargo_line_shutter";
+ name = "Cargo Line shutter";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/disposalpipe/segment,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/delivery)
"wAc" = (
/obj/effect/floor_decal/spline/plain{
dir = 9
},
/turf/simulated/floor/carpet/bcarpet,
/area/maintenance/maint_bar)
-"wAn" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 8
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/engineering/engine_eva)
"wAv" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
@@ -36889,6 +36919,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/foyer)
+"wBV" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/rift/surfaceeva)
"wCc" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/floor/tiled/steel_dirty,
@@ -37139,12 +37172,8 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
-"wHR" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_main)
"wHT" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/medical,
/area/medical/medbay_emt_bay)
"wHW" = (
/obj/item/material/knife/machete/hatchet,
@@ -37383,8 +37412,15 @@
/turf/simulated/floor/tiled/steel,
/area/tether/station/public_meeting_room)
"wQR" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_storage)
+"wRa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_south_airlock)
"wRf" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -37401,20 +37437,21 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 4
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Purge Chamber Fuel";
req_one_access = list(39)
},
/turf/simulated/floor/plating,
/area/medical/virologypurge)
"wRP" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/hallway)
"wSo" = (
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfaceeva/aa/surface_south)
"wSq" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
/turf/simulated/floor/plating,
/area/medical/psych)
"wSD" = (
@@ -37445,9 +37482,7 @@
/area/maintenance/substation/medical)
"wTy" = (
/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
+/turf/simulated/wall/prepainted,
/area/maintenance/evahallway)
"wTT" = (
/obj/structure/dancepole{
@@ -37490,7 +37525,7 @@
/turf/simulated/floor/tiled/white,
/area/security/forensics)
"wVZ" = (
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/medical,
/area/medical/psych)
"wWA" = (
/obj/effect/floor_decal/industrial/halfstair,
@@ -37533,19 +37568,6 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/maintenance/maint_bar)
-"wYk" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "cargo_line_shutter";
- name = "Cargo Line shutter";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/plating,
-/area/quartermaster/delivery)
"wYB" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -37693,22 +37715,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/medical/patient_wing)
-"xbG" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "cargo_line_shutter";
- name = "Cargo Line shutter";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/office)
"xbW" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -37757,11 +37766,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/main/secondary)
-"xci" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/flora/ausbushes/ppflowers,
-/turf/simulated/floor/outdoors/grass/heavy/interior,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"xcx" = (
/obj/structure/grille,
/obj/structure/sign/warning/lethal_turrets{
@@ -37844,10 +37848,6 @@
/obj/vehicle_old/train/trolley,
/turf/simulated/floor/tiled/steel,
/area/quartermaster/warehouse)
-"xdW" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/tether/surfacebase/entertainment)
"xej" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/catwalk,
@@ -37872,19 +37872,6 @@
/obj/item/reagent_containers/food/snacks/cherrypie,
/turf/simulated/floor/wood,
/area/maintenance/research/lower)
-"xfu" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "sfc_check_shutter";
- name = "Surface Checkpoint Shutter";
- opacity = 0
- },
-/obj/structure/cable,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/checkpoint)
"xfC" = (
/obj/structure/curtain/black{
anchored = 1;
@@ -37949,6 +37936,20 @@
},
/turf/simulated/floor/tiled/steel,
/area/janitor)
+"xha" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "cargo_line_shutter";
+ name = "Cargo Line shutter";
+ opacity = 0
+ },
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/office)
"xhl" = (
/obj/structure/table/standard,
/obj/machinery/cell_charger,
@@ -37960,7 +37961,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/surface_south)
"xhz" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -38145,6 +38146,13 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
+"xme" = (
+/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
+ dir = 8
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/engineering/engine_eva)
"xmm" = (
/obj/structure/sink/kitchen{
dir = 4;
@@ -38187,6 +38195,11 @@
},
/turf/simulated/floor/wood,
/area/lawoffice)
+"xnJ" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/beastybrown,
+/turf/simulated/floor/plating,
+/area/quartermaster/delivery)
"xoa" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 4
@@ -38302,7 +38315,7 @@
/turf/simulated/floor/tiled/steel,
/area/quartermaster/delivery)
"xsG" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rift/surfaceeva/airlock/main/secondary)
"xsI" = (
/obj/structure/disposalpipe/segment{
@@ -38311,11 +38324,6 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/alarm{
- dir = 1;
- pixel_x = 30;
- pixel_y = -22
- },
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"xsL" = (
@@ -38336,8 +38344,8 @@
/turf/simulated/floor/plating,
/area/maintenance/cargo)
"xtr" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
@@ -38424,6 +38432,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/cargo)
+"xvN" = (
+/turf/simulated/wall/wood/hardwood,
+/area/maintenance/library)
"xvP" = (
/obj/effect/floor_decal/techfloor/orange/corner,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -38434,7 +38445,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/garage)
"xvW" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoarch Storage";
req_access = list(65)
},
@@ -38686,6 +38697,11 @@
},
/turf/simulated/floor/plating,
/area/engineering/engine_eva)
+"xDd" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/medbay_emt_bay)
"xDK" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
@@ -38693,10 +38709,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/steel_ridged,
/area/quartermaster/garage)
-"xDR" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/hallway)
"xEb" = (
/obj/effect/floor_decal/borderfloor/shifted{
dir = 4
@@ -38734,6 +38746,10 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_breakroom)
+"xEp" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_breakroom)
"xEs" = (
/obj/machinery/light,
/obj/machinery/vending/medical,
@@ -38821,7 +38837,7 @@
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop)
"xIm" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/rnd/outpost/xenobiology/outpost_stairs)
"xJm" = (
/obj/structure/cable/green{
@@ -38866,6 +38882,15 @@
/obj/effect/floor_decal/industrial/halfstair,
/turf/simulated/floor/wood,
/area/maintenance/maint_bar)
+"xMc" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/concrete/rng/indoors,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"xMn" = (
/obj/machinery/door/airlock/medical{
id_tag = "mentaldoor";
@@ -38948,6 +38973,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/surfaceeva)
+"xNM" = (
+/turf/simulated/floor/outdoors/grass/heavy/interior,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"xNO" = (
/obj/structure/stairs/spawner/south,
/turf/simulated/floor/tiled/steel,
@@ -39032,8 +39060,8 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"xQq" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
@@ -39061,18 +39089,7 @@
"xRb" = (
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/civilian_hallway_mid)
-"xRi" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized/full{
- id = "patient_room_b"
- },
-/turf/simulated/floor/plating,
-/area/medical/patient_a)
"xRu" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
/obj/effect/floor_decal/borderfloor{
dir = 8
},
@@ -39095,9 +39112,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/janitor)
-"xSd" = (
-/turf/simulated/wall/r_wall,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"xSw" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39118,7 +39132,7 @@
/turf/simulated/floor/snow/gravsnow,
/area/rift/surfacebase/outside/outside1)
"xTe" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/cargo,
/area/quartermaster/office)
"xTz" = (
/obj/structure/bed/chair/wood,
@@ -39172,8 +39186,8 @@
/obj/effect/floor_decal/corner/red/bordercorner{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/security/security_cell_hallway)
@@ -39281,7 +39295,7 @@
/area/lawoffice)
"xWb" = (
/obj/structure/sign/warning/caution,
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/tankstorage)
"xWD" = (
/obj/effect/floor_decal/techfloor,
@@ -39356,7 +39370,7 @@
/turf/simulated/floor/wood,
/area/lawoffice)
"xZM" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted,
/area/tether/surfacebase/funny/mimeoffice)
"yav" = (
/obj/structure/table/hardwoodtable,
@@ -39446,7 +39460,7 @@
/area/rift/surfaceeva/airlock/main)
"ydQ" = (
/obj/structure/sign/securearea,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_hallway)
"yeC" = (
/obj/structure/table/steel,
@@ -39483,14 +39497,6 @@
/obj/machinery/door/airlock/maintenance/cargo,
/turf/simulated/floor/plating,
/area/quartermaster/garage)
-"ygM" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized/full{
- id = "psych_office"
- },
-/turf/simulated/floor/plating,
-/area/tether/surfacebase/medical/mentalhealth)
"ygW" = (
/obj/effect/floor_decal/rust,
/obj/machinery/portable_atmospherics/hydroponics,
@@ -39504,9 +39510,7 @@
"yhd" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2
- },
+/obj/machinery/door/airlock/multi_tile/glass,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/tether/station/public_meeting_room)
@@ -39517,18 +39521,6 @@
},
/turf/simulated/floor/wood,
/area/library)
-"yhi" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "cargo_line_shutter";
- name = "Cargo Line shutter";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/quartermaster/office)
"yhD" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -39587,7 +39579,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/library)
"ykF" = (
-/turf/simulated/wall,
+/turf/simulated/wall/prepainted/science,
/area/rnd/outpost/xenobiology/outpost_office)
"ykK" = (
/obj/structure/table/rack,
@@ -45403,21 +45395,21 @@ tJx
sGn
sGn
ykF
-osx
-osx
-osx
-osx
-osx
-osx
-osx
-osx
+cFz
+cFz
+cFz
+cFz
+cFz
+cFz
+cFz
+cFz
iUb
iUb
iUb
iUb
iUb
-wHR
-wHR
+bEY
+bEY
dTo
dTo
dTo
@@ -45785,7 +45777,7 @@ kMx
kMx
qqW
slF
-amO
+qHS
slF
slF
ujT
@@ -45804,13 +45796,13 @@ vOK
vwg
foq
mDS
-nNF
+pGE
hpa
sVi
diG
kIp
xjQ
-kkw
+jzo
sHD
ivW
lcN
@@ -45974,7 +45966,7 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
jOr
qpj
qqW
@@ -46000,7 +45992,7 @@ eMK
ePi
xEd
hGn
-sdx
+bUk
dOr
dqv
mPx
@@ -46168,7 +46160,7 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
jOr
oCM
qqW
@@ -46198,7 +46190,7 @@ crn
mtL
lLD
kqi
-kkw
+jzo
sGn
sGn
iEK
@@ -46362,7 +46354,7 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
jOr
qpj
qqW
@@ -46388,7 +46380,7 @@ sMk
iUb
vDR
xsI
-kkw
+jzo
ktS
weE
iLH
@@ -46582,11 +46574,11 @@ iUb
wrm
dzt
cfn
-xIm
-xIm
-xIm
-xIm
-xIm
+uZm
+uZm
+uZm
+uZm
+uZm
xIm
hEV
hEV
@@ -46750,7 +46742,7 @@ klr
klr
klr
uQi
-vGZ
+mBd
jOr
wAO
eZK
@@ -46944,18 +46936,18 @@ vUA
vUA
vUA
uQi
-vGZ
+mBd
qEl
mdt
iZS
sqd
tYP
ecQ
-vwG
+wRa
bkA
xvX
ujw
-fuf
+fvO
veE
iBr
iKe
@@ -46970,7 +46962,7 @@ xlO
oDa
tZv
ory
-ihd
+shK
aPh
fgE
fgE
@@ -47138,7 +47130,7 @@ klr
klr
klr
uQi
-vGZ
+mBd
wqA
kZd
lun
@@ -47336,9 +47328,9 @@ qqW
mSy
lTj
qqW
-vGZ
-vGZ
-mzj
+mBd
+mBd
+oVH
kUL
wgx
uQP
@@ -47358,11 +47350,11 @@ fyf
jlx
dzt
bYi
-xIm
-xIm
-xIm
-xIm
-xIm
+uZm
+uZm
+uZm
+uZm
+uZm
xIm
hEV
hEV
@@ -47526,7 +47518,7 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
mDM
pPk
dFk
@@ -47720,14 +47712,14 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
rZO
bdt
haT
cya
cya
cya
-vUA
+stE
wPH
mLf
jPz
@@ -47746,7 +47738,7 @@ mip
fyf
wIJ
lIQ
-qJn
+num
ikc
qKN
goE
@@ -47918,13 +47910,13 @@ qqW
wqA
lTj
qqW
-lwS
-lwS
-vUA
-vUA
+vfP
+vfP
+stE
+stE
mLf
mLf
-ctY
+xEp
nho
sHv
ylI
@@ -48108,17 +48100,17 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
lcN
fxg
sHD
-ctY
+xEp
ilP
nMN
xSw
@@ -48134,7 +48126,7 @@ gji
fyf
nNF
hpa
-qJn
+num
xUO
boU
vxG
@@ -48302,10 +48294,10 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
@@ -48399,9 +48391,9 @@ dER
iFN
kAb
kAb
-nnS
-nnS
-nnS
+rQq
+rQq
+rQq
kAb
kAb
kAb
@@ -48494,8 +48486,8 @@ qqW
qqW
qqW
qqW
-vGZ
-ucY
+mBd
+nBB
qqW
mSy
klC
@@ -48507,21 +48499,21 @@ lcN
tJx
sHD
jPz
-ctY
-ctY
-ctY
-ctY
-ctY
-ctY
-ctY
-ctY
+vAc
+vAc
+vAc
+vAc
+vAc
+vAc
+vAc
+vAc
fyf
fyf
fyf
fyf
fyf
-wHR
-wHR
+bEY
+bEY
wQR
wQR
wQR
@@ -48693,7 +48685,7 @@ fjP
xmK
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
@@ -48887,7 +48879,7 @@ fjP
xmK
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
@@ -49076,8 +49068,8 @@ qqW
qqW
qqW
qqW
-vGZ
-ucY
+mBd
+nBB
qqW
wjj
rqu
@@ -49264,18 +49256,18 @@ iFN
iFN
qqW
qqW
-rlZ
-rlZ
+emM
+emM
qqW
arS
lcN
lcN
lcN
vgp
-vGZ
+mBd
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
@@ -49433,18 +49425,18 @@ kYl
kYl
veF
dER
-vgL
-hoj
-hoj
-vgL
-vgL
-vgL
-vgL
-hoj
+oFp
+vuL
+vuL
+oFp
+oFp
+oFp
+oFp
+vuL
gTL
gTL
-hoj
-vgL
+oFp
+vUA
iFN
jZZ
rPE
@@ -49466,10 +49458,10 @@ lcN
lcN
lcN
vgp
-vGZ
+mBd
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
@@ -49627,18 +49619,18 @@ kYl
kYl
iSM
dER
-vgL
+oFp
jfd
jfd
nwm
xks
cHI
-hoj
+vuL
rtL
xRu
-xRu
mmU
-vgL
+oFp
+vUA
iFN
jZZ
pqd
@@ -49821,7 +49813,7 @@ kYl
igQ
rKQ
hgE
-vgL
+oFp
aeP
jfd
jzl
@@ -49829,10 +49821,10 @@ gso
qLr
wRf
ciq
-oFO
vzJ
pQX
-vgL
+oFp
+vUA
iFN
gXe
rgY
@@ -49854,10 +49846,10 @@ hgE
hgE
hgE
wdE
-vGZ
+mBd
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
@@ -50015,18 +50007,18 @@ nBa
fgL
hgE
hgE
-vgL
+oFp
fXN
jfd
jfd
sew
mnh
-hoj
+vuL
dmW
nDb
-nDb
xDK
-vgL
+oFp
+vUA
hgE
cqY
nbg
@@ -50048,10 +50040,10 @@ hgE
hgE
hgE
wdE
-vGZ
+mBd
wqA
lTj
-vGZ
+mBd
lcN
lcN
lcN
@@ -50199,17 +50191,17 @@ iFN
lPZ
lPZ
lPZ
-cbU
+bnS
rEL
uYH
uxJ
-cbU
+bnS
lPZ
lPZ
hgE
hgE
hgE
-vgL
+oFp
hmw
jfd
aeP
@@ -50217,9 +50209,9 @@ uyd
gQY
aMg
vGT
-qaT
bcB
ahB
+oFp
fNU
fNU
fNU
@@ -50393,17 +50385,17 @@ hgE
hgE
hgE
iFN
-cbU
+bnS
bxV
oTu
cpA
-cbU
+bnS
iFN
hgE
hgE
hgE
hgE
-vgL
+oFp
jfd
jfd
jfd
@@ -50411,16 +50403,16 @@ uyd
mQF
cbL
tJX
-qDq
uGl
krD
+oFp
fNU
dgp
bhT
iyB
ptA
fuW
-vhu
+niI
xkZ
cpO
lMo
@@ -50436,10 +50428,10 @@ wes
wes
hgE
aoF
-vGZ
+mBd
dHX
fam
-vGZ
+mBd
lcN
lcN
gxt
@@ -50592,29 +50584,29 @@ lJv
fqb
fqb
iTr
-vgL
-vgL
-vgL
-vgL
-vgL
-vgL
+oFp
+oFp
+oFp
+oFp
+oFp
+oFp
hmw
jfd
jzl
pPL
reU
-vgL
-vgL
-vgL
-vgL
-vgL
+oFp
+oFp
+oFp
+oFp
+oFp
fNU
ydt
lqo
mta
nJF
tLR
-aOn
+cUv
uuO
pej
aWL
@@ -50630,10 +50622,10 @@ xUK
wes
wes
aoF
-vGZ
+mBd
fxS
pPk
-vGZ
+mBd
mfX
mfX
iFN
@@ -50797,7 +50789,7 @@ jfd
jfd
dZX
mHZ
-vgL
+oFp
jBE
vgL
haS
@@ -50808,7 +50800,7 @@ nAi
bQV
wCw
mgR
-aOn
+cUv
qlX
oiA
tTg
@@ -50991,7 +50983,7 @@ fWU
fWU
ikv
uvS
-vgL
+oFp
pvv
vgL
sDA
@@ -51185,7 +51177,7 @@ eCU
cTP
eFz
mSs
-vgL
+oFp
fNL
pMr
wmb
@@ -51367,26 +51359,26 @@ wRP
wjJ
hwq
szi
-vgL
-vgL
-vgL
-vgL
-vgL
-vgL
-vgL
-vgL
-vgL
-vgL
-vgL
+oFp
+oFp
+oFp
+oFp
+oFp
+oFp
+oFp
+oFp
+oFp
+oFp
+oFp
yfX
-vgL
+oFp
fNL
phu
-bmv
-bmv
+kaF
+kaF
hGg
-bmv
-fLw
+kaF
+wBV
uzb
odd
rDH
@@ -51561,7 +51553,7 @@ wRP
bBn
kDV
inT
-lvy
+did
irf
uHT
lvy
@@ -51576,15 +51568,15 @@ ooN
ooN
ooN
vNO
-bmv
+kaF
uSm
ylL
rHl
kaF
-sXZ
+wBV
hPo
vuD
-ujt
+mTX
sIG
oFn
sXZ
@@ -51755,7 +51747,7 @@ wRP
vaP
ebQ
pgt
-lvy
+did
wrP
kMQ
vls
@@ -51770,12 +51762,12 @@ fNL
fNL
fNL
fNL
-bmv
+kaF
pVk
bTN
feB
uAl
-jaC
+bqy
atV
ttD
pJn
@@ -51797,7 +51789,7 @@ aom
cEL
apR
tep
-qvB
+euZ
qvB
oRd
qvB
@@ -51812,8 +51804,8 @@ qvB
ptB
qvB
qvB
-tpH
-tpH
+lCB
+lCB
rZY
fLU
fLU
@@ -51964,7 +51956,7 @@ wWJ
xvJ
fNL
fNL
-bmv
+kaF
ujL
acl
aJT
@@ -52143,7 +52135,7 @@ wRP
vaP
ebQ
pgt
-lvy
+did
lvy
lvy
lvy
@@ -52158,7 +52150,7 @@ bXZ
hPC
xvJ
gQU
-bmv
+kaF
uRx
jSu
rOA
@@ -52169,12 +52161,12 @@ ttD
cdP
pHO
gKl
-iBT
-iBT
-iBT
-iBT
-iBT
-iBT
+kDS
+kDS
+kDS
+kDS
+kDS
+kDS
shM
lXB
kfy
@@ -52337,7 +52329,7 @@ wRP
vaP
ebQ
moU
-bXZ
+qkC
poZ
mWj
bXZ
@@ -52357,7 +52349,7 @@ ylL
duq
rOA
xxc
-xfu
+wpM
akX
opT
bZS
@@ -52384,11 +52376,11 @@ qvB
oRd
qvB
qvB
-wAn
+xme
qvB
qvB
qvB
-wAn
+xme
qvB
qvB
ptB
@@ -52508,7 +52500,7 @@ kEN
dXv
rer
uCt
-dXv
+tSh
vSh
fCu
dsb
@@ -52531,7 +52523,7 @@ wRP
vaP
ebQ
pgt
-bXZ
+qkC
kcb
oEd
hqo
@@ -52546,7 +52538,7 @@ bXZ
sPW
ktX
frd
-bmv
+kaF
ukK
hJE
mRE
@@ -52557,7 +52549,7 @@ xtr
cNc
fNY
fVs
-nEx
+hrN
pDv
bUG
mvu
@@ -52725,7 +52717,7 @@ wRP
vaP
ebQ
pgt
-bXZ
+qkC
mAP
qSJ
nJn
@@ -52740,7 +52732,7 @@ bXZ
qRI
osC
eAF
-bmv
+kaF
kaF
smW
kaF
@@ -52751,7 +52743,7 @@ otM
otM
otM
drN
-nEx
+hrN
jxu
qZT
aXF
@@ -52768,7 +52760,7 @@ xQz
xdy
dLp
woJ
-vhD
+sib
pJC
lJs
gDI
@@ -52919,18 +52911,18 @@ wRP
vaP
ebQ
koz
-bXZ
+qkC
kTa
-bXZ
-bXZ
-bXZ
-bXZ
-bXZ
-bXZ
-bXZ
-bXZ
-bXZ
-bXZ
+qkC
+qkC
+qkC
+qkC
+qkC
+qkC
+qkC
+qkC
+qkC
+qkC
rOm
xtl
xsL
@@ -52945,7 +52937,7 @@ beI
ncK
nsK
hbJ
-nEx
+hrN
aLa
dTO
pNv
@@ -52956,8 +52948,8 @@ yeX
eTH
yeX
cEL
-jFw
-jFw
+cEL
+cEL
paX
hjc
ltg
@@ -53080,25 +53072,25 @@ dIS
dIS
fVw
fVw
-ygM
-ygM
-ygM
+flS
+flS
+flS
fVw
xMn
-ygM
+flS
fVw
dXv
dXv
dXv
dXv
dXv
-qNA
+aFU
iNl
-qNA
+aFU
dXv
fUY
wHT
-gSh
+xDd
wHT
ddN
nXP
@@ -53113,18 +53105,18 @@ wRP
bBn
ebQ
cjK
-bXZ
+qkC
tkd
-rnh
+sBt
gXB
bFI
ttp
ezu
ttp
gRv
-wYk
+wzP
mau
-bXZ
+qkC
pIS
xtl
nEP
@@ -53307,9 +53299,9 @@ wRP
vaP
wGM
gEv
-bXZ
+qkC
gxS
-bXZ
+qkC
esZ
esZ
tDp
@@ -53317,8 +53309,8 @@ qiS
eGX
esZ
esZ
-abm
-uWy
+fbH
+sOh
uWy
uAD
uWy
@@ -53329,8 +53321,8 @@ fYd
fYd
fYd
uKd
-nyx
-nyx
+vdq
+vdq
nyx
rCU
vZx
@@ -53495,15 +53487,15 @@ bNj
bNj
miX
dIS
-sVq
+gTC
gTC
wRP
vaP
uPk
pgt
-bXZ
+qkC
iGp
-bXZ
+qkC
esZ
qtA
aws
@@ -53522,7 +53514,7 @@ hgp
tcr
qKT
fYd
-eIx
+jZc
otM
otM
otM
@@ -53584,7 +53576,7 @@ avr
avr
eYZ
kLn
-cXe
+vEh
bNZ
bNZ
szb
@@ -53698,13 +53690,13 @@ idF
fOW
nNG
lus
-pXj
+xnJ
gMY
pKq
rnH
pKq
loY
-mys
+gJa
kyd
rxJ
nPI
@@ -53740,15 +53732,15 @@ hMx
bLe
wAv
nqL
-qvB
-qvB
-qvB
-qvB
-qvB
-qvB
-qvB
-qvB
-qvB
+euZ
+euZ
+euZ
+euZ
+euZ
+euZ
+euZ
+euZ
+euZ
oXj
iAL
uBP
@@ -53778,7 +53770,7 @@ eYZ
eYZ
eYZ
fyE
-cXe
+vEh
bNZ
bNZ
bNZ
@@ -53861,16 +53853,16 @@ dwP
kek
dwP
vIx
-ouW
+kko
phO
-ouW
+kko
hgc
-xRi
+ctO
eym
-xRi
+ctO
rrk
-lHX
-lHX
+czx
+czx
rrk
dPa
rrk
@@ -53905,7 +53897,7 @@ qLz
jzv
vOe
fYd
-kvi
+dAx
ouY
fYd
fYd
@@ -53972,7 +53964,7 @@ eYZ
eYZ
eYZ
ekM
-cXe
+vEh
vWs
rfz
bNZ
@@ -54031,12 +54023,12 @@ hgE
hgE
hgE
hgE
-hIo
+mNL
pVo
slX
bGX
mrV
-hIo
+mNL
hFH
uFD
tyv
@@ -54068,7 +54060,7 @@ byI
mHK
eBJ
rAr
-lHX
+czx
pix
oPn
mkU
@@ -54080,30 +54072,30 @@ dIS
sgv
eBp
eBp
-scC
-scC
-scC
+fxR
+fxR
+fxR
eBp
nYt
nRK
-pXj
+xnJ
ern
pKq
bKE
tnJ
ftp
-mys
+gJa
kWT
krr
eEi
jzv
sIz
-ueP
+baL
dWO
hTO
sqm
sqm
-ueP
+baL
kHP
otM
oiR
@@ -54166,7 +54158,7 @@ uTN
uTN
eYZ
iyI
-cXe
+vEh
rNH
vWs
nJI
@@ -54225,7 +54217,7 @@ hgE
hgE
hgE
hgE
-hIo
+mNL
nLD
ivG
lzE
@@ -54264,9 +54256,9 @@ osc
iGH
rrk
mUU
-rwR
-rwR
-mUU
+qRr
+qRr
+bKN
oOT
gWs
mUU
@@ -54278,9 +54270,9 @@ qQo
oyt
hEE
eBp
-mgh
+lRy
fOl
-pXj
+xnJ
ruk
qja
glF
@@ -54292,12 +54284,12 @@ eHr
eEi
hfB
xhE
-ueP
+baL
kpg
lPC
sqm
sqm
-ueP
+baL
pcC
otM
oiR
@@ -54318,7 +54310,7 @@ kDP
bQA
loB
mAx
-xDR
+aCD
sjX
fpG
cec
@@ -54419,7 +54411,7 @@ hgE
hgE
hgE
hgE
-hIo
+mNL
utG
aEQ
aYK
@@ -54476,12 +54468,12 @@ uWW
kdg
esZ
xTe
-pQH
-pQH
+gmT
+gmT
aqK
xTe
xTe
-uWy
+sOh
ajh
eEi
vwR
@@ -54510,7 +54502,7 @@ kDP
kDP
kDP
bQA
-nTS
+cAs
bjG
uqR
vly
@@ -54613,12 +54605,12 @@ hgE
hgE
hgE
hgE
-hIo
+mNL
pVo
cGp
mis
wfK
-hIo
+mNL
gWw
jXM
iNX
@@ -54674,13 +54666,13 @@ wBe
bMH
rUq
xvD
-yhi
+hFb
bpB
xTR
eEi
fnp
rsQ
-pDg
+smJ
gVk
tXx
tXx
@@ -54720,7 +54712,7 @@ lQP
lQP
lQP
oyI
-rZY
+adg
uBP
uBP
uBP
@@ -54807,8 +54799,8 @@ hgE
hgE
hgE
hgE
-hIo
-hIo
+mNL
+mNL
twG
twG
twG
@@ -54868,7 +54860,7 @@ uFZ
oBn
tVu
hUf
-yhi
+hFb
pIu
iTf
eEi
@@ -54876,9 +54868,9 @@ lEL
rsQ
gXU
tXx
-ttM
-ttM
-ttM
+fFd
+fFd
+fFd
tXx
qTI
oiR
@@ -54917,7 +54909,7 @@ qwF
evr
hkp
gET
-lei
+eVW
oMi
jQK
jLS
@@ -54995,9 +54987,9 @@ hgE
hgE
xxI
hgE
-xSd
-xSd
-xSd
+bQq
+bQq
+bQq
hgE
hgE
hgE
@@ -55062,7 +55054,7 @@ yfC
tRc
iFF
umf
-yhi
+hFb
pIu
iTf
tSq
@@ -55070,9 +55062,9 @@ ech
rsQ
uOi
tXx
-ttM
-ttM
-ttM
+fFd
+fFd
+fFd
gmY
cSb
oiR
@@ -55189,9 +55181,9 @@ hgE
hgE
xxI
hgE
-xSd
-cbY
-xSd
+bQq
+mWg
+bQq
hgE
hgE
hgE
@@ -55264,9 +55256,9 @@ hBk
mjA
rym
tXx
-ttM
-ttM
-ttM
+fFd
+fFd
+fFd
tXx
lcC
oiR
@@ -55305,7 +55297,7 @@ kgC
lnW
mIv
jZR
-lei
+eVW
ooZ
lph
jLS
@@ -55382,11 +55374,11 @@ hgE
hgE
hgE
xxI
-xSd
-xSd
-jvA
-xSd
-xSd
+bQq
+bQq
+jrc
+bQq
+bQq
hgE
hgE
hgE
@@ -55429,9 +55421,9 @@ cKY
cKY
fGB
khg
-gTC
-gTC
-gTC
+rnK
+rnK
+rnK
tBl
dQK
tXS
@@ -55450,7 +55442,7 @@ dLz
wEC
xbX
izZ
-yhi
+hFb
wBO
eHr
eEi
@@ -55491,8 +55483,8 @@ foD
vWP
foD
qRP
-oNv
-oNv
+rmE
+rmE
foD
cYM
mqK
@@ -55576,11 +55568,11 @@ hgE
hgE
hgE
xxI
-xSd
-fka
-aiT
-dHW
-xSd
+bQq
+mRW
+iIp
+gzo
+bQq
hgE
hgE
hgE
@@ -55589,9 +55581,9 @@ twG
twG
twG
wVZ
-qZe
+mEV
fdt
-qZe
+mEV
sDY
jyG
hwX
@@ -55640,12 +55632,12 @@ xdq
nRK
xTe
xTe
-pQH
-pQH
+gmT
+gmT
qXo
xTe
xTe
-uWy
+sOh
kSv
eEi
vwR
@@ -55674,7 +55666,7 @@ kDP
kDP
kDP
bQA
-aJk
+miT
dYA
qeb
ctb
@@ -55692,7 +55684,7 @@ cYM
fGz
aBz
oej
-eyf
+mCK
iCo
loi
iCo
@@ -55770,11 +55762,11 @@ hgE
hgE
hgE
xxI
-xSd
-rZD
-hxK
-hxK
-xSd
+bQq
+rHM
+qfY
+qfY
+bQq
hgE
hgE
hgE
@@ -55832,7 +55824,7 @@ xdR
eBp
qdw
fOl
-pQH
+gmT
iPv
vgN
bMH
@@ -55844,12 +55836,12 @@ xTR
eEi
oeY
hkO
-ueP
+baL
doS
wHa
sqm
sqm
-ueP
+baL
kHP
otM
oiR
@@ -55875,7 +55867,7 @@ gTG
klc
cec
foD
-lcp
+rOR
mGQ
oBO
wau
@@ -55886,7 +55878,7 @@ bzC
gOa
oYH
hsz
-eyf
+mCK
iCo
iCo
iCo
@@ -55964,11 +55956,11 @@ hgE
hgE
hgE
xxI
-xSd
-mwF
-ilj
-cZK
-xSd
+bQq
+xMc
+hkM
+wqy
+bQq
hgE
hgE
hgE
@@ -56026,24 +56018,24 @@ eBp
eBp
nYt
kdg
-pQH
+gmT
hCi
pgs
cIb
qfW
qWc
-xbG
+xha
blb
ofF
fjR
wft
twD
-ueP
+baL
dWO
aEG
sqm
sqm
-ueP
+baL
pcC
otM
oiR
@@ -56158,11 +56150,11 @@ hgE
hgE
hgE
xxI
-xSd
-xSd
-xSd
-xSd
-xSd
+bQq
+bQq
+bQq
+bQq
+bQq
hgE
hgE
hgE
@@ -56217,7 +56209,7 @@ dMX
iFG
bXZ
qeY
-bXZ
+qkC
quZ
jHt
vDU
@@ -56233,7 +56225,7 @@ swF
mea
vOe
fYd
-kyN
+nSO
rxp
fYd
fYd
@@ -56274,7 +56266,7 @@ cYM
fZC
vZe
aZC
-eyf
+mCK
iCo
iCo
iCo
@@ -56353,17 +56345,17 @@ hgE
gzd
xxI
gzd
-eTL
-eTL
-eTL
-eTL
-eTL
-eTL
-eTL
-xSd
-xSd
-xSd
-xSd
+eAg
+eAg
+eAg
+eAg
+eAg
+eAg
+eAg
+bQq
+bQq
+bQq
+bQq
sDY
msK
qJI
@@ -56411,16 +56403,16 @@ dMX
ouV
bXZ
mWj
-bXZ
+qkC
bMC
qXS
-pQH
+gmT
dRA
qXh
vOW
xms
lwi
-xbG
+xha
wmH
ccP
xEV
@@ -56465,10 +56457,10 @@ tpH
tpH
tpH
cYM
-uwX
+ial
oep
cnc
-mBI
+kTn
sjH
hau
dIl
@@ -56547,17 +56539,17 @@ hgE
gzd
xxI
gzd
-eTL
-pNg
-pNg
-pNg
-pNg
-pNg
-eTL
-oZG
-vsC
-tAP
-xSd
+eAg
+qqZ
+qqZ
+qqZ
+qqZ
+qqZ
+eAg
+cvv
+uyG
+kPk
+bQq
sDY
mSr
nzo
@@ -56590,7 +56582,7 @@ bfj
rii
ftr
rii
-hZd
+tBg
gFi
bGu
pBg
@@ -56605,7 +56597,7 @@ dMX
ouV
bXZ
bXZ
-bXZ
+qkC
jnz
wRP
xTe
@@ -56626,7 +56618,7 @@ tkO
tcr
qKT
fYd
-wis
+cdH
otM
otM
otM
@@ -56741,17 +56733,17 @@ hgE
gzd
xxI
gzd
-eTL
-pNg
-pNg
-pNg
-pNg
-pNg
-eTL
-oZG
-jwS
-nYM
-xSd
+eAg
+qqZ
+qqZ
+qqZ
+qqZ
+qqZ
+eAg
+cvv
+xNM
+fcq
+bQq
sDY
gqN
nOt
@@ -56935,17 +56927,17 @@ lHl
gno
xxI
gzd
-eTL
-pNg
-pNg
-pNg
-pNg
-pNg
-eTL
-oZG
-oYJ
-jwS
-xSd
+eAg
+qqZ
+qqZ
+qqZ
+qqZ
+qqZ
+eAg
+cvv
+bCI
+xNM
+bQq
sDY
mkE
cRs
@@ -56976,7 +56968,7 @@ lLp
aml
rmQ
roa
-hZd
+lBS
aml
hFE
ulr
@@ -57002,12 +56994,12 @@ kfz
qXh
dFf
xBM
-pAz
+clK
aJt
-dDr
gTk
txE
tBD
+dNx
fYd
spM
oDo
@@ -57129,17 +57121,17 @@ fOs
gtL
xxI
gzd
-eTL
-pNg
-pNg
-pNg
-pNg
-pNg
-eTL
-oZG
-jwS
-xci
-xSd
+eAg
+qqZ
+qqZ
+qqZ
+qqZ
+qqZ
+eAg
+cvv
+xNM
+sRG
+bQq
sDY
lIg
oiO
@@ -57196,12 +57188,12 @@ tth
vbi
kHi
lrc
-pAz
+clK
ieZ
-qUk
hLV
jkK
phb
+dNx
fYd
hzW
qTp
@@ -57213,7 +57205,7 @@ xEW
ncK
nsK
wMF
-aCt
+jLK
uiX
nks
xOB
@@ -57230,7 +57222,7 @@ gGT
kGM
tio
hJn
-jQZ
+qkT
qCp
owN
kkn
@@ -57323,17 +57315,17 @@ lHl
gno
xxI
gzd
-eTL
-pNg
-pNg
-pNg
-pNg
-pNg
-eTL
-oZG
-jwS
-igy
-xSd
+eAg
+qqZ
+qqZ
+qqZ
+qqZ
+qqZ
+eAg
+cvv
+xNM
+fwp
+bQq
sDY
kEZ
oiO
@@ -57356,7 +57348,7 @@ iTF
bKu
iWv
lHI
-hZd
+tBg
mmi
irQ
evU
@@ -57366,7 +57358,7 @@ jkz
eFH
sTF
xXG
-hZd
+tBg
gKJ
iEy
aUS
@@ -57393,9 +57385,9 @@ guy
hAl
ghW
iJb
-tHR
gZK
wOT
+dNx
kbe
kbe
kbe
@@ -57407,7 +57399,7 @@ otM
otM
otM
cVR
-aCt
+jLK
pvV
ofM
djH
@@ -57424,7 +57416,7 @@ gGT
sXg
ovh
hJn
-jQZ
+qkT
uTy
hTd
iGr
@@ -57517,17 +57509,17 @@ hgE
gzd
xxI
gzd
-eTL
-pNg
-pNg
-pNg
-pNg
-pNg
-eTL
-oZG
-igy
-jwS
-xSd
+eAg
+qqZ
+qqZ
+qqZ
+qqZ
+qqZ
+eAg
+cvv
+fwp
+xNM
+bQq
sDY
eiI
pGv
@@ -57584,12 +57576,12 @@ rZs
ahr
rZs
vRV
-pAz
+clK
rLI
-cBn
cbX
hlH
kXt
+dNx
kbe
lrS
hNl
@@ -57601,7 +57593,7 @@ kwC
xhz
bAm
uVg
-aCt
+jLK
oEh
tcR
iqX
@@ -57618,7 +57610,7 @@ gGT
efC
tio
gRo
-jQZ
+qkT
uTy
hTd
rsR
@@ -57711,17 +57703,17 @@ lHl
gzd
xxI
gzd
-eTL
-pNg
-pNg
-pNg
-pNg
-pNg
-eTL
-oZG
-rEi
-pJH
-xSd
+eAg
+qqZ
+qqZ
+qqZ
+qqZ
+qqZ
+eAg
+cvv
+mna
+nci
+bQq
sDY
kEZ
oiO
@@ -57778,12 +57770,12 @@ qXE
pSp
twr
vRV
-pAz
+clK
wQk
-gDH
jRU
bOg
oVt
+dNx
kbe
iNE
mKA
@@ -57812,7 +57804,7 @@ mUe
dFu
tio
vVE
-jQZ
+qkT
dmF
hTd
uuc
@@ -57905,22 +57897,22 @@ lHl
gzd
xxI
gzd
-eTL
-eTL
-eTL
-eTL
-eTL
-eTL
-eTL
-xSd
-xSd
-xSd
-xSd
+eAg
+eAg
+eAg
+eAg
+eAg
+eAg
+eAg
+bQq
+bQq
+bQq
+bQq
sDY
kEZ
oiO
fKW
-qZe
+mEV
jDX
jDX
rRV
@@ -57955,7 +57947,7 @@ pud
fHO
kyD
dps
-jIY
+oBN
jYM
kDh
dCs
@@ -57965,7 +57957,7 @@ dHp
dMX
ouV
bXZ
-kqP
+hCl
xTe
xTe
xTe
@@ -58200,7 +58192,7 @@ tio
tio
ouF
enX
-jQZ
+qkT
mtj
nxu
mqF
@@ -58308,7 +58300,7 @@ sDY
sBy
gIg
xse
-qZe
+mEV
jeG
oPs
hQy
@@ -58356,8 +58348,8 @@ bXZ
bXZ
bXZ
xPm
-bzQ
-bzQ
+cLy
+cLy
xPm
vRV
vRV
@@ -58394,14 +58386,14 @@ kKk
sJP
tio
qgo
-jQZ
+qkT
cJq
jMx
lvF
tHa
cMD
oyK
-vep
+kBr
jnd
sJO
wCc
@@ -58550,8 +58542,8 @@ ouV
tdI
nzD
qlA
-bzQ
-bzQ
+cLy
+cLy
qmG
jxt
vRV
@@ -58568,11 +58560,11 @@ ueA
ueA
eal
yhd
-ppV
+gCZ
utS
qTH
-eFp
-eFp
+spy
+spy
eFp
xqe
eFp
@@ -58588,7 +58580,7 @@ haw
ddT
mZn
joM
-jQZ
+qkT
kfX
jUT
awa
@@ -58731,7 +58723,7 @@ jei
ppX
gTM
dps
-jIY
+oBN
jYM
euT
dCs
@@ -58744,8 +58736,8 @@ ouV
uXr
dMw
wMZ
-bzQ
-bzQ
+cLy
+cLy
xPm
vRV
vRV
@@ -58766,7 +58758,7 @@ sbF
gRX
msT
xfH
-hDN
+upz
vlP
oTm
nHp
@@ -58953,7 +58945,7 @@ uCw
kbe
kbe
ueA
-vEa
+iqL
xKD
eCP
bfs
@@ -59072,10 +59064,10 @@ jLF
bcN
vWY
xMV
-uLr
+brB
lWv
bSq
-uLr
+brB
xMV
ptX
uqq
@@ -59154,7 +59146,7 @@ uaE
nkq
kLb
cRu
-hDN
+upz
daf
bMq
cfP
@@ -59280,7 +59272,7 @@ hgE
hgE
sDY
sDY
-qua
+sDY
sDY
sDY
sDY
@@ -59848,10 +59840,10 @@ jLF
mdL
xtJ
oZg
-uLr
+brB
vmY
rUD
-uLr
+brB
oZg
wCp
uDC
@@ -60245,7 +60237,7 @@ xbi
jLF
bec
tmB
-pnO
+mex
cBb
vQN
cyn
@@ -60439,7 +60431,7 @@ pmT
ybI
xjW
ouJ
-oJL
+mkq
mAk
mAk
cyn
@@ -60633,7 +60625,7 @@ xEs
jLF
qkv
wCv
-kVw
+jAs
ocY
efF
cyn
@@ -60643,10 +60635,10 @@ hgE
hgE
gTC
nbp
-jPD
+gsS
xve
bXD
-aVS
+snT
awP
rnG
rnG
@@ -60686,7 +60678,7 @@ dgb
hoU
bWw
lDv
-rNo
+hPI
vYy
edf
wDd
@@ -60817,11 +60809,11 @@ xxI
hgE
hgE
jYF
-kEb
+aGS
nww
-kEb
-kEb
-kEb
+aGS
+aGS
+aGS
jYF
jYF
lCp
@@ -60880,15 +60872,15 @@ cjy
dbv
cjy
lDv
-dxM
-dxM
+cdW
+cdW
mSJ
lDv
-dxM
+cdW
lDv
dky
-dxM
-dxM
+cdW
+cdW
lDv
oZE
lHm
@@ -61424,14 +61416,14 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
iyD
xmm
ntO
rPR
mXL
qdd
-dkv
+cBk
hgE
hgE
hgE
@@ -61448,25 +61440,25 @@ snT
snT
awP
nPu
-snT
-snT
-snT
-snT
-snT
+xvN
+xvN
+xvN
+xvN
+xvN
kWq
-xdW
-xdW
+sxf
+sxf
rGE
-xdW
+sxf
kWq
fCX
fCX
fCX
fCX
-dXb
+fAI
fCX
fCX
-dXb
+fAI
fCX
rKj
fCX
@@ -61618,14 +61610,14 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
tFw
eGb
sHk
rkh
jhW
jxa
-dkv
+cBk
hgE
hgE
hgE
@@ -61812,21 +61804,21 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
cZm
mDl
ftg
rkh
bny
hqO
-dkv
+cBk
hNH
xSV
hgE
xSV
xSV
xSV
-aVS
+snT
rnG
oZF
oZF
@@ -62006,7 +61998,7 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
wuX
eGb
ftg
@@ -62175,9 +62167,9 @@ heY
heY
heY
jYF
-kEb
+aGS
onA
-kEb
+aGS
jYF
jYF
jYF
@@ -62200,14 +62192,14 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
hcE
mXL
jhW
ghD
mXL
jhW
-dkv
+cBk
hgE
xSV
xSV
@@ -62394,14 +62386,14 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
rWI
mXL
jlF
blt
jhW
nHc
-dkv
+cBk
hgE
hgE
xSV
@@ -62588,14 +62580,14 @@ hgE
hgE
gzd
hgE
-dkv
+cBk
jQE
pDj
xLN
exN
llz
iAE
-dkv
+cBk
bPE
hgE
xSV
@@ -62782,14 +62774,14 @@ gzd
hgE
hgE
hgE
-dkv
+cBk
gvI
kod
jQE
ghD
mXL
hqO
-dkv
+cBk
owx
xSV
owx
@@ -62976,14 +62968,14 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
xxZ
wTT
jxa
bqY
jlF
jKI
-dkv
+cBk
toc
owx
owx
@@ -63167,17 +63159,17 @@ hgE
hgE
hgE
hgE
-dkv
-dkv
-dkv
-dkv
+cBk
+cBk
+cBk
+cBk
itT
xen
pDj
ksT
mXL
kVC
-dkv
+cBk
toc
owx
wZo
@@ -63233,16 +63225,16 @@ kbe
gzd
gzd
gzd
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
gzd
gzd
gzd
@@ -63251,13 +63243,13 @@ gzd
gzd
gzd
gzd
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
gzd
gzd
hgE
@@ -63360,18 +63352,18 @@ hgE
hgE
hgE
hgE
-dkv
-dkv
+cBk
+cBk
kQw
uSe
-dkv
+cBk
jQE
jxa
xLN
ghD
llz
jxa
-dkv
+cBk
toc
owx
owx
@@ -63426,8 +63418,8 @@ hdi
kbe
gzd
gzd
-hsM
-hsM
+hMq
+hMq
sgf
iJU
iJU
@@ -63436,23 +63428,23 @@ vuC
tlw
xiB
xiB
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
gzd
gzd
gzd
gzd
-hsM
-hsM
+hMq
+hMq
xiB
xiB
xiB
xiB
xiB
-hsM
-hsM
+hMq
+hMq
gzd
gzd
gzd
@@ -63554,7 +63546,7 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
jgE
jlF
hPe
@@ -63565,7 +63557,7 @@ lje
eDQ
nyh
hWl
-dkv
+cBk
hgE
toc
toc
@@ -63580,7 +63572,7 @@ ukm
pFz
aag
xZM
-vHp
+gBQ
kJv
cKp
dHw
@@ -63618,9 +63610,9 @@ iNE
ePm
ioO
ePm
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
qyE
rpP
rpP
@@ -63633,12 +63625,12 @@ xiB
xiB
tlw
iuZ
-hsM
+hMq
gzd
gzd
gzd
-hsM
-hsM
+hMq
+hMq
xiB
xiB
tlw
@@ -63646,8 +63638,8 @@ tlw
tlw
xiB
xiB
-hsM
-hsM
+hMq
+hMq
gzd
gzd
hgE
@@ -63748,18 +63740,18 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
lQh
mFn
tDQ
-dkv
+cBk
hhC
-dkv
-dkv
-dkv
-dkv
-dkv
-dkv
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
hgE
hgE
hgE
@@ -63827,11 +63819,11 @@ xiB
xiB
tlw
iDx
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
xiB
cfy
tlw
@@ -63841,7 +63833,7 @@ tlw
iDx
xiB
wUh
-hsM
+hMq
gzd
gzd
hgE
@@ -63942,18 +63934,18 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
sMS
dix
pKE
-dkv
+cBk
weV
mXL
-dkv
+cBk
xUB
npr
jNi
-dkv
+cBk
hgE
hgE
hgE
@@ -64035,7 +64027,7 @@ iuZ
tlw
xiB
wUh
-hsM
+hMq
gzd
hgE
hgE
@@ -64136,18 +64128,18 @@ hgE
hgE
hgE
hgE
-dkv
-dkv
-dkv
-dkv
-dkv
+cBk
+cBk
+cBk
+cBk
+cBk
mXL
jhW
hhC
xUB
faL
kFN
-dkv
+cBk
hgE
hgE
hgE
@@ -64229,7 +64221,7 @@ iuZ
tlw
tlw
wUh
-hsM
+hMq
gzd
kCW
hgE
@@ -64330,18 +64322,18 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
vrL
une
cIt
mXL
mXL
mXL
-dkv
+cBk
vCn
qdj
rzY
-dkv
+cBk
hgE
hgE
hgE
@@ -64423,7 +64415,7 @@ lMw
iuZ
tlw
wUh
-hsM
+hMq
gzd
gzd
hgE
@@ -64524,18 +64516,18 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
aCk
wAc
wXJ
fRc
jlF
ajI
-dkv
cBk
-dkv
-dkv
-dkv
+cBk
+cBk
+cBk
+cBk
hgE
hgE
hgE
@@ -64617,7 +64609,7 @@ iuZ
tlw
tlw
wUh
-hsM
+hMq
gzd
gzd
hgE
@@ -64718,18 +64710,18 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
xlB
nAb
pmJ
rtX
sAz
mXL
-dkv
+cBk
mXL
sAz
lnK
-dkv
+cBk
hgE
hgE
hgE
@@ -64811,7 +64803,7 @@ tlw
tlw
xiB
wUh
-hsM
+hMq
gzd
hgE
hgE
@@ -64912,18 +64904,18 @@ hgE
hgE
hgE
hgE
-dkv
+cBk
bah
dSz
hTB
ixM
jhW
bah
-dkv
+cBk
bEb
rAH
-dkv
-dkv
+cBk
+cBk
hgE
hgE
hgE
@@ -64974,11 +64966,11 @@ awP
bpJ
snT
ePm
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
qyE
rpP
rpP
@@ -65004,8 +64996,8 @@ tlw
tlw
xiB
cfy
-hsM
-hsM
+hMq
+hMq
gzd
gzd
hgE
@@ -65106,17 +65098,17 @@ hgE
hgE
hgE
hgE
-dkv
-dkv
-dkv
-dkv
-dkv
-dkv
-dkv
-dkv
-dkv
-dkv
-dkv
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
+cBk
ght
hgE
hgE
@@ -65172,8 +65164,8 @@ gzd
gzd
gzd
gzd
-hsM
-hsM
+hMq
+hMq
rpP
rpP
rpP
@@ -65182,10 +65174,10 @@ rpP
rpP
rpP
rpP
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
jfy
bGb
qKO
@@ -65197,8 +65189,8 @@ xiB
xiB
xiB
xiB
-hsM
-hsM
+hMq
+hMq
gzd
gzd
hgE
@@ -65367,7 +65359,7 @@ kCW
gzd
gzd
gzd
-hsM
+hMq
wGa
wGa
baN
@@ -65375,23 +65367,23 @@ baN
baN
baN
bTk
-hsM
-hsM
+hMq
+hMq
gzd
gzd
-hsM
+hMq
jfy
qKO
qKO
uYb
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
gzd
gzd
hgE
@@ -65529,7 +65521,7 @@ rnG
rnG
rnG
snT
-aVS
+snT
snT
snT
vTz
@@ -65561,7 +65553,7 @@ hgE
gzd
gzd
gzd
-hsM
+hMq
mbJ
mbJ
rpP
@@ -65569,16 +65561,16 @@ fnO
sQo
qyE
qyE
-hsM
+hMq
gzd
gzd
gzd
-hsM
+hMq
jfy
qKO
qKO
uYb
-hsM
+hMq
gzd
gzd
gzd
@@ -65755,7 +65747,7 @@ hgE
gzd
gzd
gzd
-hsM
+hMq
qyE
qyE
rpP
@@ -65763,16 +65755,16 @@ fnO
rpP
mbJ
mbJ
-hsM
+hMq
gzd
gzd
-hsM
-hsM
+hMq
+hMq
jfy
bGb
qKO
uYb
-hsM
+hMq
gzd
gzd
gzd
@@ -65949,7 +65941,7 @@ hgE
hgE
kCW
gzd
-hsM
+hMq
xaV
nNl
nNl
@@ -65957,16 +65949,16 @@ nNl
nNl
xxe
xxe
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
hAa
jfy
bGb
qKO
lIN
-hsM
+hMq
gzd
gzd
hgE
@@ -66143,7 +66135,7 @@ hgE
hgE
gzd
gzd
-hsM
+hMq
rpP
rpP
rpP
@@ -66160,7 +66152,7 @@ ncs
qKO
qKO
uYb
-hsM
+hMq
gzd
gzd
gzd
@@ -66337,7 +66329,7 @@ hgE
gzd
gzd
gzd
-hsM
+hMq
rpP
rpP
eGP
@@ -66354,7 +66346,7 @@ qKO
qKO
qKO
uYb
-hsM
+hMq
gzd
gzd
gzd
@@ -66531,7 +66523,7 @@ gzd
gzd
gzd
gzd
-hsM
+hMq
rpP
rpP
rpP
@@ -66548,7 +66540,7 @@ qKO
qKO
qKO
uYb
-hsM
+hMq
gzd
kCW
hgE
@@ -66725,7 +66717,7 @@ hgE
gzd
gzd
gzd
-hsM
+hMq
skM
rpP
jIa
@@ -66742,7 +66734,7 @@ myy
jSA
ifH
xiB
-hsM
+hMq
gzd
gzd
gzd
@@ -66919,7 +66911,7 @@ hgE
hgE
gzd
gzd
-hsM
+hMq
rpP
rpP
rpP
@@ -66935,8 +66927,8 @@ rpP
ufa
tlw
xiB
-hsM
-hsM
+hMq
+hMq
gzd
gzd
gzd
@@ -67113,8 +67105,8 @@ hgE
hgE
gzd
gzd
-hsM
-hsM
+hMq
+hMq
sQo
rpP
rpP
@@ -67125,11 +67117,11 @@ rpP
rpP
rpP
rpP
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
gzd
gzd
gzd
@@ -67308,18 +67300,18 @@ hgE
kCW
gzd
gzd
-hsM
+hMq
baN
tHO
baN
baN
baN
nAK
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
gzd
gzd
gzd
@@ -67502,14 +67494,14 @@ hgE
hgE
gzd
gzd
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
-hsM
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
+hMq
gzd
gzd
gzd
diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
index b09f1e766b87..ecc8a0de2dea 100644
--- a/maps/rift/levels/rift-05-surface2.dmm
+++ b/maps/rift/levels/rift-05-surface2.dmm
@@ -55,16 +55,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"acp" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized{
- dir = 10;
- icon_state = "fwindow";
- id = "holodeck"
- },
-/turf/simulated/floor/plating,
-/area/holodeck_control)
"adc" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -151,14 +141,6 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"agr" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "lockerroom"
- },
-/turf/simulated/floor/plating,
-/area/crew_quarters/locker)
"ahf" = (
/obj/machinery/space_heater,
/obj/machinery/light/small{
@@ -179,113 +161,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/security/upper)
-"ahW" = (
-/obj/structure/table/rack/shelf/steel,
-/obj/effect/floor_decal/borderfloorblack{
- alpha = 255
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = 6;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/item/clothing/accessory/storage/pouches{
- pixel_x = -5;
- pixel_y = 10
- },
-/obj/effect/floor_decal/corner/red/border,
-/obj/item/clothing/accessory/holster/leg{
- pixel_x = -3;
- pixel_y = -5
- },
-/obj/item/clothing/accessory/holster/leg{
- pixel_x = -3;
- pixel_y = -5
- },
-/obj/item/clothing/accessory/holster/leg{
- pixel_x = -3;
- pixel_y = -5
- },
-/obj/item/clothing/accessory/holster/leg{
- pixel_x = -3;
- pixel_y = -5
- },
-/obj/item/clothing/accessory/holster/leg{
- pixel_x = -3;
- pixel_y = -5
- },
-/obj/item/clothing/accessory/holster/leg{
- pixel_x = -3;
- pixel_y = -5
- },
-/obj/item/clothing/accessory/storage/pouches/navy{
- pixel_x = 6;
- pixel_y = -2
- },
-/obj/item/clothing/accessory/storage/pouches/navy{
- pixel_x = 6;
- pixel_y = -2
- },
-/obj/item/clothing/accessory/storage/pouches/navy{
- pixel_x = 6;
- pixel_y = -2
- },
-/obj/item/clothing/accessory/storage/pouches/navy{
- pixel_x = 6;
- pixel_y = -2
- },
-/obj/item/clothing/accessory/storage/pouches/navy{
- pixel_x = 6;
- pixel_y = -2
- },
-/obj/item/clothing/accessory/storage/pouches/navy{
- pixel_x = 6;
- pixel_y = -2
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/security_equiptment_storage)
-"aiL" = (
-/turf/simulated/wall,
-/area/crew_quarters/medbreak/surgery)
"ajc" = (
/obj/structure/closet,
/obj/random/maintenance/medical,
@@ -300,21 +175,21 @@
/obj/effect/mist,
/turf/simulated/floor/water/deep/pool,
/area/triumph/surfacebase/sauna)
-"ajF" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/lobby)
-"ajW" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen9";
- name = "Pen 9 Blast Doors";
- opacity = 0
+"akk" = (
+/obj/structure/ladder/up,
+/obj/effect/floor_decal/techfloor{
+ dir = 9
},
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/rift/turbolift/maint)
"akm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -332,9 +207,6 @@
/obj/landmark/spawnpoint/job/senior_researcher,
/turf/simulated/floor/wood,
/area/rnd/breakroom)
-"alz" = (
-/turf/simulated/wall,
-/area/maintenance/locker)
"alV" = (
/obj/structure/railing{
dir = 8
@@ -342,9 +214,6 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
-"alW" = (
-/turf/simulated/wall,
-/area/assembly/robotics)
"alZ" = (
/obj/item/stool/padded,
/obj/effect/floor_decal/borderfloor,
@@ -453,6 +322,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"aoh" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "Research Lobby";
+ req_one_access = list(29,47)
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"aok" = (
/obj/machinery/autolathe{
hacked = 1
@@ -538,6 +417,12 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_3)
+"aqp" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/tether/surfacebase/reading_room)
+"aqF" = (
+/turf/simulated/wall/prepainted,
+/area/tether/surfacebase/reading_room)
"aqQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -555,17 +440,6 @@
/obj/machinery/telepad,
/turf/simulated/floor/plating,
/area/rnd/telescience_lab/chamber)
-"asf" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized{
- dir = 10;
- icon_state = "fwindow";
- id = "Interr"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green,
-/turf/simulated/floor/plating,
-/area/security/interrogation)
"asl" = (
/obj/structure/filingcabinet/chestdrawer,
/obj/effect/floor_decal/borderfloorblack{
@@ -611,20 +485,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"atf" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen6";
- name = "Pen 6 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"aty" = (
/obj/structure/disposalpipe/down{
dir = 1
@@ -708,22 +568,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/hallway)
-"awd" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
"awp" = (
/obj/machinery/washing_machine,
/obj/effect/floor_decal/corner/lightgrey{
@@ -916,37 +760,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
-"azK" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 4
- },
-/obj/machinery/door/airlock/glass_security{
- name = "Processing";
- req_one_access = list(1,2,4,38)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/dark,
-/area/security/security_processing)
-"azL" = (
-/obj/effect/floor_decal/borderfloorblack{
- alpha = 255;
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/machinery/door/blast/regular{
- id = "armorylight";
- name = "Light Armory Acccess"
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/armory/blue)
"azT" = (
/obj/machinery/door/blast/regular{
dir = 4;
@@ -956,9 +769,6 @@
/obj/machinery/atmospheric_field_generator/perma,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/hammerhead/general)
-"aAg" = (
-/turf/simulated/wall,
-/area/tether/surfacebase/reading_room)
"aAG" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/surgery,
@@ -1123,12 +933,6 @@
/obj/item/pen,
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden/stairwell)
-"aEB" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/wall/r_wall,
-/area/maintenance/security/upper)
"aEU" = (
/obj/machinery/holopad,
/turf/simulated/floor/tiled/dark,
@@ -1142,15 +946,6 @@
/obj/structure/bed/chair/office/dark,
/turf/simulated/floor/tiled/monotile,
/area/rnd/research)
-"aFW" = (
-/turf/simulated/wall,
-/area/crew_quarters/sleep/Dorm_5)
-"aHb" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"aHd" = (
/obj/structure/frame{
anchored = 1
@@ -1249,31 +1044,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
-"aJW" = (
-/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;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"aJX" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/door/window/brigdoor/westleft{
@@ -1326,6 +1096,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"aKq" = (
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside2)
"aKE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/mob/living/simple_mob/slime/xenobio/rainbow/kendrick,
@@ -1341,9 +1114,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"aKY" = (
-/turf/simulated/wall,
-/area/crew_quarters/sleep/Dorm_6)
"aLf" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -1380,21 +1150,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"aLO" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red{
- dir = 1
- },
-/obj/machinery/camera/network/security{
- dir = 10
- },
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/interrogation)
"aMU" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -1404,9 +1159,17 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
-"aMW" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/telescience_lab/storage)
+"aNH" = (
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 8
+ },
+/obj/structure/curtain/open/privacy,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/white,
+/area/medical/surgeryprep)
"aOv" = (
/turf/simulated/open,
/area/maintenance/security/upper)
@@ -1454,18 +1217,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
-"aQa" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"aQd" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -1553,19 +1304,6 @@
/obj/effect/floor_decal/corner_techfloor_gray,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/hammerhead/general)
-"aST" = (
-/obj/machinery/door/airlock/glass_medical{
- name = "Chemistry";
- req_one_access = list(33)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
"aTl" = (
/obj/effect/floor_decal/spline/plain,
/obj/structure/table/marble,
@@ -1641,6 +1379,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"aWl" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep/Dorm_6)
"aWA" = (
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop/loading)
@@ -1782,6 +1523,9 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
+"aYW" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/showers)
"aZd" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -1826,6 +1570,9 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rnd/research/researchdivision)
+"aZS" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/evastorage)
"aZU" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -1838,15 +1585,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"bao" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"bap" = (
/obj/machinery/door/airlock/voidcraft/vertical{
name = "Fuel Management";
@@ -1857,14 +1595,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/hammerhead/general)
-"bav" = (
-/obj/effect/floor_decal/borderfloorwhite/corner,
-/obj/effect/floor_decal/corner/paleblue/bordercorner,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery_hallway)
"baJ" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -2039,6 +1769,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
+"bdn" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/power/apc/direction_bump/south,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"bdq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -2218,17 +1963,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
-"bgr" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen10";
- name = "Pen 10 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"bgB" = (
/obj/structure/curtain/open/bed{
name = "brown curtain";
@@ -2245,6 +1979,23 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"bgC" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/purple/border,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/purple/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"bgE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2260,10 +2011,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/maintenance/medbay)
-"bgJ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/brig)
"bgP" = (
/turf/simulated/floor/glass/reinforced,
/area/hallway/primary/surfacetwo)
@@ -2406,6 +2153,11 @@
/obj/item/pen,
/turf/simulated/floor/tiled/steel,
/area/rnd/research)
+"bmS" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/surgery2)
"bmY" = (
/obj/machinery/computer/secure_data,
/obj/effect/floor_decal/borderfloorblack{
@@ -2421,6 +2173,38 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/lobby)
+"bnh" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/pool)
+"bno" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "RnD Lab";
+ req_one_access = list(7)
+ },
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "research_shutter_int";
+ name = "Research shutter";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research)
"bns" = (
/obj/effect/floor_decal/rust,
/obj/effect/overlay/snow/floor,
@@ -2475,6 +2259,9 @@
/obj/effect/floor_decal/corner/paleblue/border,
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
+"boC" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/recovery_room)
"boG" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -2551,6 +2338,9 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
+"bqU" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/breakroom)
"brg" = (
/obj/effect/overlay/snow/floor,
/obj/random/contraband,
@@ -2637,9 +2427,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"btM" = (
-/turf/simulated/wall,
-/area/rnd/breakroom)
"btN" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -2802,9 +2589,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/rnd/breakroom)
-"byV" = (
-/turf/simulated/wall/r_wall,
-/area/security/range)
"bzd" = (
/obj/item/stool,
/obj/machinery/light/small{
@@ -2868,6 +2652,21 @@
/obj/effect/mist,
/turf/simulated/floor/water/deep/pool,
/area/crew_quarters/pool)
+"bBi" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen8";
+ name = "Pen 8 Blast Doors";
+ opacity = 0
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"bBy" = (
/obj/structure/bed/chair{
dir = 4
@@ -2959,23 +2758,9 @@
/obj/effect/mist,
/turf/simulated/floor/water/pool,
/area/triumph/surfacebase/sauna)
-"bEq" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
+"bEp" = (
+/turf/simulated/wall/prepainted/science,
+/area/rnd/research)
"bEr" = (
/obj/effect/floor_decal/industrial/outline/red,
/obj/machinery/power/apc{
@@ -3144,6 +2929,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/heads/hor)
+"bJk" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/sleeper)
"bJz" = (
/obj/structure/closet/athletic_mixed,
/obj/item/clothing/shoes/boots/jackboots{
@@ -3152,26 +2940,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
-"bKl" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"bKV" = (
/obj/structure/kitchenspike,
/obj/effect/floor_decal/rust,
@@ -3204,6 +2972,17 @@
/obj/effect/floor_decal/corner/red/bordercorner,
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
+"bMn" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/monotile,
+/area/hallway/primary/surfacetwo)
"bOa" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/cable{
@@ -3220,23 +2999,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
-"bOx" = (
-/obj/machinery/button/remote/blast_door{
- id = "mech_bay_int";
- name = "Mech Bay Interior blast door-control";
- pixel_y = -6;
- req_one_access = list(29,47)
- },
-/obj/machinery/button/remote/blast_door{
- dir = 1;
- id = "mech_bay_ext";
- name = "Mech Bay Exterior blast door-control";
- pixel_x = 1;
- pixel_y = 6;
- req_one_access = list(29,47)
- },
-/turf/simulated/wall/r_wall,
-/area/assembly/chargebay)
"bOz" = (
/obj/structure/railing{
dir = 1
@@ -3313,6 +3075,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
+"bRx" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
"bRA" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/structure/cable/green{
@@ -3453,6 +3218,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"bTZ" = (
+/turf/simulated/wall/r_wall/prepainted/medical,
+/area/hallway/primary/surfacetwo)
"bUX" = (
/obj/effect/floor_decal/spline/plain,
/obj/machinery/atmospherics/component/unary/vent_pump/on,
@@ -3491,6 +3259,9 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/dormitory)
+"bWq" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/lower/medsec_maintenance)
"bXh" = (
/obj/item/mecha_parts/part/durand_right_leg{
name = "Priapic Monument"
@@ -3553,15 +3324,24 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"bZU" = (
-/turf/simulated/wall/r_wall,
-/area/security/evidence_storage)
"cal" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
+"caG" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/medical/reception)
"cbe" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -3602,19 +3382,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"cbM" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized{
- dir = 10;
- icon_state = "fwindow";
- id = "Interr"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/turf/simulated/floor/plating,
-/area/security/interrogation)
"cbV" = (
/obj/machinery/alarm{
breach_detection = 0;
@@ -3623,16 +3390,6 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
-"ccW" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/medical/morgue)
"cdC" = (
/obj/structure/table/bench/padded,
/turf/simulated/floor/wood,
@@ -3716,6 +3473,9 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/hammerhead/general)
+"cfk" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep/Dorm_4)
"cfz" = (
/obj/structure/closet/crate/bin{
desc = "A large bin for medical and other personnel that deals with bio-grade waste.";
@@ -3736,6 +3496,16 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
+"cfM" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/airlock/medical{
+ id_tint = "medbay_outer";
+ name = "Medbay Lobby"
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/reception)
"cfW" = (
/obj/structure/railing{
dir = 8
@@ -3788,6 +3558,9 @@
},
/turf/simulated/floor,
/area/maintenance/substation/security)
+"cgH" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep/Dorm_5)
"cgM" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -3832,9 +3605,6 @@
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/crew_quarters/pool)
-"ciC" = (
-/turf/simulated/wall,
-/area/security/security_lockerroom)
"ciK" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -3898,6 +3668,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/brig)
+"ckI" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/cafeteria_dock)
"cls" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -3979,6 +3752,9 @@
/obj/structure/grille,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside2)
+"cnl" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/turbolift/rhammerhead/hhbay)
"cno" = (
/turf/simulated/open,
/area/rift/stairwell/primary/surfacetwo)
@@ -4059,6 +3835,13 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
+"crU" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/research/xenobiology_lab)
+"crX" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"csj" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/floor_decal/steeldecal/steel_decals9{
@@ -4080,15 +3863,6 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/holofloor/tiled/dark,
/area/crew_quarters/pool/changing_room)
-"ctN" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"cuf" = (
/obj/effect/floor_decal/techfloor,
/obj/effect/floor_decal/techfloor{
@@ -4096,9 +3870,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/assembly/robotics)
-"cuh" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/telescience_lab/foyer)
"cuJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -4120,20 +3891,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
-"cvH" = (
-/turf/simulated/wall,
-/area/crew_quarters/heads/hos)
-"cwe" = (
-/obj/machinery/atmospherics/pipe/zpipe/down/supply,
-/obj/structure/disposalpipe/up,
-/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
-/obj/structure/cable/green{
- icon_state = "32-2"
- },
-/obj/structure/lattice,
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/open,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"cwg" = (
/obj/machinery/conveyor{
dir = 4;
@@ -4181,10 +3938,26 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"cwR" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/coffee_shop)
+"cwI" = (
+/obj/machinery/door/airlock/glass/security{
+ name = "Break Room";
+ req_one_access = list(1,38)
+ },
+/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/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/wood,
+/area/security/breakroom)
"cwV" = (
/obj/machinery/computer/crew{
dir = 8;
@@ -4202,6 +3975,16 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
+"cxg" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "Research Lobby";
+ req_one_access = list(29,47)
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"cxh" = (
/obj/machinery/photocopier,
/obj/machinery/light{
@@ -4248,6 +4031,34 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
+"czB" = (
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 9
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/machinery/holoposter{
+ pixel_x = -32
+ },
+/obj/effect/floor_decal/borderfloorwhite/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/paleblue/bordercorner2{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery_hallway)
"czJ" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -4426,6 +4237,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"cFD" = (
+/obj/structure/symbol/sa,
+/turf/simulated/wall/prepainted,
+/area/maintenance/dormitory)
"cGk" = (
/obj/structure/bed/chair{
dir = 8
@@ -4480,81 +4295,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
-"cIb" = (
-/obj/effect/floor_decal/borderfloorblack{
- alpha = 255
- },
-/obj/structure/table/rack/shelf/steel,
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = 5;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = 5;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = 5;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = 5;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate/stab{
- pixel_x = -4;
- pixel_y = -3
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = -4;
- pixel_y = 8
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = 5;
- pixel_y = 8
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = 5;
- pixel_y = 8
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = 5;
- pixel_y = 8
- },
-/obj/item/clothing/accessory/armor/armorplate{
- pixel_x = 5;
- pixel_y = 8
- },
-/obj/effect/floor_decal/corner/red/border,
-/turf/simulated/floor/tiled/dark,
-/area/security/security_equiptment_storage)
-"cIj" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/medbay)
"cIO" = (
/obj/structure/railing,
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
@@ -4676,15 +4416,25 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
+"cKM" = (
+/obj/machinery/door/airlock/glass/security{
+ name = "Equipment Storage";
+ req_one_access = list(2)
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/monotile,
+/area/security/security_lockerroom)
"cLg" = (
/obj/structure/bed/padded,
/obj/item/bedsheet/blue,
/obj/structure/curtain/open/bed,
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/medbreak/surgery)
-"cLl" = (
-/turf/simulated/wall,
-/area/maintenance/asmaint2)
"cMl" = (
/obj/structure/table/steel,
/obj/effect/floor_decal/borderfloorblack{
@@ -4729,22 +4479,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monowhite,
/area/medical/surgery_hallway)
-"cML" = (
-/obj/structure/ladder/up,
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/railing,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/rift/turbolift/maint)
"cMV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -4770,10 +4504,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
-"cND" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/surgery2)
"cPy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -4831,10 +4561,6 @@
},
/turf/simulated/floor/concrete/rng/indoors,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
-"cRn" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/asmaint2)
"cRt" = (
/obj/structure/sink{
pixel_y = 18
@@ -4857,6 +4583,9 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/research/researchdivision)
+"cRS" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/surgery_hallway)
"cRT" = (
/obj/structure/table/steel,
/obj/random/cigarettes,
@@ -4906,25 +4635,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
-"cUw" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/structure/curtain/open/bed{
- name = "brown curtain"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"cUB" = (
/obj/machinery/floodlight,
/turf/simulated/floor/plating,
@@ -4937,32 +4647,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"cUS" = (
-/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/hidden,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
"cUU" = (
/obj/machinery/portable_atmospherics/powered/scrubber,
/turf/simulated/floor/tiled/techmaint,
/area/crew_quarters/pool/emergency_closet)
-"cUW" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfacebase/outside/outside2)
"cVx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -5030,9 +4718,17 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/breakroom)
-"cXU" = (
-/turf/simulated/wall,
-/area/maintenance/substation/research/telescience_lab)
+"cXI" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"cYf" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -5123,12 +4819,6 @@
/obj/structure/cable/green,
/turf/simulated/floor/wood,
/area/rnd/breakroom)
-"dbs" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/asmaint2)
"dbt" = (
/obj/structure/bed/chair/bay/shuttle{
dir = 8
@@ -5171,6 +4861,9 @@
"ddZ" = (
/turf/simulated/floor/outdoors/gravsnow/lythios43c/indoors,
/area/rift/surfacebase/outside/outside2)
+"dep" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/range)
"der" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5341,26 +5034,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"dkP" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
- name = "Weapons Testing Range";
- req_access = list(47)
- },
-/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/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/testingrange)
"dla" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5411,28 +5084,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/tactical)
-"dnh" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/light,
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"dnv" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -5480,9 +5131,6 @@
/obj/structure/medical_stand/anesthetic,
/turf/simulated/floor/tiled/steel_grid,
/area/medical/sleeper)
-"dpE" = (
-/turf/simulated/wall/r_wall,
-/area/turbolift/rhammerhead/hhbay)
"dpV" = (
/obj/machinery/disposal,
/obj/machinery/light_switch{
@@ -5576,6 +5224,23 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"dsj" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "Research Lounge";
+ req_access = list(47)
+ },
+/obj/machinery/door/firedoor/glass,
+/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
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rnd/breakroom)
"dsu" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -5710,20 +5375,11 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
-"duF" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/door/airlock/multi_tile/glass,
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
+"duY" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/surgeryprep)
"dvw" = (
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
@@ -5815,9 +5471,25 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"dxZ" = (
-/turf/simulated/wall,
-/area/rift/stairwell/primary/surfacetwo)
+"dxl" = (
+/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
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"dyg" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -5861,6 +5533,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"dzq" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/telescience_lab/storage)
"dzv" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -5914,9 +5589,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/medbay)
-"dAk" = (
-/turf/simulated/wall,
-/area/hallway/primary/surfacetwo)
"dAt" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -5939,16 +5611,6 @@
},
/turf/simulated/floor,
/area/maintenance/substation/security)
-"dAH" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "mech_bay_int";
- name = "Mech Bay Blast Door"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/turf/simulated/floor/tiled/steel_grid,
-/area/assembly/chargebay)
"dBb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -6061,9 +5723,12 @@
/obj/item/bikehorn/rubberducky,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"dDT" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/research/testingrange)
+"dDP" = (
+/obj/machinery/door/firedoor/glass,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/warden)
"dEc" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -6115,9 +5780,6 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
-"dFt" = (
-/turf/simulated/wall,
-/area/medical/surgeryprep)
"dFE" = (
/obj/structure/bed/chair/comfy/black{
dir = 4
@@ -6507,6 +6169,19 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/range)
+"dPl" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/holoposter{
+ pixel_y = 32
+ },
+/obj/machinery/camera/network/security,
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"dPC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -6529,20 +6204,32 @@
/obj/landmark/spawnpoint/job/senior_researcher,
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"dRc" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
+"dQq" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen2";
+ name = "Pen 2 Blast Doors";
+ opacity = 0
},
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"dQE" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/research{
+ name = "Circuitry Workshop";
+ req_access = list(7);
+ req_one_access = list(7)
},
-/obj/machinery/camera/network/security{
- dir = 5
+/obj/structure/cable/green{
+ icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
+/area/rnd/workshop)
"dRy" = (
/obj/structure/table/reinforced,
/obj/item/gps,
@@ -6572,6 +6259,13 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/lobby)
+"dSo" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/sleep)
"dSq" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -6717,6 +6411,9 @@
/obj/effect/floor_decal/corner/red/border,
/turf/simulated/floor/tiled/dark,
/area/security/tactical)
+"dWm" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/maintenance/engineering/pumpstation)
"dWw" = (
/obj/structure/railing{
dir = 4
@@ -6737,24 +6434,9 @@
/obj/item/stool/padded,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"dXI" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 1;
- name = "Medbay Storage";
- req_access = list(5);
- req_one_access = list(5)
- },
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/medbay_primary_storage)
+"dXY" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/armory/red)
"dYz" = (
/obj/structure/closet/bombclosetsecurity,
/obj/effect/floor_decal/industrial/outline/blue,
@@ -6851,14 +6533,6 @@
},
/turf/simulated/open,
/area/rift/station/public_garden/gantry)
-"edi" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
- name = "Firing Range";
- req_one_access = list(1,2,4)
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/range)
"eev" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -6901,6 +6575,17 @@
/obj/item/storage/box/glasses,
/turf/simulated/floor/wood,
/area/rift/station/public_garden/gantry)
+"egy" = (
+/obj/machinery/door/blast/shutters{
+ dir = 4;
+ id = "chemistry";
+ layer = 3.1;
+ name = "Chemistry Shutters"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/chemistry)
"egF" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -6958,10 +6643,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_1)
-"eiq" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/trade_shop/loading)
"eiA" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -6982,35 +6663,10 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"ejv" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen3";
- name = "Pen 3 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
-"ejD" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/door/airlock/multi_tile/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
+"eju" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/sleep)
"ejY" = (
/obj/structure/inflatable/door,
/turf/simulated/floor/plating,
@@ -7030,6 +6686,41 @@
},
/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,
+/area/security/security_lockerroom)
+"eko" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 5
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/multi_tile/medical{
+ id_tag = "medbay_lobby";
+ id_tint = "medbay_outer";
+ name = "Medbay Lobby";
+ req_one_access = list(5)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/medical/reception)
"ekx" = (
/obj/structure/railing{
dir = 1
@@ -7063,6 +6754,21 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/recovery_room)
+"elc" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"emd" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 4
@@ -7117,6 +6823,25 @@
},
/turf/simulated/floor/carpet,
/area/security/warden)
+"enX" = (
+/obj/structure/sign/department/morgue,
+/turf/simulated/wall/prepainted,
+/area/assembly/robotics)
+"eon" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "warden";
+ layer = 3.1;
+ name = "Warden's Office Shutters";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/warden)
"eoA" = (
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
@@ -7191,36 +6916,16 @@
},
/turf/simulated/open,
/area/rift/station/public_garden/gantry)
-"etg" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
-"etO" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/light,
-/obj/effect/floor_decal/corner/purple/border,
-/obj/effect/floor_decal/borderfloor/corner2,
-/obj/effect/floor_decal/corner/purple/bordercorner2,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+"esQ" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/interrogation)
+"eut" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/surgery)
"euI" = (
/obj/structure/closet/secure_closet/hos2,
/obj/effect/floor_decal/borderfloorblack/full,
@@ -7282,19 +6987,6 @@
/obj/machinery/vending/cola,
/turf/simulated/floor/tiled/monotile,
/area/crew_quarters/pool)
-"eyL" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/purple/border,
-/obj/effect/floor_decal/borderfloor/corner2,
-/obj/effect/floor_decal/corner/purple/bordercorner2,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"eyP" = (
/obj/structure/table/standard,
/obj/item/storage/toolbox/mechanical,
@@ -7394,10 +7086,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"eAf" = (
-/obj/effect/floor_decal/industrial/outline/grey,
-/turf/simulated/wall,
-/area/maintenance/locker)
"eAI" = (
/obj/structure/window/reinforced{
dir = 1
@@ -7441,12 +7129,18 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"eBi" = (
-/turf/simulated/wall,
-/area/maintenance/research/rnd)
-"eBE" = (
-/turf/simulated/wall,
-/area/crew_quarters/sleep/Dorm_2)
+"eBD" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen6";
+ name = "Pen 6 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"eBF" = (
/obj/machinery/shipsensors,
/obj/machinery/light/no_nightshift,
@@ -7507,6 +7201,9 @@
"eCq" = (
/turf/simulated/floor/tiled/dark,
/area/security/evidence_storage)
+"eCy" = (
+/turf/simulated/wall/prepainted/security,
+/area/maintenance/substation/cafeteria_dock)
"eCN" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -7558,20 +7255,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"eDE" = (
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 8
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 8
- },
-/obj/structure/curtain/open/privacy,
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/surgeryprep)
"eEI" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -7727,6 +7410,9 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
+"eKD" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/stairwell/primary/surfacetwo)
"eKH" = (
/obj/structure/cable/green{
icon_state = "32-2"
@@ -7735,6 +7421,9 @@
/obj/structure/lattice,
/turf/simulated/open,
/area/maintenance/security/upper)
+"eKL" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/engineering/pumpstation)
"eLN" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
@@ -7761,9 +7450,6 @@
/obj/structure/flora/pottedplant/flower,
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
-"eMD" = (
-/turf/simulated/wall/r_wall,
-/area/medical/morgue)
"eMI" = (
/obj/structure/bed/chair/office/light{
dir = 8
@@ -7824,26 +7510,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"ePP" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/structure/curtain/open/bed{
- name = "brown curtain"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"eQx" = (
/obj/structure/table/woodentable,
/obj/machinery/microwave,
@@ -7938,6 +7604,19 @@
/obj/machinery/disposal,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
+"eTn" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "robotics_shutter_int";
+ name = "Robotics shutter";
+ opacity = 0
+ },
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/assembly/robotics)
"eTD" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -7960,6 +7639,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
+"eTP" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/surface_two)
"eTT" = (
/obj/machinery/light{
dir = 8
@@ -8075,6 +7757,12 @@
/obj/effect/mist,
/turf/simulated/floor/wood,
/area/triumph/surfacebase/sauna)
+"eWN" = (
+/obj/structure/bed/chair,
+/obj/landmark/spawnpoint/job/security_officer,
+/obj/machinery/camera/network/security,
+/turf/simulated/floor/carpet/blue,
+/area/security/breakroom)
"eWO" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -8141,9 +7829,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
-"eYY" = (
-/turf/simulated/wall/r_wall,
-/area/security/security_equiptment_storage)
"eZd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -8295,6 +7980,10 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"fcv" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/stairwell/primary/surfacetwo)
"fcw" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -8355,69 +8044,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/visible/fuel,
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
-"fdJ" = (
-/obj/structure/bed/chair,
-/obj/landmark/spawnpoint/job/security_officer,
-/obj/machinery/camera/network/security{
- dir = 6
- },
-/turf/simulated/floor/carpet/blue,
-/area/security/breakroom)
-"fdP" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/obj/structure/table/marble,
-/obj/item/reagent_containers/food/condiment/small/sugar{
- pixel_x = -6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/small/packet/coffee{
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/small/packet/coffee{
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/small/packet/coffee{
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/condiment/small/packet/coffee,
-/obj/item/reagent_containers/food/condiment/small/packet/tea{
- pixel_x = 6;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/small/packet/tea{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/small/packet/tea{
- pixel_x = 6;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/condiment/small/packet/tea{
- pixel_x = 6
- },
-/obj/item/reagent_containers/food/condiment/small/packet/sugar{
- pixel_x = 12;
- pixel_y = 9
- },
-/obj/item/reagent_containers/food/condiment/small/packet/sugar{
- pixel_x = 12;
- pixel_y = 6
- },
-/obj/item/reagent_containers/food/condiment/small/packet/sugar{
- pixel_x = 12;
- pixel_y = 3
- },
-/obj/item/reagent_containers/food/condiment/small/packet/sugar{
- pixel_x = 12
- },
-/obj/item/reagent_containers/glass/rag{
- pixel_x = -10;
- pixel_y = 6
- },
-/turf/simulated/floor/lino,
-/area/crew_quarters/coffee_shop)
"fdT" = (
/obj/structure/inflatable/door,
/obj/structure/cable/green{
@@ -8438,13 +8064,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
-"fei" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"feB" = (
/obj/structure/railing{
dir = 1
@@ -8494,20 +8113,6 @@
/obj/item/storage/single_use/med_pouch/trauma,
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"feU" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen2";
- name = "Pen 2 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"fff" = (
/obj/structure/bed/chair{
dir = 1
@@ -8518,6 +8123,10 @@
},
/turf/simulated/floor/tiled,
/area/security/briefing_room)
+"ffl" = (
+/obj/structure/sign/xenobio,
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside2)
"ffG" = (
/obj/machinery/holopad/ship,
/turf/simulated/floor/tiled/techfloor,
@@ -8583,9 +8192,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/lobby)
-"fhQ" = (
-/turf/simulated/wall,
-/area/rnd/lockers)
"fic" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -8685,47 +8291,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/locker)
-"fkd" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/obj/machinery/camera/network/civilian{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/medical/reception)
-"fkm" = (
-/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/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
-"fkC" = (
-/turf/simulated/wall,
-/area/medical/resleeving)
"fkH" = (
/turf/simulated/open,
/area/rnd/research/researchdivision)
@@ -8833,6 +8398,9 @@
},
/turf/simulated/floor/tiled,
/area/security/briefing_room)
+"fqf" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep/Dorm_3)
"fqj" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -8991,6 +8559,10 @@
/obj/structure/bed/chair,
/turf/simulated/floor/tiled/red,
/area/security/hallway)
+"fuv" = (
+/obj/structure/symbol/sa,
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/pool/changing_room)
"fuH" = (
/obj/structure/sink{
pixel_y = 18
@@ -9017,20 +8589,12 @@
/obj/structure/barricade,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/outside/outside2)
-"fwo" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen5";
- name = "Pen 5 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
-"fwK" = (
-/turf/simulated/wall,
-/area/maintenance/security/upper)
+"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{
@@ -9051,10 +8615,6 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
-"fyb" = (
-/obj/structure/sign/warning/falling,
-/turf/simulated/wall/r_wall,
-/area/rift/surfacebase/outside/outside2)
"fyj" = (
/obj/effect/floor_decal/corner_techfloor_grid/diagonal{
dir = 4
@@ -9068,24 +8628,6 @@
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/turf/simulated/floor/plating,
/area/maintenance/medbay)
-"fzv" = (
-/obj/machinery/door/airlock/glass_security{
- name = "Security Reception";
- req_access = list();
- req_one_access = list(2,4)
- },
-/obj/machinery/door/firedoor/glass,
-/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/lobby)
"fzG" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -9127,6 +8669,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"fzX" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/dormitory)
"fAc" = (
/obj/item/stool,
/turf/simulated/floor/plating,
@@ -9145,17 +8690,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
-"fAD" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen4";
- name = "Pen 4 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"fBD" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
@@ -9165,6 +8699,10 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
+"fCn" = (
+/obj/structure/sign/signnew/danger,
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside2)
"fCQ" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -9241,15 +8779,27 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
+"fEL" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/power/apc/direction_bump/south,
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"fGi" = (
/obj/structure/closet/hydrant{
pixel_y = 32
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
-"fGP" = (
-/turf/simulated/wall,
-/area/security/range)
"fHa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -9275,22 +8825,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
-"fIf" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
"fIg" = (
/obj/effect/floor_decal/spline/plain{
dir = 10
@@ -9305,6 +8839,29 @@
},
/turf/simulated/open,
/area/rift/station/public_garden/gantry)
+"fIK" = (
+/obj/machinery/door/airlock/multi_tile/glass/medical{
+ name = "Medbay Hallway";
+ req_one_access = list(5)
+ },
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/sleeper)
"fJh" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply,
/obj/structure/cable/green{
@@ -9439,12 +8996,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/showers)
-"fLE" = (
-/obj/structure/closet/wardrobe/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/light,
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_lockerroom)
"fLN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -9477,16 +9028,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
-"fMU" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Research Lobby";
- req_one_access = list(29,47)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"fNI" = (
/obj/structure/table/steel,
/obj/machinery/light,
@@ -9650,6 +9191,9 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"fSq" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"fSu" = (
/obj/effect/floor_decal/rust,
/obj/structure/cable{
@@ -9680,6 +9224,11 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/brig)
+"fSS" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/surgery)
"fTu" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -9723,9 +9272,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
-"fUo" = (
-/turf/simulated/wall,
-/area/maintenance/dormitory)
"fUs" = (
/obj/structure/railing{
dir = 8
@@ -9777,21 +9323,34 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
-"fVF" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/glass_research{
- name = "Telescience Wing"
- },
-/turf/simulated/floor/tiled,
-/area/rnd/telescience_lab/foyer)
"fWX" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
/obj/machinery/vending/coffee,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"fXf" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"fXh" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255
@@ -9803,10 +9362,6 @@
/obj/effect/floor_decal/corner/red/border,
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
-"fYM" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"fYW" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -9961,16 +9516,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgeryprep)
-"gcU" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals_central4,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/pool)
"gcX" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -9999,10 +9544,32 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"gdk" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
+"gdw" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 1
+ },
+/obj/structure/sign/directions/medical{
+ dir = 8;
+ pixel_y = 30
+ },
+/obj/structure/sign/directions/science{
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"gdS" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -10028,10 +9595,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
-"gek" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/hallway/primary/surfacetwo)
"geu" = (
/obj/machinery/door/airlock/glass{
name = "Dormitories"
@@ -10048,38 +9611,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"gey" = (
-/obj/structure/sign/department/morgue,
-/turf/simulated/wall,
-/area/assembly/robotics)
-"gfE" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 10
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/multi_tile/glass/polarized{
- id_tag = "medbay_lobby";
- id_tint = "medbay_outer";
- name = "Medbay Lobby";
- req_one_access = list(5)
- },
-/turf/simulated/floor/tiled/steel,
-/area/medical/reception)
"gfL" = (
/obj/structure/table/bench/wooden,
/obj/effect/mist,
@@ -10118,6 +9649,21 @@
},
/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
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"gjx" = (
/obj/structure/railing{
dir = 4
@@ -10140,19 +9686,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
-"gjV" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"gkl" = (
/obj/machinery/disposal,
/obj/structure/window/reinforced{
@@ -10172,9 +9705,6 @@
/obj/effect/mist,
/turf/simulated/floor/water/pool,
/area/triumph/surfacebase/sauna)
-"gkM" = (
-/turf/simulated/wall,
-/area/maintenance/substation/security)
"gkR" = (
/obj/structure/bed/chair/sofa/red,
/turf/simulated/floor/wood,
@@ -10214,6 +9744,22 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
+"glz" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/corner/red{
+ dir = 5
+ },
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/interrogation)
"glD" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -10235,17 +9781,6 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
-"gmw" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen2";
- name = "Pen 2 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"gmz" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -10258,9 +9793,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"gmC" = (
-/turf/simulated/wall/r_wall,
-/area/security/brig)
"gmT" = (
/obj/structure/closet/secure_closet/personal,
/obj/item/clothing/suit/storage/hooded/wintercoat,
@@ -10273,20 +9805,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/locker)
-"gnd" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen5";
- name = "Pen 5 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"gne" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -10368,6 +9886,23 @@
/obj/random/slimecore,
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"gqT" = (
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/obj/structure/railing/grey{
+ dir = 1
+ },
+/obj/structure/railing/grey,
+/obj/structure/railing/grey{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/simulated/open,
+/area/hallway/primary/surfacetwo)
"gra" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner/paleblue{
@@ -10628,6 +10163,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/security/interrogation)
+"gvL" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"gvP" = (
/obj/structure/table/marble,
/obj/structure/window/reinforced{
@@ -10762,43 +10306,15 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
+"gzJ" = (
+/turf/simulated/wall/prepainted/medical,
+/area/maintenance/lower/medsec_maintenance)
"gzR" = (
/obj/machinery/conveyor_switch{
tag = "trade_load"
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/trade_shop/loading)
-"gzX" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "warden";
- layer = 3.1;
- name = "Warden's Office Shutters";
- opacity = 0
- },
-/obj/machinery/door/airlock/glass_security/polarized{
- id_tag = "warden_office";
- id_tint = "warden_office";
- name = "Warden";
- req_one_access = list(3)
- },
-/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
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/warden)
"gzZ" = (
/obj/machinery/light/no_nightshift{
dir = 8
@@ -10809,6 +10325,9 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/cockpit)
+"gBj" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/interrogation)
"gBp" = (
/obj/structure/closet/emcloset,
/obj/random/maintenance/clean,
@@ -11069,19 +10588,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"gGp" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
- name = "Research Locker Room";
- req_access = list(47)
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/lockers)
"gHa" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -11182,12 +10688,35 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
+"gKF" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"gKK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/item/radio/beacon/anchored,
/turf/simulated/floor/tiled/monotile,
/area/rnd/research/researchdivision)
+"gKR" = (
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/steeldecal/steel_decals_central4,
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/pool)
"gKT" = (
/obj/structure/table/steel,
/obj/item/paper_bin,
@@ -11208,9 +10737,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
-"gMe" = (
-/turf/simulated/wall,
-/area/medical/surgery)
"gMv" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central1,
/obj/structure/cable/green{
@@ -11269,9 +10795,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/rift/turbolift/maint)
-"gOV" = (
-/turf/simulated/wall,
-/area/rift/station/public_garden/gantry)
"gPk" = (
/obj/structure/closet/crate/medical/blood,
/obj/item/reagent_containers/blood/empty,
@@ -11314,36 +10837,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/storage)
-"gQJ" = (
-/obj/machinery/button/crematorium{
- id = "medbay_crematorium";
- pixel_x = 26;
- pixel_y = 23;
- req_access = list(5)
- },
-/obj/structure/noticeboard{
- pixel_y = 32
- },
-/obj/structure/table/standard,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/item/paper{
- info = "Please remember to write down the date, time, reason and name of the patient prior to cremation. A noticeboard has been provided to help keep track of cremated bodies.";
- name = "note from CentCom";
- pixel_x = -6;
- pixel_y = -4
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/medical/morgue)
-"gRc" = (
-/turf/simulated/wall,
-/area/maintenance/research/xenobio)
-"gSp" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/heads/hor)
"gSq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -11403,6 +10896,9 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
+"gUS" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/armory/blue)
"gUY" = (
/obj/structure/table/steel,
/obj/item/tool/crowbar,
@@ -11491,6 +10987,9 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
+"gYM" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/recreation_area)
"gZt" = (
/obj/machinery/firealarm{
dir = 8;
@@ -11552,21 +11051,14 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
-"hcA" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+"hcH" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/door/firedoor/glass{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
+ dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
@@ -11597,6 +11089,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"heZ" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/morgue)
"hfg" = (
/obj/machinery/portable_atmospherics/canister/phoron,
/obj/machinery/atmospherics/portables_connector/fuel{
@@ -11621,6 +11116,19 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
+"hfO" = (
+/obj/structure/table/steel,
+/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
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"hga" = (
/turf/simulated/floor/tiled/steel,
/area/maintenance/medbay)
@@ -11727,6 +11235,9 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
+"hio" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/surgeryprep)
"hiE" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -11766,15 +11277,24 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/security/brig)
-"hlN" = (
-/turf/simulated/wall,
-/area/crew_quarters/sleep/Dorm_1)
+"hlq" = (
+/obj/structure/sign/department/medbay{
+ pixel_x = -32
+ },
+/obj/structure/disposalpipe/segment,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/reception)
"hlW" = (
/obj/effect/floor_decal/spline/plain{
dir = 10
},
/turf/simulated/floor/water/deep/pool,
/area/crew_quarters/pool)
+"hmz" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/telescience_lab/foyer)
"hmO" = (
/obj/effect/floor_decal/borderfloorwhite/corner,
/obj/effect/floor_decal/corner/paleblue/bordercorner,
@@ -11970,52 +11490,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
-"hrw" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "warden";
- layer = 3.1;
- name = "Warden's Office Shutters";
- opacity = 0
- },
-/obj/structure/window/reinforced/polarized/full{
- id = "warden_office"
- },
-/turf/simulated/floor/plating,
-/area/security/warden)
"hrW" = (
/obj/machinery/recharger/wallcharger{
pixel_y = -28
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"hso" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- name = "Medbay Hallway";
- req_one_access = list(5)
- },
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 8
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 10
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 5
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/sleeper)
"hst" = (
/obj/structure/table/steel,
/obj/item/storage/box/handcuffs,
@@ -12047,14 +11527,20 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/storage)
-"htU" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "warden_office"
+"hsT" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
},
-/turf/simulated/floor/plating,
-/area/security/warden)
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/camera/network/security{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"hvo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -12083,9 +11569,6 @@
"hwE" = (
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
-"hxo" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/engineering/pumpstation)
"hyg" = (
/obj/machinery/door/airlock/medical{
id_tag = "medbay_recovery";
@@ -12095,13 +11578,6 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"hyJ" = (
-/obj/structure/curtain/open/bed{
- name = "brown curtain"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/hallway/primary/surfacetwo)
"hyN" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -12149,9 +11625,6 @@
/obj/machinery/sleep_console,
/turf/simulated/floor/tiled/steel_grid,
/area/medical/sleeper)
-"hAg" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/security/upper)
"hAE" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -12294,14 +11767,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/testingrange)
-"hCt" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Robotics Morgue";
- req_access = list(29,47)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/assembly/robotics)
"hCS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -12483,22 +11948,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"hHE" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"hHH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -12602,6 +12051,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
+"hKi" = (
+/turf/simulated/wall/r_wall/prepainted/medical,
+/area/medical/chemistry)
"hKy" = (
/obj/structure/catwalk,
/obj/structure/railing{
@@ -12654,23 +12106,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
-"hKS" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "hos_office"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "hos";
- layer = 3.1;
- name = "Head of Security's Office Shutters";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/hos)
"hLf" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -12701,6 +12136,18 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
+"hLX" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"hMP" = (
/obj/structure/closet/secure_closet/security,
/obj/machinery/light{
@@ -12722,6 +12169,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
+"hMX" = (
+/obj/machinery/camera/network/security{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/security/hammerhead_bay)
"hMY" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -13005,31 +12458,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"hQi" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/purple/border{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/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/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"hQA" = (
/obj/effect/floor_decal/rust,
/obj/machinery/door/airlock/maintenance/common,
@@ -13042,12 +12470,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/security_lockerroom)
-"hRG" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 6
- },
-/turf/simulated/floor/lino,
-/area/crew_quarters/coffee_shop)
"hRU" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -13098,19 +12520,6 @@
},
/turf/simulated/open,
/area/maintenance/lower/medsec_maintenance)
-"hTe" = (
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
-"hTs" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/medbay)
"hTW" = (
/obj/structure/bed/chair/office/dark{
dir = 1
@@ -13147,12 +12556,6 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"hUN" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Telescience Wing"
- },
-/turf/simulated/floor/tiled,
-/area/rnd/telescience_lab/foyer)
"hUU" = (
/obj/structure/bed/roller,
/obj/structure/railing,
@@ -13172,6 +12575,9 @@
},
/turf/simulated/floor/wood,
/area/security/breakroom)
+"hVB" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/pool/changing_room)
"hWn" = (
/obj/effect/floor_decal/spline/plain{
dir = 6
@@ -13238,6 +12644,22 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/lockers)
+"hZr" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 24
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"hZL" = (
/obj/structure/table/rack/shelf/steel,
/obj/machinery/firealarm{
@@ -13306,6 +12728,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
+"ibQ" = (
+/obj/structure/sign/science,
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside2)
"icn" = (
/obj/machinery/door/blast/regular{
density = 0;
@@ -13493,22 +12919,11 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_3)
-"iga" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/structure/curtain/open/bed{
- name = "brown curtain"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+"ifW" = (
+/obj/machinery/door/firedoor/glass,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/turf/simulated/floor/plating,
+/area/holodeck_control)
"igc" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -13606,9 +13021,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"iis" = (
-/turf/simulated/wall,
-/area/maintenance/substation/research)
"iiw" = (
/obj/machinery/power/breakerbox/activated{
RCon_tag = "Exterior Docking Pads Substation Bypass"
@@ -13636,6 +13048,45 @@
},
/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
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/sign/directions/science{
+ pixel_y = 24
+ },
+/obj/structure/sign/directions/security{
+ dir = 1;
+ pixel_y = 30
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"ijx" = (
/obj/structure/bed/chair/office/dark{
dir = 1
@@ -13658,12 +13109,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/hammerhead/general)
-"ijO" = (
-/obj/machinery/camera/network/security{
- dir = 10
- },
-/turf/simulated/floor/reinforced,
-/area/security/hammerhead_bay)
"ijR" = (
/obj/structure/table/steel,
/obj/item/folder/red,
@@ -13695,6 +13140,9 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_1)
+"ind" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/security/range)
"inX" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -13804,10 +13252,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/workshop)
-"iqI" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"iru" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -13893,22 +13337,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"itz" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+"isx" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/resleeving)
+"itG" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/pool/emergency_closet)
"iub" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -13942,17 +13376,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
-"iwY" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"ixd" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -13974,9 +13397,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
-"ixC" = (
-/turf/simulated/wall,
-/area/security/evidence_storage)
"iyg" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
@@ -14068,12 +13488,6 @@
/obj/item/extinguisher,
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/lower/medsec_maintenance)
-"iBp" = (
-/obj/structure/closet/secure_closet/security,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/holowarrant,
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_lockerroom)
"iBU" = (
/obj/structure/table/steel,
/obj/item/paper_bin,
@@ -14081,10 +13495,6 @@
/obj/item/pen,
/turf/simulated/floor/wood,
/area/security/breakroom)
-"iBZ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/briefing_room)
"iCs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -14108,13 +13518,10 @@
},
/turf/simulated/floor/tiled,
/area/security/briefing_room)
-"iDq" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/spawner/window/reinforced/full/firelocks,
+"iCM" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
-/area/crew_quarters/sleep)
+/area/shuttle/hammerhead/cockpit)
"iDO" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -14163,31 +13570,6 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
-"iFG" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 5
- },
-/obj/effect/floor_decal/corner/red/bordercorner2{
- dir = 5
- },
-/obj/machinery/camera/network/civilian{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"iFX" = (
/obj/machinery/door/airlock/command{
id_tag = "HoSdoor";
@@ -14226,9 +13608,6 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
-"iGT" = (
-/turf/simulated/wall/r_wall,
-/area/security/lobby)
"iHi" = (
/obj/structure/table/steel,
/obj/effect/floor_decal/borderfloorblack{
@@ -14276,6 +13655,23 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/storage)
+"iIp" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/door/airlock/multi_tile/glass{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"iIr" = (
/obj/machinery/power/apc{
dir = 1;
@@ -14364,6 +13760,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop/loading)
+"iLp" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/security/upper)
"iLI" = (
/obj/structure/curtain/open/privacy,
/turf/simulated/floor/tiled/freezer,
@@ -14375,6 +13774,25 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"iMv" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen4";
+ name = "Pen 4 Blast Doors";
+ opacity = 0
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"iMz" = (
+/obj/structure/sign/poster,
+/turf/simulated/wall/prepainted/security,
+/area/security/briefing_room)
"iMB" = (
/obj/machinery/mech_recharger,
/obj/machinery/atmospherics/portables_connector{
@@ -14395,13 +13813,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"iMQ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/plating,
-/area/rift/trade_shop/loading)
"iMV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -14503,28 +13914,6 @@
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"iQc" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/purple/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/purple/bordercorner2{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/rnd/workshop)
"iQi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -14533,9 +13922,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/locker)
-"iQr" = (
-/turf/simulated/wall,
-/area/crew_quarters/recreation_area)
+"iQl" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/pool)
"iQw" = (
/obj/structure/bed/double/padded,
/obj/item/bedsheet/reddouble,
@@ -14562,21 +13952,27 @@
},
/turf/simulated/floor/tiled/monotile,
/area/medical/reception)
-"iRx" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
+"iRk" = (
+/obj/machinery/door/airlock/glass/security{
+ name = "Briefing Room";
+ req_access = list();
+ req_one_access = list(1,38)
},
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
+/obj/structure/cable/green{
+ icon_state = "4-8"
},
-/obj/machinery/holoposter{
- pixel_y = 32
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/obj/machinery/camera/network/security{
- dir = 6
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/security/briefing_room)
"iRD" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -14678,10 +14074,31 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
-"iVo" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/telescience_lab/foyer)
+"iUP" = (
+/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;
+ icon_state = "pdoor0";
+ id = "security_lockdown";
+ name = "Security Blast Doors";
+ opacity = 0
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/security/brig)
"iVL" = (
/obj/structure/railing,
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -14716,22 +14133,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/chargebay)
-"iXg" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "research_inner"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "research_shutter_int";
- name = "Research shutter";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/rnd/research)
"iXD" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
/obj/machinery/airlock_sensor{
@@ -14912,6 +14313,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden/stairwell)
+"jbk" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/hallway)
"jbn" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -14943,6 +14347,26 @@
/obj/machinery/flasher/portable,
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
+"jcV" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/structure/curtain/open/bed{
+ name = "brown curtain"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"jcW" = (
/obj/item/radio/intercom{
dir = 1;
@@ -14990,6 +14414,31 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"jdd" = (
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "chemistry";
+ layer = 3.1;
+ name = "Chemistry Shutters"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/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;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "research_shutter_ext";
+ name = "Research shutter";
+ opacity = 0
+ },
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/research)
"jdp" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -15024,9 +14473,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/assembly/robotics)
-"jff" = (
-/turf/simulated/wall,
-/area/holodeck_control)
"jfk" = (
/obj/structure/bed/chair{
dir = 4
@@ -15044,32 +14490,10 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"jfz" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/structure/sign/directions/science{
- pixel_y = 24
- },
-/obj/structure/sign/directions/security{
- dir = 1;
- pixel_y = 30
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
+"jfl" = (
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/turf/simulated/floor/tiled,
+/area/rnd/telescience_lab/storage)
"jgg" = (
/obj/structure/railing{
dir = 4
@@ -15173,16 +14597,10 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
-"jmh" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/structure/bed/chair{
- dir = 1
- },
-/obj/machinery/camera/network/security{
- dir = 10
+"jmj" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
},
-/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/computer/timeclock/premade/south,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
"jmn" = (
@@ -15252,19 +14670,9 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"jnK" = (
-/turf/simulated/wall/r_wall,
-/area/security/security_lockerroom)
"jnY" = (
/turf/simulated/floor/carpet/purcarpet,
/area/crew_quarters/heads/hor)
-"joW" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"jpg" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -15341,22 +14749,6 @@
},
/turf/simulated/floor/tiled/red,
/area/security/evastorage)
-"jqM" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/machinery/door/airlock/glass_security{
- name = "Processing";
- req_one_access = list(1,2,4,38)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/dark,
-/area/security/security_processing)
"jra" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -15377,6 +14769,18 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/monotile,
/area/crew_quarters/coffee_shop)
+"jru" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"jrD" = (
/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/borderfloorblack/full,
@@ -15454,32 +14858,34 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden/stairwell)
-"jtH" = (
-/obj/structure/disposalpipe/segment{
- dir = 8
+"jug" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
},
-/obj/structure/cable/green{
- icon_state = "4-8"
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/hammerhead/general)
+"jul" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
+/obj/effect/floor_decal/corner/purple/border{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
},
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
- name = "Firing Range";
- req_one_access = list(1,2,4)
+/obj/effect/floor_decal/corner/purple/bordercorner2{
+ dir = 1
},
-/turf/simulated/floor/tiled/steel,
-/area/security/range)
-"jug" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/machinery/light{
dir = 1
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/hammerhead/general)
+/turf/simulated/floor/tiled/steel,
+/area/rnd/workshop)
"jux" = (
/obj/machinery/light/small{
dir = 8
@@ -15503,6 +14909,11 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"juW" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/briefing_room)
"juX" = (
/obj/effect/floor_decal/corner/green/diagonal,
/obj/effect/floor_decal/corner/green/diagonal{
@@ -15581,24 +14992,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/range)
-"jxx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/door/airlock/glass_research{
- name = "Telescience Storage"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled,
-/area/rnd/telescience_lab/storage)
"jxW" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -15727,6 +15120,21 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"jFC" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfacebase/outside/outside2)
+"jFL" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"jGh" = (
/obj/machinery/vending/coffee,
/turf/simulated/floor/wood,
@@ -15870,10 +15278,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
-"jMC" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/research/xenobio)
"jNi" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -15898,6 +15302,9 @@
},
/turf/simulated/floor/tiled/red,
/area/security/evidence_storage)
+"jNL" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/locker)
"jNN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
@@ -16065,6 +15472,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/range)
+"jQZ" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/telescience_lab/foyer)
"jRK" = (
/obj/structure/closet/hydrant{
pixel_x = -32
@@ -16088,6 +15499,19 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/tiled/steel,
/area/rnd/research)
+"jRQ" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen8";
+ 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,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"jSr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -16154,19 +15578,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"jTH" = (
-/turf/simulated/wall,
-/area/triumph/surfacebase/sauna)
-"jTS" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized{
- dir = 10;
- icon_state = "fwindow";
- id = "resleeving-tint"
- },
-/turf/simulated/floor/plating,
-/area/medical/resleeving)
"jTU" = (
/obj/machinery/light/no_nightshift{
dir = 4
@@ -16264,22 +15675,6 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/holofloor/tiled/dark,
/area/crew_quarters/pool/changing_room)
-"jXe" = (
-/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/hidden{
- dir = 2
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"jXj" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -16414,6 +15809,14 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
+"kaW" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "Robotics Morgue";
+ req_access = list(29,47)
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/assembly/robotics)
"kaY" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
@@ -16482,6 +15885,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/rnd/breakroom)
+"kcn" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/security/upper)
"kco" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -16531,14 +15937,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
-"kdW" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "sec_processing_l"
- },
-/turf/simulated/floor/plating,
-/area/security/security_processing)
"ker" = (
/obj/structure/table/rack/shelf/steel,
/turf/simulated/floor/tiled/red,
@@ -16549,6 +15947,13 @@
},
/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,
+/area/security/security_processing)
"keH" = (
/obj/structure/railing{
dir = 4
@@ -16556,39 +15961,6 @@
/obj/structure/railing,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"keL" = (
-/obj/machinery/door/firedoor/glass,
-/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/machinery/door/airlock/glass_security/polarized{
- id_tint = "seclocker";
- name = "Locker Room";
- req_one_access = list(2)
- },
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/security_lockerroom)
-"kfv" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen8";
- name = "Pen 8 Blast Doors";
- opacity = 0
- },
-/obj/machinery/door/firedoor,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"kfP" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -16602,6 +15974,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/medical/reception)
+"kfW" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/evidence_storage)
"kfZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -16611,14 +15986,24 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_1)
-"kgH" = (
-/obj/machinery/door/airlock/glass_security{
- layer = 2.8;
- name = "EVA Operations";
- req_one_access = list(1,38)
+"kgd" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen7";
+ name = "Pen 7 Blast Doors";
+ opacity = 0
},
-/turf/simulated/floor/tiled/steel,
-/area/security/evastorage)
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"kgx" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/evidence_storage)
"khd" = (
/obj/structure/table/rack/shelf/steel,
/obj/item/storage/toolbox/emergency,
@@ -16654,23 +16039,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/hos)
-"khZ" = (
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 8
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 8
- },
-/obj/structure/curtain/open/privacy,
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/surgeryprep)
+"kid" = (
+/turf/simulated/wall/r_wall/prepainted/medical,
+/area/medical/resleeving)
"kiq" = (
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
@@ -16683,6 +16054,10 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
+"kiM" = (
+/obj/effect/floor_decal/industrial/outline/grey,
+/turf/simulated/wall/prepainted,
+/area/maintenance/locker)
"kiP" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/borderfloorwhite{
@@ -16697,6 +16072,9 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
+"kiS" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/reception)
"kiW" = (
/obj/structure/undies_wardrobe,
/obj/structure/window/reinforced/tinted/frosted{
@@ -16710,29 +16088,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
-"kjC" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/machinery/alarm{
- desc = null;
- pixel_y = 24
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
"kjO" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -16798,6 +16153,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
+"kjT" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/stairwell/primary/surfacetwo)
"klD" = (
/obj/machinery/button/windowtint{
dir = 8;
@@ -16880,10 +16239,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
-"kmy" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/stairwell/primary/surfacetwo)
"kmQ" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/borderfloorwhite/corner{
@@ -16939,6 +16294,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
+"kpm" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/assembly/chargebay)
"kpD" = (
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/airlock/research{
@@ -16964,20 +16322,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"kqv" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen1";
- name = "Pen 1 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"kqN" = (
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/lythios43c/indoors,
@@ -17140,6 +16484,22 @@
/obj/structure/stairs/spawner/north,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacetwo)
+"ktQ" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"ktT" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -17215,6 +16575,12 @@
},
/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)
"kvB" = (
/obj/structure/railing{
dir = 1
@@ -17280,36 +16646,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"kwI" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen4";
- name = "Pen 4 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"kxb" = (
/obj/structure/bed/chair/sofa/red/left{
dir = 1
},
/turf/simulated/floor/wood,
/area/rift/station/public_garden/gantry)
-"kxt" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"kxv" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
@@ -17400,19 +16742,25 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"kAp" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Research Staircase"
+"kzS" = (
+/obj/machinery/door_timer/cell_3{
+ pixel_x = 32
},
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/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,
/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
+/area/security/brig)
"kAt" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -17583,6 +16931,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/range)
+"kGz" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/green{
+ icon_state = "2-8"
+ },
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/interrogation)
"kHg" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 10
@@ -17611,9 +16974,9 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
-"kHO" = (
-/turf/simulated/wall/r_wall,
-/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"kIL" = (
+/turf/simulated/wall/prepainted/medical,
+/area/medical/surgery2)
"kIW" = (
/obj/effect/floor_decal/borderfloorblack/corner{
alpha = 255
@@ -17630,6 +16993,9 @@
/obj/machinery/atmospheric_field_generator/perma,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/hammerhead/general)
+"kJS" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/medbay)
"kKd" = (
/obj/structure/railing{
dir = 8
@@ -17678,6 +17044,10 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"kMg" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/hallway/primary/surfacetwo)
"kMi" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -17780,9 +17150,6 @@
/obj/machinery/door/airlock/lift,
/turf/simulated/floor/holofloor/tiled/dark,
/area/turbolift/rsurface/level2)
-"kPi" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"kPr" = (
/obj/machinery/door/blast/regular{
id = "xenobiodiv2";
@@ -17822,12 +17189,29 @@
"kRq" = (
/turf/simulated/floor/wood,
/area/security/breakroom)
+"kRE" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "Research Staircase";
+ req_one_access = list(47,43,67)
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"kRF" = (
/obj/structure/cable/green{
icon_state = "2-4"
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
+"kRV" = (
+/turf/simulated/wall/prepainted,
+/area/triumph/surfacebase/sauna)
"kSb" = (
/obj/structure/railing{
dir = 8
@@ -17862,12 +17246,54 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/rnd/research)
+"kSM" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen3";
+ name = "Pen 3 Blast Doors";
+ opacity = 0
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"kTd" = (
/obj/structure/table/steel,
/obj/item/storage/firstaid/surgery,
/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
+"kTG" = (
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 1
+ },
+/obj/machinery/door/airlock/multi_tile/glass/medical{
+ dir = 1;
+ name = "Medbay Storage";
+ req_access = list(5);
+ req_one_access = list(5)
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay_primary_storage)
"kTY" = (
/obj/structure/catwalk,
/obj/effect/floor_decal/rust,
@@ -17926,14 +17352,6 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"kUS" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"kVi" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -18039,9 +17457,36 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
-"kXk" = (
-/turf/simulated/wall,
-/area/maintenance/substation/cafeteria_dock)
+"kWZ" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/door/blast/regular{
+ id = "armorylight";
+ name = "Light Armory Acccess"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/armory/blue)
+"kXg" = (
+/obj/machinery/atmospherics/pipe/zpipe/down/supply,
+/obj/structure/disposalpipe/up,
+/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
+/obj/structure/cable/green{
+ icon_state = "32-2"
+ },
+/obj/structure/lattice,
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/open,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"kXq" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -18055,9 +17500,25 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
-"kXA" = (
-/turf/simulated/wall/r_wall,
-/area/security/hammerhead_bay)
+"kXv" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"kXI" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -18100,6 +17561,28 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
+"kYf" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
+"kYo" = (
+/obj/structure/closet/secure_closet/security,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/holowarrant,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/security_lockerroom)
"kYq" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -18204,6 +17687,20 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/pool/changing_room)
+"kZE" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"kZL" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -18213,6 +17710,12 @@
},
/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)
"lac" = (
/obj/structure/grille,
/turf/simulated/floor/outdoors/snow/lythios43c,
@@ -18263,9 +17766,6 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/holofloor/tiled/dark,
/area/crew_quarters/pool/changing_room)
-"lbD" = (
-/turf/simulated/wall,
-/area/security/warden)
"lbN" = (
/obj/machinery/light,
/obj/structure/cable/green{
@@ -18282,21 +17782,20 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"lcv" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/obj/structure/sink/kitchen{
- dir = 8;
- pixel_x = 12
+"lcl" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen2";
+ name = "Pen 2 Blast Doors";
+ opacity = 0
},
-/obj/item/radio/intercom{
- dir = 4;
- name = "Station Intercom (General)";
- pixel_x = 24
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/lino,
-/area/crew_quarters/coffee_shop)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"lcJ" = (
/obj/structure/bed/chair/comfy/black{
dir = 8
@@ -18505,25 +18004,19 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
-"ljh" = (
-/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
+"lkF" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
},
-/obj/effect/floor_decal/steeldecal/steel_decals5{
+/obj/machinery/door/firedoor/glass{
dir = 4
},
+/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
+/area/holodeck_control)
"lkT" = (
/turf/simulated/open,
/area/crew_quarters/sleep)
@@ -18679,10 +18172,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
-"lsM" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/sleep)
"lti" = (
/obj/structure/table/standard,
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
@@ -18708,9 +18197,6 @@
/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
-"ltz" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/heads/hos)
"ltM" = (
/obj/effect/floor_decal/techfloor,
/obj/effect/floor_decal/techfloor/hole,
@@ -18743,6 +18229,15 @@
/obj/item/pen,
/turf/simulated/floor/tiled,
/area/security/briefing_room)
+"luL" = (
+/obj/item/radio/intercom{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/spline/plain,
+/obj/machinery/camera/network/security,
+/turf/simulated/floor/wood,
+/area/crew_quarters/heads/hos)
"luN" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central6,
/turf/simulated/floor/tiled/steel,
@@ -18817,38 +18312,9 @@
},
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"lwV" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/camera/network/security{
- dir = 10
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
-"lxd" = (
-/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/structure/cable/green{
- icon_state = "1-2"
- },
-/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)
+"lxh" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/security)
"lxr" = (
/obj/machinery/light/small{
dir = 4
@@ -18864,6 +18330,18 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
+"lxO" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen5";
+ name = "Pen 5 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"lxP" = (
/obj/machinery/light{
dir = 1
@@ -18888,6 +18366,17 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
+"lzb" = (
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "mech_bay_ext";
+ name = "Mech Bay Blast Door"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/assembly/chargebay)
"lzf" = (
/obj/structure/toilet{
pixel_y = 9
@@ -18946,9 +18435,17 @@
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
-"lBi" = (
-/turf/simulated/wall,
-/area/security/security_bathroom)
+"lAW" = (
+/obj/machinery/door/firedoor/glass,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/holodeck_control)
"lBx" = (
/obj/effect/floor_decal/borderfloorwhite/corner,
/obj/effect/floor_decal/corner/lightorange/bordercorner,
@@ -18962,6 +18459,23 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
+"lBB" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/door/airlock/multi_tile/glass{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"lBE" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -19094,17 +18608,11 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
-"lEf" = (
-/obj/item/radio/intercom{
- dir = 1;
- pixel_y = 24
- },
-/obj/effect/floor_decal/spline/plain,
-/obj/machinery/camera/network/security{
- dir = 6
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+"lDW" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"lEq" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -19138,9 +18646,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
-"lEX" = (
-/turf/simulated/wall,
-/area/security/hallway)
"lEZ" = (
/obj/structure/curtain/open/bed{
name = "brown curtain"
@@ -19193,32 +18698,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rnd/research/researchdivision)
-"lFY" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 1
- },
-/obj/structure/sign/directions/medical{
- dir = 8;
- pixel_y = 30
- },
-/obj/structure/sign/directions/science{
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
"lGh" = (
/obj/structure/catwalk,
/obj/machinery/light/small{
@@ -19257,6 +18736,29 @@
/obj/machinery/door/airlock/maintenance/common,
/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" = (
+/obj/structure/symbol/sa,
+/turf/simulated/wall/prepainted,
+/area/maintenance/medbay)
+"lKj" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/workshop)
"lKu" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -19392,6 +18894,26 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monowhite,
/area/medical/surgery_hallway)
+"lNS" = (
+/obj/structure/disposalpipe/segment{
+ 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
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/security{
+ name = "Firing Range";
+ req_one_access = list(1,2,4)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/range)
"lOg" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/target_stake,
@@ -19442,6 +18964,11 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
+"lPj" = (
+/obj/machinery/smartfridge/chemistry,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/wall/r_wall/prepainted,
+/area/medical/chemistry)
"lPt" = (
/obj/structure/cable/orange{
icon_state = "2-8"
@@ -19481,6 +19008,18 @@
/obj/item/gun/launcher/syringe,
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
+"lQo" = (
+/obj/effect/floor_decal/borderfloorwhite/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/paleblue/bordercorner{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery_hallway)
"lQr" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -19521,28 +19060,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
-"lRD" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/purple/border{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"lSc" = (
/obj/machinery/recharger/wallcharger{
pixel_x = -24;
@@ -19591,6 +19108,9 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
+"lTi" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/maintenance/lower/medsec_maintenance)
"lTI" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -19634,6 +19154,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"lUI" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/breakroom)
"lUK" = (
/obj/structure/closet/secure_closet/security,
/obj/structure/window/basic{
@@ -19734,6 +19259,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
+"lYG" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen7";
+ name = "Pen 7 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"lYJ" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -19798,20 +19335,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
-"maC" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen7";
- name = "Pen 7 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"maJ" = (
/obj/structure/bed/chair{
dir = 8
@@ -19923,6 +19446,28 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hammerhead_bay)
+"meI" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/purple/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/purple/bordercorner2{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rnd/lockers)
"meM" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -20033,9 +19578,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/locker)
-"mhX" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/telescience_lab/chamber)
"mib" = (
/obj/effect/floor_decal/borderfloorblack/corner{
dir = 4
@@ -20071,6 +19613,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"miH" = (
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/telescience_lab/foyer)
"mjr" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -20137,11 +19683,49 @@
/obj/machinery/power/apc/direction_bump/east,
/turf/simulated/floor,
/area/maintenance/substation/research)
+"mkp" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/purple/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"mks" = (
/obj/structure/table/steel,
/obj/item/clothing/suit/iasexy,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
+"mkt" = (
+/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 = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"mkA" = (
/obj/structure/table/wooden_reinforced,
/obj/item/reagent_containers/food/condiment/small/sugar,
@@ -20253,6 +19837,20 @@
/obj/structure/cable/green,
/turf/simulated/floor/tiled/dark,
/area/security/range)
+"mpl" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/morgue{
+ dir = 2
+ },
+/obj/machinery/camera/network/medbay,
+/turf/simulated/floor/tiled/techfloor,
+/area/medical/morgue)
"mpJ" = (
/obj/structure/closet/emcloset,
/obj/structure/railing,
@@ -20269,6 +19867,16 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"mqh" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/structure/disposalpipe/junction,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"mql" = (
/obj/structure/table/wooden_reinforced,
/obj/item/clothing/glasses/science,
@@ -20328,17 +19936,15 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"mqK" = (
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "mech_bay_ext";
- name = "Mech Bay Blast Door"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
+"mqC" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "0-2"
},
-/turf/simulated/floor/tiled/steel_grid,
-/area/assembly/chargebay)
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/interrogation)
"mrE" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -20364,6 +19970,32 @@
},
/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";
+ req_one_access = list(1,38)
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/evastorage)
+"msb" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/machinery/light,
+/obj/effect/floor_decal/corner/purple/border,
+/obj/effect/floor_decal/borderfloor/corner2,
+/obj/effect/floor_decal/corner/purple/bordercorner2,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"msf" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -20428,10 +20060,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/cockpit)
-"mvj" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/tiled,
-/area/rnd/telescience_lab/storage)
"mvo" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -20454,9 +20082,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
-"mvZ" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/lower/medsec_maintenance)
"mwd" = (
/obj/structure/table/woodentable,
/obj/machinery/microwave,
@@ -20483,12 +20108,14 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
-"mxG" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall/r_wall{
- can_open = 1
+"myF" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/security{
+ name = "Holding Cell";
+ req_one_access = list(1,2,4,38)
},
-/area/rift/trade_shop/loading)
+/turf/simulated/floor/tiled/dark,
+/area/security/hallway)
"myW" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -20524,6 +20151,27 @@
/obj/structure/curtain/open/shower/security,
/turf/simulated/floor/tiled/white,
/area/security/warden)
+"mzG" = (
+/obj/machinery/button/crematorium{
+ id = "medbay_crematorium";
+ pixel_x = 26;
+ pixel_y = 23;
+ req_access = list(5)
+ },
+/obj/structure/noticeboard{
+ pixel_y = 32
+ },
+/obj/structure/table/standard,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/item/paper{
+ info = "Please remember to write down the date, time, reason and name of the patient prior to cremation. A noticeboard has been provided to help keep track of cremated bodies.";
+ name = "note from CentCom";
+ pixel_x = -6;
+ pixel_y = -4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/medical/morgue)
"mzJ" = (
/obj/structure/table/reinforced,
/obj/item/folder/white{
@@ -20549,6 +20197,24 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"mAG" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/red/bordercorner{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"mAS" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -20811,6 +20477,27 @@
/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
+"mFI" = (
+/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/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"mFW" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -20828,21 +20515,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
-"mGb" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
"mGl" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -20859,6 +20531,19 @@
/obj/effect/floor_decal/steeldecal/steel_decals10,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"mGr" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"mGL" = (
/obj/machinery/alarm{
dir = 1;
@@ -20905,6 +20590,9 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
+"mHQ" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/turbolift/maint)
"mIa" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -20916,9 +20604,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"mIc" = (
-/turf/simulated/wall,
-/area/crew_quarters/sleep/Dorm_4)
"mIn" = (
/turf/simulated/floor/outdoors/gravsnow/lythios43c,
/area/rift/surfacebase/outside/outside2)
@@ -20948,6 +20633,29 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
+"mJx" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/hallway)
+"mKp" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/door/airlock/glass/research{
+ name = "Telescience Storage"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/rnd/telescience_lab/storage)
"mLK" = (
/obj/structure/cable/green{
icon_state = "1-4"
@@ -21167,6 +20875,18 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/workshop)
+"mRT" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"mRU" = (
/obj/structure/closet/l3closet/security,
/obj/effect/floor_decal/industrial/outline/blue,
@@ -21204,9 +20924,6 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/resleeving)
-"mUX" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/substation/research/telescience_lab)
"mVh" = (
/obj/structure/table/glass,
/obj/effect/floor_decal/borderfloor{
@@ -21224,6 +20941,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"mVC" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/research/testingrange)
"mVE" = (
/obj/structure/table/marble,
/obj/structure/window/reinforced{
@@ -21243,6 +20963,9 @@
/obj/item/gun/ballistic/deagle/taj,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
+"mWB" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/security_lockerroom)
"mWL" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 10
@@ -21287,6 +21010,26 @@
/obj/machinery/light_construct,
/turf/simulated/floor/plating,
/area/maintenance/medbay)
+"mXw" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"mYc" = (
/obj/structure/grille,
/obj/structure/foamedmetal,
@@ -21387,24 +21130,15 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
-"nbS" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass/hidden,
+"nbw" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
dir = 4
},
/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
+/area/hallway/primary/surfacetwo)
"ncb" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 4
@@ -21481,16 +21215,6 @@
/obj/structure/bookcase/manuals/research_and_development,
/turf/simulated/floor/wood,
/area/rnd/breakroom)
-"ncV" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized{
- dir = 10;
- icon_state = "fwindow";
- id = "sauna"
- },
-/turf/simulated/floor/plating,
-/area/triumph/surfacebase/sauna)
"ncZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -21516,6 +21240,19 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
+"ner" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "Research Staircase"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"neC" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -21542,9 +21279,9 @@
"neF" = (
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
-"neO" = (
-/turf/simulated/wall,
-/area/crew_quarters/pool/changing_room)
+"nfd" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/tactical)
"ngb" = (
/obj/machinery/holopad,
/turf/simulated/floor/tiled/monotile,
@@ -21554,6 +21291,12 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"ngn" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/turf/simulated/floor/lino,
+/area/crew_quarters/coffee_shop)
"ngr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -21580,22 +21323,6 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
-"ngX" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
"ngZ" = (
/obj/structure/table/reinforced,
/obj/machinery/photocopier,
@@ -21619,23 +21346,6 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hor)
-"niL" = (
-/obj/effect/floor_decal/borderfloorblack/cee{
- alpha = 255;
- dir = 8
- },
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/bordercee{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/armory/red)
"niV" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/computer/skills,
@@ -21643,23 +21353,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hos)
-"niY" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/purple/border,
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/purple/bordercorner2{
- dir = 9
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"njk" = (
/obj/machinery/atmospheric_field_generator/perma,
/obj/machinery/door/blast/regular{
@@ -21782,6 +21475,9 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
+"npm" = (
+/turf/simulated/wall/prepainted,
+/area/holodeck_control)
"npG" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
@@ -21791,6 +21487,20 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_6)
+"nqd" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/security{
+ layer = 2.8;
+ name = "Hammerhead Hangar";
+ req_one_access = list(1,38)
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/security/hammerhead_bay)
"nqz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -21816,6 +21526,22 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"nrE" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"nrF" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -21842,17 +21568,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
-"nsg" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen7";
- name = "Pen 7 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"nsn" = (
/turf/simulated/floor/tiled/monotile,
/area/rnd/research/testingrange)
@@ -22003,19 +21718,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
-"nvR" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/light,
-/obj/effect/floor_decal/corner/purple/border,
-/obj/machinery/computer/timeclock/premade/south,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"nwr" = (
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
@@ -22092,6 +21794,9 @@
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
+"nxY" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/crew_quarters/coffee_shop)
"nyq" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -22150,19 +21855,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/lockers)
-"nzk" = (
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+"nzd" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep/Dorm_1)
+"nzp" = (
+/turf/simulated/wall/prepainted/science,
+/area/rnd/breakroom)
"nzt" = (
/obj/machinery/keycard_auth{
pixel_x = -28;
@@ -22297,12 +21995,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
-"nCO" = (
-/obj/machinery/vending/coffee{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/security/breakroom)
"nDj" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -22398,17 +22090,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/recovery_room)
-"nEX" = (
-/obj/machinery/button/remote/blast_door{
- dir = 1;
- id = "mech_bay_ext";
- name = "Mech Bay Exterior blast door-control";
- pixel_x = 1;
- pixel_y = 6;
- req_one_access = list(29,47)
- },
-/turf/simulated/wall/r_wall,
-/area/assembly/chargebay)
"nFb" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 8
@@ -22438,37 +22119,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rnd/research/researchdivision)
-"nGM" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/holodeck_control)
-"nGZ" = (
-/obj/machinery/door/airlock/glass_security{
- name = "Break Room";
- req_one_access = list(1,38)
- },
-/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/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/wood,
-/area/security/breakroom)
"nHA" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
@@ -22517,6 +22167,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"nKk" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/security/evidence_storage)
"nKp" = (
/obj/machinery/power/terminal{
dir = 4
@@ -22536,6 +22189,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"nLl" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/crew_quarters/heads/hos)
"nLm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment{
@@ -22583,6 +22239,19 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/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)
+"nMq" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/security{
+ name = "Firing Range";
+ req_one_access = list(1,2,4)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/range)
"nNb" = (
/obj/effect/floor_decal/borderfloor{
dir = 5
@@ -22674,14 +22343,6 @@
/obj/structure/cable/green,
/turf/simulated/floor/plating,
/area/rift/trade_shop/loading)
-"nPe" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "seclocker"
- },
-/turf/simulated/floor/plating,
-/area/security/security_lockerroom)
"nQd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -22700,6 +22361,23 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/security/brig)
+"nRi" = (
+/obj/effect/floor_decal/borderfloorblack/cee{
+ alpha = 255;
+ dir = 8
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/bordercee{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/armory/red)
"nRA" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
@@ -22742,6 +22420,10 @@
"nSr" = (
/turf/simulated/floor/tiled/steel_grid/lythios43c,
/area/rift/surfacebase/outside/outside2)
+"nSt" = (
+/obj/machinery/status_display,
+/turf/simulated/wall/prepainted/medical,
+/area/medical/surgery)
"nSS" = (
/obj/structure/railing{
dir = 8
@@ -22766,22 +22448,6 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"nTp" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
"nTT" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -22853,11 +22519,6 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"nVQ" = (
-/obj/machinery/smartfridge/chemistry,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/wall/r_wall,
-/area/medical/chemistry)
"nVS" = (
/obj/effect/floor_decal/corner_techfloor_grid/diagonal{
dir = 4
@@ -22885,6 +22546,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
+"nXi" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/asmaint2)
"nXl" = (
/obj/effect/overlay/snow/floor,
/obj/structure/cable/green{
@@ -22895,27 +22559,12 @@
"nXs" = (
/turf/simulated/floor/tiled/red,
/area/security/evidence_storage)
-"nXX" = (
-/turf/simulated/wall,
-/area/medical/morgue)
"nYq" = (
/obj/structure/cable{
icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/locker)
-"nYw" = (
-/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{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"nYB" = (
/obj/structure/table/rack/shelf/steel,
/obj/structure/window/reinforced{
@@ -23000,25 +22649,38 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"nZS" = (
-/turf/simulated/floor/plating,
-/area/maintenance/substation/surface_two)
-"oan" = (
+"nZB" = (
+/obj/structure/sign/warning/falling,
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfacebase/outside/outside2)
+"nZR" = (
/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/purple/border{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
+/obj/structure/cable/green{
+ icon_state = "4-8"
},
-/obj/effect/floor_decal/corner/lightgrey/border{
+/obj/machinery/door/firedoor/glass{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/steeldecal/steel_decals5,
/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
+/area/rnd/research/researchdivision)
+"nZS" = (
+/turf/simulated/floor/plating,
+/area/maintenance/substation/surface_two)
"oau" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -23046,6 +22708,18 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
+"obw" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen3";
+ name = "Pen 3 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"obA" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -23071,6 +22745,20 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
+"obO" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/structure/curtain/open/bed{
+ name = "brown curtain"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"obW" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
@@ -23088,10 +22776,6 @@
"ocv" = (
/turf/simulated/floor/tiled/monotile,
/area/assembly/robotics)
-"odk" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/hallway)
"odu" = (
/obj/structure/bed/chair{
dir = 1
@@ -23158,14 +22842,20 @@
},
/turf/simulated/floor/carpet,
/area/security/warden)
-"oeU" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
+"ofr" = (
+/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 = "rd_shutter";
+ name = "Research Director Office shutter";
+ opacity = 0
},
-/obj/structure/disposalpipe/junction,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/hor)
"ofP" = (
/obj/effect/floor_decal/spline/plain{
dir = 9
@@ -23211,10 +22901,10 @@
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
-"ogT" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
+"ohi" = (
+/obj/structure/symbol/sa,
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/trade_shop/loading)
"ohv" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -23227,18 +22917,14 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/security/hallway)
-"ohC" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable{
- icon_state = "1-2"
+"ohN" = (
+/obj/effect/floor_decal/borderfloorwhite/corner,
+/obj/effect/floor_decal/corner/paleblue/bordercorner,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
},
-/turf/simulated/floor/tiled/steel,
-/area/medical/reception)
+/turf/simulated/floor/tiled/white,
+/area/medical/surgery_hallway)
"ohT" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
@@ -23283,6 +22969,23 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
+"oiL" = (
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 8
+ },
+/obj/structure/curtain/open/privacy,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/surgeryprep)
"oji" = (
/obj/structure/table/steel,
/obj/machinery/light/small{
@@ -23463,9 +23166,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"osz" = (
-/turf/simulated/wall,
-/area/medical/reception)
"osF" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
@@ -23510,6 +23210,9 @@
"oul" = (
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
+"ouI" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/substation/research/telescience_lab)
"ouY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -23521,6 +23224,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/maintenance/medbay)
+"ovr" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/security/tactical)
"ovs" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -23536,22 +23242,6 @@
},
/turf/simulated/floor/lino,
/area/crew_quarters/coffee_shop)
-"ovT" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "research_outer"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "research_shutter_ext";
- name = "Research shutter";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/rnd/research)
"owO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
@@ -23752,6 +23442,37 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/security_lockerroom)
+"oDx" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "warden";
+ layer = 3.1;
+ name = "Warden's Office Shutters";
+ opacity = 0
+ },
+/obj/machinery/door/airlock/glass/security/polarized{
+ id_tag = "warden_office";
+ id_tint = "warden_office";
+ name = "Warden";
+ req_one_access = list(3)
+ },
+/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
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/warden)
"oDC" = (
/obj/structure/railing{
dir = 8
@@ -23798,36 +23519,20 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_4)
+"oFb" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/resleeving)
"oFi" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/catwalk,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/crew_quarters/coffee_shop)
-"oFY" = (
-/obj/machinery/door/airlock/glass_security{
- name = "Briefing Room";
- req_access = list();
- req_one_access = list(1,38)
- },
-/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 = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/security/briefing_room)
-"oGg" = (
-/turf/simulated/wall,
-/area/crew_quarters/showers)
+"oFt" = (
+/turf/simulated/wall/prepainted/science,
+/area/rnd/lockers)
"oGZ" = (
/obj/machinery/door/blast/regular{
id = "xenobiodiv4";
@@ -23880,25 +23585,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"oJK" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized{
- dir = 10;
- icon_state = "fwindow";
- id = "Interr"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/obj/structure/cable/green{
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating,
-/area/security/interrogation)
+"oJG" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep/Dorm_2)
"oJU" = (
/obj/machinery/status_display{
pixel_x = -32
@@ -23998,9 +23687,6 @@
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
-"oNa" = (
-/turf/simulated/wall/r_wall,
-/area/assembly/chargebay)
"oNk" = (
/obj/structure/railing{
dir = 4
@@ -24186,6 +23872,27 @@
},
/turf/simulated/floor/carpet/purcarpet,
/area/rnd/breakroom)
+"oRV" = (
+/turf/simulated/wall/r_wall/prepainted/medical,
+/area/medical/morgue)
+"oRZ" = (
+/obj/machinery/door/airlock/multi_tile/glass/medical{
+ dir = 1;
+ name = "Medbay Storage";
+ req_access = list(5);
+ req_one_access = list(5)
+ },
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay_primary_storage)
"oSh" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -24217,10 +23924,6 @@
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/tiled/steel,
/area/rnd/research/testingrange)
-"oSw" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/breakroom)
"oSM" = (
/obj/machinery/button/remote/airlock{
id = "maint_cell_1";
@@ -24241,20 +23944,6 @@
},
/turf/simulated/floor/tiled/steel_dirty,
/area/maintenance/asmaint2)
-"oTf" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/status_display{
- pixel_y = -32
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
"oTn" = (
/obj/structure/table/bench/steel,
/obj/landmark/spawnpoint/job/security_officer,
@@ -24272,19 +23961,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/security_lockerroom)
-"oTA" = (
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 9
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 9
- },
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/medbay_primary_storage)
"oUb" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -24341,6 +24017,22 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
+"oUG" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"oUW" = (
/obj/structure/bed/chair/bay/shuttle{
dir = 8
@@ -24364,6 +24056,9 @@
"oVk" = (
/turf/simulated/floor/plating,
/area/maintenance/medbay)
+"oVl" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/sleep)
"oVH" = (
/obj/machinery/door/airlock/command{
name = "Research Director's Quarters";
@@ -24403,9 +24098,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
-"oWB" = (
-/turf/simulated/wall,
-/area/maintenance/engineering/pumpstation)
"oWC" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central1{
dir = 8
@@ -24525,10 +24217,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"oZr" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/surgeryprep)
"oZw" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -24562,6 +24250,9 @@
},
/turf/simulated/floor/plating,
/area/rift/trade_shop/loading)
+"pbn" = (
+/turf/simulated/wall/prepainted,
+/area/rift/station/public_garden/gantry)
"pbs" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -24805,11 +24496,6 @@
},
/turf/simulated/floor/tiled,
/area/security/briefing_room)
-"phT" = (
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/substation/surface_two)
"pic" = (
/obj/effect/floor_decal/rust,
/obj/structure/catwalk,
@@ -24826,6 +24512,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
+"piR" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/coffee_shop)
"pjd" = (
/obj/item/radio/intercom/department/security{
dir = 8;
@@ -24922,10 +24612,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
-"plg" = (
-/obj/machinery/status_display,
-/turf/simulated/wall,
-/area/medical/surgery)
"plx" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 5
@@ -24982,21 +24668,6 @@
/obj/random/trash,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
-"pnh" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
"pnl" = (
/obj/structure/table/steel,
/obj/item/storage/box/evidence,
@@ -25045,23 +24716,15 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_5)
-"poW" = (
-/obj/effect/floor_decal/borderfloor{
+"poN" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/effect/floor_decal/corner/lightgrey/border{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
"ppg" = (
@@ -25209,10 +24872,45 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
+"ptH" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/structure/curtain/open/bed{
+ name = "brown curtain"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"puy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/monotile,
/area/rnd/research)
+"puA" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/structure/curtain/open/bed{
+ name = "brown curtain"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"pvo" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -25338,20 +25036,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
-"pyR" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
- layer = 2.8;
- name = "Hammerhead Hangar";
- req_one_access = list(1,38)
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hammerhead_bay)
"pzq" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
@@ -25434,6 +25118,9 @@
/obj/item/radio/beacon/anchored,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/cockpit)
+"pBA" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/research/rnd)
"pBD" = (
/obj/machinery/door/window/brigdoor/eastleft{
name = "Slime Pen 7";
@@ -25468,9 +25155,10 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
-"pDo" = (
-/turf/simulated/wall,
-/area/security/breakroom)
+"pEN" = (
+/obj/structure/symbol/sa,
+/turf/simulated/wall/prepainted,
+/area/maintenance/asmaint2)
"pFg" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -25510,6 +25198,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"pFC" = (
+/turf/simulated/wall/prepainted,
+/area/rift/stairwell/primary/surfacetwo)
"pFY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -25627,6 +25318,18 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_3)
+"pLA" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen4";
+ name = "Pen 4 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"pMR" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -25643,22 +25346,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/medical/reception)
-"pNY" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"pNZ" = (
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_3)
@@ -25720,12 +25407,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/lockers)
-"pPm" = (
-/turf/simulated/wall/r_wall,
-/area/rift/trade_shop/loading)
-"pPq" = (
-/turf/simulated/wall,
-/area/maintenance/substation/research/xenobiology_lab)
+"pPD" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/security/upper)
"pPM" = (
/turf/simulated/floor/tiled,
/area/security/briefing_room)
@@ -25768,16 +25455,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/hammerhead/general)
-"pQT" = (
-/obj/machinery/door/blast/shutters{
- dir = 4;
- id = "chemistry";
- layer = 3.1;
- name = "Chemistry Shutters"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/chemistry)
"pRg" = (
/obj/machinery/power/breakerbox/activated{
RCon_tag = "Research Telescience Substation Bypass"
@@ -25799,22 +25476,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"pRn" = (
-/obj/structure/bed/chair/office/dark{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/corner/red{
- dir = 5
- },
-/obj/machinery/camera/network/security{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/interrogation)
"pRt" = (
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor/glass,
@@ -25966,9 +25627,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
-"pVv" = (
-/turf/simulated/wall,
-/area/crew_quarters/pool)
"pVW" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -26033,22 +25691,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"pZa" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/purple/border,
-/obj/machinery/computer/timeclock/premade/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"pZG" = (
/obj/structure/table/steel,
/obj/item/electronic_assembly/large/default,
@@ -26151,9 +25793,20 @@
"qcG" = (
/turf/simulated/floor/tiled/monotile,
/area/rnd/research)
-"qcK" = (
-/turf/simulated/wall,
-/area/crew_quarters/locker)
+"qcI" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"qcZ" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -26305,10 +25958,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/medbay)
-"qic" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/recreation_area)
"qiJ" = (
/obj/structure/grille,
/obj/structure/foamedmetal,
@@ -26383,18 +26032,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/breakroom)
-"qjD" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "rd_shutter";
- name = "Research Director Office shutter";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/lockers)
+"qjY" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/lower/medsec_maintenance)
"qkd" = (
/obj/structure/table/steel,
/obj/item/storage/box/flashbangs{
@@ -26423,6 +26063,104 @@
},
/turf/simulated/floor/tiled/monotile,
/area/crew_quarters/heads/hor)
+"qmn" = (
+/obj/effect/floor_decal/borderfloorblack{
+ alpha = 255
+ },
+/obj/structure/table/rack/shelf/steel,
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = 5;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate/stab{
+ pixel_x = -4;
+ pixel_y = -3
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = -4;
+ pixel_y = 8
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = 5;
+ pixel_y = 8
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = 5;
+ pixel_y = 8
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = 5;
+ pixel_y = 8
+ },
+/obj/item/clothing/accessory/armor/armorplate{
+ pixel_x = 5;
+ pixel_y = 8
+ },
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/security_equiptment_storage)
+"qmO" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/bordercorner2{
+ dir = 5
+ },
+/obj/machinery/camera/network/civilian{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"qnm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -26501,14 +26239,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/interrogation)
-"qpO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/dark,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"qpY" = (
/obj/structure/table/rack/shelf/steel,
/obj/effect/floor_decal/industrial/outline/blue,
@@ -26621,9 +26351,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/hos)
-"quB" = (
-/turf/simulated/wall/r_wall,
-/area/security/tactical)
"quS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -26681,10 +26408,31 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/brig)
+"qvx" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/machinery/camera/network/civilian{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/medical/reception)
"qvW" = (
/obj/structure/girder/displaced,
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"qwz" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/recreation_area)
"qwA" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -26693,16 +26441,6 @@
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/crew_quarters/sleep)
-"qwE" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_medical/polarized{
- id_tint = "medbay_outer";
- name = "Medbay Lobby"
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/reception)
"qwS" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 9
@@ -26717,6 +26455,12 @@
/obj/structure/bed/chair/wheelchair,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"qxd" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/wall/prepainted,
+/area/maintenance/security/upper)
"qxp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -26747,6 +26491,23 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rnd/lockers)
+"qza" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/trade_shop/loading)
+"qze" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/machinery/light,
+/obj/effect/floor_decal/corner/purple/border,
+/obj/machinery/computer/timeclock/premade/south,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"qzf" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -26775,17 +26536,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_6)
-"qzW" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/sleep)
"qzY" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -26859,6 +26609,12 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
+"qBn" = (
+/obj/structure/closet/wardrobe/red,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/monotile,
+/area/space)
"qBo" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -26873,6 +26629,22 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
+"qBI" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/research)
+"qCH" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"qCM" = (
/obj/machinery/power/apc{
cell_type = /obj/item/cell/super;
@@ -26948,9 +26720,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
-"qGO" = (
-/turf/simulated/wall,
-/area/crew_quarters/coffee_shop)
"qGR" = (
/obj/structure/railing,
/obj/random/trash_pile,
@@ -26995,10 +26764,26 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/evastorage)
-"qIa" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/telescience_lab/foyer)
+"qIh" = (
+/obj/effect/floor_decal/borderfloorblack{
+ alpha = 255;
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 1
+ },
+/obj/machinery/door/blast/regular{
+ id = "armorylight";
+ name = "Light Armory Acccess"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/armory/blue)
"qIm" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -27031,6 +26816,11 @@
/obj/structure/lattice,
/turf/simulated/open,
/area/maintenance/lower/medsec_maintenance)
+"qJa" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"qJl" = (
/obj/structure/cable/orange{
icon_state = "1-8"
@@ -27123,6 +26913,19 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/heads/hor)
+"qLf" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "rd_shutter";
+ name = "Research Director Office shutter";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/lockers)
"qMG" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 1
@@ -27132,9 +26935,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
-"qMP" = (
-/turf/simulated/wall/r_wall,
-/area/security/evastorage)
"qNg" = (
/obj/structure/window/reinforced{
dir = 8;
@@ -27147,6 +26947,9 @@
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
+"qNu" = (
+/turf/simulated/wall/wood/hardwood,
+/area/rift/surfacebase/outside/outside2)
"qNx" = (
/obj/machinery/light{
dir = 8
@@ -27161,6 +26964,13 @@
/obj/structure/stairs/spawner/east,
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
+"qNS" = (
+/obj/structure/closet/secure_closet/security,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/item/holowarrant,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/monotile,
+/area/security/security_lockerroom)
"qNU" = (
/obj/structure/bed/chair{
dir = 1
@@ -27235,6 +27045,26 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/evidence_storage)
+"qQk" = (
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/machinery/alarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/bed/chair/wood,
+/obj/structure/curtain/open/bed{
+ name = "brown curtain";
+ pixel_x = -32
+ },
+/turf/simulated/floor/wood,
+/area/crew_quarters/coffee_shop)
"qRv" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/flasher/portable,
@@ -27353,6 +27183,33 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/heads/hor)
+"qUk" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "security_lockdown";
+ name = "Security Blast Doors";
+ opacity = 0
+ },
+/obj/machinery/door/airlock/glass/security{
+ id_tag = "BrigFoyer";
+ layer = 2.8;
+ name = "Security";
+ req_one_access = list(38,63)
+ },
+/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,
+/turf/simulated/floor/tiled/steel,
+/area/security/brig)
"qUt" = (
/obj/structure/closet/crate/freezer,
/obj/item/nif/bad,
@@ -27432,6 +27289,25 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_5)
+"qWt" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/warden)
+"qWE" = (
+/obj/machinery/light,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/purple/border,
+/obj/machinery/computer/timeclock/premade/south,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"qWP" = (
/obj/machinery/light/small{
dir = 8
@@ -27446,19 +27322,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
-"qXA" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/holodeck_control)
"qXG" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
@@ -27503,9 +27366,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
-"rab" = (
-/turf/simulated/wall/r_wall,
-/area/rift/stairwell/primary/surfacetwo)
+"qYi" = (
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"raA" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -27522,9 +27386,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"raC" = (
-/turf/simulated/wall/hardwood,
-/area/rift/surfacebase/outside/outside2)
"raF" = (
/obj/structure/table/woodentable,
/obj/item/clothing/under/shorts/red,
@@ -27536,17 +27397,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/pool)
-"raH" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen1";
- name = "Pen 1 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"rba" = (
/obj/structure/railing{
dir = 4
@@ -27625,9 +27475,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/security/brig)
-"rcZ" = (
+"rcQ" = (
/obj/machinery/smartfridge/chemistry,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/r_wall/prepainted,
/area/medical/chemistry)
"rda" = (
/obj/machinery/button/remote/blast_door{
@@ -27692,6 +27542,21 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/red)
+"rej" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"req" = (
/turf/simulated/floor/reinforced{
name = "Holodeck Projector Floor"
@@ -27747,6 +27612,18 @@
/obj/structure/disposalpipe/junction/flipped,
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"rhH" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen1";
+ name = "Pen 1 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"rhI" = (
/obj/structure/undies_wardrobe,
/obj/structure/window/reinforced/tinted/frosted{
@@ -27891,6 +27768,110 @@
/obj/structure/bed/chair/bay/comfy/red,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hos)
+"rkB" = (
+/obj/structure/table/rack/shelf/steel,
+/obj/effect/floor_decal/borderfloorblack{
+ alpha = 255
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = 6;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/item/clothing/accessory/storage/pouches{
+ pixel_x = -5;
+ pixel_y = 10
+ },
+/obj/effect/floor_decal/corner/red/border,
+/obj/item/clothing/accessory/holster/leg{
+ pixel_x = -3;
+ pixel_y = -5
+ },
+/obj/item/clothing/accessory/holster/leg{
+ pixel_x = -3;
+ pixel_y = -5
+ },
+/obj/item/clothing/accessory/holster/leg{
+ pixel_x = -3;
+ pixel_y = -5
+ },
+/obj/item/clothing/accessory/holster/leg{
+ pixel_x = -3;
+ pixel_y = -5
+ },
+/obj/item/clothing/accessory/holster/leg{
+ pixel_x = -3;
+ pixel_y = -5
+ },
+/obj/item/clothing/accessory/holster/leg{
+ pixel_x = -3;
+ pixel_y = -5
+ },
+/obj/item/clothing/accessory/storage/pouches/navy{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/item/clothing/accessory/storage/pouches/navy{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/item/clothing/accessory/storage/pouches/navy{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/item/clothing/accessory/storage/pouches/navy{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/item/clothing/accessory/storage/pouches/navy{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/item/clothing/accessory/storage/pouches/navy{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/security_equiptment_storage)
"rlg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -27899,6 +27880,22 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/pool/changing_room)
+"rlk" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"rls" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -27909,17 +27906,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
/area/maintenance/medbay)
-"rlw" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"rlG" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -28091,24 +28077,6 @@
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
-"rsB" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"rtk" = (
/obj/machinery/power/apc{
name = "south bump";
@@ -28122,24 +28090,6 @@
/obj/item/bedsheet/bluedouble,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_2)
-"rtz" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/door/blast/regular{
- id = "armorylight";
- name = "Light Armory Acccess"
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/armory/blue)
"rtU" = (
/obj/structure/table/steel,
/obj/item/gps/security,
@@ -28246,6 +28196,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
+"ryQ" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/security_equiptment_storage)
"rza" = (
/obj/effect/floor_decal/techfloor{
dir = 5
@@ -28376,25 +28329,14 @@
/obj/effect/floor_decal/rust,
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
-"rBT" = (
-/turf/simulated/wall,
-/area/medical/recovery_room)
"rCo" = (
/turf/simulated/open,
/area/turbolift/rsurface/level2)
-"rDQ" = (
-/obj/structure/table/steel,
-/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 = 10
- },
+"rCu" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
/turf/simulated/floor/tiled/dark,
-/area/security/security_processing)
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"rEg" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/engi{
@@ -28504,9 +28446,6 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/pool)
-"rHQ" = (
-/turf/simulated/wall/r_wall,
-/area/rift/turbolift/maint)
"rIc" = (
/obj/effect/floor_decal/steeldecal/steel_decals10,
/obj/effect/floor_decal/steeldecal/steel_decals10{
@@ -28694,6 +28633,30 @@
},
/turf/simulated/floor/reinforced,
/area/security/hammerhead_bay)
+"rMY" = (
+/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/structure/cable/green{
+ icon_state = "1-2"
+ },
+/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)
+"rNb" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/security_lockerroom)
"rNr" = (
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
@@ -28766,6 +28729,16 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/research/telescience_lab)
+"rOE" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/obj/structure/sink/kitchen{
+ dir = 4;
+ pixel_x = -14
+ },
+/turf/simulated/floor/lino,
+/area/crew_quarters/coffee_shop)
"rOF" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 10
@@ -28786,10 +28759,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
-"rOZ" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/workshop)
"rPk" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
@@ -28841,6 +28810,19 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/reception)
+"rRJ" = (
+/obj/machinery/door/airlock/glass/medical{
+ name = "Chemistry";
+ req_one_access = list(33)
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/white,
+/area/medical/chemistry)
"rRQ" = (
/obj/structure/cable/green{
icon_state = "1-4"
@@ -28887,24 +28869,25 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"rSk" = (
-/obj/effect/floor_decal/borderfloorwhite/corner{
- dir = 4
- },
-/obj/effect/floor_decal/corner/paleblue/bordercorner{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery_hallway)
"rSm" = (
/obj/structure/closet/emcloset,
/obj/item/clothing/glasses/sunglasses/medhud,
/obj/random/maintenance/medical,
/turf/simulated/floor/plating,
/area/maintenance/medbay)
+"rSM" = (
+/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/brig)
"rTn" = (
/turf/simulated/floor/carpet/blue,
/area/security/breakroom)
@@ -28913,6 +28896,24 @@
/obj/structure/disposalpipe/segment,
/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/door/firedoor/glass,
+/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/lobby)
"rUn" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
@@ -28923,9 +28924,42 @@
/obj/structure/closet/secure_closet/personal/patient,
/turf/simulated/floor/tiled/white,
/area/medical/surgeryprep)
-"rVe" = (
-/turf/simulated/wall,
-/area/security/briefing_room)
+"rUw" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 6
+ },
+/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/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/machinery/door/airlock/glass/security/polarized{
+ id_tint = "seclocker";
+ name = "Locker Room";
+ req_one_access = list(2)
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/security_lockerroom)
"rVf" = (
/obj/structure/table/standard,
/obj/item/storage/firstaid/adv{
@@ -28941,9 +28975,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
-"rVp" = (
-/turf/simulated/wall/r_wall,
-/area/security/armory/blue)
"rVC" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -28988,9 +29019,16 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
-"rYl" = (
-/turf/simulated/wall/r_wall,
-/area/security/armory/red)
+"rYN" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "mech_bay_int";
+ name = "Mech Bay Blast Door"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/turf/simulated/floor/tiled/steel_grid,
+/area/assembly/chargebay)
"rYY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -29008,34 +29046,6 @@
/obj/effect/blocker,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"rZr" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/lobby)
-"rZC" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "mech_bay_int";
- name = "Mech Bay Blast Door"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/steel_grid,
-/area/assembly/chargebay)
"saj" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/paleblue/bordercorner,
@@ -29045,22 +29055,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/medical/reception)
-"say" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "robotics_inner"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "robotics_shutter_int";
- name = "Robotics shutter";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/assembly/robotics)
"saL" = (
/obj/structure/railing{
dir = 8
@@ -29107,6 +29101,17 @@
"scS" = (
/turf/simulated/floor/plating,
/area/rnd/telescience_lab/chamber)
+"sdd" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"sdn" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 10
@@ -29134,6 +29139,11 @@
/obj/effect/mist,
/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)
"sen" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -29209,6 +29219,12 @@
},
/turf/simulated/floor,
/area/maintenance/substation/security)
+"sfB" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"sfC" = (
/obj/structure/toilet{
pixel_y = 9
@@ -29262,9 +29278,9 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/dark,
/area/security/lobby)
-"siD" = (
-/turf/simulated/wall,
-/area/rnd/workshop)
+"siA" = (
+/turf/simulated/wall/prepainted/science,
+/area/rnd/research/researchdivision)
"sjx" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -29311,29 +29327,26 @@
},
/turf/simulated/floor/plating,
/area/rift/station/fighter_bay/transport_tunnel_garage_maint)
+"slq" = (
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"sly" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"slB" = (
/obj/machinery/atmospherics/pipe/simple/visible/fuel{
dir = 4
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
-"slH" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Research Lounge";
- req_access = list(47)
- },
-/obj/machinery/door/firedoor/glass,
-/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
- },
-/turf/simulated/floor/tiled/steel,
-/area/rnd/breakroom)
"slO" = (
/obj/machinery/light{
dir = 8
@@ -29376,6 +29389,22 @@
},
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
+"snD" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"snQ" = (
/obj/structure/window/basic{
dir = 4
@@ -29458,6 +29487,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monowhite,
/area/medical/surgery_hallway)
+"sqF" = (
+/turf/simulated/wall/prepainted/security,
+/area/crew_quarters/heads/hos)
"srb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -29466,37 +29498,13 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
-"srt" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "cmo_office"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/hammerhead/cockpit)
"srw" = (
/obj/structure/railing,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"srF" = (
-/obj/effect/floor_decal/corner/green/diagonal,
-/obj/effect/floor_decal/corner/green/diagonal{
- dir = 4
- },
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/firealarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/station/public_garden/stairwell)
+"sse" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/security_processing)
"sss" = (
/obj/structure/handrail,
/obj/structure/lattice,
@@ -29592,24 +29600,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"svF" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 8
- },
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/bordercorner{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"swv" = (
/obj/machinery/camera/network/security{
dir = 6
@@ -29781,6 +29771,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"szC" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/research/telescience_lab)
"szQ" = (
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
@@ -29797,6 +29790,17 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/chemistry)
+"sAX" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/trade_shop/loading)
+"sBe" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"sBu" = (
/obj/structure/bed/double/padded,
/obj/item/bedsheet/browndouble,
@@ -29825,10 +29829,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/crew_quarters/heads/hor)
-"sCL" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/tether/surfacebase/reading_room)
"sCV" = (
/obj/machinery/power/smes/buildable{
charge = 1.5e+007;
@@ -29839,29 +29839,38 @@
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
-"sDx" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
+"sDd" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/structure/bed/chair{
+ dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/machinery/camera/network/security{
+ dir = 1
},
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/computer/timeclock/premade/south,
/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
+/area/hallway/primary/surfacetwo)
"sDK" = (
/obj/item/bedsheet/purpledouble,
/obj/structure/bed/double/padded,
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
-"sDO" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
+"sDP" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen5";
+ name = "Pen 5 Blast Doors";
+ opacity = 0
},
-/turf/simulated/wall{
- can_open = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/area/maintenance/security/upper)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"sEs" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -29876,6 +29885,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"sEw" = (
+/turf/simulated/wall/prepainted/medical,
+/area/crew_quarters/medbreak/surgery)
"sEB" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
@@ -29917,6 +29929,27 @@
},
/turf/simulated/floor/tiled/monotile,
/area/assembly/robotics)
+"sGw" = (
+/obj/machinery/status_display,
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/stairwell/primary/surfacetwo)
+"sGX" = (
+/obj/machinery/button/remote/blast_door{
+ id = "mech_bay_int";
+ name = "Mech Bay Interior blast door-control";
+ pixel_y = -6;
+ req_one_access = list(29,47)
+ },
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "mech_bay_ext";
+ name = "Mech Bay Exterior blast door-control";
+ pixel_x = 1;
+ pixel_y = 6;
+ req_one_access = list(29,47)
+ },
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/assembly/chargebay)
"sHl" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -30057,12 +30090,6 @@
},
/turf/simulated/floor/wood,
/area/security/breakroom)
-"sLu" = (
-/turf/simulated/wall,
-/area/maintenance/lower/medsec_maintenance)
-"sLx" = (
-/turf/simulated/wall,
-/area/medical/surgery2)
"sLC" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -30122,9 +30149,6 @@
/obj/structure/disposalpipe/junction,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"sMA" = (
-/turf/simulated/wall,
-/area/medical/surgery_hallway)
"sNa" = (
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
@@ -30229,6 +30253,10 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
+"sQW" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/asmaint2)
"sRF" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -30388,10 +30416,10 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"sZj" = (
-/obj/spawner/window/reinforced/full/firelocks,
+"sZs" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
-/area/medical/surgery)
+/area/tether/surfacebase/reading_room)
"taa" = (
/obj/effect/overlay/snow/floor,
/obj/structure/railing{
@@ -30512,17 +30540,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/pool)
-"tcQ" = (
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 8
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 8
- },
-/obj/structure/curtain/open/privacy,
-/obj/machinery/door/firedoor/glass/hidden,
-/turf/simulated/floor/tiled/white,
-/area/medical/surgeryprep)
"tcX" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 10
@@ -30545,6 +30562,13 @@
},
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
+"tdg" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/rift/trade_shop/loading)
"tdp" = (
/obj/structure/railing{
dir = 8
@@ -30575,18 +30599,6 @@
"tdD" = (
/turf/simulated/floor/outdoors/safeice/indoors,
/area/maintenance/asmaint2)
-"tdO" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
- layer = 2.8;
- name = "EVA Operations";
- req_one_access = list(1,38)
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/evastorage)
"teb" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/machinery/atmospherics/pipe/simple/visible/supply,
@@ -30609,6 +30621,13 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
+"tfk" = (
+/obj/structure/curtain/open/bed{
+ name = "brown curtain"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/hallway/primary/surfacetwo)
"tfp" = (
/obj/effect/floor_decal/spline/plain,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -30634,10 +30653,6 @@
/obj/structure/metal_edge,
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/outside/outside2)
-"tfF" = (
-/obj/structure/sign/poster,
-/turf/simulated/wall,
-/area/security/briefing_room)
"tfN" = (
/obj/structure/bed/chair/office/light,
/obj/landmark/spawnpoint/job/chemist,
@@ -30671,15 +30686,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/recovery_room)
-"tgY" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/medbay)
-"thy" = (
-/turf/simulated/wall,
-/area/security/interrogation)
"thO" = (
/obj/structure/inflatable,
/turf/simulated/floor/plating,
@@ -30693,6 +30699,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"tjD" = (
+/turf/simulated/wall/prepainted,
+/area/hallway/primary/surfacetwo)
"tjO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -30724,20 +30733,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
-"tlj" = (
-/obj/structure/bed/chair/wood,
-/obj/effect/floor_decal/steeldecal/steel_decals6{
- dir = 1
- },
-/obj/structure/curtain/open/bed{
- name = "brown curtain";
- pixel_x = -32
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/coffee_shop)
"tll" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
@@ -30775,6 +30770,19 @@
/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,
@@ -30804,14 +30812,14 @@
},
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/showers)
-"tmJ" = (
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside2)
"tnc" = (
/obj/structure/table/glass,
/obj/item/flashlight/lamp/green,
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
+"tnj" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/coffee_shop)
"tnu" = (
/obj/effect/floor_decal/corner_techfloor_grid/full{
dir = 8
@@ -30994,6 +31002,18 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"tsj" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen9";
+ name = "Pen 9 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"tsk" = (
/obj/structure/table/standard,
/obj/machinery/computer/med_data/laptop,
@@ -31065,6 +31085,10 @@
},
/turf/simulated/floor/wood,
/area/rift/station/public_garden/gantry)
+"tvK" = (
+/obj/machinery/status_display,
+/turf/simulated/wall/prepainted,
+/area/rift/stairwell/primary/surfacetwo)
"tvM" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -31099,6 +31123,24 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
+"txE" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"txZ" = (
/obj/machinery/vending/medical,
/obj/effect/floor_decal/corner/paleblue{
@@ -31112,23 +31154,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/medbay_primary_storage)
-"tyb" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "warden";
- layer = 3.1;
- name = "Warden's Office Shutters";
- opacity = 0
- },
-/obj/structure/window/reinforced/polarized/full{
- id = "warden_office"
- },
-/turf/simulated/floor/plating,
-/area/security/warden)
"tyg" = (
/obj/structure/bed/chair{
dir = 4
@@ -31152,20 +31177,14 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
-"tzd" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/structure/curtain/open/bed{
- name = "brown curtain"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
+"tzc" = (
+/obj/machinery/door/airlock/glass/security{
+ name = "Light Armory";
+ req_access = list(3)
},
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/dark,
+/area/security/warden)
"tAd" = (
/obj/machinery/light{
dir = 4
@@ -31173,6 +31192,35 @@
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/steel_ridged,
/area/assembly/chargebay)
+"tAh" = (
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 9
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/medbay_primary_storage)
+"tAk" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/machinery/door/airlock/glass/security{
+ name = "Processing";
+ req_one_access = list(1,2,4,38)
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"tAT" = (
/obj/machinery/light/small{
dir = 1
@@ -31197,6 +31245,22 @@
/obj/structure/fitness/weightlifter,
/turf/simulated/floor/wood,
/area/crew_quarters/recreation_area)
+"tBp" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "mech_bay_int";
+ name = "Mech Bay Blast Door"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel_grid,
+/area/assembly/chargebay)
"tBq" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -31354,21 +31418,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
-"tFn" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/medical/reception)
"tFo" = (
/obj/machinery/door/airlock{
id_tag = "ReadingRoom1";
@@ -31395,6 +31444,66 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
+"tFF" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/structure/table/marble,
+/obj/item/reagent_containers/food/condiment/small/sugar{
+ pixel_x = -6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/coffee{
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/coffee{
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/coffee{
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/coffee,
+/obj/item/reagent_containers/food/condiment/small/packet/tea{
+ pixel_x = 6;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/tea{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/tea{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/tea{
+ pixel_x = 6
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/sugar{
+ pixel_x = 12;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/sugar{
+ pixel_x = 12;
+ pixel_y = 6
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/sugar{
+ pixel_x = 12;
+ pixel_y = 3
+ },
+/obj/item/reagent_containers/food/condiment/small/packet/sugar{
+ pixel_x = 12
+ },
+/obj/item/reagent_containers/glass/rag{
+ pixel_x = -10;
+ pixel_y = 6
+ },
+/obj/item/radio/intercom{
+ dir = 4;
+ name = "Station Intercom (General)";
+ pixel_x = 24
+ },
+/turf/simulated/floor/lino,
+/area/crew_quarters/coffee_shop)
"tGe" = (
/obj/structure/railing{
dir = 8
@@ -31473,29 +31582,40 @@
},
/turf/simulated/floor/carpet,
/area/security/warden)
-"tHP" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/power/apc/direction_bump/south,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
-"tHT" = (
-/obj/structure/sign/deck/second,
-/turf/simulated/wall/r_wall,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"tIA" = (
/obj/machinery/space_heater,
/turf/simulated/floor/tiled/techmaint,
/area/crew_quarters/pool/emergency_closet)
+"tIN" = (
+/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/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
+"tJG" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/glass/research{
+ name = "Telescience Wing"
+ },
+/turf/simulated/floor/tiled,
+/area/rnd/telescience_lab/foyer)
"tKD" = (
/obj/structure/closet/walllocker/emergsuit_wall{
pixel_y = 32
@@ -31520,9 +31640,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/crew_quarters/pool/emergency_closet)
-"tMQ" = (
-/turf/simulated/wall/r_wall,
-/area/security/interrogation)
"tMV" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -31535,9 +31652,9 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery_hallway)
-"tNt" = (
-/turf/simulated/wall,
-/area/crew_quarters/pool/emergency_closet)
+"tNc" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/briefing_room)
"tOd" = (
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hos)
@@ -31553,20 +31670,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
-"tPS" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Research Staircase";
- req_one_access = list(47,43,67)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"tQp" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/obj/structure/cable/green{
@@ -31607,18 +31710,6 @@
},
/turf/simulated/floor/tiled/steel_dirty,
/area/maintenance/asmaint2)
-"tRq" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = 24
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/resleeving)
"tRt" = (
/obj/machinery/button/remote/blast_door{
id = "armoryriot";
@@ -31687,6 +31778,52 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
+"tTi" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/machinery/door/airlock/multi_tile/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
+"tTI" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "robotics_shutter_ext";
+ name = "Robotics shutter";
+ opacity = 0
+ },
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/assembly/robotics)
+"tUr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/holodeck_control)
"tUW" = (
/obj/machinery/light{
dir = 8
@@ -31728,6 +31865,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"tVF" = (
+/turf/simulated/wall/prepainted/science,
+/area/assembly/robotics)
"tVG" = (
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside2)
@@ -31797,6 +31937,21 @@
/obj/effect/floor_decal/industrial/outline/blue,
/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;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "hos";
+ layer = 3.1;
+ name = "Head of Security's Office Shutters";
+ opacity = 0
+ },
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/hos)
"tZW" = (
/turf/simulated/floor,
/area/maintenance/substation/security)
@@ -31848,6 +32003,9 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_3)
+"uaX" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/interrogation)
"uaY" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -31951,21 +32109,6 @@
/obj/structure/handrail,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/cockpit)
-"ufE" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/power/apc/direction_bump/south,
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacetwo)
"ufF" = (
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating/lythios43c,
@@ -32005,20 +32148,15 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"ugJ" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
- layer = 2.8;
- name = "Hammerhead Hangar";
- req_one_access = list(1,38)
+"ugC" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/pool)
+"ugD" = (
+/obj/machinery/door/airlock/glass/research{
+ name = "Telescience Wing"
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/security/hammerhead_bay)
+/turf/simulated/floor/tiled,
+/area/rnd/telescience_lab/foyer)
"uhb" = (
/obj/machinery/atmospherics/component/unary/vent_pump/high_volume,
/obj/map_helper/airlock/atmos/chamber_pump,
@@ -32027,10 +32165,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/hammerhead/general)
-"uhl" = (
-/obj/structure/sign/signnew/danger,
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside2)
"uht" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/reinforced,
@@ -32054,9 +32188,20 @@
},
/turf/simulated/floor/wood,
/area/security/breakroom)
-"uik" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/coffee_shop)
+"uim" = (
+/obj/effect/floor_decal/borderfloorwhite{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 8
+ },
+/obj/structure/curtain/open/privacy,
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/white,
+/area/medical/surgeryprep)
"uje" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -32076,24 +32221,15 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
-"ujx" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/brig)
"ujL" = (
/obj/effect/floor_decal/corner_techfloor_grid{
dir = 6
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/cockpit)
+"ukp" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/warden)
"uks" = (
/obj/machinery/door/airlock/glass{
id_tag = "maint_cell_1"
@@ -32131,21 +32267,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
-"ulu" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"ulK" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
@@ -32173,6 +32294,20 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/security_lockerroom)
+"umG" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/security{
+ layer = 2.8;
+ name = "Hammerhead Hangar";
+ req_one_access = list(1,38)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hammerhead_bay)
"umI" = (
/obj/machinery/light{
dir = 4
@@ -32183,6 +32318,17 @@
/obj/structure/disposaloutlet,
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"uns" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/machinery/door/airlock/glass/security{
+ name = "Processing";
+ req_one_access = list(1,2,4,38)
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/dark,
+/area/security/security_processing)
"unt" = (
/obj/machinery/camera/network/research{
dir = 1
@@ -32207,15 +32353,26 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
-"unF" = (
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
+"unO" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/research{
+ name = "Weapons Testing Range";
+ req_access = list(47)
},
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
+/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/structure/disposalpipe/segment{
+ dir = 4
},
/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
+/area/rnd/research/testingrange)
"unX" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -32228,6 +32385,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"uom" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/research/xenobio)
"upg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -32266,6 +32426,14 @@
/obj/effect/floor_decal/corner/purple/bordercorner,
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
+"urg" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"urW" = (
/obj/machinery/vending/coffee{
dir = 4
@@ -32298,9 +32466,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"usU" = (
-/turf/simulated/wall,
-/area/rift/station/public_garden/stairwell)
"utv" = (
/obj/structure/lattice,
/obj/structure/railing{
@@ -32403,6 +32568,25 @@
},
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
+"uxp" = (
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/effect/floor_decal/corner/green/diagonal{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 24
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
+ },
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/station/public_garden/stairwell)
"uxX" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -32437,6 +32621,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
+"uAn" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/hammerhead_bay)
"uAD" = (
/obj/machinery/button/remote/blast_door{
id = "chemistry";
@@ -32482,6 +32669,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/armory/blue)
+"uBu" = (
+/turf/simulated/wall/prepainted/science,
+/area/rnd/workshop)
"uCH" = (
/obj/structure/closet/hydrant{
pixel_y = -32
@@ -32501,6 +32691,18 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/medbay_primary_storage)
+"uDc" = (
+/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{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/hallway)
"uEv" = (
/obj/structure/bed/chair/office/dark{
dir = 4
@@ -32508,22 +32710,6 @@
/obj/landmark/spawnpoint/job/scientist,
/turf/simulated/floor/tiled/monotile,
/area/rnd/research)
-"uEQ" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "robotics_outer"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "robotics_shutter_ext";
- name = "Robotics shutter";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/assembly/robotics)
"uFa" = (
/obj/effect/floor_decal/spline/plain{
dir = 1
@@ -32629,6 +32815,9 @@
"uIZ" = (
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
+"uJn" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/security_bathroom)
"uJq" = (
/turf/simulated/floor/plating,
/area/rift/surfacebase/outside/outside2)
@@ -32684,9 +32873,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research)
-"uKm" = (
-/turf/simulated/wall/r_wall,
-/area/security/hallway)
"uKp" = (
/obj/effect/floor_decal/rust,
/obj/effect/overlay/snow/floor,
@@ -32713,22 +32899,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/rnd/research/researchdivision)
-"uLa" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"uLD" = (
/obj/machinery/light/small{
dir = 1
@@ -32782,21 +32952,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
-"uMW" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
- name = "Circuitry Workshop";
- req_access = list(7);
- req_one_access = list(7)
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/workshop)
"uMY" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -33009,14 +33164,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/medical/reception)
-"uRD" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
- name = "Holding Cell";
- req_one_access = list(1,2,4,38)
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/hallway)
"uRF" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 4
@@ -33238,6 +33385,9 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/foyer)
+"uUy" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/maintenance/substation/security)
"uVt" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -33271,6 +33421,20 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/showers)
+"uWx" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/status_display{
+ pixel_y = -32
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"uWH" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/borderfloor{
@@ -33296,10 +33460,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_1)
-"uWP" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"uWS" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 10
@@ -33415,12 +33575,6 @@
/obj/effect/floor_decal/corner/purple/bordercorner2,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"uYp" = (
-/turf/simulated/wall,
-/area/medical/sleeper)
-"uYR" = (
-/turf/simulated/wall,
-/area/security/security_processing)
"uZq" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -33466,6 +33620,14 @@
/obj/machinery/space_heater,
/turf/simulated/floor/plating,
/area/maintenance/research/rnd)
+"vab" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'HIGH VOLTAGE'";
+ icon_state = "shock";
+ name = "HIGH VOLTAGE"
+ },
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/research)
"vaj" = (
/obj/structure/inflatable/door,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
@@ -33486,14 +33648,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/station/public_garden/stairwell)
-"vaO" = (
-/obj/machinery/door/airlock/glass_security{
- name = "Light Armory";
- req_access = list(3)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/dark,
-/area/security/warden)
"vbd" = (
/obj/machinery/holopad,
/turf/simulated/floor/tiled/monotile,
@@ -33622,6 +33776,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
+"vfg" = (
+/turf/simulated/wall/r_wall/prepainted/medical,
+/area/maintenance/lower/medsec_maintenance)
"vfq" = (
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 10
@@ -33641,9 +33798,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_6)
-"vgt" = (
-/turf/simulated/wall/r_wall,
-/area/medical/chemistry)
"vgK" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 4
@@ -33676,19 +33830,15 @@
/obj/item/stack/cable_coil,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/dormitory)
-"vhX" = (
-/obj/machinery/door/airlock/glass_security{
- name = "Equipment Storage";
- req_one_access = list(2)
+"vhT" = (
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "mech_bay_ext";
+ name = "Mech Bay Blast Door"
},
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_lockerroom)
+/turf/simulated/floor/tiled/steel_grid,
+/area/assembly/chargebay)
"vip" = (
/obj/structure/ladder{
pixel_y = 8
@@ -33696,12 +33846,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"viJ" = (
-/obj/structure/bed/chair/comfy/beige{
- dir = 1
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/coffee_shop)
"viV" = (
/obj/effect/floor_decal/borderfloorblack{
alpha = 255;
@@ -33833,14 +33977,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/recovery_room)
-"vmI" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "sec_processing_r"
- },
-/turf/simulated/floor/plating,
-/area/security/security_processing)
"vmU" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central6,
/obj/effect/floor_decal/steeldecal/steel_decals10{
@@ -33878,17 +34014,14 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/dormitory)
+"vnU" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/locker)
"von" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
/turf/simulated/floor/tiled/steel,
/area/security/security_lockerroom)
-"vop" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/dormitory)
"vos" = (
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
@@ -33919,34 +34052,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rnd/research)
-"vpG" = (
-/obj/effect/floor_decal/borderfloorwhite{
- dir = 9
- },
-/obj/effect/floor_decal/corner/paleblue/border{
- dir = 9
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/holoposter{
- pixel_x = -32
- },
-/obj/effect/floor_decal/borderfloorwhite/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/paleblue/bordercorner2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/surgery_hallway)
"vpJ" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -34128,22 +34233,6 @@
/obj/structure/cable/green,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"vuH" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/grille,
-/obj/structure/window/reinforced/polarized{
- dir = 10;
- icon_state = "fwindow";
- id = "holodeck"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/plating,
-/area/holodeck_control)
"vvp" = (
/obj/machinery/door/airlock/security{
name = "Private Quarters"
@@ -34164,6 +34253,11 @@
/obj/structure/flora/pottedplant/drooping,
/turf/simulated/floor/tiled/steel,
/area/holodeck_control)
+"vvP" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/telescience_lab/foyer)
"vwR" = (
/turf/simulated/floor/tiled/monowhite,
/area/medical/sleeper)
@@ -34228,6 +34322,9 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
+"vyn" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/medbay)
"vyB" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -34320,20 +34417,6 @@
/obj/effect/floor_decal/steeldecal/steel_decals4,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"vCu" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen8";
- name = "Pen 8 Blast Doors";
- opacity = 0
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"vCw" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -34524,39 +34607,25 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/dormitory)
-"vJs" = (
-/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,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
-"vJU" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Research Lobby";
- req_one_access = list(29,47)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research/researchdivision)
"vKd" = (
/obj/machinery/vending/fitness,
/turf/simulated/floor/tiled/monotile,
/area/crew_quarters/pool)
+"vKj" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "warden";
+ layer = 3.1;
+ name = "Warden's Office Shutters";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/warden)
"vKo" = (
/obj/machinery/door/window/brigdoor/eastleft{
name = "Slime Pen 3";
@@ -34564,25 +34633,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"vKw" = (
-/obj/structure/sign/department/medbay{
- pixel_x = -32
- },
-/obj/structure/disposalpipe/segment,
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/reception)
"vKN" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"vKQ" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 8
- },
-/turf/simulated/floor/lino,
-/area/crew_quarters/coffee_shop)
"vLE" = (
/obj/machinery/door/airlock/maintenance/sec,
/obj/machinery/door/firedoor/glass,
@@ -34626,20 +34681,6 @@
},
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
-"vNp" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacetwo)
"vNQ" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -34670,6 +34711,11 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/locker)
+"vPP" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/reception)
"vQg" = (
/obj/structure/closet/crate,
/obj/random/mre,
@@ -34829,10 +34875,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"vVt" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/reception)
"vVE" = (
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 9
@@ -34867,6 +34909,22 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/Dorm_4)
+"vWW" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"vXk" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -34882,17 +34940,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/resleeving)
-"vXF" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen6";
- name = "Pen 6 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"vYh" = (
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating,
@@ -34913,6 +34960,17 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
+"vYU" = (
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "mech_bay_ext";
+ name = "Mech Bay Exterior blast door-control";
+ pixel_x = 1;
+ pixel_y = 6;
+ req_one_access = list(29,47)
+ },
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/assembly/chargebay)
"vYW" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
@@ -34971,6 +35029,9 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/medical/morgue)
+"wci" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/crew_quarters/heads/hor)
"wcr" = (
/obj/structure/closet/crate,
/obj/random/maintenance/research,
@@ -35034,6 +35095,29 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/hallway)
+"wfn" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/machinery/alarm{
+ desc = null;
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
"wft" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -35127,21 +35211,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/dormitory)
-"whi" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/hallway)
"whF" = (
/obj/structure/table/steel,
/obj/machinery/light/small{
@@ -35150,9 +35219,6 @@
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
/turf/simulated/floor/tiled/red,
/area/security/hallway)
-"whR" = (
-/turf/simulated/wall/r_wall,
-/area/security/warden)
"wil" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/obj/structure/cable/green{
@@ -35217,10 +35283,27 @@
/obj/structure/cable/green,
/turf/simulated/floor/tiled/red,
/area/security/evidence_storage)
-"wkK" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/resleeving)
+"wks" = (
+/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 = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/sleep)
"wla" = (
/obj/structure/railing{
dir = 1
@@ -35283,47 +35366,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
-"wmK" = (
-/obj/structure/closet/wardrobe/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/monotile,
-/area/security/security_lockerroom)
"wna" = (
/turf/simulated/floor/wood,
/area/rift/station/public_garden/gantry)
-"wni" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/obj/machinery/door/airlock/glass_security{
- id_tag = "BrigFoyer";
- layer = 2.8;
- name = "Security";
- req_one_access = list(38,63)
- },
-/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,
-/turf/simulated/floor/tiled/steel,
-/area/security/brig)
"wnW" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -35366,6 +35411,14 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
+"woV" = (
+/obj/machinery/door/airlock/glass/security{
+ layer = 2.8;
+ name = "EVA Operations";
+ req_one_access = list(1,38)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/evastorage)
"wpd" = (
/obj/item/radio/intercom/department/security{
dir = 8;
@@ -35403,10 +35456,6 @@
/obj/structure/window/reinforced/tinted/frosted,
/turf/simulated/floor/tiled/techmaint,
/area/rnd/research/researchdivision)
-"wpV" = (
-/obj/structure/sign/xenobio,
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside2)
"wpX" = (
/obj/structure/bed/chair/wood{
dir = 1
@@ -35419,6 +35468,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
+"wpY" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/research/xenobio)
"wqh" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -35574,17 +35627,6 @@
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/pool)
-"wwb" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/morgue{
- dir = 2
- },
-/obj/machinery/camera/network/medbay,
-/turf/simulated/floor/tiled/techfloor,
-/area/medical/morgue)
"wwg" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -35615,18 +35657,6 @@
/obj/structure/closet/crate/bin,
/turf/simulated/floor/wood,
/area/rift/station/public_garden/gantry)
-"wxk" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "security_lockdown";
- name = "Security Blast Doors";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/security/brig)
"wxx" = (
/obj/machinery/door/airlock/maintenance/sec{
req_one_access = null
@@ -35732,6 +35762,15 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/resleeving)
+"wBI" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/lino,
+/area/crew_quarters/coffee_shop)
"wBK" = (
/obj/machinery/oxygen_pump/mobile/anesthetic,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -35842,6 +35881,18 @@
},
/turf/simulated/floor/plating,
/area/maintenance/security/upper)
+"wFg" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen10";
+ name = "Pen 10 Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"wFo" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -35855,6 +35906,9 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
+"wFv" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/telescience_lab/chamber)
"wFy" = (
/obj/structure/stairs/spawner/east,
/obj/structure/railing{
@@ -35952,9 +36006,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep)
-"wJl" = (
-/turf/simulated/wall/r_wall,
-/area/medical/resleeving)
"wJB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
dir = 8
@@ -35964,28 +36015,16 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
-"wLN" = (
-/obj/machinery/door/airlock/glass_research{
- name = "RnD Lab";
- req_one_access = list(7)
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "research_shutter_int";
- name = "Research shutter";
- opacity = 0
+"wKw" = (
+/obj/machinery/light/small{
+ dir = 4
},
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 24
},
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/rnd/research)
+/turf/simulated/floor/tiled/techfloor,
+/area/medical/morgue)
"wLS" = (
/obj/machinery/door/blast/regular{
density = 0;
@@ -36028,10 +36067,10 @@
/obj/landmark/spawnpoint/job/medical_doctor,
/turf/simulated/floor/tiled/monowhite,
/area/medical/medbay_primary_storage)
-"wNK" = (
-/obj/machinery/status_display,
-/turf/simulated/wall,
-/area/rift/stairwell/primary/surfacetwo)
+"wNZ" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/medbay)
"wOu" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -36060,12 +36099,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
-"wPX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/coffee_shop)
"wQd" = (
/obj/effect/floor_decal/rust,
/obj/effect/overlay/snow/floor,
@@ -36088,9 +36121,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/sleep/Dorm_6)
-"wQC" = (
-/turf/simulated/wall,
-/area/crew_quarters/sleep/Dorm_3)
"wQJ" = (
/obj/effect/floor_decal/industrial/outline/red,
/obj/structure/table/rack/shelf/steel,
@@ -36251,14 +36281,6 @@
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/pool/emergency_closet)
-"wVY" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'HIGH VOLTAGE'";
- icon_state = "shock";
- name = "HIGH VOLTAGE"
- },
-/turf/simulated/wall,
-/area/maintenance/substation/research)
"wWl" = (
/obj/structure/table/bench/steel,
/obj/structure/cable/green{
@@ -36399,9 +36421,6 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"xaB" = (
-/turf/simulated/wall,
-/area/crew_quarters/sleep)
"xaM" = (
/obj/structure/cable/orange{
icon_state = "4-8"
@@ -36451,9 +36470,6 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/outpost/xenobiology/outpost_slimepens)
-"xcy" = (
-/turf/simulated/wall,
-/area/medical/medbay_primary_storage)
"xcU" = (
/obj/effect/floor_decal/industrial/loading{
dir = 1;
@@ -36478,37 +36494,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/trade_shop/loading)
-"xdy" = (
-/obj/structure/sign/science,
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside2)
-"xdG" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "rd_office"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "rd_shutter";
- name = "Research Director Office shutter";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/hor)
-"xdK" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- icon_state = "pdoor0";
- id = "xenobiopen3";
- name = "Pen 3 Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/reinforced,
-/area/rnd/outpost/xenobiology/outpost_slimepens)
"xdO" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -36538,18 +36523,9 @@
/obj/structure/lattice,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside2)
-"xex" = (
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "mech_bay_ext";
- name = "Mech Bay Blast Door"
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/turf/simulated/floor/tiled/steel_grid,
-/area/assembly/chargebay)
-"xeK" = (
-/turf/simulated/wall/r_wall,
-/area/tether/surfacebase/reading_room)
+"xes" = (
+/turf/simulated/wall/prepainted,
+/area/rift/station/public_garden/stairwell)
"xeY" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -36563,6 +36539,14 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/shuttle/hammerhead/general)
+"xfy" = (
+/obj/structure/closet/wardrobe/red,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/security/security_lockerroom)
"xfF" = (
/obj/machinery/alarm/monitor/isolation{
alarm_id = "slime_pens";
@@ -36574,28 +36558,18 @@
"xfT" = (
/turf/simulated/floor/plating,
/area/maintenance/substation/research/xenobiology_lab)
-"xgz" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/purple/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
+"xgs" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 4
},
-/obj/effect/floor_decal/corner/purple/bordercorner2{
- dir = 4
+/obj/effect/floor_decal/borderfloorwhite,
+/obj/effect/floor_decal/corner/paleblue/border,
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = 24
},
-/turf/simulated/floor/tiled/steel,
-/area/rnd/lockers)
+/turf/simulated/floor/tiled/white,
+/area/medical/resleeving)
"xgG" = (
/obj/structure/table/standard,
/obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -36645,6 +36619,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/rnd/research/testingrange)
+"xjt" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/lobby)
+"xju" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/security/armory/blue)
"xjH" = (
/obj/machinery/computer/ship/sensors{
dir = 4
@@ -36768,16 +36748,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
-"xpv" = (
-/obj/machinery/door/blast/shutters{
- dir = 2;
- id = "chemistry";
- layer = 3.1;
- name = "Chemistry Shutters"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/chemistry)
"xpI" = (
/obj/structure/table/steel,
/obj/item/camera,
@@ -36824,6 +36794,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_processing)
+"xql" = (
+/obj/machinery/vending/coffee{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/security/breakroom)
"xqy" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -36965,33 +36941,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/pool/changing_room)
-"xvn" = (
-/obj/effect/floor_decal/borderfloorwhite,
-/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 1
- },
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 1;
- name = "Medbay Storage";
- req_access = list(5);
- req_one_access = list(5)
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/medical/medbay_primary_storage)
"xvx" = (
/obj/machinery/body_scanconsole,
/obj/machinery/light{
@@ -37003,6 +36952,19 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/medical/surgeryprep)
+"xvG" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/research{
+ name = "Research Locker Room";
+ req_access = list(47)
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel,
+/area/rnd/lockers)
"xwx" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -37092,9 +37054,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
-"xzS" = (
-/turf/simulated/wall,
-/area/maintenance/medbay)
+"xza" = (
+/obj/structure/sign/deck/second,
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"xAl" = (
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloor{
@@ -37132,9 +37095,6 @@
},
/turf/simulated/floor/wood,
/area/triumph/surfacebase/sauna)
-"xBB" = (
-/turf/simulated/wall,
-/area/rnd/research)
"xBE" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -37166,9 +37126,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/assembly/robotics)
-"xBT" = (
-/turf/simulated/wall,
-/area/rnd/research/researchdivision)
"xCl" = (
/obj/structure/railing{
dir = 8
@@ -37272,6 +37229,19 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
+"xGj" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/paleblue/border{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/medical/reception)
"xGk" = (
/obj/structure/table/woodentable,
/obj/machinery/microwave,
@@ -37425,12 +37395,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/hammerhead/general)
-"xKj" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
-/area/crew_quarters/pool/changing_room)
"xKy" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -37450,6 +37414,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacetwo)
+"xKD" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"xLb" = (
/obj/effect/floor_decal/spline/plain{
dir = 5
@@ -37569,10 +37536,6 @@
/obj/machinery/door/firedoor/multi_tile,
/turf/simulated/floor/plating,
/area/maintenance/asmaint2)
-"xNj" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/pool)
"xNm" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -37597,6 +37560,25 @@
},
/turf/simulated/floor,
/area/maintenance/substation/research)
+"xNR" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/dark,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
+"xOj" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/purple/border,
+/obj/effect/floor_decal/borderfloor/corner2,
+/obj/effect/floor_decal/corner/purple/bordercorner2,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rnd/research/researchdivision)
"xOs" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -37656,6 +37638,11 @@
},
/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{
@@ -37664,14 +37651,14 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacetwo)
+"xPp" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/range)
"xPs" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/obj/landmark/spawnpoint/job/scientist,
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab/storage)
-"xPt" = (
-/turf/simulated/wall,
-/area/maintenance/substation/surface_two)
"xPx" = (
/obj/machinery/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -37702,6 +37689,16 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"xQd" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacetwo)
"xQu" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -37741,6 +37738,21 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/substation/research/xenobiology_lab)
+"xRi" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen6";
+ name = "Pen 6 Blast Doors";
+ opacity = 0
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"xRj" = (
/obj/effect/floor_decal/borderfloorblack/corner{
alpha = 255;
@@ -37907,21 +37919,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/security_equiptment_storage)
-"xVu" = (
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_y = 24
- },
-/obj/machinery/alarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/coffee_shop)
"xVD" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -37979,13 +37976,6 @@
},
/turf/simulated/floor/wood,
/area/tether/surfacebase/reading_room)
-"xXn" = (
-/obj/structure/sign/department/operational{
- pixel_x = -32
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/medical/sleeper)
"xXR" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
@@ -38000,20 +37990,21 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/security/brig)
-"xXV" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
+"xYc" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ icon_state = "pdoor0";
+ id = "xenobiopen1";
+ name = "Pen 1 Blast Doors";
+ opacity = 0
},
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/floor_decal/steeldecal/steel_decals_central4,
-/obj/machinery/door/airlock/multi_tile/glass,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/pool)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/reinforced,
+/area/rnd/outpost/xenobiology/outpost_slimepens)
"xYV" = (
/obj/structure/cable{
icon_state = "16-0"
@@ -38251,6 +38242,25 @@
/obj/item/pen,
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/heads/hor)
+"yfx" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacetwo)
+"yga" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/hallway)
"ygN" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -38327,6 +38337,14 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/hallway)
+"yiS" = (
+/obj/structure/sign/department/operational{
+ pixel_x = -32
+ },
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/babyblue,
+/turf/simulated/floor/plating,
+/area/medical/sleeper)
"yjq" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -40447,7 +40465,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -40471,7 +40489,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -40641,7 +40659,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -40665,7 +40683,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -40676,7 +40694,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -40700,7 +40718,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -40834,9 +40852,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -40858,9 +40876,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -40870,7 +40888,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -40894,7 +40912,7 @@ uIZ
uIZ
uIZ
xec
-cUW
+jFC
xec
uIZ
uIZ
@@ -41028,9 +41046,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41052,9 +41070,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41063,9 +41081,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41087,9 +41105,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41222,9 +41240,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41246,9 +41264,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41257,9 +41275,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41281,9 +41299,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41451,9 +41469,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41475,9 +41493,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -41648,16 +41666,16 @@ uIZ
xec
xec
xec
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
lpl
lpl
-raC
+qNu
uIZ
uIZ
uIZ
@@ -41720,19 +41738,19 @@ uIZ
srw
tex
ddZ
-mhX
-mhX
-mhX
-mhX
-mhX
-mhX
-mhX
-mhX
-aMW
-aMW
-aMW
-aMW
-aMW
+wFv
+wFv
+wFv
+wFv
+wFv
+wFv
+wFv
+wFv
+dzq
+dzq
+dzq
+dzq
+dzq
gzd
pBj
pBj
@@ -41914,19 +41932,19 @@ uIZ
srw
mIn
ddZ
-mhX
+wFv
oul
oul
sxp
oul
oul
pwb
-mhX
+wFv
dRy
kMj
iIa
gQI
-aMW
+dzq
gzd
bAh
pBj
@@ -42036,16 +42054,16 @@ uIZ
uIZ
uIZ
uIZ
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
lpl
lpl
-raC
+qNu
uIZ
uIZ
uIZ
@@ -42108,19 +42126,19 @@ uIZ
srw
mIn
oLJ
-mhX
+wFv
oul
oul
oul
oul
oul
pIR
-mhX
+wFv
pIZ
dNx
hsO
nLU
-aMW
+dzq
gzd
bAh
pBj
@@ -42133,9 +42151,9 @@ pBj
pBj
pBj
pBj
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
pBj
pBj
pBj
@@ -42302,19 +42320,19 @@ uIZ
srw
mIn
oLJ
-mhX
+wFv
kHr
oul
arG
oul
oul
hOq
-mhX
+wFv
rBx
dNx
myW
mCM
-aMW
+dzq
gzd
bAh
pBj
@@ -42327,9 +42345,9 @@ pBj
pBj
pBj
pBj
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
pBj
pBj
pBj
@@ -42424,16 +42442,16 @@ uIZ
uIZ
uIZ
uIZ
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
lpl
lpl
-raC
+qNu
uIZ
uIZ
uIZ
@@ -42451,9 +42469,9 @@ uIZ
uIZ
srw
flP
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
uIZ
uIZ
uIZ
@@ -42496,19 +42514,19 @@ uIZ
srw
tex
oLJ
-mhX
+wFv
oul
oul
oul
oul
oul
pIR
-mhX
+wFv
vLT
ehO
xPs
mbS
-aMW
+dzq
gzd
pBj
pBj
@@ -42522,7 +42540,7 @@ pBj
pBj
pBj
pBj
-cUW
+jFC
pBj
pBj
pBj
@@ -42647,7 +42665,7 @@ iYe
flP
tVG
fst
-cUW
+jFC
uIZ
uIZ
uIZ
@@ -42690,19 +42708,19 @@ uIZ
srw
tex
ddZ
-mhX
+wFv
oul
oul
oul
oul
oul
pIR
-mhX
-aMW
-aMW
-mvj
-jxx
-aMW
+wFv
+dzq
+dzq
+jfl
+mKp
+dzq
tex
aal
uIZ
@@ -42716,7 +42734,7 @@ pBj
pBj
pBj
pBj
-cUW
+jFC
pBj
pBj
pBj
@@ -42814,11 +42832,11 @@ uIZ
uIZ
uIZ
uIZ
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
uIZ
uIZ
uIZ
@@ -42839,9 +42857,9 @@ uIZ
uIZ
srw
flP
-fyb
-cUW
-cUW
+nZB
+jFC
+jFC
uIZ
uIZ
uIZ
@@ -42884,19 +42902,19 @@ uIZ
srw
mIn
ddZ
-mhX
+wFv
oau
oau
rKs
oau
oau
qBh
-mhX
+wFv
rZb
nhb
kCB
uXD
-iVo
+vvP
tex
aal
uIZ
@@ -42910,7 +42928,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -43035,7 +43053,7 @@ iYe
flP
uIZ
uIZ
-cUW
+jFC
uIZ
uIZ
uIZ
@@ -43078,19 +43096,19 @@ uIZ
srw
mIn
bAh
-mhX
+wFv
scS
scS
-cuh
+hmz
oOQ
oOQ
-cuh
-cuh
+hmz
+hmz
lzp
oLn
nwu
duA
-iVo
+vvP
tex
aal
uIZ
@@ -43104,7 +43122,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -43202,11 +43220,11 @@ uIZ
uIZ
uIZ
uIZ
-raC
+qNu
lpl
-raC
+qNu
lpl
-raC
+qNu
uIZ
uIZ
uIZ
@@ -43227,9 +43245,9 @@ uIZ
uIZ
srw
flP
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
uIZ
uIZ
uIZ
@@ -43272,10 +43290,10 @@ uIZ
srw
mIn
bAh
-mhX
+wFv
faS
scS
-qIa
+miH
cal
blw
uHP
@@ -43284,7 +43302,7 @@ kCB
kCB
mJq
laI
-iVo
+vvP
tex
aal
uIZ
@@ -43298,7 +43316,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -43466,10 +43484,10 @@ uIZ
srw
mIn
bAh
-mhX
+wFv
jZo
scS
-qIa
+miH
fOe
uQA
lpy
@@ -43478,7 +43496,7 @@ qFG
cTo
iGG
lBJ
-cuh
+hmz
tex
aal
uIZ
@@ -43492,7 +43510,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -43660,19 +43678,19 @@ uIZ
srw
mIn
ddZ
-mhX
-mhX
-mhX
-cuh
-cuh
-cuh
-cuh
-cuh
-hUN
-fVF
-cuh
+wFv
+wFv
+wFv
+hmz
+hmz
+hmz
+hmz
+hmz
+ugD
+tJG
+hmz
bft
-cuh
+hmz
tex
aal
uIZ
@@ -43686,7 +43704,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -43861,12 +43879,12 @@ ddZ
tex
tex
tex
-iVo
+jQZ
kCB
xFv
-cuh
+hmz
qbY
-gRc
+uom
tex
fVv
bBF
@@ -43880,7 +43898,7 @@ bBF
bBF
lBT
oAD
-cUW
+jFC
oAD
lBT
bBF
@@ -43901,8 +43919,8 @@ bBF
uIZ
uIZ
uIZ
-cUW
-cUW
+jFC
+jFC
pBj
pBj
pBj
@@ -44055,12 +44073,12 @@ gzd
xax
oDC
tex
-iVo
+jQZ
kCB
qcg
-cuh
+hmz
plb
-gRc
+uom
tex
tex
tex
@@ -44073,9 +44091,9 @@ tex
tex
tex
rqX
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
tny
tex
tex
@@ -44092,11 +44110,11 @@ tex
tex
tex
tex
-cUW
-cUW
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
+jFC
+jFC
pBj
pBj
pBj
@@ -44249,38 +44267,38 @@ ddZ
aal
srw
tex
-cuh
+hmz
mmU
bSr
-cuh
+hmz
plb
-gRc
+uom
lfm
oDC
tex
aYt
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
bCO
bCO
bCO
-kPi
-kPi
+fSq
+fSq
lfm
lfm
lfm
@@ -44289,8 +44307,8 @@ tex
aal
uIZ
pBj
-cUW
-cUW
+jFC
+jFC
pBj
pBj
pBj
@@ -44443,17 +44461,17 @@ tVG
aal
srw
tex
-iVo
+jQZ
iTw
iTw
-cuh
+hmz
plb
-jMC
+wpY
uIZ
srw
tex
aal
-kPi
+fSq
nrn
hUC
qgp
@@ -44474,7 +44492,7 @@ tui
tui
tui
smn
-kPi
+fSq
uIZ
uIZ
uIZ
@@ -44520,9 +44538,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44544,9 +44562,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44555,9 +44573,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44579,9 +44597,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44637,17 +44655,17 @@ iPh
aal
srw
tex
-iVo
+jQZ
iTw
iTw
-cuh
+hmz
plb
-gRc
-jMC
-gRc
+uom
+wpY
+uom
ufF
aal
-kPi
+fSq
qEZ
tui
ftd
@@ -44668,7 +44686,7 @@ tui
tui
tui
lUM
-kPi
+fSq
uIZ
uIZ
uIZ
@@ -44714,9 +44732,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44738,9 +44756,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44749,9 +44767,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44773,9 +44791,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44831,17 +44849,17 @@ aYt
uIZ
srw
tex
-iVo
+jQZ
iTw
iTw
-cuh
+hmz
vNQ
vIz
aty
-gRc
+uom
ufF
aal
-kPi
+fSq
tui
tui
ftd
@@ -44862,7 +44880,7 @@ tui
tui
tui
xTt
-kPi
+fSq
uIZ
uIZ
uIZ
@@ -44908,9 +44926,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44932,9 +44950,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44943,9 +44961,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -44967,9 +44985,9 @@ uIZ
uIZ
uIZ
xec
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
xec
uIZ
uIZ
@@ -45025,17 +45043,17 @@ aal
uIZ
srw
tex
-cuh
-iVo
-iVo
-cuh
+hmz
+jQZ
+jQZ
+hmz
fnX
wTh
gSO
-gRc
+uom
ufF
aal
-kPi
+fSq
tui
tui
ftd
@@ -45051,13 +45069,13 @@ taM
dDb
tui
tui
-kPi
-kPi
+fSq
+fSq
hKb
-ajW
-ajW
-kPi
-kPi
+tsj
+tsj
+fSq
+fSq
uIZ
uIZ
oUY
@@ -45222,36 +45240,36 @@ tex
nSr
nSr
nSr
-gRc
+uom
lDD
bQx
pFv
-gRc
+uom
ufF
ufF
-kPi
-raH
+fSq
+rhH
kpD
-kqv
-kPi
-ejv
+xYc
+xKD
+kSM
qat
-xdK
-kPi
-gnd
+obw
+xKD
+sDP
pUL
-fwo
-kPi
-maC
+lxO
+xKD
+kgd
wLS
-nsg
-kPi
+lYG
+fSq
ozM
cuM
cuM
anZ
tUW
-kPi
+fSq
uIZ
uIZ
tex
@@ -45416,39 +45434,39 @@ lfm
lwh
lwh
lwh
-cXU
+szC
pgh
-cXU
+szC
jSY
-cXU
+szC
cnh
cnh
-kPi
+fSq
xtd
sUg
jdp
oNU
bkq
vKo
-uWP
+lDW
gJf
bkq
tVw
-uWP
+lDW
rRW
gkl
pBD
-uWP
-iqI
+lDW
+slq
bTa
bcO
pFw
iLZ
aKV
-kPi
-pPq
-pPq
-pPq
+fSq
+crU
+crU
+crU
flP
aal
uIZ
@@ -45601,8 +45619,8 @@ uIZ
uIZ
pBj
pBj
-cUW
-cUW
+jFC
+jFC
oAD
oAD
oAD
@@ -45610,25 +45628,25 @@ oAD
cnh
ufF
ufF
-mUX
+ouI
jYp
kzl
bIo
-mUX
+ouI
ufF
-cUW
-kPi
+jFC
+fSq
jEp
sUg
sUg
cuM
xcc
cuM
-ogT
+qYi
cuM
xcc
cuM
-ogT
+qYi
cuM
xcc
cuM
@@ -45642,14 +45660,14 @@ mYr
ioW
eWO
rHs
-pPq
+crU
flP
nTd
oAD
oAD
oAD
-cUW
-cUW
+jFC
+jFC
pBj
pBj
pBj
@@ -45712,9 +45730,9 @@ qfQ
uIZ
srw
flP
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
uIZ
uIZ
uIZ
@@ -45795,55 +45813,55 @@ uIZ
uIZ
pBj
pBj
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-mUX
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+ouI
rOo
sNu
xox
-mUX
-cUW
-cUW
-kPi
+ouI
+jFC
+jFC
+fSq
xMi
fcE
qJP
kYE
nKB
hUs
-qpO
+sBe
fqm
gGf
der
-qpO
+sBe
mEx
gGf
oCx
abV
-cwe
+kXg
ueu
-gdk
-fYM
+qJa
+rCu
cuM
cuM
-kPi
+fSq
xfT
xQU
-pPq
+crU
wcZ
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
pBj
pBj
pBj
@@ -45908,7 +45926,7 @@ srw
flP
uIZ
uIZ
-cUW
+jFC
uIZ
uIZ
uIZ
@@ -45989,8 +46007,8 @@ uIZ
uIZ
pBj
pBj
-cUW
-cUW
+jFC
+jFC
oAD
oAD
oAD
@@ -45998,25 +46016,25 @@ oAD
aUX
ufF
ufF
-mUX
+ouI
pRg
gsJ
jXj
-mUX
+ouI
brg
-cUW
-kPi
+jFC
+fSq
aoS
sUg
sUg
cuM
gbO
cuM
-aHb
+xNR
cuM
gbO
cuM
-aHb
+xNR
cuM
gbO
cuM
@@ -46030,14 +46048,14 @@ cuM
iOo
xfT
xfT
-pPq
+crU
flP
nTd
oAD
oAD
oAD
-cUW
-cUW
+jFC
+jFC
pBj
pBj
pBj
@@ -46085,14 +46103,14 @@ uIZ
qfQ
qfQ
qfQ
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
tfC
qfQ
qfQ
@@ -46100,9 +46118,9 @@ qfQ
uIZ
srw
flP
-fyb
-cUW
-cUW
+nZB
+jFC
+jFC
uIZ
uIZ
uIZ
@@ -46192,39 +46210,39 @@ uIZ
cnh
ufF
ufF
-cXU
-cXU
-cXU
-cXU
-cXU
+szC
+szC
+szC
+szC
+szC
cnh
cnh
-kPi
+fSq
dxe
sUg
bHB
qbw
iOD
oPI
-uWP
+lDW
osc
iOD
ggC
-uWP
+lDW
bRL
iOD
fik
-uWP
-iqI
+lDW
+slq
fne
vzC
xeY
cuM
hrW
-kPi
-pPq
-pPq
-pPq
+fSq
+crU
+crU
+crU
flP
aal
uIZ
@@ -46279,24 +46297,24 @@ uIZ
qfQ
qfQ
qfQ
-pPm
+sAX
chm
vDb
vDb
vDb
vDb
nPd
-pPm
+sAX
tfC
qfQ
qfQ
qfQ
qfQ
-cUW
+jFC
flP
tVG
fst
-cUW
+jFC
uIZ
uIZ
uIZ
@@ -46393,29 +46411,29 @@ dJK
boI
boI
ufF
-kPi
-gmw
+fSq
+dQq
pfn
-feU
-kPi
-kwI
+lcl
+xKD
+iMv
icn
-fAD
-kPi
-atf
+pLA
+xKD
+xRi
tGA
-vXF
-kPi
-vCu
+eBD
+xKD
+bBi
qtI
-kfv
-tHT
+jRQ
+xza
qqZ
cuM
cuM
syo
ymb
-kPi
+fSq
uIZ
uIZ
srw
@@ -46473,24 +46491,24 @@ uIZ
qfQ
qfQ
qfQ
-pPm
+sAX
pHH
-pPm
-pPm
-pPm
-pPm
+sAX
+sAX
+sAX
+sAX
pHH
-pPm
+sAX
tfC
qfQ
qfQ
qfQ
qfQ
-cUW
-cUW
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
+jFC
+jFC
uIZ
uIZ
uIZ
@@ -46587,7 +46605,7 @@ flP
flP
vip
aal
-kPi
+fSq
tui
tui
ftd
@@ -46603,13 +46621,13 @@ vjQ
nEg
tui
tui
-kPi
-kPi
+fSq
+fSq
tEi
-bgr
-bgr
-kPi
-kPi
+wFg
+wFg
+fSq
+fSq
uIZ
uIZ
srw
@@ -46667,14 +46685,14 @@ uIZ
qfQ
qfQ
qfQ
-pPm
+sAX
ybH
-pPm
+sAX
liB
liB
-pPm
+sAX
hpZ
-pPm
+sAX
tfC
qfQ
qfQ
@@ -46781,7 +46799,7 @@ bTj
bTj
bTj
uIZ
-kPi
+fSq
tui
tui
ftd
@@ -46802,7 +46820,7 @@ tui
tui
tui
xTt
-kPi
+fSq
uIZ
uIZ
uIZ
@@ -46861,14 +46879,14 @@ uIZ
qfQ
qfQ
qfQ
-pPm
-pPm
-pPm
+sAX
+sAX
+sAX
liB
liB
-pPm
+sAX
pHH
-pPm
+sAX
tfC
qfQ
qfQ
@@ -46975,7 +46993,7 @@ uIZ
uIZ
uIZ
uIZ
-kPi
+fSq
qEZ
tui
ftd
@@ -46996,7 +47014,7 @@ tui
tui
tui
lUM
-kPi
+fSq
uIZ
uIZ
uIZ
@@ -47056,13 +47074,13 @@ qfQ
qfQ
qfQ
qfQ
-pPm
+sAX
cgv
aWA
wyV
-pPm
+sAX
pHH
-pPm
+sAX
tfC
qfQ
qfQ
@@ -47169,7 +47187,7 @@ uIZ
uIZ
uIZ
uIZ
-kPi
+fSq
sST
xfF
iMW
@@ -47190,7 +47208,7 @@ tui
tui
tui
smn
-kPi
+fSq
uIZ
aal
uIZ
@@ -47250,13 +47268,13 @@ uIZ
qfQ
qfQ
qfQ
-pPm
+sAX
cgv
aWA
aWA
-pPm
+sAX
qOG
-pPm
+sAX
tfC
qfQ
qfQ
@@ -47363,28 +47381,28 @@ uIZ
uIZ
uIZ
uIZ
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
-kPi
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
+fSq
sZf
sZf
sZf
-kPi
-kPi
+fSq
+fSq
uIZ
fVv
bBF
@@ -47395,8 +47413,8 @@ uIZ
uIZ
uIZ
oLJ
-cUW
-cUW
+jFC
+jFC
pBj
pBj
pBj
@@ -47444,13 +47462,13 @@ uIZ
qfQ
qfQ
qfQ
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -47565,9 +47583,9 @@ uIZ
uIZ
uIZ
oAD
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
tny
tex
tex
@@ -47584,13 +47602,13 @@ tex
tex
tex
tex
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
pBj
pBj
uIZ
@@ -47638,13 +47656,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
fof
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -47760,7 +47778,7 @@ uIZ
uIZ
oAD
oAD
-cUW
+jFC
oAD
bys
lfm
@@ -47783,8 +47801,8 @@ uIZ
uIZ
uIZ
uIZ
-cUW
-cUW
+jFC
+jFC
pBj
pBj
pBj
@@ -47832,13 +47850,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
cwg
aWA
xdl
-pPm
+sAX
wFU
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -47954,7 +47972,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -48026,13 +48044,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -48148,7 +48166,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -48220,13 +48238,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -48301,19 +48319,19 @@ oLJ
oLJ
tVG
tVG
-tVG
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-pBj
+oLJ
+xec
+jFC
+utv
+utv
+tBE
+jFC
+tBE
+utv
+utv
+jFC
+xec
+oLJ
pBj
pBj
pBj
@@ -48342,7 +48360,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -48414,13 +48432,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
fof
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -48495,19 +48513,19 @@ pBj
oLJ
oLJ
oLJ
-tVG
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-uIZ
-pBj
+oLJ
+oLJ
+tex
+tex
+tex
+tex
+tex
+tex
+tex
+tex
+tex
+oLJ
+oLJ
pBj
pBj
pBj
@@ -48536,7 +48554,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -48608,13 +48626,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -48689,19 +48707,19 @@ pBj
pBj
pBj
oLJ
-oLJ
-xec
-cUW
-utv
-utv
-tBE
-cUW
-tBE
-utv
-utv
-cUW
-xec
-oLJ
+pBj
+nxY
+nxY
+piR
+piR
+piR
+nxY
+piR
+piR
+piR
+nxY
+nxY
+nxY
oLJ
oLJ
oLJ
@@ -48730,7 +48748,7 @@ uIZ
uIZ
uIZ
oAD
-cUW
+jFC
oAD
uIZ
uIZ
@@ -48802,13 +48820,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -48867,35 +48885,35 @@ oLJ
oLJ
oLJ
oLJ
-wJl
-wJl
-jTS
-jTS
-wJl
-wJl
-wJl
-wkK
-wkK
-wJl
-eMD
-eMD
-eMD
-eMD
-eMD
-pBj
-oLJ
-oLJ
-tex
-tex
-tex
-tex
-tex
-tex
-tex
-tex
-tex
-oLJ
-oLJ
+kid
+kid
+fwk
+fwk
+kid
+kid
+kid
+oFb
+oFb
+kid
+oRV
+oRV
+oRV
+oRV
+oRV
+pBj
+nxY
+nxY
+nxY
+qQk
+pRF
+fHU
+dJH
+nCx
+rnE
+fHU
+kHx
+jrj
+tnj
pBj
oLJ
oLJ
@@ -48924,7 +48942,7 @@ uIZ
uIZ
oAD
oAD
-cUW
+jFC
oAD
oAD
oLJ
@@ -48996,13 +49014,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -49060,41 +49078,41 @@ oLJ
pBj
pBj
pBj
-wJl
-wJl
+kid
+kid
cAf
wTJ
iOf
klD
-fkC
+isx
pzq
fJx
lKB
lVq
-nXX
+heZ
jdN
jUi
bfg
-eMD
-eMD
-pBj
-uik
-uik
-cwR
-cwR
-cwR
-uik
-cwR
-cwR
-cwR
-uik
-uik
-uik
-cUW
-cUW
-cUW
-cUW
-cUW
+oRV
+oRV
+tnj
+ovs
+rOE
+fIg
+uMP
+neF
+neF
+neF
+neF
+neF
+neF
+pqG
+tnj
+jFC
+jFC
+jFC
+jFC
+jFC
pBj
pBj
oLJ
@@ -49117,9 +49135,9 @@ oLJ
oLJ
oLJ
buD
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
wGI
oLJ
oLJ
@@ -49190,13 +49208,13 @@ uIZ
uIZ
uIZ
uIZ
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
pHH
-pPm
+sAX
uIZ
uIZ
uIZ
@@ -49254,7 +49272,7 @@ pBj
pBj
pBj
pBj
-wJl
+kid
gjP
xIB
wsI
@@ -49270,26 +49288,26 @@ hhy
suF
amw
kNR
-eMD
-uik
-uik
-xVu
-tlj
-pRF
-fHU
-dJH
-nCx
-rnE
-fHU
-kHx
-jrj
-qGO
+oRV
+tnj
+mCt
+dqp
+hoN
+uMP
+wlU
+cwF
+tGt
+neF
+neF
+wlU
+mkA
+tnj
hJs
hJs
hJs
hJs
-cUW
-cUW
+jFC
+jFC
pBj
oLJ
oLJ
@@ -49311,9 +49329,9 @@ oLJ
oLJ
oLJ
wGI
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
wGI
oLJ
oLJ
@@ -49384,27 +49402,27 @@ pBj
pBj
pBj
pBj
-pPm
+sAX
cwg
aWA
aWA
-pPm
+sAX
dla
-pPm
-pPm
-eiq
-eiq
-pPm
-eiq
-eiq
-eiq
-pPm
-eiq
-eiq
-pPm
-pPm
-pPm
-pPm
+sAX
+sAX
+qza
+qza
+sAX
+qza
+qza
+qza
+sAX
+qza
+qza
+sAX
+sAX
+sAX
+sAX
pBj
vnk
oLJ
@@ -49448,43 +49466,43 @@ pBj
pBj
pBj
pBj
-wJl
+kid
gFH
eYx
gHr
ixy
odu
-jTS
+fwk
jvX
vjt
wnW
vXk
-nXX
+heZ
tRT
qXG
vUk
cHW
-nXX
-ovs
-vKQ
-fIg
-neF
+oRV
+tnj
+aRq
+dqp
+aTl
uMP
+wlU
+cwF
+tGt
neF
neF
-neF
-neF
-neF
-neF
-pqG
-qGO
-eBi
-eBi
-eBi
+wlU
+ipQ
+tnj
+pBA
+pBA
+pBA
hJs
hJs
-cUW
-cUW
+jFC
+jFC
oLJ
ohX
aXY
@@ -49578,7 +49596,7 @@ pBj
pBj
pBj
pBj
-pPm
+sAX
fof
aWA
aWA
@@ -49598,7 +49616,7 @@ vjO
vjO
jlp
lLU
-pPm
+sAX
pBj
oLJ
oLJ
@@ -49638,48 +49656,48 @@ pBj
pBj
pBj
pBj
-cUW
-cUW
-cUW
-cUW
-wJl
+jFC
+jFC
+jFC
+jFC
+kid
avx
eYx
iKu
kRa
lto
-jTS
+fwk
eUN
dyj
wBH
bdU
-nXX
-wwb
+heZ
+mpl
wbl
jQD
cHW
-nXX
-mCt
-dqp
-hoN
-viJ
-uMP
-wlU
-cwF
-tGt
-neF
+oRV
+tnj
+tFF
+ngn
+wBI
+qrc
+gsZ
+gsZ
+mvC
+voC
+gSq
neF
-wlU
-mkA
-qGO
-cee
+eyX
+oFi
+tyH
nsG
-eBi
-eBi
+pBA
+pBA
hJs
hJs
-cUW
-cUW
+jFC
+jFC
ohX
aZm
bog
@@ -49698,7 +49716,7 @@ oLJ
oLJ
oLJ
oLJ
-cUW
+jFC
pBj
pBj
pBj
@@ -49772,7 +49790,7 @@ pBj
pBj
pBj
pBj
-pPm
+sAX
cwg
aWA
aWA
@@ -49790,9 +49808,9 @@ aWA
aWA
aWA
wyV
-pPm
+sAX
pHH
-pPm
+sAX
kqN
kqN
oLJ
@@ -49811,74 +49829,74 @@ oLJ
enB
pBj
pBj
-cIj
-cIj
-xeK
-sCL
-sCL
-xeK
-sCL
-sCL
-xeK
-sCL
-sCL
-xeK
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
+kJS
+kJS
+aqp
+sZs
+sZs
+aqp
+sZs
+sZs
+aqp
+sZs
+sZs
+aqp
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
hJs
hJs
hJs
-fkC
-fkC
+isx
+isx
oUw
dTk
bor
lto
-jTS
+fwk
epz
tQp
xkt
bdU
-nXX
-gQJ
+heZ
+mzG
gvq
rNr
cHW
-nXX
-aRq
-dqp
-aTl
-viJ
-uMP
-wlU
-cwF
-tGt
-neF
-neF
-wlU
-ipQ
-qGO
-jdR
+oRV
+tnj
+tnj
+ibd
+iVL
+kBf
+wHa
+jYd
+wHa
+qTL
+kvB
+sMm
+tnj
+tnj
+tyH
iiF
iiF
-eBi
-eBi
+pBA
+pBA
hJs
hJs
-cUW
-cUW
-cUW
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
+jFC
+jFC
+jFC
pBj
pBj
pBj
@@ -49910,7 +49928,7 @@ pBj
pBj
vUE
vUE
-tmJ
+aKq
vUE
enB
enB
@@ -49966,7 +49984,7 @@ pBj
pBj
pBj
pBj
-pPm
+sAX
hpv
opV
opV
@@ -49984,9 +50002,9 @@ xcU
aWA
aWA
aWA
-pPm
+sAX
uNQ
-iMQ
+tdg
nEJ
enB
oLJ
@@ -50005,18 +50023,18 @@ pBj
vaj
enB
pBj
-xzS
+vyn
qiJ
-aAg
+aqF
gYG
wsr
-aAg
+aqF
gYG
wsr
-aAg
+aqF
gYG
wsr
-aAg
+aqF
hJs
hJs
hJs
@@ -50028,53 +50046,53 @@ hJs
hJs
hJs
hJs
-tmJ
-tmJ
-tmJ
-fkC
+aKq
+aKq
+aKq
+isx
kWP
rBj
-tRq
+xgs
pcY
-fkC
+isx
cev
apv
uXF
ptk
-nXX
+heZ
ayd
rjB
-ccW
+wKw
cHW
-nXX
-fdP
-lcv
-hRG
-wPX
-qrc
-gsZ
-gsZ
-mvC
-voC
-gSq
-neF
-eyX
-oFi
+oRV
+tnj
+tnj
+tnj
+tnj
+puA
+obO
+tfk
+ptH
+jcV
+pBA
+pBA
+pBA
+tyH
tyH
tyH
tyH
nsG
-eBi
-eBi
+pBA
+pBA
hJs
hJs
hJs
hJs
-cUW
-cUW
-cUW
-cUW
-cUW
+jFC
+jFC
+jFC
+jFC
+jFC
pBj
pBj
pBj
@@ -50160,27 +50178,27 @@ pBj
pBj
pBj
pBj
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
-pPm
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
+sAX
gzR
aWA
cMt
aWA
-pPm
+sAX
pag
-pPm
+sAX
dUn
enB
enB
@@ -50199,70 +50217,70 @@ pBj
pBj
enB
pBj
-xzS
+vyn
qiJ
-aAg
+aqF
wUu
jzu
-aAg
+aqF
kiJ
jzu
-aAg
+aqF
oWM
jzu
-aAg
-xzS
-xzS
-sLx
-sLx
-sLx
-sLx
-sLx
-sLx
-gMe
-gMe
-gMe
-gMe
-gMe
-gMe
-xcy
-xcy
-xcy
-xcy
-xcy
-xcy
-xcy
+aqF
+vyn
+vyn
+kIL
+kIL
+kIL
+kIL
+kIL
+kIL
+eut
+eut
+eut
+eut
+eut
+eut
+dxl
+dxl
+dxl
+dxl
+dxl
+dxl
+dxl
hET
-dXI
-vgt
-vgt
-vgt
-vgt
-vgt
-vgt
-vgt
-vgt
-vgt
-ibd
-iVL
-kBf
-wHa
-jYd
-wHa
-qTL
-kvB
-sMm
-qGO
-qGO
+oRZ
+hKi
+hKi
+hKi
+hKi
+hKi
+hKi
+hKi
+hKi
+hKi
+tjD
+tjD
+aZU
+bPt
+mJn
+egW
+fbQ
+pBA
+cee
+jdR
+tyH
alV
fUs
tyH
iiF
nsG
-eBi
-eBi
-tmJ
-tmJ
+pBA
+pBA
+aKq
+aKq
hJs
hJs
hJs
@@ -50288,7 +50306,7 @@ enB
enB
enB
vUE
-wpV
+ffl
vUE
dVV
enB
@@ -50298,7 +50316,7 @@ enB
dVV
enB
vUE
-tmJ
+aKq
vUE
vUE
vUE
@@ -50367,14 +50385,14 @@ kqN
pBj
pBj
pBj
-pPm
-pPm
+sAX
+sAX
aWA
wFy
dbI
-pPm
-pPm
-pPm
+sAX
+sAX
+sAX
dUn
enB
enB
@@ -50393,42 +50411,42 @@ enB
pBj
vaj
pBj
-xzS
+vyn
qiJ
-aAg
+aqF
tFo
-aAg
-aAg
+aqF
+aqF
kFX
-aAg
-aAg
+aqF
+aqF
kPS
-aAg
-aAg
+aqF
+aqF
kez
qFo
-sLx
+kIL
pvE
gFN
-sLx
+kIL
gFN
fVh
-gMe
+eut
odw
vyj
-gMe
+eut
vyj
yeu
-xcy
+dxl
lOM
gts
mCK
txZ
lQj
-oTA
+tAh
igG
fJs
-vgt
+hKi
utK
wwg
jlL
@@ -50436,20 +50454,20 @@ wwg
sbA
lDM
ylV
-vgt
-dAk
-dAk
-cUw
-tzd
-hyJ
-iga
-ePP
-xPt
-xPt
-xPt
-xPt
-xPt
-xPt
+hKi
+bTZ
+bTZ
+aZU
+bPt
+mJn
+egW
+fbQ
+eTP
+eTP
+eTP
+eTP
+eTP
+eTP
tyH
tyH
tyH
@@ -50457,13 +50475,13 @@ iSd
tyH
tyH
uJq
-tmJ
-tmJ
-tmJ
-tmJ
-tmJ
-tmJ
-tmJ
+aKq
+aKq
+aKq
+aKq
+aKq
+aKq
+aKq
bDx
pBj
pBj
@@ -50562,12 +50580,12 @@ kqN
pBj
pBj
pBj
-pPm
+sAX
igz
-pPm
-pPm
-pPm
-pPm
+sAX
+sAX
+sAX
+sAX
kqN
dUn
nFd
@@ -50587,9 +50605,9 @@ enB
dVV
enB
pBj
-xzS
+vyn
qiJ
-aAg
+aqF
fGi
cQN
xXj
@@ -50598,22 +50616,22 @@ yjZ
gzu
fJJ
moy
-aAg
+aqF
hga
hga
-sLx
+kIL
rzB
sop
xlp
hNg
iJA
-gMe
+eut
aAG
rea
guh
ehd
eXK
-xcy
+dxl
gra
vCQ
wMA
@@ -50622,7 +50640,7 @@ fBD
sgR
gyG
kXZ
-xpv
+jdd
igp
eMI
lzZ
@@ -50630,25 +50648,25 @@ eMI
xGn
kXN
uCH
-vgt
+hKi
cWj
hzb
aZU
bPt
-mcn
+gqT
egW
cQu
-xPt
+eTP
jho
nZS
nZS
aoY
-phT
-iis
-iis
-iis
-iis
-iis
+eTP
+qBI
+qBI
+qBI
+qBI
+qBI
tyH
iiF
iiF
@@ -50657,9 +50675,9 @@ iiF
iiF
iiF
son
-eBi
-eBi
-eBi
+pBA
+pBA
+pBA
hhh
hhh
pBj
@@ -50676,7 +50694,7 @@ pBj
vUE
vUE
vUE
-uhl
+fCn
vUE
vUE
vUE
@@ -50695,10 +50713,10 @@ enB
enB
enB
enB
-tmJ
-tmJ
-tmJ
-tmJ
+aKq
+aKq
+aKq
+aKq
pBj
pBj
pBj
@@ -50756,12 +50774,12 @@ enB
pBj
pBj
pBj
-pPm
+sAX
dhE
aWA
hGK
ybi
-pPm
+sAX
kqN
dUn
enB
@@ -50781,9 +50799,9 @@ enB
enB
kqN
pBj
-xzS
+vyn
qiJ
-aAg
+aqF
jVo
mvf
bIp
@@ -50795,19 +50813,19 @@ mEd
hBC
sEV
tbE
-sLx
+kIL
pdw
kiP
sgl
qey
xoa
-gMe
+eut
lEN
uFg
eho
eqI
fQp
-xcy
+dxl
eWC
lLc
cNx
@@ -50816,7 +50834,7 @@ qMG
ikz
uCS
gwj
-rcZ
+rcQ
obd
kyg
rwF
@@ -50832,17 +50850,17 @@ bPt
mcn
egW
fbQ
-xPt
+eTP
wgd
vWe
sxm
oir
-xPt
-iis
+eTP
+qBI
xNq
jsh
odS
-iis
+qBI
tyH
tyH
tyH
@@ -50892,7 +50910,7 @@ enB
vUE
vUE
bns
-tmJ
+aKq
pBj
pBj
pBj
@@ -50950,12 +50968,12 @@ enB
pBj
pBj
pBj
-pPm
+sAX
tti
xdl
-pPm
-pPm
-pPm
+sAX
+sAX
+sAX
kqN
dUn
enB
@@ -50975,9 +50993,9 @@ pBj
kqN
kqN
pBj
-xzS
+vyn
qiJ
-aAg
+aqF
xHT
cQN
glH
@@ -50986,22 +51004,22 @@ ifi
wWo
ghA
cQN
-aAg
+aqF
qnm
hga
-sLx
+kIL
bgd
tFx
uZL
kmQ
bok
-gMe
+eut
cfz
knJ
oUb
iWF
pvV
-xcy
+dxl
pOm
oQb
tCX
@@ -51010,7 +51028,7 @@ hij
emd
bXR
wgm
-aST
+rRJ
srb
kAG
uRJ
@@ -51026,20 +51044,20 @@ bPt
eAI
egW
xxo
-xPt
-xPt
+eTP
+eTP
pbK
-xPt
-xPt
-xPt
-iis
+eTP
+eTP
+eTP
+qBI
wAP
lFc
mTa
-iis
+qBI
iSd
-eBi
-eBi
+pBA
+pBA
lef
tyH
tyH
@@ -51086,7 +51104,7 @@ enB
enB
vUE
vUE
-tmJ
+aKq
pBj
pBj
pBj
@@ -51144,12 +51162,12 @@ enB
pBj
pBj
pBj
-pPm
+sAX
dhE
aWA
hGK
iLl
-pPm
+sAX
kqN
dUn
enB
@@ -51166,36 +51184,36 @@ enB
enB
enB
avF
-xzS
-tgY
-xzS
-xzS
-xzS
-aAg
-aAg
+vyn
+lJq
+vyn
+vyn
+vyn
+aqF
+aqF
uSj
-aAg
-aAg
-aAg
-aAg
-aAg
-aAg
-aAg
+aqF
+aqF
+aqF
+aqF
+aqF
+aqF
+aqF
qnm
hga
-sLx
+kIL
obW
qot
deS
eJr
aIr
-plg
+nSt
tFm
plx
hvo
rWy
tpn
-xcy
+dxl
eyP
mWL
mWL
@@ -51204,7 +51222,7 @@ njX
ihk
fDJ
jbT
-vgt
+hKi
cKC
ujg
tQx
@@ -51212,7 +51230,7 @@ wXN
vrT
mzJ
uAD
-nVQ
+lPj
guH
mTq
szg
@@ -51220,36 +51238,36 @@ tvM
kVL
guD
fzG
-eBi
+pBA
pyc
lIF
pKj
wAb
iiF
-iis
+qBI
pPT
mka
dBn
-iis
+qBI
tyH
anv
-btM
-btM
-btM
-btM
-btM
-btM
-btM
-btM
-btM
-btM
-btM
-btM
-btM
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
+nzp
ejY
-cLl
-cLl
-cLl
+nXi
+nXi
+nXi
pBj
pBj
pBj
@@ -51280,7 +51298,7 @@ enB
enB
vUE
vUE
-tmJ
+aKq
pBj
pBj
pBj
@@ -51338,12 +51356,12 @@ enB
pBj
pBj
pBj
-pPm
-pPm
-pPm
-pPm
-mxG
-pPm
+sAX
+sAX
+sAX
+sAX
+ohi
+sAX
pBj
dUn
enB
@@ -51364,7 +51382,7 @@ tBl
fKt
qAq
oDD
-xzS
+vyn
oVk
hga
hga
@@ -51376,70 +51394,70 @@ hga
fiN
oVk
qnm
-sMA
-sLx
-cND
-cND
+cRS
+kIL
+bmS
+bmS
dCV
-cND
-cND
-gMe
-sZj
-sZj
+bmS
+bmS
+eut
+fSS
+fSS
pPZ
-sZj
-sZj
-xcy
-xcy
-xcy
-xcy
-xcy
-xcy
-xcy
+fSS
+fSS
+dxl
+dxl
+dxl
+dxl
+dxl
+dxl
+dxl
rXz
-xvn
-vgt
-vgt
+kTG
+hKi
+hKi
drO
-vgt
-pQT
-pQT
-pQT
-vgt
-vgt
-dAk
-dAk
-bKl
-kxt
-oeU
-kUS
-dnh
-eBi
+hKi
+egy
+egy
+egy
+hKi
+hKi
+bTZ
+bTZ
+mXw
+xQd
+mqh
+urg
+fXf
+pBA
pae
lIF
feB
nsG
nsG
-wVY
+vab
nTb
-iis
+qBI
syg
-iis
+qBI
tyH
nUZ
-btM
+nzp
kmZ
fcb
aeF
xII
wjQ
jhU
-btM
+nzp
oud
gbb
drE
daF
-btM
+nzp
aTy
aYR
tdD
@@ -51474,7 +51492,7 @@ dVV
enB
enB
vUE
-tmJ
+aKq
pBj
pBj
pBj
@@ -51570,8 +51588,8 @@ vyB
jZl
vTi
qnm
-sMA
-vpG
+cRS
+czB
lXv
wEc
kXI
@@ -51583,7 +51601,7 @@ bvr
iYP
oWl
eMu
-xXn
+yiS
qwS
fKg
juS
@@ -51592,14 +51610,14 @@ oME
dhw
kvU
sMx
-vKw
+hlq
tBq
tqs
uRC
lTI
pMR
kfP
-fkd
+qvx
nBG
idk
hIX
@@ -51608,7 +51626,7 @@ mJn
hPL
mJn
prL
-eBi
+pBA
pZT
toV
cls
@@ -51621,19 +51639,19 @@ igS
mqr
jxW
dOi
-btM
+nzp
lxP
mql
xkv
mgD
noa
aly
-btM
+nzp
cWU
baU
-btM
-btM
-btM
+nzp
+nzp
+nzp
aTy
aYR
tdD
@@ -51752,7 +51770,7 @@ tBl
tBl
hHm
oVk
-xzS
+vyn
oVk
oKX
upk
@@ -51777,7 +51795,7 @@ hcK
tfB
dKN
pVo
-hso
+fIK
fRW
lzT
mid
@@ -51786,14 +51804,14 @@ mDD
lzT
kyC
qVn
-gfE
+eko
kYD
bOB
wWn
nJd
nEB
rqo
-ohC
+caG
lBA
lBA
dSA
@@ -51827,7 +51845,7 @@ byN
nkE
qjB
dTX
-btM
+nzp
aTy
aYR
tdD
@@ -51944,24 +51962,24 @@ nFd
pBj
tBl
avF
-xzS
-xzS
-xzS
-xzS
-xzS
+vyn
+vyn
+vyn
+vyn
+vyn
pYa
-xzS
-hTs
-hTs
-xzS
-xzS
+vyn
+wNZ
+wNZ
+vyn
+vyn
mmN
dtc
oVk
-sMA
+cRS
gHs
-rSk
-bav
+lQo
+ohN
dzv
pFg
eIh
@@ -51987,16 +52005,16 @@ ncZ
qjk
iRb
saj
-tFn
+xGj
dke
pYQ
ofT
rPk
dBs
-rlw
+bMn
iyg
kaY
-eBi
+pBA
ljf
cjp
rBB
@@ -52009,22 +52027,22 @@ aQG
eCU
pbs
nrU
-btM
+nzp
vRd
jGh
xVD
dbd
ncT
ncT
-btM
+nzp
uGS
apT
-btM
-btM
-btM
+nzp
+nzp
+nzp
ejY
thO
-cLl
+nXi
tdD
pBj
pBj
@@ -52139,33 +52157,33 @@ enB
pBj
pBj
pBj
-xzS
+vyn
qiJ
-xzS
+vyn
ajc
oVk
sSX
oVk
oVk
oVk
-xzS
+vyn
mmN
dtc
oVk
-sMA
-sMA
+cRS
+cRS
iWe
iWe
-aiL
-aiL
+sEw
+sEw
vQQ
-aiL
-oZr
-eDE
-tcQ
-khZ
-oZr
-uYp
+sEw
+duY
+uim
+aNH
+oiL
+duY
+bJk
cHO
xZq
ihE
@@ -52174,51 +52192,51 @@ ihE
beh
orF
xhk
-osz
+kiS
lfu
rAc
rOF
gwp
cMV
xRH
-dxZ
-dxZ
-dxZ
-lFY
-bEq
-wNK
-hHE
-fei
-pZa
-xBB
-xBB
-xBB
-xBB
-xBB
-xBB
-xBB
+pFC
+pFC
+pFC
+gdw
+lBB
+tvK
+vWW
+gKF
+qWE
+bEp
+bEp
+bEp
+bEp
+bEp
+bEp
+bEp
sys
-xBB
-xBB
-xBT
+bEp
+bEp
+siA
jsz
-xBT
-btM
-btM
-btM
-slH
-siD
-siD
-siD
-siD
-siD
-siD
-siD
+siA
+nzp
+nzp
+nzp
+dsj
+uBu
+uBu
+uBu
+uBu
+uBu
+uBu
+uBu
sSg
sSg
aTy
sSg
-cLl
+nXi
tdD
pBj
pBj
@@ -52333,33 +52351,33 @@ enB
enB
pBj
pBj
-xzS
+vyn
qiJ
-xzS
+vyn
uXc
qzs
sKM
qfG
qfG
oVk
-hTs
+wNZ
uJC
dtc
hga
rSm
-sMA
+cRS
iWe
iWe
-aiL
+sEw
xLB
oem
-aiL
+sEw
kuo
hmO
drb
lCb
rUn
-uYp
+bJk
eNj
xZq
dpz
@@ -52368,23 +52386,23 @@ dpz
kzA
fdj
sya
-qwE
+cfM
fqL
uGG
ndb
gwp
cMV
rVC
-kmy
+fcv
cno
cno
ppg
xOO
-ejD
+tTi
mDz
mJn
aYp
-xBB
+bEp
hPM
xwx
pyC
@@ -52393,26 +52411,26 @@ uKi
fjr
dbM
jRK
-xBB
+bEp
jTo
tWZ
qoA
-xBT
+siA
fkH
dIY
vMq
-rOZ
+lKj
jSt
lBE
wln
osR
mRj
-siD
+uBu
sSg
sSg
aTy
aTy
-cLl
+nXi
aYR
pBj
pBj
@@ -52527,33 +52545,33 @@ enB
enB
pBj
pBj
-xzS
+vyn
qiJ
-xzS
+vyn
oVk
yhp
wrb
kcQ
fKU
oVk
-hTs
+wNZ
uJC
dtc
oVk
-xzS
-sMA
-sMA
-sMA
-aiL
+vyn
+cRS
+cRS
+cRS
+sEw
gYu
bfe
-aiL
+sEw
gcL
tYs
yjr
eBG
peR
-uYp
+bJk
iML
cYm
jOg
@@ -52562,23 +52580,23 @@ fCQ
yhc
vwR
wUC
-osz
+kiS
hHr
cwV
rRs
gwp
cMV
wqh
-kmy
+fcv
cno
cno
bSg
eLN
-oan
+yfx
iru
mJn
aYp
-ovT
+jdi
uOH
qcG
lvg
@@ -52587,26 +52605,26 @@ puy
puy
dtA
pkS
-iXg
+lIZ
kAC
slX
oio
-xBT
+siA
fkH
dIY
vMq
-rOZ
+lKj
jvH
vHd
fls
fls
mRB
-siD
+uBu
sSg
aTy
aTy
sSg
-cLl
+nXi
pBj
pBj
pBj
@@ -52692,7 +52710,7 @@ pBj
enB
enB
nFd
-kXA
+uAn
pwA
pwA
pwA
@@ -52715,39 +52733,39 @@ pwA
pwA
pwA
pwA
-kXA
+uAn
enB
enB
enB
dVV
pBj
-xzS
+vyn
qiJ
-xzS
+vyn
oVk
yhp
mmN
oVk
oVk
oVk
-hTs
+wNZ
uJC
dtc
oVk
-xzS
+vyn
oyx
vzc
gPk
-aiL
+sEw
cLg
cnw
-aiL
+sEw
hDK
gsD
xvx
wDr
qeC
-uYp
+bJk
uKe
ngf
mGl
@@ -52756,19 +52774,19 @@ mGl
aaA
vwR
vYO
-vVt
+vPP
rYY
jMc
rRs
gwp
cMV
wHx
-dxZ
-dxZ
-dxZ
-kjC
-ufE
-dxZ
+pFC
+pFC
+pFC
+wfn
+fEL
+pFC
bPd
ngb
dvz
@@ -52781,26 +52799,26 @@ rTo
orG
aJi
quS
-wLN
+bno
nqz
cRG
dTd
-xBT
+siA
oBj
xBE
dKy
-siD
-iQc
+uBu
+jul
xLq
vbd
qBo
bpy
-siD
+uBu
aTy
aTy
sSg
sSg
-cLl
+nXi
pBj
pBj
pBj
@@ -52828,9 +52846,9 @@ pBj
pBj
pBj
pBj
-tmJ
+aKq
goH
-tmJ
+aKq
pBj
pBj
pBj
@@ -52886,7 +52904,7 @@ nFd
enB
enB
pBj
-kXA
+uAn
fqV
qly
qly
@@ -52909,39 +52927,39 @@ qly
qly
qly
sZb
-kXA
+uAn
enB
enB
enB
enB
pBj
-xzS
+vyn
qiJ
-xzS
+vyn
oVk
yhp
mmN
oVk
oVk
mGL
-xzS
+vyn
fgh
dtc
oVk
-xzS
+vyn
dAe
bIT
oVk
-aiL
-aiL
+sEw
+sEw
vCV
-aiL
-dFt
-dFt
-dFt
+sEw
+hio
+hio
+hio
kNQ
-dFt
-uYp
+hio
+bJk
jSH
xZq
jpr
@@ -52950,23 +52968,23 @@ hHd
fqy
fic
xpP
-vVt
+vPP
ebM
rjS
pnZ
gwp
oRD
rxE
-dxZ
+pFC
ktB
hhA
vzn
gjf
-kmy
+kjT
hPU
mJn
vKN
-ovT
+jdi
bmj
jcW
qcG
@@ -52975,26 +52993,26 @@ qcG
qcG
uyl
uON
-iXg
+lIZ
eDh
dfZ
kbg
-kAp
+ner
cem
kbg
rGA
-uMW
+dQE
vqe
uNy
nMd
tbz
jQP
-siD
+uBu
sSg
aTy
aTy
sSg
-cLl
+nXi
pBj
pBj
pBj
@@ -53080,7 +53098,7 @@ enB
enB
enB
pBj
-kXA
+uAn
qly
qly
qly
@@ -53103,15 +53121,15 @@ qly
qly
qly
qly
-kXA
+uAn
enB
enB
enB
enB
kqN
-xzS
+vyn
qiJ
-xzS
+vyn
oVk
hpL
fJh
@@ -53127,9 +53145,9 @@ dAe
dAe
nqW
sNO
-aiL
-aiL
-rBT
+sEw
+sEw
+boC
tsk
tfW
elb
@@ -53144,51 +53162,51 @@ cmk
xsE
tuS
vFO
-osz
+kiS
dwm
gFK
gCz
bPe
rlG
xqC
-dxZ
+pFC
ktB
aoF
-nTp
+hZr
kYq
-kmy
+kjT
grW
mJn
vKN
-xBB
-xBB
+bEp
+bEp
tBX
qcG
uEv
qcG
aFK
fqI
-xBB
-xBB
-lRD
-sDx
-eyL
-xBT
+bEp
+bEp
+mkp
+jFL
+xOj
+siA
oLQ
rJV
oHd
-siD
+uBu
iqA
fcw
gXg
lKH
axh
-siD
+uBu
sSg
sSg
aTy
sSg
-cLl
+nXi
pBj
pBj
pBj
@@ -53274,7 +53292,7 @@ enB
enB
pBj
pBj
-kXA
+uAn
swv
qly
qly
@@ -53296,32 +53314,32 @@ qly
qly
qly
qly
-ijO
-kXA
+hMX
+uAn
nFd
enB
dVV
pBj
kqN
-xzS
+vyn
qiJ
-xzS
+vyn
uXc
oVk
oVk
oVk
spY
mXs
-xzS
+vyn
uJC
bgE
hga
-xzS
+vyn
hUU
dAe
nqW
dGn
-rBT
+boC
moS
jOi
eyA
@@ -53329,7 +53347,7 @@ ang
hXf
nEQ
ktW
-uYp
+bJk
qjg
nFb
vsT
@@ -53338,52 +53356,52 @@ vsT
mpY
vwR
raA
-sLu
-sLu
-sLu
-mvZ
-rHQ
+gzJ
+gzJ
+gzJ
+vfg
+mHQ
rEg
-rHQ
-rab
-rab
-rab
-rab
-kmy
-rab
+mHQ
+eKD
+eKD
+eKD
+eKD
+kjT
+eKD
qIm
mJn
dpt
mMs
-ovT
+jdi
aCP
uRP
mPZ
gFl
vpB
mqp
-iXg
+lIZ
dQg
gde
xWq
dNL
-gSp
-xdG
-xdG
-xdG
-gSp
-xdG
-gSp
-gSp
-gSp
-gSp
-gSp
-cLl
-cLl
+wci
+ofr
+ofr
+ofr
+wci
+ofr
+wci
+wci
+wci
+wci
+wci
+nXi
+nXi
wrZ
-cLl
-cLl
-cLl
+nXi
+nXi
+nXi
pBj
pBj
pBj
@@ -53468,12 +53486,12 @@ enB
enB
pBj
pBj
-kXA
+uAn
qly
qly
qly
-srt
-srt
+iCM
+iCM
oOw
oOw
sUa
@@ -53486,44 +53504,44 @@ bpb
eqt
oOw
oOw
-srt
-srt
+iCM
+iCM
qly
qly
qly
-kXA
-sLu
-sLu
-sLu
-sLu
-sLu
-sLu
+uAn
+bWq
+bWq
+bWq
+bWq
+bWq
+bWq
mYc
-xzS
+vyn
kye
arA
cGw
qfG
feR
oVk
-xzS
+vyn
mmN
bgE
oVk
-xzS
+vyn
qtM
dAe
nqW
tZg
-rBT
+boC
vmd
-rBT
+boC
iEO
-rBT
+boC
iEO
-rBT
+boC
iEO
-uYp
+bJk
wgt
nxe
wRh
@@ -53536,48 +53554,48 @@ bkz
qUB
rfv
dJn
-rHQ
-cML
+mHQ
+akk
emT
xUe
xUe
xUe
emT
-gjV
+jru
xLE
mDz
bgP
bgP
amA
-xBB
-xBB
-xBB
-xBB
-xBB
-xBB
-xBB
-xBB
+bEp
+bEp
+bEp
+bEp
+bEp
+bEp
+bEp
+bEp
hAE
eZd
xWq
oio
-gSp
+wci
dNb
kMi
yfi
bIY
hoL
qTV
-gSp
+wci
dcq
pjv
-gSp
+wci
toG
jpV
stz
qqk
opb
-cLl
+nXi
pBj
pBj
pBj
@@ -53662,11 +53680,11 @@ enB
enB
pBj
pBj
-kXA
+uAn
qly
qly
-srt
-srt
+iCM
+iCM
xjH
aKa
qpx
@@ -53681,11 +53699,11 @@ sQt
qpx
aKa
iqw
-srt
-srt
+iCM
+iCM
qly
qly
-kXA
+uAn
mYc
mYc
mYc
@@ -53693,85 +53711,85 @@ mYc
mYc
mYc
mYc
-sLu
-sLu
-sLu
-sLu
-sLu
-sLu
-sLu
-sLu
+bWq
+bWq
+bWq
+bWq
+bWq
+bWq
+bWq
+bWq
gcX
iMV
-sLu
-sLu
-sLu
+bWq
+bWq
+bWq
wDR
-sLu
-sLu
-rBT
-rBT
-rBT
-rBT
-rBT
-rBT
-rBT
-rBT
-uYp
-uYp
-uYp
-uYp
-uYp
-uYp
-uYp
-uYp
-uYp
-sLu
+bWq
+bWq
+boC
+boC
+boC
+boC
+boC
+boC
+boC
+boC
+bJk
+bJk
+bJk
+bJk
+bJk
+bJk
+bJk
+bJk
+bJk
+gzJ
tlq
tmh
bqO
-rHQ
+mHQ
gNI
xUe
rCo
rCo
rCo
xUe
-ctN
+sfB
bgP
bgP
bgP
bgP
xoD
unt
-xBT
+siA
lFJ
nFJ
bli
rIc
-xBT
+siA
mIN
rnd
tca
xWq
dTd
-xdG
+ofr
aHC
eNU
kOp
sKA
qmd
hOZ
-gSp
+wci
qcZ
xLx
-gSp
+wci
pZG
ijx
stz
aTy
aQw
-cLl
+nXi
pBj
pBj
pBj
@@ -53856,10 +53874,10 @@ pBj
enB
enB
pBj
-kXA
+uAn
fqV
qly
-srt
+iCM
uuY
ehg
sQt
@@ -53876,19 +53894,19 @@ sQt
sQt
ehg
hhM
-srt
+iCM
qly
sZb
-kXA
-gkM
-gkM
-gkM
-gkM
-sLu
-sLu
-sLu
-sLu
-sLu
+uAn
+lxh
+lxh
+lxh
+lxh
+bWq
+bWq
+bWq
+bWq
+bWq
hSS
hSS
qUB
@@ -53924,26 +53942,26 @@ rba
hpT
tci
hhp
-rHQ
+mHQ
tSy
xUe
rCo
rCo
rCo
kPd
-joW
+crX
bgP
bgP
bgP
bgP
mod
iLd
-vJU
+cxg
usM
obN
obN
kbX
-fMU
+aoh
hDX
gKK
mDQ
@@ -53956,16 +53974,16 @@ sCo
mNn
apL
uRi
-gSp
+wci
qKh
uxX
-gSp
+wci
tpf
oNT
stz
aTy
wBK
-cLl
+nXi
pBj
pBj
pBj
@@ -53984,8 +54002,8 @@ pBj
pBj
pBj
pBj
-tmJ
-xdy
+aKq
+ibQ
enB
enB
enB
@@ -54050,7 +54068,7 @@ pBj
nFd
enB
dVV
-kXA
+uAn
qly
qly
oOw
@@ -54073,16 +54091,16 @@ hOS
oOw
qly
qly
-kXA
+uAn
wMk
uWX
cgA
-gkM
+lxh
qIG
szQ
szQ
szQ
-sLu
+bWq
szQ
szQ
qUB
@@ -54125,25 +54143,25 @@ rCo
rCo
rCo
xUe
-fei
+jmj
bgP
bgP
bgP
bgP
teP
uXR
-xBT
+siA
wpw
gab
aZI
qzY
-xBT
+siA
aLf
ibv
rIq
xWq
bhU
-xdG
+ofr
kqZ
aKE
nLm
@@ -54153,13 +54171,13 @@ lHO
oVH
fOu
jnY
-gSp
+wci
uZB
vQg
stz
aTy
muu
-cLl
+nXi
pBj
pBj
pBj
@@ -54178,7 +54196,7 @@ pBj
pBj
pBj
pBj
-tmJ
+aKq
vUE
mea
enB
@@ -54239,12 +54257,12 @@ pBj
pBj
pBj
pBj
-kHO
-kHO
-kHO
+bRx
+bRx
+bRx
enB
enB
-kXA
+uAn
qly
qly
oOw
@@ -54267,7 +54285,7 @@ oOw
oOw
qly
qly
-kXA
+uAn
dAE
eTD
dgJ
@@ -54290,13 +54308,13 @@ szQ
ora
szQ
lTc
-eYY
-eYY
-eYY
-eYY
-eYY
-eYY
-eYY
+ryQ
+ryQ
+ryQ
+ryQ
+ryQ
+ryQ
+ryQ
szQ
szQ
szQ
@@ -54312,48 +54330,48 @@ szQ
bVi
szQ
sJg
-rHQ
+mHQ
twZ
emT
xUe
xUe
xUe
emT
-ulu
+hLX
sJl
iru
bgP
bgP
rhM
-alW
-alW
-alW
-alW
-alW
-alW
-alW
-alW
+tVF
+tVF
+tVF
+tVF
+tVF
+tVF
+tVF
+tVF
uRh
rIq
xWq
oio
-gSp
+wci
aRI
sxz
xAl
qKQ
ngZ
fac
-gSp
+wci
nhw
wEE
-gSp
+wci
iKF
qUt
stz
onH
kTd
-cLl
+nXi
pBj
pBj
pBj
@@ -54372,7 +54390,7 @@ pBj
pBj
pBj
pBj
-tmJ
+aKq
sxd
vUE
wQd
@@ -54433,12 +54451,12 @@ pBj
pBj
pBj
pBj
-kHO
+bRx
mDk
-kHO
-kHO
-kHO
-kHO
+bRx
+bRx
+bRx
+kvr
swv
qly
qly
@@ -54461,16 +54479,16 @@ qly
qly
qly
qly
-kXA
+uAn
tZW
tZW
cbe
-gkM
+lxh
qUB
szQ
szQ
szQ
-sLu
+bWq
xco
xco
ssT
@@ -54484,13 +54502,13 @@ guy
ora
xco
lTc
-eYY
+ryQ
aXP
hZL
qJo
ldl
xRj
-eYY
+ryQ
qDl
szQ
mYq
@@ -54506,48 +54524,48 @@ xco
xco
szQ
sJg
-rHQ
-rHQ
-rHQ
-rab
-rab
-rab
-rab
-kmy
-rab
+mHQ
+mHQ
+mHQ
+eKD
+eKD
+eKD
+eKD
+kjT
+sGw
egW
mJn
mCk
rMr
-uEQ
+tTI
uXp
enk
wCc
oJr
pps
coN
-say
+eTn
bzz
sev
xWq
fuP
-gSp
-xdG
-xdG
-xdG
-gSp
-xdG
-gSp
-gSp
-gSp
-gSp
-gSp
-cLl
-cLl
+wci
+ofr
+ofr
+ofr
+wci
+ofr
+wci
+wci
+wci
+wci
+wci
+nXi
+nXi
bAB
-cLl
-cLl
-cLl
+nXi
+nXi
+nXi
pBj
pBj
pBj
@@ -54566,12 +54584,12 @@ pBj
pBj
pBj
pBj
-tmJ
+aKq
vHo
vUE
uKp
vUE
-wpV
+ffl
pBj
pBj
pBj
@@ -54627,12 +54645,12 @@ pBj
pBj
pBj
pBj
-kHO
+bRx
skv
rRV
rRV
rRQ
-kHO
+kvr
fqV
qly
qly
@@ -54655,92 +54673,92 @@ qly
qly
qly
qly
-kXA
+uAn
aLs
tZW
lQX
-gkM
+lxh
qUB
-byV
-byV
-byV
-byV
-byV
-byV
-byV
-byV
-byV
-fGP
-fGP
+ind
+xPp
+xPp
+xPp
+xPp
+xPp
+xPp
+xPp
+xPp
+dep
+dep
vLE
-fGP
-fGP
+dep
+dep
ora
xco
lTc
-eYY
+ryQ
ayC
viV
uje
xVa
cMl
-eYY
-jnK
-jnK
-jnK
-jnK
-jnK
+ryQ
+mWB
+mWB
+mWB
+mWB
+mWB
mYq
szQ
qUB
-sLu
-sLu
+bWq
+bWq
uOj
-sLu
-sLu
+bWq
+bWq
uLD
xPE
aMU
met
iek
-dxZ
+pFC
ktB
wHt
-ngX
+oUG
jpg
-kmy
+kjT
hPU
mJn
vKN
-alW
-alW
+tVF
+tVF
vxg
ocv
ocv
wYJ
ocv
ist
-alW
-alW
-hQi
-aQa
-niY
-xBT
+tVF
+tVF
+nZR
+mRT
+bgC
+siA
dGm
mVh
olp
-fhQ
+oFt
pOV
xEG
uvN
gtH
eAV
-fhQ
+oFt
uga
fJO
stz
aHd
-cLl
+nXi
pBj
pBj
pBj
@@ -54760,12 +54778,12 @@ pBj
pBj
pBj
pBj
-tmJ
+aKq
wzZ
vUE
vUE
mea
-tmJ
+aKq
pBj
pBj
pBj
@@ -54821,7 +54839,7 @@ pBj
pBj
pBj
pBj
-kHO
+bRx
vHF
uMb
utA
@@ -54849,14 +54867,14 @@ qly
qly
qly
sZb
-kXA
+uAn
oPZ
sfs
oqx
nyq
ycY
-byV
-byV
+ind
+xPp
dTx
dTx
dTx
@@ -54868,45 +54886,45 @@ usA
jQY
mEM
uNo
-fGP
+dep
qSP
ssT
lTc
-eYY
-ahW
+ryQ
+rkB
vnm
vfF
aeO
uLE
-eYY
-jnK
+ryQ
+mWB
buN
nSn
uNX
-jnK
-jnK
+mWB
+mWB
szQ
qUB
-sLu
+bWq
mYq
szQ
pge
-sLu
+bWq
szQ
szQ
szQ
wFo
iBi
-dxZ
+pFC
ktB
hhA
sRF
gjf
-kmy
+kjT
grW
mJn
fre
-uEQ
+tTI
dLr
jmO
ocv
@@ -54915,26 +54933,26 @@ aVu
ocv
xOs
cbA
-say
+eTn
bAo
gTr
lil
-tPS
+kRE
cjr
uKA
gxW
-gGp
+xvG
nCo
dsC
mlx
nyW
kWq
-fhQ
+oFt
iIr
taE
gWg
uJs
-cLl
+nXi
pBj
pBj
pBj
@@ -54954,12 +54972,12 @@ pBj
pBj
pBj
pBj
-tmJ
-tmJ
-tmJ
-tmJ
-tmJ
-tmJ
+aKq
+aKq
+aKq
+aKq
+aKq
+aKq
pBj
pBj
pBj
@@ -55015,12 +55033,12 @@ pBj
pBj
pBj
pBj
-kHO
-kHO
-kHO
-kHO
-kHO
-kHO
+bRx
+bRx
+bRx
+bRx
+bRx
+kvr
qly
qly
qly
@@ -55042,15 +55060,15 @@ qly
qly
qly
qly
-ijO
-kXA
-gkM
-gkM
-gkM
-gkM
+hMX
+uAn
+uUy
+lxh
+lxh
+lxh
xFu
-byV
-byV
+ind
+xPp
dTx
lOg
dTx
@@ -55062,41 +55080,41 @@ fDH
fyx
dOP
mpk
-fGP
+dep
epm
-kXk
+ckI
eVY
-eYY
+ryQ
hPT
vnm
kua
hMQ
hMY
-jnK
+mWB
xZL
oCF
eGD
pvo
fcX
-jnK
+mWB
szQ
qUB
-sLu
+bWq
szQ
szQ
mYq
-sLu
-sLu
-sLu
-sLu
+bWq
+bWq
+bWq
+bWq
oWC
-sLu
-dxZ
-dxZ
-dxZ
-kjC
-tHP
-dxZ
+bWq
+pFC
+pFC
+pFC
+wfn
+bdn
+pFC
jlr
ngb
iLd
@@ -55113,22 +55131,22 @@ xBS
kuS
loh
iZF
-xBT
+siA
noc
sWa
lbN
-fhQ
-xgz
+oFt
+meI
qyY
hFu
rJG
jTV
-fhQ
+oFt
lvU
dHk
cpk
pix
-cLl
+nXi
pBj
pBj
pBj
@@ -55210,13 +55228,13 @@ pBj
pBj
pBj
pBj
-dpE
-dpE
-dpE
-dpE
-dpE
-dpE
-dpE
+cnl
+cnl
+cnl
+cnl
+cnl
+cnl
+cnl
qly
eqc
qly
@@ -55227,7 +55245,7 @@ pxC
xbD
xbD
rLY
-nVS
+xbD
pxC
pxC
kJk
@@ -55238,13 +55256,13 @@ qly
qly
qly
qRD
-mvZ
+lTi
aEk
xco
xco
xFu
-byV
-byV
+ind
+xPp
sfI
dTx
dTx
@@ -55256,17 +55274,17 @@ eWs
fyx
jxw
bYv
-fGP
+dep
eFZ
gDE
yfc
-eYY
-cIb
+ryQ
+qmn
vnm
ixd
qHx
qHx
-vhX
+cKM
kFB
xbW
mjL
@@ -55275,26 +55293,26 @@ umt
oXc
qUB
qUB
-sLu
+bWq
teZ
szQ
odF
-sLu
-sLu
-sLu
+bWq
+bWq
+bWq
djg
riA
fZA
-kmy
+fcv
cno
cno
vQP
eGu
-duF
+qcI
mDz
mJn
aeV
-uEQ
+tTI
eze
hTW
sEC
@@ -55303,26 +55321,26 @@ ioS
jNN
nsN
oZd
-say
+eTn
kws
sVW
oio
-xBT
+siA
pzB
nSo
sPc
-qjD
+qLf
hYR
nIq
nIq
nIq
aWP
-fhQ
+oFt
rMp
aTy
aTy
sHl
-cLl
+nXi
pBj
pBj
pBj
@@ -55404,13 +55422,13 @@ pBj
pBj
pBj
pBj
-dpE
+cnl
hEU
hEU
hEU
hEU
hEU
-dpE
+cnl
aTs
eqc
qly
@@ -55432,13 +55450,13 @@ qly
tll
kXL
hPc
-mvZ
+lTi
szQ
szQ
szQ
xFu
-byV
-byV
+ind
+xPp
dTx
lOg
dTx
@@ -55450,45 +55468,45 @@ fDH
fyx
xdO
kre
-fGP
+dep
lQr
nKp
jOn
-eYY
+ryQ
rNs
vnm
ppI
pTC
kUl
-jnK
+mWB
sjU
uSd
wWl
lSx
sjU
-jnK
+mWB
uLD
qUB
-iGT
-iGT
-iGT
-iGT
-iGT
-iGT
-iGT
+xjt
+xjt
+xjt
+xjt
+xjt
+xjt
+xjt
jNi
lQY
fPA
-kmy
+fcv
cno
cno
czJ
vZt
-pnh
+rej
iru
mJn
vKN
-alW
+tVF
aww
feS
noY
@@ -55497,26 +55515,26 @@ xQu
tVk
jeA
pRj
-alW
+tVF
sur
pzB
dpk
-xBT
+siA
qNI
nnI
sPc
-qjD
+qLf
xEG
dwy
frc
vAF
dIR
-fhQ
+oFt
bZj
maJ
drL
fMn
-cLl
+nXi
pBj
pBj
pBj
@@ -55598,7 +55616,7 @@ pBj
pBj
pBj
pBj
-dpE
+cnl
hEU
hEU
hEU
@@ -55626,13 +55644,13 @@ qly
cVK
tll
eWf
-mvZ
+lTi
ayG
cwt
cwt
fse
-byV
-byV
+ind
+xPp
sfI
dTx
dTx
@@ -55644,73 +55662,73 @@ eWs
fyx
tut
fNI
-fGP
+dep
iiw
vcn
bGX
-eYY
+ryQ
fPN
vnm
tYM
aeO
gUY
-jnK
-iBp
+mWB
+kYo
iKd
oTn
von
-iBp
-jnK
+qNS
+mWB
szQ
qUB
-iGT
+xjt
pnl
fhH
cxh
jQM
biL
-iGT
+xjt
obA
pyL
-jmh
-dxZ
-dxZ
-dxZ
-jfz
-bEq
-wNK
-hHE
-hTe
-nvR
-oNa
-oNa
-oNa
-oNa
-oNa
-oNa
+sDd
+pFC
+pFC
+pFC
+ijv
+iIp
+pFC
+vWW
+gvL
+qze
+kpm
+kpm
+kpm
+kpm
+kpm
+kpm
ktT
sGv
wGU
-alW
-alW
-hCt
-gey
-dDT
-dDT
-dDT
-dkP
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
+tVF
+tVF
+kaW
+enX
+mVC
+mVC
+mVC
+unO
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
aQd
vcj
-cLl
+nXi
pBj
pBj
pBj
@@ -55792,7 +55810,7 @@ pBj
pBj
pBj
pBj
-dpE
+cnl
hEU
hEU
hEU
@@ -55819,14 +55837,14 @@ qly
qly
cVK
fxj
-kXA
-mvZ
+uAn
+lTi
gne
szQ
szQ
szQ
-byV
-byV
+ind
+xPp
dTx
lOg
dTx
@@ -55838,36 +55856,36 @@ fDH
fyx
tut
lvP
-fGP
-kXk
-kXk
-kXk
-eYY
+dep
+eCy
+eCy
+eCy
+ryQ
ies
axV
efi
qvc
fTU
-jnK
+mWB
lUK
iKd
wWl
von
lUK
-jnK
-gmC
+mWB
+kvg
hRV
-iGT
+xjt
llM
shx
mLK
qSU
soJ
-rZr
+tmt
kVi
lYJ
bew
-uLa
+ktQ
hPi
uaY
bBQ
@@ -55876,20 +55894,20 @@ xLE
mDz
mJn
fre
-nEX
+vYU
iMB
gTs
iMB
iMB
-bOx
+sGX
kYs
jeA
oqw
ihN
-alW
+tVF
cuf
fqj
-dDT
+mVC
wli
xLX
hCp
@@ -55901,10 +55919,10 @@ xIz
xIz
eTT
xIz
-dDT
+mVC
sHl
yam
-cLl
+nXi
pBj
pBj
pBj
@@ -55986,7 +56004,7 @@ pBj
pBj
pBj
pBj
-dpE
+cnl
hEU
hEU
hEU
@@ -56013,14 +56031,14 @@ qly
qly
cVK
gQB
-kXA
-mvZ
+uAn
+qjY
gne
szQ
yjX
szQ
-byV
-byV
+ind
+xPp
dTx
dTx
dTx
@@ -56032,26 +56050,26 @@ eWs
vfq
kGy
dpV
-fGP
-lEX
+dep
+jbk
rEC
rEC
-eYY
+ryQ
jsy
oyj
ncO
fPY
hcy
-jnK
-wmK
+mWB
+xfy
nNb
mfE
mZa
-fLE
-jnK
+qBn
+mWB
icx
qvp
-iGT
+xjt
bmY
cMm
dbc
@@ -56061,7 +56079,7 @@ dRG
gxK
wja
wPF
-bao
+sly
nQd
wPF
vYW
@@ -56070,20 +56088,20 @@ ciK
ngb
qTk
hbT
-xex
+vhT
xQH
iXe
iXe
pCM
-dAH
+rYN
beQ
diG
upg
sUU
-alW
+tVF
ncD
jPU
-dDT
+mVC
wWV
nsn
jsd
@@ -56095,10 +56113,10 @@ jUh
xIz
tly
xIz
-dDT
+mVC
sHl
ekx
-cLl
+nXi
pBj
pBj
pBj
@@ -56180,7 +56198,7 @@ pBj
pBj
pBj
pBj
-dpE
+cnl
hEU
hEU
hEU
@@ -56207,55 +56225,55 @@ qly
qly
cVK
kaZ
-kXA
-kXA
+uAn
+uAn
msH
-kXA
-kXA
-uKm
-byV
-byV
-fGP
-fGP
-fGP
-fGP
-fGP
-fGP
-fGP
-fGP
-edi
-jtH
-fGP
-fGP
-lEX
+uAn
+uAn
+yga
+xPp
+xPp
+dep
+dep
+dep
+dep
+dep
+dep
+dep
+dep
+nMq
+lNS
+dep
+dep
+jbk
rEC
rEC
-eYY
-eYY
-eYY
-eYY
-eYY
-eYY
-jnK
-nPe
-ciC
-keL
-ciC
-nPe
-jnK
+ryQ
+ryQ
+ryQ
+ryQ
+ryQ
+ryQ
+mWB
+eke
+rNb
+rVb
+rNb
+eke
+mWB
btj
oSh
-iGT
-iGT
-ajF
-fzv
-ajF
-iGT
-rZr
+xjt
+xjt
+xOW
+rTT
+xOW
+xjt
+tmt
uwD
hCS
vkb
-iFG
+qmO
mvr
xKy
ygT
@@ -56264,20 +56282,20 @@ qSf
uSL
kox
hbT
-mqK
+lzb
upj
owO
owO
bfV
-rZC
+tBp
mIa
sdv
ykq
bBV
-alW
+tVF
kSz
jPU
-dDT
+mVC
xOv
oQa
jsd
@@ -56289,10 +56307,10 @@ jUh
xIz
tly
xIz
-dDT
+mVC
sHl
luR
-cLl
+nXi
pBj
pBj
pBj
@@ -56374,7 +56392,7 @@ pBj
pBj
pBj
pBj
-dpE
+cnl
hEU
hEU
hEU
@@ -56401,11 +56419,11 @@ qly
qly
cVK
tVi
-kXA
+uAn
lEq
nxk
nAo
-kXA
+uAn
dsi
cFr
uVt
@@ -56414,7 +56432,7 @@ uVt
cDU
uVt
uVt
-dRc
+hsT
hnY
hJF
vVE
@@ -56422,12 +56440,12 @@ yhO
rKN
ezU
fAu
-pNY
-svF
+dyd
+mAG
llR
fUV
hSr
-rsB
+elc
aWT
fUV
llR
@@ -56436,7 +56454,7 @@ jLI
jLN
soA
ojJ
-lxd
+rMY
xXR
hBp
rnL
@@ -56444,34 +56462,34 @@ fbe
ckC
seB
fiF
-wni
+qUk
sLC
mjV
xPj
cUF
-alz
+vnU
hOp
-alz
-alz
-jXe
-unF
-hTe
-nzk
-etO
-oNa
+vnU
+vnU
+mkt
+nbw
+gvL
+qCH
+msb
+kpm
mfZ
sIy
sIy
pcd
-oNa
+kpm
hnn
nkD
uqE
dGA
-alW
+tVF
xxw
hYs
-dDT
+mVC
eBJ
oSn
bEu
@@ -56483,10 +56501,10 @@ xIz
xIz
iZl
xIz
-dDT
+mVC
yaG
luR
-cLl
+nXi
pBj
pBj
pBj
@@ -56568,13 +56586,13 @@ pBj
pBj
pBj
pBj
-dpE
+cnl
hEU
hEU
hEU
hEU
hEU
-dpE
+cnl
nSi
eqc
qly
@@ -56595,11 +56613,11 @@ qly
qly
fJM
eCc
-ugJ
+nqd
vxf
pfA
kco
-pyR
+umG
mEB
fVx
fVx
@@ -56630,7 +56648,7 @@ wnZ
lhR
rMB
weU
-ujx
+rSM
nxD
reL
dPC
@@ -56638,49 +56656,49 @@ toi
hSd
fSE
axb
-ujx
+rSM
oLy
ngb
fLN
cww
-alz
+vnU
nYq
tLc
-alz
+vnU
bSU
krw
wMn
cKe
nHA
-oNa
+kpm
gZt
fOd
tAd
mPu
-oNa
+kpm
oHl
nyH
sIo
-alW
-alW
-alW
-alW
-dDT
-dDT
-dDT
+tVF
+tVF
+tVF
+tVF
+mVC
+mVC
+mVC
oUo
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
-dDT
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
+mVC
yaG
luR
-cLl
+nXi
pBj
pBj
pBj
@@ -56762,13 +56780,13 @@ pBj
pBj
pBj
pBj
-dpE
-dpE
-dpE
-dpE
-dpE
-dpE
-dpE
+cnl
+cnl
+cnl
+cnl
+cnl
+cnl
+cnl
qly
eqc
qly
@@ -56789,11 +56807,11 @@ qly
qly
uQM
qly
-kXA
+uAn
meA
rPy
vrz
-kXA
+uAn
xsc
tyJ
tyJ
@@ -56808,7 +56826,7 @@ unX
tyJ
mEU
bGI
-bGI
+vCw
iUC
sxN
fJQ
@@ -56824,7 +56842,7 @@ vCw
nJT
scJ
hpE
-vJs
+kzS
nQn
wft
rcB
@@ -56832,30 +56850,30 @@ nQn
wft
hkV
nQn
-aJW
+iUP
ygT
sEs
bSS
rtZ
-alz
+vnU
iZe
ezR
-alz
+vnU
mGY
bPt
pWj
eZQ
dzW
-hxo
-hxo
-hxo
-hxo
-hxo
-hxo
-alW
-alW
-alW
-alW
+dWm
+dWm
+dWm
+dWm
+dWm
+dWm
+tVF
+tVF
+tVF
+tVF
aTy
aTy
aTy
@@ -56864,7 +56882,7 @@ aTy
xrK
hAN
mIA
-cLl
+nXi
tnV
jgg
oiH
@@ -56874,7 +56892,7 @@ wOy
dug
yaG
wla
-cLl
+nXi
pBj
pBj
pBj
@@ -56960,7 +56978,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
qly
qly
@@ -56982,74 +57000,74 @@ qly
qly
qly
uQM
-ijO
-kXA
-kXA
+hMX
+uAn
+uAn
vlE
-qMP
-qMP
-qMP
-qMP
-qMP
-tdO
-rYl
-rYl
-rYl
-rYl
-rYl
-rYl
-rVp
-rVp
-rVp
-rVp
-rVp
-rVp
-azL
-rtz
-whR
-whR
-tyb
-whR
-gzX
-whR
+aZS
+aZS
+aZS
+aZS
+aZS
+mrZ
+dXY
+dXY
+dXY
+dXY
+dXY
+dXY
+gUS
+gUS
+gUS
+gUS
+gUS
+gUS
+qIh
+kWZ
+ukp
+ukp
+eon
+ukp
+oDx
+ukp
aJX
-tyb
-whR
+eon
+ukp
uSV
uUo
hUf
-gmC
+kvg
foy
-gmC
-gmC
+kvg
+kvg
hbY
-gmC
-gmC
+kvg
+kvg
ebx
-gmC
-gmC
+kvg
+kvg
lIf
hhN
fWX
-alz
+vnU
aVr
oCh
-alz
+vnU
gCG
bPt
flv
eZQ
dSs
-oWB
+eKL
lYV
pkN
cIO
oKz
-oWB
+eKL
xdi
gBp
xni
-cLl
+nXi
kqp
gMM
bch
@@ -57068,7 +57086,7 @@ gWg
rqR
igc
aDI
-cLl
+nXi
pBj
pBj
pBj
@@ -57154,7 +57172,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
fqV
kRF
hLh
@@ -57177,22 +57195,22 @@ qly
qly
uQM
sZb
-kXA
+uAn
jux
lMt
-qMP
+aZS
hZX
hZX
uhx
pjd
sEB
-rYl
+dXY
ruC
-niL
+nRi
lpI
lSc
brw
-rVp
+gUS
dYz
uHm
olH
@@ -57200,7 +57218,7 @@ mRU
sIz
eFk
pCD
-whR
+ukp
asl
vjn
bSJ
@@ -57208,27 +57226,27 @@ bei
kYK
fDe
oPH
-hrw
+vKj
tiu
bhS
nuH
-bgJ
+nMi
xsX
vtq
-bgJ
+nMi
xsX
vtq
-bgJ
+nMi
xsX
vtq
-wxk
+ijr
tZX
hLM
tDr
-alz
+vnU
cdE
xDn
-alz
+vnU
gCG
bPt
flv
@@ -57239,7 +57257,7 @@ jDR
coq
vtu
ula
-oWB
+eKL
aTy
gMM
bch
@@ -57252,7 +57270,7 @@ mIA
mIA
mIA
eiJ
-cLl
+nXi
mIA
gTH
gTH
@@ -57262,7 +57280,7 @@ mIA
mIA
mIA
aDI
-cLl
+nXi
pBj
pBj
pBj
@@ -57348,7 +57366,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
swv
iFy
dFm
@@ -57371,16 +57389,16 @@ qly
uht
rrx
qly
-kXA
+uAn
pCP
lMt
-qMP
+aZS
eRj
vqS
vqS
vqS
jbn
-rYl
+dXY
vek
ukG
nWU
@@ -57394,7 +57412,7 @@ bXx
uBg
dmj
fXh
-whR
+ukp
dtU
tGY
yem
@@ -57402,61 +57420,61 @@ uKa
bFQ
oeO
wsa
-hrw
+vKj
tiu
bhS
nuH
-bgJ
+nMi
dBB
yeT
-bgJ
+nMi
dBB
yeT
-bgJ
+nMi
dBB
yeT
-wxk
+ijr
eRf
qUz
mYE
-eAf
+kiM
yaF
-alz
-alz
-itz
-iwY
-gek
-poW
-vNp
-oWB
-oWB
-oWB
+vnU
+vnU
+rlk
+poN
+kMg
+kXv
+kZE
+eKL
+eKL
+eKL
baK
-oWB
-oWB
+eKL
+eKL
aTy
jXO
ekx
-cLl
+nXi
saL
agg
mIA
mIA
mIA
-cLl
-cLl
-cLl
-cLl
-dbs
-cLl
-cLl
-cLl
-cLl
-cLl
-cLl
-dbs
-cLl
-cLl
+nXi
+nXi
+nXi
+nXi
+pEN
+nXi
+nXi
+nXi
+nXi
+nXi
+nXi
+pEN
+nXi
+nXi
vjI
pBj
pBj
@@ -57542,7 +57560,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
qdY
fJu
@@ -57565,16 +57583,16 @@ qly
spg
mAS
cbV
-kXA
+uAn
pCP
lMt
-qMP
+aZS
ske
ske
ske
vqS
jqL
-rYl
+dXY
tXm
qJr
kmo
@@ -57588,7 +57606,7 @@ wux
uwn
hwE
kAK
-htU
+dDP
xrI
tXP
mCp
@@ -57596,26 +57614,26 @@ tHi
baJ
enF
hst
-whR
-oqK
+ukp
+tiu
bhS
-nuH
-gmC
+gjq
+kvg
lNl
oji
-gmC
+kvg
lNl
oji
-gmC
+kvg
lNl
oji
-gmC
-lEX
-nYw
-lEX
-alz
+kvg
+jbk
+uDc
+jbk
+vnU
cdE
-alz
+vnU
awS
bgB
lNm
@@ -57623,35 +57641,35 @@ ykc
ksE
qdJ
urW
-cLl
+nXi
xFV
lnv
aBV
aTy
aTy
jXO
-cLl
-cLl
-cLl
-cLl
-cLl
-cLl
-cLl
-cLl
+nXi
+nXi
+nXi
+nXi
+nXi
+nXi
+nXi
+nXi
aDI
aDI
mIA
aTy
sSg
-cLl
+nXi
krg
uuX
-cRn
+sQW
ieu
mIA
ore
-cLl
-cLl
+nXi
+nXi
pBj
pBj
pBj
@@ -57736,7 +57754,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
ecx
qly
@@ -57759,16 +57777,16 @@ qly
qly
uQM
qly
-kXA
+uAn
pCP
lMt
-qMP
+aZS
nEx
nCa
nCa
vqS
kKh
-rYl
+dXY
nYB
qJr
bcT
@@ -57782,7 +57800,7 @@ gqo
blO
mED
asp
-vaO
+tzc
lqA
eWR
eRg
@@ -57790,26 +57808,26 @@ rAw
rdE
kAI
fxc
-hrw
+vKj
tiu
bhS
rrl
-gmC
-gmC
-gmC
-gmC
-gmC
-gmC
-gmC
-gmC
-gmC
-gmC
+kvg
+kvg
+kvg
+kvg
+kvg
+kvg
+kvg
+kvg
+kvg
+kvg
ksX
cbn
-lEX
+jbk
jZN
cdE
-alz
+vnU
gtD
tSV
sQy
@@ -57827,17 +57845,17 @@ qPE
wTy
oNk
nVv
-cLl
+nXi
ycW
cmA
cmA
-cLl
+nXi
aDI
mIA
aTy
sSg
sSg
-cLl
+nXi
ryi
ieu
uks
@@ -57845,7 +57863,7 @@ aTy
ieu
mIA
bKV
-cLl
+nXi
pBj
pBj
pBj
@@ -57930,7 +57948,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
ecx
qly
@@ -57953,57 +57971,57 @@ ilr
qly
nxh
rtk
-kXA
+uAn
vBG
lMt
-qMP
+aZS
eRj
vqS
vqS
vqS
lye
-rYl
+dXY
eIB
xRX
fsv
aPX
kUn
-rVp
+xju
kjQ
xsA
liI
hEi
-rVp
+gUS
qRv
-whR
-whR
-lbD
+ukp
+qWt
+qWt
vvp
-lbD
-lbD
-uKm
-uKm
-uKm
-uKm
+qWt
+qWt
+yga
+yga
+yga
+yga
xNm
bhS
nuH
-kdW
+keC
pUO
xQz
owT
xpX
-thy
+uaX
jVH
iHi
pch
-thy
+uaX
iwt
mix
-lEX
+jbk
xgN
cdE
-alz
+vnU
plZ
sJl
dyP
@@ -58025,21 +58043,21 @@ aVa
wOu
rnP
cmA
-cLl
+nXi
aDI
axz
sSg
sSg
aDI
-cLl
-cLl
-cLl
-cLl
+nXi
+nXi
+nXi
+nXi
oSM
ieu
ieu
bKV
-cLl
+nXi
pBj
pBj
pBj
@@ -58124,7 +58142,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
ecx
qly
@@ -58147,42 +58165,42 @@ ilr
qly
uQM
qly
-kXA
+uAn
vBG
lMt
-qMP
+aZS
hZX
hZX
hZX
vqS
rtU
-rYl
+dXY
fmV
fzK
jqk
xDK
qkd
-rVp
+gUS
jBb
xsA
liI
xHo
-rVp
+gUS
qRv
-whR
+ukp
oJU
brY
fhb
isc
kXR
-uKm
+yga
ftt
bct
-uRD
+myF
pwT
bhS
nuH
-kdW
+keC
hGI
ijR
oZw
@@ -58194,38 +58212,38 @@ pjS
jrD
pwT
dyg
-lEX
-qcK
+jbk
+jNL
sym
-qcK
-qcK
-qcK
-iDq
+jNL
+jNL
+jNL
+dSo
geu
-lsM
-hlN
-hlN
-hlN
-hlN
-hlN
-wQC
-wQC
-wQC
-wQC
-aFW
-aFW
-aFW
-aFW
+eju
+nzd
+nzd
+nzd
+nzd
+nzd
+fqf
+fqf
+fqf
+fqf
+cgH
+cgH
+cgH
+cgH
hXa
upL
cmA
-cLl
+nXi
aDI
aTy
sSg
aDI
aDI
-cLl
+nXi
ryi
ieu
hqa
@@ -58233,7 +58251,7 @@ ieu
mIA
ore
xpI
-cLl
+nXi
pBj
pBj
pBj
@@ -58318,7 +58336,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
fqV
ecx
ilr
@@ -58341,93 +58359,93 @@ ilr
ilr
uQM
sZb
-kXA
+uAn
vBG
lMt
-qMP
-qMP
-qMP
-qMP
-kgH
-qMP
-rYl
+aZS
+aZS
+aZS
+aZS
+woV
+aZS
+dXY
qXW
vjT
vSe
xDK
wjW
-rVp
+gUS
qpY
xsA
liI
hBe
-rVp
+gUS
jcm
-whR
+ukp
nEu
iyu
pIw
mmM
mzD
-uKm
+yga
whF
oRC
-odk
+mJx
wXp
bhS
nuH
-kdW
+keC
eUi
cCa
fEm
dZR
-thy
+uaX
pcO
uMY
-aLO
-thy
+rUw
+uaX
nsP
mrE
-lEX
+jbk
gmT
dVi
nzw
sIX
-qcK
+jNL
kjO
kQE
baT
-hlN
+nzd
ihl
vzR
agh
-hlN
+nzd
gqg
qWP
pKw
-wQC
+fqf
gYz
oWD
vAl
-aFW
+cgH
vEJ
dsu
uLR
-cLl
+nXi
sSg
aTy
mIA
aDI
aDI
-cLl
+nXi
krg
tRo
-cRn
+sQW
ieu
ieu
ieu
otg
-cLl
+nXi
pBj
pBj
pBj
@@ -58512,7 +58530,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
swv
ecx
ilr
@@ -58534,94 +58552,94 @@ dym
ilr
ilr
uQM
-ijO
-kXA
+hMX
+uAn
vBG
lMt
vBG
kBE
-qMP
+aZS
wpd
vqS
xba
-rYl
+dXY
uIi
hqn
dEA
kap
liF
-rVp
+gUS
llD
xsA
liI
nvz
-rVp
-rVp
-whR
-whR
-whR
-whR
-whR
-whR
-uKm
-uKm
-uKm
-uKm
-iRx
+gUS
+gUS
+ukp
+ukp
+ukp
+ukp
+ukp
+ukp
+yga
+yga
+yga
+yga
+dPl
oBU
cUn
-jqM
+tAk
jVz
ydS
qOA
-rDQ
-thy
+hfO
+uaX
jnl
jIN
scA
-thy
+uaX
tiu
hiE
-lEX
+jbk
gap
nDj
czR
jjr
-agr
+laa
kWb
oRp
uaM
-hlN
+nzd
lzf
rvP
kiW
-hlN
+nzd
aRs
pNZ
cow
-wQC
+fqf
hzm
xda
xtD
-aFW
+cgH
qSY
upL
vnE
-cLl
-cLl
-dbs
-cLl
-cLl
-cLl
-cLl
-cLl
-cLl
-cLl
+nXi
+nXi
+pEN
+nXi
+nXi
+nXi
+nXi
+nXi
+nXi
+nXi
aTy
ore
xmK
-cLl
-cLl
+nXi
+nXi
pBj
pBj
pBj
@@ -58706,7 +58724,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
ecx
ilr
@@ -58729,75 +58747,75 @@ ilr
ilr
uQM
qly
-kXA
+uAn
vBG
lMt
pCP
vBG
-qMP
+aZS
hMP
vqS
xba
-quB
-quB
+nfd
+nfd
nrF
vFi
sJO
-quB
-rVp
+ovr
+gUS
syF
nCl
liI
gBU
-ltz
+nLl
nta
oOG
-cvH
+sqF
kvT
euI
onG
-ltz
+nLl
quk
wrf
jZm
-ltz
-whi
+nLl
+oqK
bhS
quY
-azK
+uns
unz
unz
jAe
ioo
-tMQ
-cbM
-oJK
-asf
-tMQ
+gBj
+mqC
+kGz
+esQ
+gBj
tiu
-lwV
-lEX
+cXI
+jbk
gmT
nDj
czR
jjr
-agr
+laa
nOt
wUE
wpX
-hlN
-hlN
+nzd
+nzd
eii
-hlN
-hlN
-wQC
+nzd
+nzd
+fqf
aOU
-wQC
-wQC
-aFW
+fqf
+fqf
+cgH
gvh
-aFW
-aFW
+cgH
+cgH
uLR
upL
uLR
@@ -58810,13 +58828,13 @@ orP
orP
lhq
lhq
-fUo
-fUo
+fzX
+fzX
lIT
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
pBj
pBj
pBj
@@ -58900,7 +58918,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
fHa
bYD
@@ -58923,30 +58941,30 @@ wtF
wtF
qap
qly
-kXA
+uAn
vBG
lMt
pCP
kBE
-qMP
+aZS
smO
qHW
xba
-quB
+nfd
hiK
xOG
mcs
dVY
iZt
-quB
-rVp
-rVp
-rVp
-rVp
-ltz
+nfd
+gUS
+gUS
+gUS
+gUS
+nLl
rxW
oOG
-cvH
+sqF
gon
woR
woR
@@ -58954,11 +58972,11 @@ nzt
woR
bxf
nyI
-hKS
+tZG
tiu
bhS
nuH
-vmI
+keC
fQG
bBy
bVn
@@ -58967,31 +58985,31 @@ pwk
dFj
fil
sdn
-tMQ
+gBj
tiu
hiE
-lEX
+jbk
sjS
nDj
czR
lNB
-qcK
+jNL
qTP
qST
vSw
-hlN
+nzd
kbj
imL
eQx
-hlN
+nzd
exU
ncb
tDY
-wQC
+fqf
uep
ipW
ayK
-aFW
+cgH
uLR
snv
wOu
@@ -59004,13 +59022,13 @@ wOu
wOu
rnP
lhq
-fUo
+fzX
hEB
cmA
-fUo
+fzX
hEB
vGQ
-fUo
+fzX
pBj
pBj
pBj
@@ -59094,7 +59112,7 @@ pBj
pBj
pBj
pBj
-kXA
+uAn
qly
rMS
qly
@@ -59117,75 +59135,75 @@ qly
qly
rMS
qly
-kXA
+uAn
dwd
lMt
pCP
pCP
-qMP
-qMP
-qMP
-qMP
-quB
+aZS
+aZS
+aZS
+aZS
+nfd
vSi
cYf
aEU
jmn
mQc
-quB
+nfd
rIs
dsc
dsc
jOE
-ltz
+nLl
clA
txB
-cvH
-lEf
+sqF
+luL
bvA
tOd
guL
tOd
lDe
jAc
-hKS
+tZG
mve
bhS
nuH
-vmI
+keC
hGI
ijR
eTG
cig
-tMQ
+gBj
mZy
qhU
-pRn
-tMQ
+glz
+gBj
tiu
hiE
-lEX
+jbk
gmT
nDj
czR
klL
-agr
+laa
uZq
xqL
vtX
-hlN
+nzd
emu
kfZ
nao
-hlN
+nzd
axQ
tjO
ifJ
-wQC
+fqf
oWE
iCs
cht
-aFW
+cgH
lVa
uLR
uLR
@@ -59198,13 +59216,13 @@ uLR
uLR
upL
uLR
-vop
+cFD
gEy
gEy
lEZ
gEy
pYi
-fUo
+fzX
pBj
pBj
pBj
@@ -59288,50 +59306,50 @@ pBj
pBj
pBj
pBj
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
-kXA
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
+uAn
vBG
lMt
lMt
lMt
lMt
vBG
-hAg
+iLp
wFc
-quB
+nfd
bEr
lSG
dmx
tWJ
trg
-quB
+nfd
kKH
-hAg
-hAg
-aEB
-ltz
+iLp
+iLp
+pPD
+nLl
fJF
rib
xME
@@ -59346,19 +59364,19 @@ iFX
eCN
ohv
oQS
-vmI
+keC
pUO
mzx
yaJ
wTt
-tMQ
+gBj
vIc
rgb
xSm
-tMQ
+gBj
tiu
wms
-lEX
+jbk
gap
iOy
iQi
@@ -59367,38 +59385,38 @@ mhV
eOq
cuJ
lxu
-hlN
+nzd
mlV
uWK
tQv
-hlN
+nzd
lcJ
lhu
ldp
-wQC
+fqf
rQD
tmD
qDe
-aFW
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
+cgH
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
hHu
mal
lhq
-fUo
+fzX
gEy
gEy
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
pBj
pBj
pBj
@@ -59500,7 +59518,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
aOv
aOv
lMt
@@ -59512,23 +59530,23 @@ vBG
vBG
lMt
vBG
-hAg
+iLp
wFc
-quB
-quB
+nfd
+nfd
lVi
aaW
wQJ
-quB
-quB
+nfd
+nfd
kKH
-hAg
+iLp
vBG
bVr
-ltz
+nLl
gtx
ecf
-cvH
+sqF
mbW
dWJ
tOd
@@ -59536,63 +59554,63 @@ suI
wRc
gFO
eSN
-hKS
+tZG
wXp
ewu
fgP
-uYR
-uYR
-uYR
-uYR
-uYR
-tMQ
-tMQ
-tMQ
-tMQ
-tMQ
+sse
+sse
+sse
+sse
+sse
+gBj
+gBj
+gBj
+gBj
+gBj
tiu
hiE
-lEX
+jbk
gmT
yjq
rHe
awp
-qcK
+jNL
pbY
tdy
orZ
-hlN
+nzd
eNY
sPP
sBu
-hlN
+nzd
uXn
uaP
iQw
-wQC
+fqf
hNv
pog
qVP
-aFW
+cgH
lUe
tmF
wGW
-oGg
+aYW
uWd
fMy
cWA
kHg
-oGg
+aYW
lhq
gvY
lhq
-fUo
+fzX
cmA
gEy
duq
gEy
eLV
-fUo
+fzX
pBj
pBj
pBj
@@ -59694,35 +59712,35 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
fzS
fzS
vBG
vBG
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
udB
-fwK
-hAg
+kcn
+iLp
wFc
-quB
-quB
-quB
-quB
-quB
-quB
-quB
+nfd
+nfd
+nfd
+nfd
+nfd
+nfd
+nfd
kKH
-hAg
+iLp
qGR
pmi
-ltz
+nLl
wiw
hLf
-cvH
+sqF
qgw
cqp
cqp
@@ -59730,7 +59748,7 @@ dwr
gQH
ioQ
fSD
-hKS
+tZG
tiu
mgL
ktw
@@ -59746,47 +59764,47 @@ rFb
rFb
eVT
iFp
-lEX
-qcK
+jbk
+jNL
sym
-qcK
-qcK
-qcK
-fIf
-cUS
-oTf
-hlN
-hlN
+jNL
+jNL
+jNL
+nrE
+wks
+uWx
+nzd
+nzd
sxe
-hlN
-hlN
-wQC
+nzd
+nzd
+fqf
aqd
-wQC
-wQC
-aFW
+fqf
+fqf
+cgH
ezu
-aFW
-aFW
+cgH
+cgH
qAx
jSr
cgM
-oGg
+aYW
uWd
hGo
hGo
kHg
-oGg
+aYW
uLR
gvY
lhq
-fUo
+fzX
tmi
dtj
-fUo
+fzX
hEB
pYi
-fUo
+fzX
pBj
pBj
pBj
@@ -59888,19 +59906,19 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
vBG
pCP
pCP
-fwK
+kcn
lMt
vBG
-hAg
+iLp
aVI
byw
byw
@@ -59910,21 +59928,21 @@ byw
byw
byw
dHQ
-hAg
+iLp
mCO
bVr
-ltz
+nLl
wXb
fsz
-cvH
+sqF
gvP
kWU
mVE
-ltz
+nLl
lvn
khV
aBh
-ltz
+nLl
jqg
rIk
fTu
@@ -59940,7 +59958,7 @@ hyN
tyJ
tyJ
xPU
-lEX
+jbk
ahf
efg
lkT
@@ -59949,7 +59967,7 @@ aBa
wHL
hgi
iDO
-nbS
+txE
neC
lKu
lZO
@@ -59970,17 +59988,17 @@ msf
msf
isg
lti
-oGg
+aYW
cmA
gvY
uLR
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
pBj
pBj
pBj
@@ -60087,54 +60105,54 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
pCP
-fwK
+kcn
lMt
pCP
-hAg
-hAg
-hAg
-hAg
-hAg
-hAg
-hAg
-hAg
-hAg
-hAg
-hAg
-fwK
-sDO
-ltz
-ltz
-ltz
-ltz
-ltz
-ltz
-ltz
-ltz
-ltz
-ltz
-ltz
-ltz
-oSw
-nGZ
-ixC
-ixC
+iLp
+iLp
+iLp
+iLp
+iLp
+iLp
+iLp
+iLp
+iLp
+iLp
+iLp
+kcn
+qxd
+nLl
+nLl
+nLl
+nLl
+nLl
+nLl
+nLl
+nLl
+nLl
+nLl
+nLl
+nLl
+lUI
+cwI
+kfW
+kfW
rbk
-ixC
-rVe
-rVe
-iBZ
-iBZ
-oFY
-rVe
-iBZ
-iBZ
-rVe
-rVe
+kfW
+tNc
+tNc
+juW
+juW
+iRk
+tNc
+juW
+juW
+tNc
+tNc
vNW
efg
lkT
@@ -60143,7 +60161,7 @@ uPz
buA
tdy
qaz
-mGb
+kYf
ekb
vBU
sfH
@@ -60164,16 +60182,16 @@ hGo
hGo
pFY
xgG
-oGg
+aYW
cmA
bde
vnE
-fUo
+fzX
vpM
grX
eyv
bWd
-fUo
+fzX
pBj
pBj
pBj
@@ -60281,7 +60299,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
vBG
@@ -60305,21 +60323,21 @@ vBG
vjN
fce
fce
-lBi
+uJn
eFJ
qVo
-lBi
+uJn
mbM
kul
kCA
-nCO
+xql
adc
qAO
-ixC
+kfW
xxF
qPN
jNu
-rVe
+tNc
nND
mNd
boG
@@ -60328,46 +60346,46 @@ mWW
qiU
qiU
pgI
-rVe
-tNt
-tNt
-tNt
-tNt
-tNt
-etg
-fkm
-oTf
-eBE
-eBE
+tNc
+itG
+itG
+itG
+itG
+itG
+snD
+mFI
+uWx
+oJG
+oJG
gKz
-eBE
-eBE
-mIc
+oJG
+oJG
+cfk
nLu
-mIc
-mIc
-aKY
+cfk
+cfk
+aWl
wQw
-aKY
-aKY
+aWl
+aWl
iLI
-oGg
+aYW
iLI
-oGg
+aYW
lBU
hGo
hGo
uWS
-oGg
+aYW
cmA
gvY
uLR
-fUo
+fzX
nmy
nso
nso
ekH
-fUo
+fzX
pBj
pBj
pBj
@@ -60475,11 +60493,11 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
vBG
-fwK
+kcn
mVr
lMt
lMt
@@ -60499,21 +60517,21 @@ vyi
vyi
vyi
jra
-lBi
+uJn
tdf
uSr
-lBi
+uJn
iBU
tln
uhz
kRq
sVH
sKU
-ixC
+kfW
hCo
kot
jNu
-rVe
+tNc
uWH
pPM
lun
@@ -60522,46 +60540,46 @@ mNc
tmA
eJh
uNH
-rVe
+tNc
qrG
khd
qxJ
tIA
-tNt
+itG
vVs
tdy
orZ
-eBE
+oJG
dFE
mua
xGk
-eBE
+oJG
vWA
tOE
hfz
-mIc
+cfk
clz
pRS
mwd
-aKY
+aWl
cEt
-oGg
+aYW
cEt
-oGg
+aYW
lBU
gaL
rrL
uWS
-oGg
+aYW
uLR
gvY
uLR
-fUo
+fzX
rza
jyL
cBN
vJe
-fUo
+fzX
pBj
pBj
pBj
@@ -60669,11 +60687,11 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
vBG
-fwK
+kcn
vBG
vBG
vBG
@@ -60693,7 +60711,7 @@ pCP
pCP
vBG
tfU
-lBi
+uJn
qDA
ksG
pdZ
@@ -60703,11 +60721,11 @@ hXM
pqQ
pqQ
lig
-ixC
+kfW
jCa
clD
jNu
-rVe
+tNc
kZL
cAZ
gur
@@ -60716,7 +60734,7 @@ rAn
gur
nvo
biH
-rVe
+tNc
tAT
tLz
wcJ
@@ -60725,38 +60743,38 @@ wVX
dCz
cSG
orZ
-eBE
+oJG
maU
pAN
wWN
-eBE
+oJG
pfD
ulK
lyr
-mIc
+cfk
tCA
npG
aJd
-aKY
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
-oGg
+aWl
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
+aYW
uLR
gvY
uLR
-fUo
-fUo
+fzX
+fzX
lIT
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
pBj
pBj
pBj
@@ -60863,45 +60881,45 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
vBG
bVr
-lBi
-lBi
-lBi
-lBi
-pDo
+uJn
+uJn
+uJn
+uJn
+bqU
cBT
lmf
lmf
rTn
iki
-ixC
+kfW
rjW
iJu
wjX
-rVe
+tNc
uSb
iZJ
gur
@@ -60910,28 +60928,28 @@ kYB
gur
eJh
nAm
-rVe
+tNc
wrq
tSC
cUU
qHc
-tNt
+itG
yli
pqq
orZ
-eBE
+oJG
mPY
lly
kjy
-eBE
+oJG
wac
dBb
sXG
-mIc
+cfk
aCm
aVs
lml
-aKY
+aWl
cmA
cmA
uLR
@@ -60939,7 +60957,7 @@ tcq
uLR
uLR
uLR
-fUo
+fzX
qdm
eAc
gvY
@@ -60950,7 +60968,7 @@ uLR
uLR
uLR
mNx
-fUo
+fzX
pBj
pBj
pBj
@@ -61078,24 +61096,24 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
oXo
bVr
vBG
vBG
vBG
vjN
-pDo
+bqU
ufT
uqC
uqC
xkh
hVm
-bZU
-bZU
+kgx
+kfW
ryd
-ixC
-bZU
+kfW
+kgx
mvo
pzU
gur
@@ -61104,28 +61122,28 @@ rAn
gur
eJh
foH
-rVe
-tNt
-tNt
-tNt
-tNt
-tNt
+tNc
+itG
+itG
+itG
+itG
+itG
qTP
pqq
rlS
-eBE
+oJG
wek
soE
rto
-eBE
+oJG
kKy
qgP
sDK
-mIc
+cfk
hna
qzP
lAf
-aKY
+aWl
cmA
gvY
gvY
@@ -61144,7 +61162,7 @@ gvY
gvY
gvY
wcr
-fUo
+fzX
pBj
pBj
pBj
@@ -61272,24 +61290,24 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
nzK
sAv
vyi
vyi
vyi
qDa
-pDo
-fdJ
+bqU
+eWN
uqC
uqC
tpI
uFa
-bZU
+kgx
vsK
eCq
vsK
-bZU
+kgx
dSq
pPM
nyt
@@ -61298,28 +61316,28 @@ nnV
rHa
eJh
gQs
-tfF
+iMz
snQ
aaU
lbx
lbx
-neO
+hVB
nkv
pqq
dTN
-eBE
-eBE
+oJG
+oJG
meM
-eBE
-eBE
-mIc
+oJG
+oJG
+cfk
mbu
-mIc
-mIc
-aKY
+cfk
+cfk
+aWl
tGv
-aKY
-aKY
+aWl
+aWl
uLR
gvY
mop
@@ -61327,7 +61345,7 @@ uLR
uLR
hXa
pdD
-fUo
+fzX
ptn
ptn
ptn
@@ -61338,7 +61356,7 @@ uLR
uLR
gvY
uLR
-fUo
+fzX
pBj
pBj
pBj
@@ -61466,24 +61484,24 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
+kcn
+kcn
wxx
-fwK
-fwK
+kcn
+kcn
fzS
bVr
-pDo
+bqU
rvo
jIH
cGk
hox
sWB
-bZU
+kgx
rjW
nXs
ker
-bZU
+kgx
gCP
iCF
beo
@@ -61492,50 +61510,50 @@ gkY
gkX
bjY
iyL
-rVe
+tNc
snQ
xuZ
xtR
fDk
-neO
+hVB
jOw
pTQ
cAt
-eBE
+oJG
vjj
guZ
gCF
-eBE
+oJG
lCv
cJW
rhI
-mIc
+cfk
sfC
sSp
vgj
-aKY
+aWl
cmA
gvY
-fUo
-fUo
+fzX
+fzX
lIT
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
uLR
uLR
gvY
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
pBj
pBj
pBj
@@ -61660,57 +61678,57 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
qdL
wOG
nNc
-fwK
+kcn
vBG
bVr
-pDo
-pDo
-pDo
-pDo
+bqU
+bqU
+bqU
+bqU
sMg
-pDo
-bZU
-bZU
-bZU
-bZU
-bZU
-rVe
-rVe
-rVe
-rVe
-rVe
-rVe
+bqU
+kgx
+kgx
+kgx
+kgx
+kgx
+tNc
+tNc
+tNc
+tNc
+tNc
+tNc
rzY
-rVe
-rVe
+tNc
+tNc
snQ
bsX
jVT
jVT
-neO
+hVB
pOQ
wYl
orZ
-eBE
+oJG
fuH
bHs
eIt
-eBE
+oJG
oEW
bed
tcX
-mIc
+cfk
cRt
hnZ
rLk
-aKY
+aWl
uLR
bde
-fUo
+fzX
fAc
uLR
uLR
@@ -61721,15 +61739,15 @@ uLR
gKT
mks
fcR
-fUo
+fzX
hOH
uLR
gvY
-fUo
+fzX
kzc
wCM
nZb
-fUo
+fzX
pBj
pBj
pBj
@@ -61854,11 +61872,11 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pxj
tdt
cRT
-fwK
+kcn
pCP
bVr
gjx
@@ -61867,11 +61885,11 @@ vBG
dWw
nDH
uzq
-bZU
-bZU
-bZU
-bZU
-bZU
+nKk
+nKk
+nKk
+nKk
+nKk
anr
vBG
pCP
@@ -61879,43 +61897,43 @@ pCP
vBG
vBG
lMt
-fwK
-fwK
+kcn
+kcn
snQ
bsX
csj
nUp
-neO
+hVB
dOe
wYl
eAZ
-xaB
-eBE
-eBE
-eBE
-eBE
-mIc
-mIc
-mIc
-mIc
-aKY
-aKY
-aKY
-aKY
+oVl
+oJG
+oJG
+oJG
+oJG
+cfk
+cfk
+cfk
+cfk
+aWl
+aWl
+aWl
+aWl
aTS
bde
-fUo
+fzX
bzd
uLR
eaK
uLR
-fUo
+fzX
uMD
uLR
vNU
qPM
vnE
-fUo
+fzX
uLR
uLR
gvY
@@ -61923,7 +61941,7 @@ lIT
wgR
nso
ltM
-fUo
+fzX
pBj
pBj
pBj
@@ -62048,11 +62066,11 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
pCP
ybv
vyi
@@ -62098,26 +62116,26 @@ bvk
bvk
dwf
gvY
-fUo
+fzX
fAc
uLR
rGz
qPM
-fUo
+fzX
hOH
uLR
uLR
uLR
uLR
-fUo
+fzX
uLR
uLR
gvY
-fUo
+fzX
tCz
vhK
bjq
-fUo
+fzX
pBj
pBj
pBj
@@ -62246,7 +62264,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pCP
pCP
pCP
@@ -62268,16 +62286,16 @@ vBG
oXo
tGe
osF
-fwK
+kcn
iTP
gJd
sNa
woM
-neO
+hVB
iHH
auZ
qhj
-xaB
+oVl
uLR
uLR
lxr
@@ -62292,26 +62310,26 @@ cmA
cmA
xYV
uLR
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
ttR
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
eOH
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
pBj
pBj
pBj
@@ -62440,62 +62458,62 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
qXa
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-neO
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+hVB
xUy
-neO
-xKj
-neO
-awd
-ljh
-qzW
-xaB
-fUo
-fUo
-fUo
-fUo
+hVB
+fuv
+hVB
+mGr
+tIN
+sdd
+oVl
+fzX
+fzX
+fzX
+fzX
lIT
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
+fzX
bOO
jLY
iyU
-fUo
+fzX
vzg
hFA
rGz
-fUo
-fUo
+fzX
+fzX
bOO
bOO
bOO
@@ -62503,8 +62521,8 @@ jLY
iyU
sxn
bOO
-gOV
-gOV
+pbn
+pbn
pBj
pBj
pBj
@@ -62638,11 +62656,11 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
ahw
kNo
-pVv
+ugC
cGP
dWN
glt
@@ -62660,45 +62678,45 @@ tyg
efd
kUJ
nUi
-xNj
+iQl
btA
aUD
wYl
orZ
-xaB
-usU
-srF
+oVl
+xes
+uxp
avg
dwp
juX
-usU
-usU
+xes
+xes
bOO
bOO
-gOV
+pbn
iyU
sxn
bOO
bOO
bOO
bOO
-gOV
+pbn
iyU
-fUo
-fUo
-fUo
-fUo
-fUo
+fzX
+fzX
+fzX
+fzX
+fzX
bOO
bOO
bOO
bOO
-gOV
+pbn
iyU
sxn
bOO
bOO
-gOV
+pbn
pBj
pBj
pBj
@@ -62832,7 +62850,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
lMt
pic
@@ -62854,19 +62872,19 @@ jPx
jPx
hSj
mjr
-xXV
+gKR
axE
aXW
dKq
eAZ
-xaB
+oVl
fQU
ygN
bCT
bCT
pVW
rrV
-usU
+xes
edb
edb
eev
@@ -62892,7 +62910,7 @@ iyU
sxn
bOO
bOO
-gOV
+pbn
pBj
pBj
pBj
@@ -63026,11 +63044,11 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
sJJ
lMt
ydW
-pVv
+ugC
izD
cQJ
bCH
@@ -63048,7 +63066,7 @@ hlW
jPx
hSj
wvJ
-gcU
+bnh
emR
luN
iLj
@@ -63086,7 +63104,7 @@ iyU
sxn
bOO
bOO
-gOV
+pbn
pBj
pBj
pBj
@@ -63216,15 +63234,15 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
dwd
lMt
ydW
-pVv
+ugC
dlX
qHK
iXc
@@ -63242,7 +63260,7 @@ uvB
jPx
bUX
cJX
-xNj
+iQl
atc
emR
jmA
@@ -63254,7 +63272,7 @@ qKP
qKP
udo
wzI
-usU
+xes
vtU
vtU
fgn
@@ -63280,7 +63298,7 @@ iyU
sxn
bOO
bOO
-gOV
+pbn
pBj
pBj
pBj
@@ -63410,7 +63428,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
eKH
wPl
kKR
@@ -63418,7 +63436,7 @@ wPl
wPl
vyi
rns
-pVv
+ugC
dDH
eKx
eKx
@@ -63436,45 +63454,45 @@ uvB
jPx
bUX
cjg
-pVv
-xaB
+ugC
+oVl
qHq
jmA
rKE
-xaB
+oVl
dFH
rAf
van
btN
lOs
aEp
-usU
+xes
bOO
bOO
-gOV
+pbn
dzC
sxn
bOO
bOO
bOO
bOO
-gOV
+pbn
xVY
sxn
bOO
bOO
-gOV
+pbn
iyU
sxn
bOO
bOO
bOO
-gOV
+pbn
iyU
sxn
bOO
bOO
-gOV
+pbn
pBj
pBj
pBj
@@ -63604,19 +63622,19 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
vBG
vBG
lMt
-jTH
-jTH
-ncV
-ncV
-ncV
-jTH
+kRV
+kRV
+sdE
+sdE
+sdE
+kRV
tEC
jPx
uaB
@@ -63631,18 +63649,18 @@ jPx
hSj
vtD
cnF
-xaB
+oVl
eGN
egF
cAt
-xaB
-usU
+oVl
+xes
sVM
dDm
iYa
mYf
-usU
-usU
+xes
+xes
bOO
bOO
fIH
@@ -63668,7 +63686,7 @@ iyU
sxn
bOO
bOO
-gOV
+pbn
pBj
pBj
pBj
@@ -63801,16 +63819,16 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
aOv
tSz
vBG
-jTH
+kRV
iys
gfL
gfL
jOS
-ncV
+sdE
pYz
jPx
uaB
@@ -63825,17 +63843,17 @@ jPx
hSj
bdq
alZ
-jff
-qXA
-hcA
-nGM
-jff
-jff
-jff
-jff
-jff
-jff
-jff
+npm
+lkF
+tUr
+hcH
+npm
+npm
+npm
+npm
+npm
+npm
+npm
bOO
bOO
bOO
@@ -63846,7 +63864,7 @@ bOO
bOO
bOO
oLP
-gOV
+pbn
vGZ
esP
bOO
@@ -63861,8 +63879,8 @@ aIZ
iyU
sxn
bOO
-gOV
-gOV
+pbn
+pbn
pBj
pBj
pBj
@@ -63995,16 +64013,16 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
aOv
tSz
bjJ
-jTH
+kRV
gCx
sWC
lfl
xBa
-ncV
+sdE
pYz
jPx
uaB
@@ -64019,7 +64037,7 @@ jPx
hSj
bdq
oWW
-jff
+npm
uxm
ngr
eUG
@@ -64029,8 +64047,8 @@ iiW
fef
hKd
vvz
-jff
-jff
+npm
+npm
bOO
bOO
jLY
@@ -64054,8 +64072,8 @@ bOO
jLY
iyU
sxn
-gOV
-gOV
+pbn
+pbn
pBj
pBj
pBj
@@ -64189,11 +64207,11 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
cHD
vBG
-fwK
-jTH
+kcn
+kRV
uWZ
fuI
fuI
@@ -64213,7 +64231,7 @@ jPx
afC
aOO
xwO
-jff
+npm
hRU
uTa
cuW
@@ -64224,10 +64242,10 @@ dvw
dvw
pGf
bdf
-jff
-jff
+npm
+npm
bOO
-gOV
+pbn
iyU
sxn
bOO
@@ -64239,16 +64257,16 @@ utU
kxb
sxn
bOO
-gOV
+pbn
iyU
-gOV
-gOV
-gOV
-gOV
-gOV
-gOV
-gOV
-gOV
+pbn
+pbn
+pbn
+pbn
+pbn
+pbn
+pbn
+pbn
pBj
pBj
pBj
@@ -64383,16 +64401,16 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pCP
vBG
vBG
-jTH
+kRV
dNt
bDF
gks
fuI
-ncV
+sdE
dMA
jPx
uaB
@@ -64407,19 +64425,19 @@ jPx
afC
rmi
xwO
-jff
-acp
-vuH
+npm
+ifW
+lAW
bOb
-acp
-acp
-acp
+ifW
+ifW
+ifW
bOb
-acp
-acp
-jff
-jff
-jff
+ifW
+ifW
+npm
+npm
+npm
bOO
fIH
iyU
@@ -64435,7 +64453,7 @@ sxn
bOO
fIH
iyU
-gOV
+pbn
pBj
pBj
pBj
@@ -64577,16 +64595,16 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
+kcn
+kcn
gIF
-fwK
-jTH
+kcn
+kRV
jUG
yeJ
yeJ
qvd
-ncV
+sdE
dMA
jPx
rbb
@@ -64600,8 +64618,8 @@ pru
jPx
hSj
tcK
-jff
-jff
+npm
+npm
req
req
req
@@ -64612,8 +64630,8 @@ req
req
req
req
-jff
-jff
+npm
+npm
bOO
aIZ
iyU
@@ -64629,7 +64647,7 @@ sxn
bOO
aIZ
iyU
-gOV
+pbn
pBj
pBj
pBj
@@ -64772,15 +64790,15 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
-jTH
+kRV
hHV
ajn
luc
stD
-jTH
+kRV
kxv
jPx
jPx
@@ -64794,7 +64812,7 @@ jPx
jPx
hSj
wzt
-jff
+npm
gMc
req
req
@@ -64807,7 +64825,7 @@ req
req
req
jMu
-jff
+npm
bOO
jLY
iyU
@@ -64823,7 +64841,7 @@ bOO
bOO
jLY
iyU
-gOV
+pbn
pBj
pBj
pBj
@@ -64966,15 +64984,15 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
-jTH
-jTH
-jTH
-jTH
-jTH
-jTH
+kRV
+kRV
+kRV
+kRV
+kRV
+kRV
agp
rHN
oVU
@@ -64988,8 +65006,8 @@ nTT
nTT
cdD
pOI
-jff
-jff
+npm
+npm
req
req
req
@@ -65000,24 +65018,24 @@ req
req
req
req
-jff
-jff
+npm
+npm
edb
-gOV
+pbn
iyU
uXg
edb
edb
kSb
iyU
-gOV
+pbn
cfW
edb
edb
oLP
-gOV
+pbn
iyU
-gOV
+pbn
pBj
pBj
pBj
@@ -65160,30 +65178,30 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
-fwK
+kcn
vBG
vBG
vBG
vBG
-iQr
-qic
+gYM
+qwz
mhd
-qic
-qic
-qic
-iQr
-qic
-iQr
+qwz
+qwz
+qwz
+gYM
+qwz
+gYM
rIr
wFM
wFM
aXq
mnO
eyK
-jff
+npm
req
req
req
@@ -65211,7 +65229,7 @@ iyU
iyU
iyU
iyU
-gOV
+pbn
pBj
pBj
pBj
@@ -65354,15 +65372,15 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
-fwK
+kcn
pCP
vBG
vBG
vBG
-iQr
+gYM
oQY
lrw
xRB
@@ -65370,14 +65388,14 @@ bxX
tBn
qCM
gza
-qic
+qwz
xdU
raF
rEO
wUM
vmU
vKd
-jff
+npm
req
req
req
@@ -65388,7 +65406,7 @@ req
req
req
req
-jff
+npm
vtU
vtU
xMz
@@ -65405,7 +65423,7 @@ vtU
vtU
vtU
vtU
-gOV
+pbn
pBj
pBj
pBj
@@ -65548,7 +65566,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
gIF
@@ -65556,7 +65574,7 @@ vBG
vBG
vBG
vBG
-iQr
+gYM
djA
dOd
dOd
@@ -65564,14 +65582,14 @@ qxp
gUb
dOd
qBv
-iQr
-pVv
-pVv
-pVv
+gYM
+ugC
+ugC
+ugC
aFj
-pVv
-pVv
-jff
+ugC
+ugC
+npm
req
req
req
@@ -65582,7 +65600,7 @@ req
req
req
req
-jff
+npm
bOO
bOO
jLY
@@ -65599,7 +65617,7 @@ bOO
bOO
bOO
bOO
-gOV
+pbn
pBj
pBj
pBj
@@ -65742,15 +65760,15 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
vBG
vBG
-fwK
+kcn
vBG
vBG
pCP
pCP
-iQr
+gYM
djA
dOd
myY
@@ -65758,14 +65776,14 @@ qxp
lUm
dOd
aJG
-iQr
+gYM
ahQ
kyH
krG
lMt
bXh
lKJ
-jff
+npm
req
req
req
@@ -65776,24 +65794,24 @@ req
req
req
req
-jff
+npm
bOO
bOO
-gOV
+pbn
iyU
sxn
bOO
bOO
aIZ
iyU
-gOV
+pbn
bOO
bOO
bOO
bOO
bOO
-gOV
-gOV
+pbn
+pbn
pBj
pBj
pBj
@@ -65936,7 +65954,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pCP
vBG
qvW
@@ -65944,7 +65962,7 @@ vBG
vBG
pCP
vBG
-iQr
+gYM
bJz
dOd
dOd
@@ -65952,14 +65970,14 @@ qxp
xPx
dOd
dOd
-iQr
+gYM
cqn
vVr
pCP
xnw
gsd
-jff
-jff
+npm
+npm
req
req
req
@@ -65970,8 +65988,8 @@ req
req
req
req
-jff
-jff
+npm
+npm
bOO
fIH
iyU
@@ -65982,11 +66000,11 @@ aIZ
iyU
sHK
bOO
-gOV
-gOV
-gOV
-gOV
-gOV
+pbn
+pbn
+pbn
+pbn
+pbn
pBj
pBj
pBj
@@ -66130,15 +66148,15 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pCP
vBG
-fwK
+kcn
vBG
vBG
vBG
vBG
-iQr
+gYM
lzB
dOd
dPH
@@ -66146,13 +66164,13 @@ erQ
vem
mbB
bBN
-iQr
+gYM
wdP
gIF
gIF
jse
pWS
-jff
+npm
aoU
req
req
@@ -66165,18 +66183,18 @@ req
req
req
jMu
-jff
+npm
bOO
aIZ
iyU
sxn
bOO
bOO
-gOV
-gOV
-gOV
-gOV
-gOV
+pbn
+pbn
+pbn
+pbn
+pbn
pBj
pBj
pBj
@@ -66324,30 +66342,30 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pCP
pCP
-fwK
+kcn
gIF
gIF
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
hQA
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
pCP
pCP
pCP
lMt
pCP
-jff
-jff
+npm
+npm
req
req
req
@@ -66358,15 +66376,15 @@ req
req
req
req
-jff
-jff
-gOV
-gOV
+npm
+npm
+pbn
+pbn
pkT
-gOV
-gOV
-gOV
-gOV
+pbn
+pbn
+pbn
+pbn
pBj
pBj
pBj
@@ -66518,7 +66536,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pCP
pCP
pCP
@@ -66534,31 +66552,31 @@ vBG
kBE
osF
eoA
-fwK
+kcn
pCP
dLN
pCP
lMt
pCP
vBG
-jff
-jff
+npm
+npm
aoU
-jff
-jff
-jff
-jff
-jff
-jff
+npm
+npm
+npm
+npm
+npm
+npm
gMa
-jff
-jff
+npm
+npm
pCP
pCP
vBG
lMt
kBE
-fwK
+kcn
pBj
pBj
pBj
@@ -66712,7 +66730,7 @@ pBj
pBj
pBj
pBj
-fwK
+kcn
pCP
pCP
pCP
@@ -66720,7 +66738,7 @@ vBG
vBG
vBG
vBG
-fwK
+kcn
pCP
lMt
lMt
@@ -66736,23 +66754,23 @@ lMt
vBG
vBG
atb
-jff
+npm
fOh
-jff
+npm
vjN
vBG
iRU
mzV
-jff
-jff
-jff
+npm
+npm
+npm
pCP
vBG
vBG
vBG
lMt
kBE
-fwK
+kcn
pBj
pBj
pBj
@@ -66906,23 +66924,23 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
fzS
fzS
pCP
@@ -66946,7 +66964,7 @@ lMt
lMt
lMt
vBG
-fwK
+kcn
pBj
pBj
pBj
@@ -67116,9 +67134,9 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
vBG
cyk
vBG
@@ -67140,7 +67158,7 @@ vBG
mBU
osF
vBG
-fwK
+kcn
pBj
pBj
pBj
@@ -67312,29 +67330,29 @@ pBj
pBj
pBj
pBj
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
-fwK
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
+kcn
pBj
pBj
pBj
diff --git a/maps/rift/levels/rift-06-surface3.dmm b/maps/rift/levels/rift-06-surface3.dmm
index 78c25f74bd9e..97a12889a544 100644
--- a/maps/rift/levels/rift-06-surface3.dmm
+++ b/maps/rift/levels/rift-06-surface3.dmm
@@ -239,10 +239,6 @@
"aaM" = (
/turf/simulated/shuttle/wall/voidcraft/blue,
/area/shuttle/emt/cockpit)
-"aaN" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/kitchen)
"aaO" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -453,9 +449,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/carpet/tealcarpet,
/area/shuttle/civvie/general)
-"abx" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/kitchen)
"abz" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
@@ -479,14 +472,6 @@
/obj/structure/flora/pottedplant/largebush,
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
-"abC" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/effect/floor_decal/steeldecal/steel_decals6{
- dir = 5
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"abD" = (
/obj/structure/closet/wardrobe/captain,
/turf/simulated/floor/carpet/blue,
@@ -621,40 +606,6 @@
},
/turf/simulated/floor/carpet,
/area/bridge/bridge_hallway)
-"abQ" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/obj/machinery/atm{
- pixel_x = 32
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
-"abR" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
- },
-/obj/effect/floor_decal/corner/beige/bordercorner{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
"abT" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/computer/crew{
@@ -710,24 +661,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/exploration)
-"acb" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/item/radio/intercom{
- dir = 8;
- name = "Station Intercom (General)";
- pixel_x = -24
- },
-/obj/machinery/washing_machine,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/locker/laundry_arrival)
"acc" = (
/obj/structure/railing{
dir = 4
@@ -737,40 +670,6 @@
},
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"acd" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/window/reinforced/polarized/full{
- id = "pathfinder_office"
- },
-/turf/simulated/floor/plating,
-/area/exploration/pathfinder_office)
-"ace" = (
-/turf/simulated/wall,
-/area/crew_quarters/heads/hop)
-"acf" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
- dir = 4
- },
-/obj/item/radio/intercom{
- dir = 1;
- name = "Station Intercom (General)";
- pixel_y = 24
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
"acg" = (
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/shuttle/civvie/cockpit)
@@ -807,22 +706,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/office)
-"ack" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/exploration/meeting)
-"acm" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/atm{
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"acn" = (
/obj/machinery/door/airlock/maintenance/engi{
name = "RTG Access";
@@ -830,15 +713,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_south)
-"aco" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"acp" = (
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
@@ -861,6 +735,10 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"acs" = (
+/obj/machinery/holoposter,
+/turf/simulated/wall/r_wall/prepainted,
+/area/bridge)
"acv" = (
/obj/machinery/ai_slipper,
/obj/structure/cable/cyan{
@@ -868,24 +746,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/ai)
-"acw" = (
-/obj/structure/table/wooden_reinforced,
-/obj/item/storage/photo_album{
- pixel_y = -10
- },
-/obj/item/reagent_containers/food/drinks/flask{
- pixel_x = 8
- },
-/obj/item/hand_tele,
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = -24
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/captain)
"acx" = (
/obj/machinery/light,
/turf/simulated/floor/tiled/dark,
@@ -900,10 +760,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/exploration/courser_dock)
-"acA" = (
-/obj/structure/sign/warning/secure_area,
-/turf/simulated/wall/r_wall,
-/area/ai_upload)
"acB" = (
/obj/structure/closet/emcloset,
/obj/structure/cable/green{
@@ -985,22 +841,6 @@
/obj/item/material/knife/machete/hatchet,
/turf/simulated/floor/tiled,
/area/hydroponics)
-"acK" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "bridge_tint"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/bridge)
"acM" = (
/obj/structure/flora/pottedplant/minitree{
pixel_y = 12
@@ -1008,9 +848,6 @@
/obj/structure/table/wooden_reinforced,
/turf/simulated/floor/tiled/dark,
/area/bridge/meeting_room)
-"acO" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/bar)
"acP" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -1079,10 +916,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/exploration/excursion_dock)
-"acW" = (
-/obj/structure/sign/department/commander,
-/turf/simulated/wall/r_wall,
-/area/bridge/office)
"acY" = (
/obj/machinery/alarm{
desc = null;
@@ -1090,9 +923,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"acZ" = (
-/turf/simulated/wall,
-/area/security/checkpoint2)
"ada" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -1175,10 +1005,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"adm" = (
-/obj/structure/sign/warning/lethal_turrets,
-/turf/simulated/wall/r_wall,
-/area/ai_upload)
"adn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -1318,30 +1144,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"adF" = (
-/obj/machinery/door/airlock/maintenance/rnd{
- req_one_access = list(19,43,67)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/plating,
-/area/exploration)
-"adG" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 4;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/structure/window/reinforced/polarized/full{
- id = "bridge_tint"
- },
-/turf/simulated/floor/plating,
-/area/bridge)
"adH" = (
/obj/structure/table/rack/shelf,
/obj/random/maintenance/security,
@@ -1437,10 +1239,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_south)
-"adQ" = (
-/obj/structure/sign/department/conference_room,
-/turf/simulated/wall/r_wall,
-/area/bridge/meeting_room)
"adR" = (
/obj/effect/floor_decal/corner_techfloor_grid{
dir = 6
@@ -1490,24 +1288,6 @@
},
/turf/simulated/floor/wood,
/area/exploration/meeting)
-"adY" = (
-/obj/machinery/disposal,
-/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/structure/extinguisher_cabinet{
- pixel_y = -30
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/checkpoint2)
"adZ" = (
/obj/effect/floor_decal/steeldecal/steel_decals_central5{
dir = 4
@@ -1609,14 +1389,6 @@
/obj/landmark/map_data/lythios43c,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"aeo" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1380;
- id_tag = "civvie_dock";
- req_one_access = list(67)
- },
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside3)
"aep" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -1629,33 +1401,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
-"aeq" = (
-/obj/machinery/door/airlock/glass_command{
- dir = 1;
- name = "Bridge";
- req_access = list(19)
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/bridge)
"aer" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1687,18 +1432,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"aev" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/loading{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/heads/hop)
"aew" = (
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techmaint,
@@ -1745,52 +1478,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/bridge)
-"aeA" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "hop_office"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "hop_office_shutters";
- name = "HoP Office Shutters";
- opacity = 0
- },
-/obj/structure/cable/green,
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/hop)
-"aeB" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/machinery/door/airlock/glass_command/polarized{
- id_tint = "bridge_tint";
- name = "Bridge"
- },
-/obj/machinery/door/firedoor/glass,
-/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
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge)
"aeD" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -1840,17 +1527,6 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
-"aeL" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Explorer Prep";
- req_one_access = list(19,43,67)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/explorer_prep)
"aeM" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/closet/firecloset/full,
@@ -1928,15 +1604,6 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/cockpit)
-"aeY" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"aeZ" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/ship/navigation/telescreen{
@@ -2029,19 +1696,6 @@
/obj/landmark/spawnpoint/job/field_medic,
/turf/simulated/floor/tiled/steel_grid,
/area/exploration/explorer_prep)
-"afs" = (
-/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/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/bridge)
"afu" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -2166,12 +1820,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
-"afL" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
- dir = 8
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
"afM" = (
/obj/machinery/holopad,
/turf/simulated/floor/tiled/monotile,
@@ -2205,16 +1853,6 @@
/obj/structure/railing,
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"afR" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2;
- name = "Laundry"
- },
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/locker/laundry_arrival)
"afS" = (
/obj/structure/cable/green{
icon_state = "1-4"
@@ -2300,14 +1938,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"afZ" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1380;
- id_tag = "emt_shuttle_dock";
- req_one_access = list(5,67)
- },
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside3)
"agb" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -2355,29 +1985,6 @@
/obj/structure/foamedmetal,
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
-"agj" = (
-/obj/machinery/door/airlock/command{
- name = "Head of Personnel";
- req_access = list(57)
- },
-/obj/machinery/door/firedoor/glass,
-/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
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/heads/hop)
"agk" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -2388,9 +1995,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/teleporter)
-"agm" = (
-/turf/simulated/wall/r_wall,
-/area/hallway/secondary/docking_hallway)
"agn" = (
/obj/machinery/vending/hydronutrients{
req_one_access = list(30,35,47,77)
@@ -2468,15 +2072,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/pathfinder_office)
-"agx" = (
-/obj/machinery/light{
- dir = 8
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"agy" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/power/smes/buildable{
@@ -2503,10 +2098,6 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/lythios43c/indoors,
/area/rift/surfacebase/outside/outside3)
-"agC" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/emt/cockpit)
"agD" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -2545,9 +2136,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
-"agI" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfaceeva/airlock/arrivals)
"agJ" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -2717,12 +2305,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel,
/area/exploration)
-"ahi" = (
-/obj/effect/floor_decal/borderfloorblack/corner{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"ahj" = (
/obj/structure/railing,
/obj/structure/table/rack/steel,
@@ -2763,16 +2345,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_north)
-"aho" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/borderfloorblack/corner,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/turf/simulated/floor/tiled/dark,
-/area/exploration/showers)
"ahq" = (
/obj/machinery/suit_cycler/exploration,
/obj/effect/floor_decal/steeldecal/steel_decals9,
@@ -3019,14 +2591,6 @@
},
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"ahT" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Pilot Prep";
- req_one_access = list(67)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/explorer_prep)
"ahU" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -3035,10 +2599,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/exploration/pathfinder_office)
-"ahW" = (
-/obj/structure/sign/department/conference_room,
-/turf/simulated/wall,
-/area/bridge/meeting_room)
"ahY" = (
/obj/machinery/cryopod/robot,
/obj/effect/floor_decal/techfloor{
@@ -3138,26 +2698,6 @@
/obj/structure/snowman,
/turf/simulated/floor/outdoors/snow/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"aim" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/beige/border,
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/beige/bordercorner2{
- dir = 9
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
"ain" = (
/obj/structure/table/wooden_reinforced,
/obj/item/paper_bin,
@@ -3175,9 +2715,6 @@
},
/turf/simulated/floor/wood,
/area/bridge/bunker)
-"aip" = (
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside3)
"aiq" = (
/obj/machinery/portable_atmospherics/hydroponics,
/obj/structure/flora/ausbushes/lavendergrass,
@@ -3197,18 +2734,6 @@
},
/turf/simulated/floor/wood,
/area/exploration/meeting)
-"ais" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"ait" = (
/obj/machinery/power/pointdefense{
id_tag = "s3south"
@@ -3313,15 +2838,6 @@
/obj/item/pickaxe,
/turf/simulated/floor/outdoors/snow/lythios43c/indoors,
/area/rift/surfacebase/outside/outside3)
-"aiH" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/exploration/pathfinder_office)
"aiI" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -3478,6 +2994,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
+"aiU" = (
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration/excursion_dock)
"aiW" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -3582,9 +3104,6 @@
},
/turf/simulated/floor/wood,
/area/exploration/meeting)
-"ajh" = (
-/turf/simulated/floor/tiled/monotile,
-/area/exploration/pathfinder_office)
"aji" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/catwalk,
@@ -3631,9 +3150,6 @@
},
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/civvie/general)
-"ajs" = (
-/turf/simulated/wall,
-/area/crew_quarters/locker/laundry_arrival)
"ajt" = (
/obj/structure/cable/cyan{
icon_state = "1-2"
@@ -3712,10 +3228,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/exploration)
-"ajB" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/locker/laundry_arrival)
"ajC" = (
/obj/machinery/door/airlock/multi_tile/glass,
/obj/effect/floor_decal/borderfloor{
@@ -3739,18 +3251,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"ajE" = (
-/obj/machinery/status_display{
- pixel_x = 32
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"ajG" = (
/obj/structure/bed/chair{
dir = 1
@@ -4026,13 +3526,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
-"akf" = (
-/obj/structure/railing,
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/wall,
-/area/rift/surfacebase/outside/outside3)
"akg" = (
/obj/item/reagent_containers/glass/bucket,
/obj/item/reagent_containers/glass/bucket,
@@ -4078,9 +3571,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/locker/laundry_arrival)
-"akm" = (
-/turf/simulated/wall/r_wall,
-/area/exploration)
"akn" = (
/obj/machinery/door/window/brigdoor/southleft{
dir = 4;
@@ -4117,18 +3607,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
-"akq" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 5
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 5
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
-"akr" = (
-/turf/simulated/wall/r_wall,
-/area/rift/trade_shop/landing_pad)
"aks" = (
/obj/machinery/door/airlock/maintenance/common{
name = "Kitchen Tool Storage"
@@ -4163,20 +3641,6 @@
/obj/machinery/camera/network/command,
/turf/simulated/floor/tiled/dark,
/area/bridge/office)
-"akw" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/bar/lower)
-"akx" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/bar)
"aky" = (
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
/obj/machinery/atmospherics/pipe/simple/visible/supply,
@@ -4235,13 +3699,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
-"akE" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"akF" = (
/obj/machinery/door/airlock/highsecurity{
id_tag = "command_bunker_exit";
@@ -4349,12 +3806,6 @@
},
/turf/simulated/floor/lino,
/area/crew_quarters/bar_backroom)
-"akP" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/old_tile/green,
-/area/shuttle/civvie/general)
"akQ" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -4439,14 +3890,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/excursion_dock)
-"akZ" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Medic Prep";
- req_one_access = list(44,19,5)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/explorer_prep)
"alb" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -4591,13 +4034,6 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"als" = (
-/obj/machinery/light,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/turf/simulated/floor/tiled/monotile,
-/area/rift/trade_shop/landing_pad)
"alt" = (
/obj/effect/overlay/snow/floor,
/obj/structure/cable{
@@ -4687,11 +4123,6 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/grass,
/area/hydroponics)
-"alI" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/effect/floor_decal/borderfloorblack/corner2,
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"alM" = (
/obj/structure/sign/directions/bridge{
dir = 4;
@@ -4966,10 +4397,6 @@
/obj/structure/marker_beacon/red,
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/shuttle)
-"amp" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/civvie/general)
"amq" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/beige/border,
@@ -5118,18 +4545,6 @@
},
/turf/simulated/floor/plating,
/area/rift/trade_shop/landing_pad)
-"amM" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
"amO" = (
/obj/structure/closet/crate,
/obj/random/maintenance/clean,
@@ -5167,27 +4582,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/trade_shop/landing_pad)
-"amU" = (
-/obj/machinery/door/airlock/glass_command{
- dir = 1;
- name = "Bridge";
- req_access = list(19)
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/bridge)
"amV" = (
/obj/effect/floor_decal/techfloor{
dir = 5
@@ -5239,10 +4633,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/pathfinder_office)
-"anb" = (
-/obj/machinery/holopad,
-/turf/simulated/floor/tiled/monotile,
-/area/hallway/secondary/docking_hallway2)
"anc" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -5262,9 +4652,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"ane" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/freezer)
"ang" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -5277,10 +4664,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/cargo)
-"anh" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/bridge/bridge_hallway)
"ani" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
@@ -5324,12 +4707,6 @@
/obj/structure/metal_edge,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"anq" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/tiled/monotile,
-/area/hallway/secondary/docking_hallway2)
"anr" = (
/obj/structure/railing{
dir = 8
@@ -5473,6 +4850,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
+"anE" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"anH" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -5575,10 +4958,6 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/lino,
/area/crew_quarters/bar_backroom)
-"anV" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/hydroponics)
"anW" = (
/obj/structure/flora/pottedplant/minitree{
pixel_y = 12
@@ -5619,9 +4998,6 @@
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"aob" = (
-/turf/simulated/wall/r_wall,
-/area/bridge/office)
"aoc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5662,29 +5038,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/general)
-"aog" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/machinery/door/airlock/glass_command/polarized{
- id_tint = "bridge_tint";
- name = "Bridge"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/dark,
-/area/bridge)
"aoj" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/space_heater,
@@ -5763,9 +5116,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"aov" = (
-/turf/simulated/wall,
-/area/maintenance/ai)
"aow" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/techfloor/grid,
@@ -5882,10 +5232,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"aoL" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/emt/general)
"aoM" = (
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/general)
@@ -5990,16 +5336,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
-"aoT" = (
-/obj/structure/sign/department/armory{
- desc = "A warning sign for anyone entering the station.";
- name = "SUBMIT WEAPONS PRIOR TO ENTRY"
- },
-/turf/simulated/wall,
-/area/hallway/secondary/docking_hallway)
-"aoU" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfacebase/outside/outside3)
"aoV" = (
/obj/machinery/camera/network/exploration{
dir = 10
@@ -6072,9 +5408,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid/lythios43c,
/area/shuttle/excursion/general)
-"apf" = (
-/turf/simulated/wall/r_wall,
-/area/rift/turbolift/maint)
"apg" = (
/obj/effect/floor_decal/borderfloorblack,
/turf/simulated/floor/tiled/dark,
@@ -6205,9 +5538,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"apv" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfaceeva/aa/cliff_south)
"apx" = (
/obj/machinery/holopad,
/obj/effect/floor_decal/borderfloor{
@@ -6218,9 +5548,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hydroponics)
-"apz" = (
-/turf/simulated/wall/r_wall,
-/area/rift/stairwell/primary/surfacethree)
"apA" = (
/obj/structure/handrail{
dir = 1
@@ -6236,12 +5563,6 @@
/obj/map_helper/airlock/atmos/pump_out_internal,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
-"apB" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/turf/simulated/wall/r_wall,
-/area/ai)
"apD" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/computer/skills{
@@ -6911,18 +6232,11 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"arq" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfaceeva/aa/cliff_north)
"arr" = (
/obj/structure/closet/emcloset,
/obj/effect/floor_decal/industrial/outline/grey,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"ars" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/bar)
"art" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -6948,9 +6262,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/trade_shop/landing_pad)
-"arv" = (
-/turf/simulated/wall,
-/area/exploration/courser_dock)
"arw" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -7055,9 +6366,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
-"arF" = (
-/turf/simulated/wall/r_wall,
-/area/bridge/bridge_hallway)
"arH" = (
/obj/machinery/vending/nifsoft_shop,
/obj/effect/floor_decal/borderfloor{
@@ -7104,9 +6412,6 @@
/obj/landmark/spawnpoint/job/explorer,
/turf/simulated/floor/carpet/purcarpet,
/area/exploration/meeting)
-"arN" = (
-/turf/simulated/wall/r_wall,
-/area/ai_upload_foyer)
"arO" = (
/obj/effect/floor_decal/borderfloorwhite/corner{
dir = 1
@@ -7116,26 +6421,6 @@
},
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/general)
-"arP" = (
-/turf/simulated/wall/r_wall,
-/area/ai_upload)
-"arQ" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "command_bunker"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "panic_shutters";
- layer = 3.1;
- name = "Bunker Lockdown Shutters";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/bridge/bunker)
"arR" = (
/obj/effect/floor_decal/borderfloorblack/corner,
/obj/structure/cable/green{
@@ -7191,9 +6476,6 @@
},
/turf/simulated/floor/plating,
/area/hydroponics)
-"arX" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/bar)
"arY" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -7251,16 +6533,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid/lythios43c,
/area/shuttle/excursion/general)
-"ase" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"asf" = (
/obj/structure/barricade,
/turf/simulated/floor/outdoors/snow/lythios43c/indoors,
@@ -7290,13 +6562,6 @@
},
/turf/simulated/floor/carpet/tealcarpet,
/area/shuttle/civvie/general)
-"asi" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/lattice,
-/turf/simulated/open/lythios43c,
-/area/rift/surfacebase/outside/outside3)
"asj" = (
/obj/structure/railing{
dir = 8
@@ -7459,23 +6724,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
-"asE" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/item/radio/intercom{
- dir = 4;
- name = "Station Intercom (General)";
- pixel_x = 24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/camera/network/civilian{
- dir = 9
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
"asF" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 4
@@ -7605,10 +6853,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/barrestroom)
-"atc" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/exploration/excursion_dock)
"atd" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
@@ -7794,18 +7038,6 @@
/obj/machinery/camera/network/exploration,
/turf/simulated/floor/tiled/techmaint,
/area/exploration)
-"aty" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"atz" = (
/obj/machinery/message_server,
/obj/effect/floor_decal/techfloor{
@@ -7854,27 +7086,6 @@
/obj/item/tool/crowbar,
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_north)
-"atF" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall/r_wall{
- can_open = 1
- },
-/area/bridge/bunker)
-"atH" = (
-/obj/machinery/light{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"atI" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -8192,18 +7403,6 @@
"aus" = (
/turf/simulated/floor/reinforced/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"auu" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/status_display{
- pixel_x = -32
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"auv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9
@@ -8269,18 +7468,6 @@
/obj/machinery/portable_atmospherics/powered/pump,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"auG" = (
-/obj/structure/bed/chair/bay/comfy/black,
-/obj/machinery/light_switch{
- dir = 1;
- pixel_y = 26
- },
-/obj/machinery/light{
- dir = 1
- },
-/obj/landmark/spawnpoint/job/head_of_personnel,
-/turf/simulated/floor/carpet/blue,
-/area/crew_quarters/heads/hop)
"auH" = (
/obj/structure/closet,
/obj/item/clothing/suit/tajaran/furs,
@@ -8331,15 +7518,15 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge)
-"auN" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/exploration/courser_dock)
"auP" = (
/obj/machinery/vending/snack,
/obj/effect/debris/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"auR" = (
+/obj/structure/sign/warning/lethal_turrets,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_upload)
"auS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -8433,9 +7620,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"ava" = (
-/turf/simulated/wall,
-/area/bridge/meeting_room)
"avc" = (
/obj/effect/spider/spiderling/virgo,
/obj/random/maintenance/security,
@@ -8610,10 +7794,6 @@
/obj/item/tool/screwdriver,
/turf/simulated/floor/tiled/dark,
/area/bridge)
-"avz" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/bar)
"avA" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -9017,9 +8197,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacethree)
-"awv" = (
-/turf/simulated/wall,
-/area/maintenance/station/exploration)
"aww" = (
/obj/structure/closet/firecloset/full,
/obj/effect/floor_decal/borderfloor{
@@ -9179,13 +8356,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_south)
-"awI" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"awJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9318,18 +8488,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"awW" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/loading{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/heads/hop)
"awX" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -9450,9 +8608,6 @@
},
/turf/simulated/floor/grass,
/area/hydroponics)
-"axl" = (
-/turf/simulated/wall,
-/area/rift/stairwell/primary/surfacethree)
"axm" = (
/obj/structure/table/bench/standard,
/turf/simulated/floor/tiled/steel,
@@ -9582,13 +8737,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/rift/trade_shop/landing_pad)
-"axI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/monotile,
-/area/rift/trade_shop/landing_pad)
"axK" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
@@ -9625,18 +8773,6 @@
/obj/effect/debris/cleanable/egg_smudge,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
-"axQ" = (
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
"axR" = (
/mob/living/simple_mob/animal/giant_spider/frost,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
@@ -9826,14 +8962,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
-"ayn" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"ayp" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -9910,10 +9038,6 @@
},
/turf/simulated/floor/lythios43c/indoors,
/area/shuttle/excursion/cargo)
-"ayw" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway2)
"ayx" = (
/obj/effect/floor_decal/borderfloorblack/full,
/obj/structure/cable/green{
@@ -10079,9 +9203,6 @@
"ayT" = (
/turf/simulated/shuttle/wall/voidcraft/green,
/area/shuttle/civvie/general)
-"ayU" = (
-/turf/simulated/wall,
-/area/exploration)
"ayW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
@@ -10173,9 +9294,6 @@
"azj" = (
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
-"azk" = (
-/turf/simulated/wall/r_wall,
-/area/security/nuke_storage)
"azm" = (
/obj/item/stool/padded,
/obj/effect/floor_decal/spline/plain{
@@ -10285,12 +9403,6 @@
/obj/landmark/spawnpoint/job/pathfinder,
/turf/simulated/floor/tiled/monotile,
/area/exploration/pathfinder_office)
-"azA" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/tiled/monotile,
-/area/exploration/pathfinder_office)
"azB" = (
/obj/machinery/meter,
/obj/structure/disposalpipe/segment{
@@ -10376,9 +9488,6 @@
},
/turf/simulated/floor/grass,
/area/hydroponics)
-"azJ" = (
-/turf/simulated/wall,
-/area/crew_quarters/kitchen)
"azL" = (
/obj/effect/floor_decal/borderfloorblack,
/turf/simulated/floor/tiled/dark,
@@ -10427,19 +9536,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/cockpit)
-"azX" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"azZ" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -10531,14 +9627,7 @@
dir = 4;
pixel_x = -30
},
-/obj/structure/ladder{
- pixel_y = 8
- },
-/obj/effect/floor_decal/spline/plain{
- dir = 5
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled/monotile,
+/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"aAk" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -10552,9 +9641,6 @@
},
/turf/simulated/shuttle/wall/voidcraft/green,
/area/shuttle/civvie/general)
-"aAm" = (
-/turf/simulated/floor/tiled/dark,
-/area/exploration/showers)
"aAn" = (
/obj/machinery/alarm{
desc = " ";
@@ -10601,30 +9687,6 @@
/mob/living/simple_mob/animal/giant_spider/carrier,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/outside/outside3)
-"aAt" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- name = "Exploration Airlock";
- req_access = list();
- req_one_access = list(19,43,67)
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 8
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 10
- },
-/obj/effect/floor_decal/corner/beige/bordercorner2{
- dir = 10
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
"aAx" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/corner/red/diagonal,
@@ -10638,9 +9700,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/exploration/courser_dock)
-"aAA" = (
-/turf/simulated/wall,
-/area/exploration/pathfinder_office)
"aAB" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -10649,9 +9708,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/monotile,
/area/exploration)
-"aAC" = (
-/turf/simulated/wall/r_wall,
-/area/exploration/courser_dock)
"aAD" = (
/obj/machinery/door/airlock/command{
name = "Teleport Access";
@@ -10709,10 +9765,6 @@
/obj/machinery/camera/network/engineering,
/turf/simulated/floor/plating,
/area/maintenance/ai)
-"aAM" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/teleporter/departing)
"aAN" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{
@@ -10892,22 +9944,6 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
-"aBp" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 10
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 10
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
- dir = 9
- },
-/obj/machinery/gear_painter,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/locker/laundry_arrival)
"aBr" = (
/obj/effect/floor_decal/spline/plain{
dir = 6
@@ -10915,28 +9951,6 @@
/obj/machinery/portable_atmospherics/hydroponics,
/turf/simulated/floor/grass,
/area/hydroponics)
-"aBs" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
"aBv" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/steel,
@@ -11102,10 +10116,6 @@
},
/turf/simulated/floor/wood,
/area/exploration/meeting)
-"aBP" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cockpit)
"aBQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11207,10 +10217,6 @@
},
/turf/simulated/floor/grass,
/area/hydroponics)
-"aCc" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/cargo)
"aCd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -11226,9 +10232,6 @@
},
/turf/simulated/floor/carpet,
/area/bridge/bridge_hallway)
-"aCh" = (
-/turf/simulated/wall,
-/area/bridge/bridge_hallway)
"aCi" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 1
@@ -11389,21 +10392,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"aCD" = (
-/obj/machinery/door/airlock/glass_command{
- dir = 1;
- name = "Bridge";
- req_access = list(19)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/dark,
-/area/bridge)
"aCE" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/borderfloorwhite{
@@ -11471,12 +10459,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"aCM" = (
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cockpit)
-"aCN" = (
-/turf/simulated/wall/r_wall,
-/area/ai_server_room)
"aCQ" = (
/obj/structure/railing{
dir = 8
@@ -11567,18 +10549,6 @@
/obj/item/pen,
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
-"aDb" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"aDd" = (
/obj/machinery/door/window/eastright{
dir = 1
@@ -11587,10 +10557,6 @@
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"aDe" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/stairwell/primary/surfacethree)
"aDf" = (
/obj/machinery/power/smes/buildable/point_of_interest,
/obj/structure/cable/cyan{
@@ -11614,23 +10580,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor,
/area/shuttle/civvie/general)
-"aDh" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/tiled/monotile,
-/area/hallway/secondary/docking_hallway2)
-"aDi" = (
-/obj/structure/sign/warning/falling,
-/turf/simulated/wall/r_wall,
-/area/rift/surfacebase/outside/outside3)
-"aDj" = (
-/obj/structure/sign/department/armory{
- desc = "A warning sign for anyone entering the station.";
- name = "SUBMIT WEAPONS PRIOR TO ENTRY"
- },
-/turf/simulated/wall/r_wall,
-/area/hallway/secondary/docking_hallway)
"aDk" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
@@ -11682,10 +10631,6 @@
/obj/structure/girder,
/turf/simulated/floor/lythios43c/indoors,
/area/maintenance/commandmaint)
-"aDs" = (
-/obj/structure/sign/warning/docking_area,
-/turf/simulated/wall/r_wall,
-/area/exploration/excursion_dock)
"aDt" = (
/obj/machinery/alarm{
desc = " ";
@@ -11854,12 +10799,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/office)
-"aEa" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 8
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"aEb" = (
/obj/structure/table/steel_reinforced,
/obj/item/paper_bin,
@@ -11869,10 +10808,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"aEc" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/hop)
"aEd" = (
/obj/machinery/light{
dir = 8
@@ -11899,27 +10834,9 @@
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/dark,
/area/exploration/courser_dock)
-"aEh" = (
-/obj/machinery/vending/boozeomat{
- req_access = null
- },
-/turf/simulated/wall,
-/area/bridge/bunker)
-"aEi" = (
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/railing,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/structure/ladder{
- pixel_y = 10
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/rift/turbolift/maint)
+"aEj" = (
+/turf/simulated/wall/prepainted/command,
+/area/teleporter)
"aEk" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 8
@@ -11984,9 +10901,6 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
-"aEq" = (
-/turf/simulated/wall,
-/area/exploration/meeting)
"aEt" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -11999,10 +10913,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
-"aEu" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/hallway/secondary/docking_hallway)
"aEv" = (
/obj/machinery/door/airlock/highsecurity{
name = "AI Storage";
@@ -12057,13 +10967,6 @@
"aEA" = (
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_south)
-"aEB" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Exploration Airlock";
- req_one_access = list(19,43,67)
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/excursion_dock)
"aEC" = (
/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
dir = 4;
@@ -12212,11 +11115,6 @@
},
/turf/simulated/floor/carpet/tealcarpet,
/area/shuttle/civvie/general)
-"aEV" = (
-/turf/simulated/wall{
- can_open = 1
- },
-/area/maintenance/bar/lower)
"aEW" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -12325,9 +11223,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"aFm" = (
-/turf/simulated/wall,
-/area/maintenance/substation/surface_three)
"aFo" = (
/obj/structure/closet/crate/secure{
name = "Gold Crate";
@@ -12373,20 +11268,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
-"aFs" = (
-/turf/simulated/wall/r_wall,
-/area/ai_cyborg_station)
-"aFt" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/beige/border,
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/beige/bordercorner2{
- dir = 9
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration/pathfinder_office)
"aFu" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/table/standard,
@@ -12613,9 +11494,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/exploration/explorer_prep)
-"aFZ" = (
-/turf/simulated/wall,
-/area/teleporter)
"aGa" = (
/obj/structure/table/standard,
/obj/item/aiModule/oxygen,
@@ -12698,9 +11576,6 @@
},
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/shuttle/emt/general)
-"aGi" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/barrestroom)
"aGj" = (
/obj/structure/railing,
/obj/structure/railing{
@@ -12876,17 +11751,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/exploration/showers)
-"aGL" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Exploration Airlock";
- req_one_access = list(19,43,67)
- },
-/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/exploration)
"aGM" = (
/obj/effect/floor_decal/spline/fancy{
dir = 5
@@ -12911,32 +11775,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"aGR" = (
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 10
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 6
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals10{
- dir = 9
- },
-/obj/machinery/door/airlock/research{
- name = "Exploration Showers"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/dark,
-/area/exploration/showers)
"aGS" = (
/obj/effect/floor_decal/techfloor/corner,
/obj/effect/floor_decal/techfloor/corner{
@@ -12968,9 +11806,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/captain)
-"aGU" = (
-/turf/simulated/wall/r_wall,
-/area/bridge)
"aGW" = (
/obj/machinery/door/airlock{
id_tag = "bathroomlock18";
@@ -13300,24 +12135,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/captain)
-"aHN" = (
-/turf/simulated/wall/r_wall,
-/area/exploration/excursion_dock)
-"aHO" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 5
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 5
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 5
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
- dir = 5
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
"aHQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -13339,9 +12156,6 @@
/obj/machinery/shipsensors,
/turf/simulated/floor/plating,
/area/shuttle/courser/general)
-"aHT" = (
-/turf/simulated/wall/r_wall,
-/area/ai)
"aHU" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -13544,9 +12358,6 @@
/obj/random/maintenance,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"aIs" = (
-/turf/simulated/wall,
-/area/crew_quarters/bar_backroom)
"aIt" = (
/obj/structure/bed/chair/sofa/black/left,
/turf/simulated/floor/plating,
@@ -13687,17 +12498,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"aIL" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on,
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/security/nuke_storage)
"aIM" = (
/obj/structure/railing{
dir = 4
@@ -13776,22 +12576,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
-"aIX" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 6
- },
-/obj/item/radio/intercom{
- dir = 4;
- pixel_x = 24
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/checkpoint2)
"aIY" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/ship_munition/disperser_charge/fire,
@@ -13853,9 +12637,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
-"aJf" = (
-/turf/simulated/wall,
-/area/exploration/showers)
"aJg" = (
/obj/structure/railing,
/obj/random/fishing_junk,
@@ -14016,26 +12797,6 @@
/obj/item/reagent_containers/dropper,
/turf/simulated/floor/tiled/steel,
/area/hydroponics)
-"aJy" = (
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacethree)
-"aJz" = (
-/turf/simulated/wall,
-/area/exploration/explorer_prep)
"aJB" = (
/obj/machinery/disposal,
/obj/effect/floor_decal/borderfloor{
@@ -14088,20 +12849,6 @@
/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/dark,
/area/exploration/courser_dock)
-"aJF" = (
-/obj/machinery/door/airlock/research{
- name = "Pathfinder's Office";
- req_access = list(44)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/exploration/pathfinder_office)
"aJH" = (
/obj/structure/bed/chair/bay/comfy/black,
/obj/effect/floor_decal/borderfloorblack/corner{
@@ -14195,43 +12942,6 @@
},
/turf/simulated/floor/plating,
/area/exploration/courser_dock)
-"aJS" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/obj/machinery/door/airlock/glass_command/polarized{
- id_tint = "bridge_tint";
- name = "Bridge"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge)
-"aJU" = (
-/obj/structure/table/woodentable,
-/obj/effect/floor_decal/borderfloorblack{
- dir = 6
- },
-/obj/effect/floor_decal/borderfloorblack/corner2,
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 6
- },
-/obj/structure/flora/pottedplant/minitree{
- pixel_y = 12
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"aJV" = (
/obj/random/humanoidremains,
/obj/random/multiple/voidsuit/vintage,
@@ -14249,9 +12959,6 @@
/obj/structure/ship_munition/disperser_charge/mining,
/turf/simulated/floor/tiled/dark,
/area/exploration/courser_dock)
-"aJX" = (
-/turf/simulated/wall/r_wall,
-/area/bridge/bunker)
"aJY" = (
/obj/structure/curtain/open/bed{
name = "brown curtain";
@@ -14331,14 +13038,6 @@
},
/turf/simulated/floor/plating,
/area/shuttle/courser/cockpit)
-"aKf" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "botany_hallway"
- },
-/turf/simulated/floor/plating,
-/area/hydroponics)
"aKg" = (
/obj/item/material/ashtray/glass,
/obj/structure/bed/chair/sofa/black{
@@ -14347,12 +13046,6 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
-"aKh" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/turf/simulated/floor/tiled/monotile,
-/area/rift/trade_shop/landing_pad)
"aKi" = (
/obj/effect/spider/stickyweb,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
@@ -14608,13 +13301,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
-"aKR" = (
-/obj/structure/bed/chair/comfy/brown{
- dir = 1
- },
-/obj/effect/floor_decal/spline/plain,
-/turf/simulated/floor/wood,
-/area/crew_quarters/captain)
"aKT" = (
/obj/structure/symbol/sa,
/turf/simulated/floor/plating,
@@ -14639,10 +13325,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"aKY" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/exploration/explorer_prep)
"aKZ" = (
/obj/machinery/holoposter{
pixel_y = 32
@@ -14752,9 +13434,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacethree)
-"aLn" = (
-/turf/simulated/wall,
-/area/crew_quarters/freezer)
"aLo" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -14822,18 +13501,6 @@
/obj/item/clothing/head/helmet/space/void/pilot,
/turf/simulated/floor/tiled,
/area/exploration/explorer_prep)
-"aLy" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 2;
- icon_state = "pdoor0";
- id = "shuttle blast";
- name = "Shuttle Blast Doors";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
"aLz" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/computer/security{
@@ -14841,9 +13508,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"aLA" = (
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
"aLB" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -14878,12 +13542,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/heads/hop)
-"aLF" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/wall/r_wall,
-/area/ai)
"aLH" = (
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14907,9 +13565,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_south)
-"aLK" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/captain)
"aLL" = (
/obj/structure/railing{
dir = 8
@@ -14923,10 +13578,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
-"aLM" = (
-/obj/structure/sign/department/bridge,
-/turf/simulated/wall/r_wall,
-/area/bridge)
"aLN" = (
/obj/structure/table/rack/shelf,
/obj/effect/floor_decal/borderfloorblack/full,
@@ -14940,26 +13591,6 @@
/obj/effect/debris/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"aLP" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 1
- },
-/obj/effect/floor_decal/corner/beige/bordercorner{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
"aLQ" = (
/obj/structure/table/wooden_reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14989,26 +13620,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/teleporter)
-"aLU" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 4
- },
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration/pathfinder_office)
-"aLV" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "meeting_tint"
- },
-/turf/simulated/floor/plating,
-/area/bridge/meeting_room)
"aLX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -15097,15 +13708,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/shuttle/courser/general)
-"aMi" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"aMj" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -15255,10 +13857,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
-"aMA" = (
-/obj/machinery/holoposter,
-/turf/simulated/wall/r_wall,
-/area/bridge)
"aMB" = (
/obj/structure/bed/chair/bay/comfy/black,
/turf/simulated/floor/carpet/blue,
@@ -15292,12 +13890,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacethree)
-"aME" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/wall/r_wall,
-/area/ai)
"aMF" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -15346,9 +13938,6 @@
},
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/cockpit)
-"aMK" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/commandmaint)
"aML" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -15358,6 +13947,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/meeting_room)
+"aMM" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/bar/lower)
"aMN" = (
/obj/item/digestion_remains/ribcage,
/obj/random/maintenance/security,
@@ -15502,27 +14095,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
-"aNo" = (
-/obj/machinery/door/airlock/command{
- id_tag = "captaindoor";
- name = "Facility Director";
- req_access = list(20)
- },
-/obj/machinery/door/firedoor/glass,
-/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/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/captain)
"aNp" = (
/turf/simulated/floor/tiled/steel,
/area/exploration)
@@ -15532,14 +14104,6 @@
},
/turf/simulated/floor/lino,
/area/crew_quarters/bar_backroom)
-"aNr" = (
-/obj/machinery/status_display,
-/turf/simulated/wall,
-/area/maintenance/substation/surface_three)
-"aNs" = (
-/obj/machinery/status_display,
-/turf/simulated/wall/r_wall,
-/area/bridge)
"aNt" = (
/obj/structure/table/woodentable,
/obj/item/deck/cards,
@@ -15567,15 +14131,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/exploration/courser_dock)
-"aNw" = (
-/obj/machinery/disposal,
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/wood,
-/area/crew_quarters/bar)
"aNx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
@@ -15638,13 +14193,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_north)
-"aNF" = (
-/obj/machinery/light/spot{
- dir = 4;
- pixel_x = -32
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/cargo)
"aNG" = (
/obj/effect/floor_decal/industrial/halfstair,
/turf/simulated/floor/tiled/steel_grid/lythios43c,
@@ -15709,12 +14257,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/teleporter)
-"aNP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 10
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
"aNR" = (
/obj/structure/table/reinforced,
/obj/machinery/photocopier/faxmachine{
@@ -15733,9 +14275,6 @@
},
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/hop)
-"aNS" = (
-/turf/simulated/wall,
-/area/maintenance/bar)
"aNT" = (
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/wood,
@@ -15973,9 +14512,6 @@
/obj/machinery/vending/coffee,
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
-"aOt" = (
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
"aOu" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/recharge_station,
@@ -15984,15 +14520,6 @@
},
/turf/simulated/floor,
/area/shuttle/civvie/general)
-"aOv" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 9
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 9
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"aOw" = (
/obj/structure/cable/cyan{
icon_state = "2-8"
@@ -16125,23 +14652,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
-"aOL" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "bridge_tint"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/bridge)
"aOM" = (
/obj/effect/floor_decal/techfloor{
dir = 9
@@ -16195,23 +14705,6 @@
/obj/structure/lattice,
/turf/simulated/open/lythios43c,
/area/rift/surfacebase/outside/outside3)
-"aOQ" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/machinery/firealarm{
- dir = 3;
- pixel_y = 24
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacethree)
"aOS" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/button/remote/blast_door{
@@ -16242,10 +14735,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"aOV" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
"aOW" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -16267,9 +14756,6 @@
},
/turf/simulated/floor/plating,
/area/shuttle/courser/cockpit)
-"aOY" = (
-/turf/simulated/wall,
-/area/maintenance/bar/lower)
"aOZ" = (
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/shuttle/courser/cockpit)
@@ -16331,9 +14817,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/office)
-"aPg" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/heads/hop)
"aPi" = (
/obj/machinery/light{
dir = 4
@@ -16399,9 +14882,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
-"aPo" = (
-/turf/simulated/wall,
-/area/crew_quarters/bar)
"aPp" = (
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
@@ -16455,10 +14935,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/bridge/meeting_room)
-"aPE" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
"aPF" = (
/obj/machinery/light/small{
dir = 1
@@ -16466,20 +14942,6 @@
/obj/random/fishing_junk,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"aPH" = (
-/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/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/bridge)
"aPJ" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/blue/border,
@@ -16542,23 +15004,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
-"aPP" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "bridge_tint"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 4;
- icon_state = "shutter0";
- id = "bridge";
- layer = 3.1;
- name = "Bridge Lockdown Shutters";
- opacity = 0
- },
-/turf/simulated/floor/plating,
-/area/bridge)
"aPQ" = (
/obj/structure/table/woodentable,
/obj/machinery/microwave,
@@ -16926,31 +15371,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/carpet/blue,
/area/bridge/meeting_room)
-"aQI" = (
-/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -24
- },
-/obj/machinery/camera/network/civilian{
- dir = 10
- },
-/turf/simulated/floor/tiled/white,
-/area/crew_quarters/kitchen)
-"aQJ" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Exploration Airlock";
- req_one_access = list(19,43,67)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/excursion_dock)
"aQK" = (
/turf/simulated/floor/outdoors/snow/noblend/lythios43c,
/area/rift/surfacebase/outside/outside3)
@@ -17234,27 +15654,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/maintenance/bar)
-"aRA" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration/courser_dock)
"aRB" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -17357,23 +15756,6 @@
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/dark,
/area/security/nuke_storage)
-"aRQ" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
"aRR" = (
/obj/map_helper/airlock/door/int_door,
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -17453,19 +15835,6 @@
},
/turf/simulated/floor/plating,
/area/rift/surfaceeva/airlock/arrivals)
-"aSd" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 1;
- name = "Bar"
- },
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/bar)
"aSe" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -17755,9 +16124,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/captain)
-"aSJ" = (
-/turf/simulated/wall/r_wall,
-/area/security/checkpoint2)
"aSK" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
@@ -17771,10 +16137,6 @@
},
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/general)
-"aSL" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/shuttle/civvie/cockpit)
"aSN" = (
/obj/effect/floor_decal/spline/plain{
dir = 10
@@ -17805,30 +16167,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"aSR" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
-/obj/structure/cable/green{
- icon_state = "2-4"
- },
-/obj/structure/cable/green{
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/crew_quarters/bar)
"aSS" = (
/obj/structure/railing{
dir = 8
@@ -17849,16 +16187,6 @@
},
/turf/simulated/floor/plating,
/area/rift/trade_shop/landing_pad)
-"aST" = (
-/obj/machinery/computer/station_alert/security,
-/obj/effect/floor_decal/borderfloor{
- dir = 5
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 5
- },
-/turf/simulated/floor/tiled/steel,
-/area/security/checkpoint2)
"aSU" = (
/obj/machinery/door/airlock/glass{
name = "Long-Range Teleporter Access"
@@ -17934,13 +16262,6 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/barrestroom)
-"aTg" = (
-/obj/machinery/light/spot{
- dir = 4;
- pixel_x = -32
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
"aTh" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -18114,12 +16435,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"aTJ" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/turf/simulated/floor/tiled/monotile,
-/area/rift/trade_shop/landing_pad)
"aTL" = (
/obj/machinery/power/apc{
dir = 4;
@@ -18144,10 +16459,6 @@
/obj/random/mre,
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_north)
-"aTP" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/surfacebase/outside/outside3)
"aTQ" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -18197,9 +16508,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
-"aTU" = (
-/turf/simulated/floor/tiled/monotile,
-/area/hallway/secondary/docking_hallway2)
"aTV" = (
/obj/structure/table/standard,
/obj/item/aiModule/reset,
@@ -18266,13 +16574,6 @@
/obj/effect/decal/mecha_wreckage/gygax,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/outside/outside3)
-"aUc" = (
-/obj/effect/floor_decal/borderfloorblack,
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
"aUe" = (
/obj/structure/mirror{
dir = 4;
@@ -18406,22 +16707,6 @@
/obj/structure/table/bench/wooden,
/turf/simulated/floor/tiled/steel,
/area/hydroponics)
-"aUx" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 2;
- name = "Exploration Briefing";
- req_access = list();
- req_one_access = list(19,43,67)
- },
-/obj/effect/floor_decal/spline/plain{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/wood,
-/area/exploration/meeting)
"aUy" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -18577,12 +16862,6 @@
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/shuttle/courser/cockpit)
-"aUQ" = (
-/turf/simulated/wall/r_wall,
-/area/rift/surfaceeva/airlock/arrivals/secondary)
-"aUR" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/locker/laundry_arrival)
"aUS" = (
/obj/structure/table/rack/shelf,
/obj/effect/floor_decal/borderfloorblack/full,
@@ -18627,16 +16906,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hydroponics)
-"aUW" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/locker/laundry_arrival)
"aUY" = (
/obj/machinery/atmospherics/component/unary/heater{
dir = 8
@@ -18877,10 +17146,6 @@
/obj/machinery/recharger,
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/hop)
-"aVF" = (
-/obj/structure/sign/department/ai,
-/turf/simulated/wall/r_wall,
-/area/ai_upload_foyer)
"aVG" = (
/obj/effect/floor_decal/techfloor{
dir = 10
@@ -18958,24 +17223,6 @@
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/grass,
/area/hydroponics)
-"aVU" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 10
- },
-/obj/effect/floor_decal/corner/beige/border{
- dir = 10
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/beige/bordercorner2{
- dir = 9
- },
-/obj/machinery/camera/network/exploration{
- dir = 10
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration/excursion_dock)
"aVX" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/ship_munition/disperser_charge/fire,
@@ -19266,9 +17513,6 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/shuttle/courser/general)
-"aWN" = (
-/turf/simulated/wall,
-/area/hallway/secondary/docking_hallway)
"aWQ" = (
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
@@ -19306,9 +17550,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge)
-"aWU" = (
-/turf/simulated/wall/r_wall,
-/area/teleporter/departing)
"aWV" = (
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
@@ -19346,10 +17587,6 @@
/obj/item/bedsheet/iandouble,
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/hop)
-"aWZ" = (
-/obj/structure/sign/department/drones,
-/turf/simulated/wall/r_wall,
-/area/ai_upload_foyer)
"aXa" = (
/obj/structure/table/reinforced,
/obj/machinery/chemical_dispenser/catering/bar_soft,
@@ -19383,14 +17620,6 @@
/obj/machinery/crystal/ice,
/turf/simulated/floor/outdoors/safeice/lythios43c/indoors,
/area/rift/surfacebase/outside/outside3)
-"aXe" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/railing,
-/obj/structure/trash_pile,
-/turf/simulated/floor/plating,
-/area/maintenance/station/exploration)
"aXf" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -19478,14 +17707,6 @@
/obj/structure/bed,
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_north)
-"aXq" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "meeting_tint"
- },
-/turf/simulated/floor/plating,
-/area/bridge/bridge_hallway)
"aXr" = (
/obj/structure/table/rack/shelf,
/obj/item/tank/oxygen,
@@ -19533,9 +17754,6 @@
},
/turf/simulated/floor/lythios43c/indoors,
/area/shuttle/excursion/cargo)
-"aXu" = (
-/turf/simulated/wall,
-/area/hydroponics)
"aXw" = (
/obj/effect/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/techfloor,
@@ -19637,15 +17855,6 @@
"aXM" = (
/turf/simulated/shuttle/wall/voidcraft,
/area/turbolift/rsurface/level3)
-"aXN" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/structure/cable/cyan{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/old_tile/green,
-/area/shuttle/civvie/general)
"aXO" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
@@ -19720,10 +17929,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"aXX" = (
-/obj/structure/sign/warning/nosmoking_1,
-/turf/simulated/wall/r_wall,
-/area/exploration/courser_dock)
"aXY" = (
/obj/machinery/portable_atmospherics/hydroponics,
/obj/effect/debris/cleanable/dirt,
@@ -19768,9 +17973,6 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techmaint,
/area/rift/surfaceeva/aa/cliff_north)
-"aYg" = (
-/turf/simulated/wall/r_wall,
-/area/maintenance/station/exploration)
"aYi" = (
/obj/structure/railing,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -19784,24 +17986,6 @@
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
-"aYk" = (
-/obj/structure/sink{
- pixel_y = 18
- },
-/obj/structure/mirror{
- pixel_y = 32
- },
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 4
- },
-/turf/simulated/floor/tiled/dark,
-/area/exploration/showers)
"aYl" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -19940,9 +18124,6 @@
/obj/item/reagent_containers/glass/bucket/wood,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"aYF" = (
-/turf/simulated/wall,
-/area/maintenance/commandmaint)
"aYG" = (
/obj/machinery/power/apc{
dir = 1;
@@ -20069,15 +18250,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/engineering/pumpstation)
-"aYT" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"aYW" = (
/obj/machinery/computer/ship/engines{
dir = 4
@@ -20122,12 +18294,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/general)
-"aYZ" = (
-/obj/structure/symbol/sa,
-/turf/simulated/wall{
- can_open = 1
- },
-/area/exploration)
"aZa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -20261,9 +18427,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
-"aZx" = (
-/turf/simulated/wall,
-/area/crew_quarters/barrestroom)
"aZB" = (
/obj/structure/shuttle/engine/heater,
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
@@ -20286,14 +18449,6 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
-"aZH" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/effect/floor_decal/steeldecal/steel_decals6{
- dir = 6
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
"aZI" = (
/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
dir = 4;
@@ -20343,13 +18498,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/cockpit)
-"aZM" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"aZO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/floor_decal/borderfloorblack{
@@ -20398,18 +18546,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/exploration/pathfinder_office)
-"aZV" = (
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
"aZW" = (
/obj/structure/anomaly_container,
/obj/effect/floor_decal/industrial/outline/yellow,
@@ -20482,26 +18618,37 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
-"bja" = (
-/obj/structure/sign/department/armory{
- desc = "A warning sign for anyone entering the station.";
- name = "SUBMIT FIREARMS PRIOR TO ENTRY";
- pixel_y = -32
- },
-/obj/structure/bed/chair/bay/chair{
- dir = 1
- },
+"bfN" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/shuttle/emt/cockpit)
+"bis" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/light,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -24
},
/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
-"bmr" = (
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
+/area/hallway/primary/surfacethree)
+"bjs" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/bar)
+"bnc" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"bnf" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
@@ -20511,6 +18658,22 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"bnN" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/beige/border{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/steel,
+/area/exploration)
"boK" = (
/obj/machinery/door/airlock/command{
id_tag = "blueshielddoor";
@@ -20540,6 +18703,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"bqs" = (
+/turf/simulated/wall/prepainted,
+/area/hallway/secondary/docking_hallway)
"brl" = (
/obj/machinery/door/airlock/glass_external{
req_one_access = list(19,43,67)
@@ -20562,6 +18728,14 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
+"bsD" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'HIGH VOLTAGE'";
+ icon_state = "shock";
+ name = "HIGH VOLTAGE"
+ },
+/turf/simulated/wall/prepainted/engineering,
+/area/maintenance/substation/research/docks)
"bvV" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
@@ -20630,6 +18804,10 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar_backroom)
+"bFr" = (
+/obj/structure/sign/warning/falling,
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfacebase/outside/outside3)
"bHN" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -20699,6 +18877,12 @@
},
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/general)
+"bPV" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/crew_quarters/heads/hop)
+"bQP" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/crew_quarters/bar)
"bQX" = (
/obj/machinery/door/airlock/maintenance/engi{
name = "Landing Pads Substation"
@@ -20777,12 +18961,30 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
+"bWN" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/commandmaint)
+"cbG" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ frequency = 1380;
+ id_tag = "emt_shuttle_dock";
+ req_one_access = list(5,67)
+ },
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside3)
"cgU" = (
/obj/machinery/computer/secure_data{
dir = 1
},
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/blueshield)
+"chf" = (
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside3)
"ciu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 8
@@ -20792,6 +18994,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
+"cnu" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/bar/lower)
"cpP" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 8
@@ -20831,6 +19036,11 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/exploration/courser_dock)
+"csw" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/bridge/bridge_hallway)
"cvg" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20841,6 +19051,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/excursion_dock)
+"cvI" = (
+/turf/simulated/wall/r_wall/prepainted/exploration,
+/area/exploration/courser_dock)
"cxI" = (
/obj/structure/table/steel,
/obj/item/storage/daki{
@@ -20849,6 +19062,12 @@
/obj/effect/debris/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"cya" = (
+/obj/machinery/vending/boozeomat{
+ req_access = null
+ },
+/turf/simulated/wall/prepainted,
+/area/bridge/bunker)
"czm" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -20876,6 +19095,30 @@
},
/turf/simulated/floor/plating,
/area/rift/surfaceeva/airlock/arrivals/secondary)
+"cBD" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/green{
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/crew_quarters/bar)
"cCj" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
dir = 4
@@ -20907,6 +19150,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
+"cIq" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/hydroponics)
"cJZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 8
@@ -20943,6 +19189,20 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"cQV" = (
+/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)
"cRX" = (
/obj/item/trash/chips,
/obj/effect/debris/cleanable/dirt,
@@ -20956,26 +19216,29 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
-"cVa" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/red/border{
- dir = 4
- },
-/obj/machinery/alarm{
- dir = 8;
- pixel_x = 24
+"cYb" = (
+/obj/machinery/door/airlock/multi_tile/glass/civilian{
+ dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/camera/network/security{
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
/turf/simulated/floor/tiled/steel,
-/area/security/checkpoint2)
+/area/crew_quarters/bar)
+"cYF" = (
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside3)
+"cYM" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfaceeva/aa/cliff_south)
"cZN" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -20985,6 +19248,21 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
+"dcy" = (
+/obj/structure/table/wooden_reinforced,
+/obj/item/storage/photo_album{
+ pixel_y = -10
+ },
+/obj/item/reagent_containers/food/drinks/flask{
+ pixel_x = 8
+ },
+/obj/item/hand_tele,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = -24
+ },
+/turf/simulated/floor/wood,
+/area/crew_quarters/captain)
"dfy" = (
/obj/effect/floor_decal/borderfloor{
dir = 10
@@ -20994,29 +19272,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
-"dfD" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/exploration/courser_dock)
-"dfP" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/machinery/door/airlock/glass_research{
- name = "Exploration Airlock";
- req_one_access = list(19,43,67)
- },
-/obj/structure/cable/orange{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/courser_dock)
"dgX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 8
@@ -21033,6 +19288,9 @@
},
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside3)
+"dnb" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/telescience_lab)
"dph" = (
/obj/machinery/light/small{
dir = 8
@@ -21042,6 +19300,10 @@
/obj/structure/cable/orange,
/turf/simulated/floor,
/area/shuttle/emt/general)
+"dpK" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/shuttle/civvie/cockpit)
"dpX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -21067,24 +19329,6 @@
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"dvK" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 2;
- icon_state = "shutter0";
- id = "arv_check_hall_shutter";
- name = "Arrivals Hallway Shutter";
- opacity = 0
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/structure/cable{
- icon_state = "2-4"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/locker/laundry_arrival)
"dvT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -21163,6 +19407,42 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
+"dDb" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 6
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 5
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/exploration{
+ name = "Exploration Showers"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/exploration/showers)
+"dDI" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/crew_quarters/heads/blueshield)
+"dIa" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/violet,
+/turf/simulated/floor/plating,
+/area/exploration/explorer_prep)
"dIm" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -21217,6 +19497,16 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"dSD" = (
+/obj/machinery/holopad,
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
"dSP" = (
/obj/structure/cable/orange{
icon_state = "1-2"
@@ -21246,18 +19536,13 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/arrivals/secondary)
-"dUX" = (
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5
+"dUS" = (
+/obj/machinery/light,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
-/turf/simulated/floor/tiled/dark,
-/area/bridge/bridge_hallway)
+/turf/simulated/floor/tiled/monotile,
+/area/rift/trade_shop/landing_pad)
"dWj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -21302,6 +19587,27 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
+"dYL" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration/courser_dock)
"ebz" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -21317,6 +19623,9 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"edo" = (
+/turf/simulated/wall/r_wall/prepainted/science,
+/area/rnd/telescience_lab/chamber)
"eeN" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21376,9 +19685,14 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/shuttle/courser/general)
-"eml" = (
-/turf/simulated/wall,
-/area/maintenance/research/xenobio)
+"eod" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai)
+"eor" = (
+/obj/effect/paint/black,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"eoD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -21396,6 +19710,23 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/emt/general)
+"epp" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 4
+ },
+/obj/machinery/alarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/checkpoint2)
"esl" = (
/obj/machinery/door/airlock/maintenance/int,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -21413,14 +19744,24 @@
},
/turf/simulated/open,
/area/rnd/telescience_lab/chamber)
-"etC" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "bridge_tint"
+"evb" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "arv_check_hall_shutter";
+ name = "Arrivals Hallway Shutter";
+ opacity = 0
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
},
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
-/area/crew_quarters/heads/blueshield)
+/area/crew_quarters/locker/laundry_arrival)
"evR" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
@@ -21443,34 +19784,18 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/rift/turbolift/maint)
-"ewK" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "hop_office"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "hop_office_shutters";
- name = "HoP Office Shutters";
- opacity = 0
- },
-/obj/structure/cable/green{
- icon_state = "0-2"
- },
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/hop)
-"exb" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/maintenance/research/xenobio)
+"exk" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/substation/surface_three)
"exW" = (
/obj/structure/catwalk,
/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"eyE" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/kitchen)
"eyO" = (
/obj/machinery/power/apc/direction_bump/north,
/obj/structure/cable/orange{
@@ -21522,6 +19847,20 @@
},
/turf/simulated/floor/lino,
/area/crew_quarters/bar_backroom)
+"ezI" = (
+/obj/machinery/computer/station_alert/security,
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 5
+ },
+/obj/item/radio/intercom{
+ dir = 4;
+ pixel_x = 24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/checkpoint2)
"ezO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -21554,10 +19893,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"eDa" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/telescience_lab)
+"eDm" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/crew_quarters/locker/laundry_arrival)
"eEa" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -21634,6 +19972,53 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/blueshield)
+"eJi" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/camera/network/civilian,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
+"eJQ" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/camera/network/civilian{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
+"eKt" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 10
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/gear_painter,
+/obj/machinery/light{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/locker/laundry_arrival)
"eKI" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 4
@@ -21666,14 +20051,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/secondary/docking_hallway)
-"eLO" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'HIGH VOLTAGE'";
- icon_state = "shock";
- name = "HIGH VOLTAGE"
- },
-/turf/simulated/wall,
-/area/maintenance/substation/dock)
"eNg" = (
/obj/random/tech_supply,
/obj/structure/table/steel,
@@ -21840,6 +20217,21 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"fhj" = (
+/turf/simulated/wall/prepainted/exploration,
+/area/maintenance/station/exploration)
+"fin" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/loading{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/heads/hop)
"fjB" = (
/obj/machinery/door/airlock/maintenance/engi{
name = "Substation Access"
@@ -21882,6 +20274,25 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside3)
+"fpt" = (
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lime/border,
+/obj/item/destTagger{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/structure/cable/green,
+/obj/machinery/camera/network/civilian{
+ dir = 1
+ },
+/obj/item/packageWrap,
+/obj/item/packageWrap,
+/obj/machinery/power/apc/direction_bump/south,
+/turf/simulated/floor/tiled/steel,
+/area/hydroponics)
"fro" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
@@ -21893,6 +20304,17 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
+"fsv" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/violet,
+/turf/simulated/floor/plating,
+/area/exploration/courser_dock)
+"fua" = (
+/turf/simulated/wall/r_wall/prepainted/civilian,
+/area/crew_quarters/freezer)
+"fuM" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/crew_quarters/barrestroom)
"fxA" = (
/obj/structure/table/hardwoodtable,
/obj/machinery/chemical_dispenser/catering/bar_soft{
@@ -21917,6 +20339,54 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside3)
+"fAb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/rift/turbolift/maint)
+"fDZ" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
+"fFo" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "bridge";
+ layer = 3.1;
+ name = "Bridge Lockdown Shutters";
+ opacity = 0
+ },
+/obj/machinery/door/airlock/glass/command/polarized{
+ id_tint = "bridge_tint";
+ name = "Bridge"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge)
"fFL" = (
/obj/map_helper/airlock/sensor/chamber_sensor,
/obj/machinery/airlock_sensor{
@@ -21947,6 +20417,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/blueshield)
+"fHr" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/hallway/secondary/docking_hallway2)
"fIe" = (
/obj/machinery/light/small{
dir = 8
@@ -21970,22 +20443,9 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"fJi" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/beige/border,
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 9
- },
-/obj/effect/floor_decal/corner/beige/bordercorner2{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/camera/network/civilian{
- dir = 10
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
+"fMP" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/teleporter/departing)
"fOb" = (
/obj/machinery/light/small{
dir = 8
@@ -22016,6 +20476,9 @@
/obj/machinery/holopad/ship,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
+"fRp" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/trade_shop/landing_pad)
"fSv" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -22031,6 +20494,34 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
+"fTe" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/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;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "hop_office_shutters";
+ name = "HoP Office Shutters";
+ opacity = 0
+ },
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/hop)
"fUe" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloor,
@@ -22064,19 +20555,6 @@
/obj/structure/table/rack/steel,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"fWF" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/monotile,
-/area/hallway/secondary/docking_hallway2)
"gaF" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -22104,10 +20582,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/exploration)
-"gfR" = (
-/obj/machinery/smartfridge/food,
-/turf/simulated/wall,
-/area/crew_quarters/kitchen)
"ghf" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/cable/green{
@@ -22118,6 +20592,24 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
+"ghR" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "hop_office_shutters";
+ name = "HoP Office Shutters";
+ opacity = 0
+ },
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
+ id = "hop_office"
+ },
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/hop)
"giX" = (
/obj/structure/closet/walllocker/emergsuit_wall{
pixel_x = 32
@@ -22147,6 +20639,10 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"glx" = (
+/obj/structure/sign/warning/nosmoking_1,
+/turf/simulated/wall/r_wall/prepainted/exploration,
+/area/exploration/courser_dock)
"glL" = (
/obj/structure/cable/orange{
icon_state = "1-2"
@@ -22169,6 +20665,12 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/arrivals)
+"gpa" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/station/exploration)
+"gqJ" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/stairwell/primary/surfacethree)
"gqO" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -22181,6 +20683,20 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
+"grq" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/beige/border,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration/pathfinder_office)
"grw" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -22238,6 +20754,16 @@
/obj/effect/floor_decal/corner/lime/border,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
+"guB" = (
+/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/structure/cable/green{
icon_state = "0-4"
@@ -22276,14 +20802,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
-"gGZ" = (
-/obj/structure/sign/securearea{
- desc = "A warning sign which reads 'HIGH VOLTAGE'";
- icon_state = "shock";
- name = "HIGH VOLTAGE"
- },
-/turf/simulated/wall,
-/area/maintenance/substation/research/docks)
+"gGW" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_cyborg_station)
"gHz" = (
/obj/structure/table/hardwoodtable,
/obj/effect/floor_decal/spline/plain{
@@ -22308,6 +20829,10 @@
/obj/structure/bed/chair/sofa/black,
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
+"gOf" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway2)
"gOH" = (
/obj/machinery/light{
dir = 8
@@ -22347,6 +20872,20 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
+"gYr" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/multi_tile/glass/exploration{
+ dir = 1;
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/wood,
+/area/exploration/meeting)
"gYP" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -22383,6 +20922,9 @@
/obj/machinery/computer/timeclock/premade/west,
/turf/simulated/floor/tiled/steel,
/area/teleporter/departing)
+"hgO" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge/office)
"hhn" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
@@ -22392,6 +20934,22 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
+"hhF" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacethree)
"hie" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 8
@@ -22417,9 +20975,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/locker/laundry_arrival)
-"hiK" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/telescience_lab/chamber)
"hjc" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -22429,35 +20984,27 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
-"hjM" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor/glass,
-/obj/structure/window/reinforced/polarized/full{
- id = "hop_office"
- },
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "hop_office_shutters";
- name = "HoP Office Shutters";
- opacity = 0
+"hkX" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
},
-/obj/structure/cable/green{
- icon_state = "0-2"
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
+"hnU" = (
+/obj/machinery/door/airlock/multi_tile/glass/civilian{
+ dir = 1
},
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
-/turf/simulated/floor/plating,
-/area/crew_quarters/heads/hop)
-"hrU" = (
-/obj/structure/cable/cyan{
- icon_state = "1-2"
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor,
-/area/shuttle/emt/general)
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/bar)
"hsD" = (
/obj/machinery/door/airlock/glass_external,
/obj/map_helper/airlock/door/int_door,
@@ -22482,6 +21029,12 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/emt/general)
+"huX" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai)
"hAi" = (
/obj/machinery/light{
dir = 1
@@ -22499,6 +21052,23 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"hAq" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"hAM" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor/tiled,
@@ -22599,6 +21169,23 @@
},
/turf/simulated/floor/tiled/dark,
/area/teleporter)
+"hIO" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 2;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/effect/paint_stripe/violet,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
+"hJz" = (
+/obj/structure/sign/department/drones,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_upload_foyer)
"hKE" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/airlock/maintenance/common,
@@ -22629,6 +21216,25 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
+"hMC" = (
+/obj/structure/sign/department/bridge,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge)
+"hNQ" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
+"hNS" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/commandmaint)
"hPM" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -22652,6 +21258,30 @@
/obj/structure/railing,
/turf/simulated/floor/outdoors/snow/noblend/lythios43c,
/area/rift/surfacebase/outside/outside3)
+"hQo" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 6
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2,
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
+"hRh" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/glass/exploration{
+ name = "Explorer Prep";
+ req_access = list();
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/explorer_prep)
"hSS" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -22663,6 +21293,9 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
+"hXj" = (
+/turf/simulated/wall/prepainted/exploration,
+/area/exploration/explorer_prep)
"hZy" = (
/obj/effect/floor_decal/industrial/halfstair{
dir = 1
@@ -22730,6 +21363,9 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
+"ieJ" = (
+/turf/simulated/wall/prepainted/exploration,
+/area/exploration/showers)
"ify" = (
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
@@ -22752,6 +21388,11 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
+"igJ" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/violet,
+/turf/simulated/floor/plating,
+/area/exploration/pathfinder_office)
"iio" = (
/obj/machinery/door/firedoor/multi_tile{
dir = 2
@@ -22765,24 +21406,21 @@
},
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"ilt" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/machinery/beehive,
-/turf/simulated/floor/grass,
-/area/hydroponics)
-"imL" = (
+"ikZ" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/structure/table/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals6{
- dir = 5
+/obj/machinery/light,
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
},
-/obj/item/storage/single_use/med_pouch/burn,
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
},
/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
+/area/rift/stairwell/primary/surfacethree)
"imV" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -22816,30 +21454,15 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
-"ipm" = (
-/obj/effect/floor_decal/borderfloor/corner{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 10
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+"ipS" = (
+/obj/machinery/door/airlock/maintenance/rnd{
+ req_one_access = list(19,43,67)
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/door/firedoor/glass{
+ dir = 8
},
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
+/turf/simulated/floor/plating,
+/area/exploration)
"ivw" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 8
@@ -22862,6 +21485,33 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint2)
+"izC" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/rift/trade_shop/landing_pad)
+"iBL" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "hop_office_shutters";
+ name = "HoP Office Shutters";
+ opacity = 0
+ },
+/obj/structure/cable/green{
+ icon_state = "0-2"
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
+ id = "hop_office"
+ },
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/hop)
"iCv" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -22877,6 +21527,30 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"iEp" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration)
+"iFT" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/telescience_lab)
"iGg" = (
/obj/machinery/door/airlock/engineering{
name = "Science Substation";
@@ -22902,12 +21576,59 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
+"iJw" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_server_room)
+"iKg" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/machinery/door/airlock/glass/exploration{
+ name = "Medic Prep";
+ req_one_access = list(44,19,5)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/explorer_prep)
"iLh" = (
/obj/structure/cable{
icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"iLp" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "arv_check_shutter";
+ name = "Arrivals Checkpoint Shutter";
+ opacity = 0
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/checkpoint2)
+"iLC" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
"iPo" = (
/obj/item/bedsheet/reddouble,
/obj/effect/debris/cleanable/dirt,
@@ -22923,6 +21644,29 @@
},
/turf/simulated/floor,
/area/shuttle/emt/general)
+"iZv" = (
+/obj/machinery/door/airlock/command{
+ id_tag = "captaindoor";
+ name = "Facility Director";
+ req_access = list(20)
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/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/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/captain)
"jat" = (
/obj/machinery/light/small{
dir = 4
@@ -22930,6 +21674,15 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"jbk" = (
+/obj/machinery/atmospherics/component/binary/passive_gate/on{
+ dir = 1;
+ pressure_resistance = 750;
+ target_pressure = 750
+ },
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rnd/telescience_lab)
"jbR" = (
/obj/effect/floor_decal/spline/plain{
dir = 8
@@ -22945,6 +21698,24 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
+"jil" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/exploration{
+ dir = 1;
+ name = "Exploration Airlock";
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/excursion_dock)
+"jiv" = (
+/turf/simulated/wall/prepainted,
+/area/rift/stairwell/primary/surfacethree)
"jkD" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -23011,6 +21782,21 @@
},
/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,
@@ -23027,6 +21813,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"jsv" = (
+/turf/simulated/wall/r_wall/prepainted/civilian,
+/area/crew_quarters/bar)
"jtQ" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -23062,6 +21851,9 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
+"jBo" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfaceeva/aa/cliff_north)
"jCn" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 4
@@ -23075,25 +21867,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/arrivals/secondary)
-"jDr" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "arv_check_shutter";
- name = "Arrivals Checkpoint Shutter";
- opacity = 0
- },
-/obj/structure/window/reinforced{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/cable{
- icon_state = "1-4"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/checkpoint2)
"jDU" = (
/obj/structure/table/woodentable,
/obj/item/paper_bin,
@@ -23137,6 +21910,59 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint2)
+"jGy" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/beige/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner2{
+ dir = 10
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/multi_tile/glass/exploration{
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration)
+"jHi" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
+"jHq" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"jIg" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
@@ -23152,6 +21978,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
+"jJn" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/locker/laundry_arrival)
"jJw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -23172,12 +22001,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/emt/general)
-"jLq" = (
-/obj/machinery/beehive,
-/obj/structure/flora/ausbushes/stalkybush,
-/obj/machinery/camera/network/civilian,
-/turf/simulated/floor/grass,
-/area/hydroponics)
"jLR" = (
/obj/structure/table/wooden_reinforced,
/obj/item/book/manual/legal/sop_vol5_6{
@@ -23207,6 +22030,26 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/arrivals)
+"jNZ" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/beige/border,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration)
"jQb" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -23270,6 +22113,25 @@
},
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/general)
+"jWp" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfacebase/outside/outside3)
+"jWV" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"jZk" = (
/obj/structure/lattice,
/turf/simulated/open,
@@ -23288,6 +22150,30 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
+"jZP" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_upload_foyer)
+"kaE" = (
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
+ id = "botany_hallway"
+ },
+/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)
"khJ" = (
/obj/random/trash,
/obj/structure/cable/green{
@@ -23295,6 +22181,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"kih" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/rift/trade_shop/landing_pad)
"kiL" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
@@ -23318,18 +22210,27 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
-"kmY" = (
-/obj/structure/handrail,
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 4
+"klE" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 10
},
-/obj/overmap/entity/visitable/ship/landable/excursion/rift,
-/obj/effect/shuttle_landmark/rift/deck3/excursion,
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/effect/floor_decal/corner/beige/border{
+ dir = 10
},
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/camera/network/exploration{
+ dir = 1
+ },
+/obj/structure/bed/chair/backed_grey{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration/excursion_dock)
"knj" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 9
@@ -23348,10 +22249,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/exploration/excursion_dock)
-"knK" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/telescience_lab)
"kol" = (
/obj/structure/curtain/open/bed{
name = "brown curtain";
@@ -23402,53 +22299,15 @@
/obj/item/reagent_containers/glass/bucket,
/turf/simulated/floor/grass,
/area/hydroponics)
-"kuP" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Exploration Airlock";
- req_one_access = list(19,43,67)
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/steel,
-/area/exploration)
-"kyK" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"kAO" = (
/obj/structure/closet/secure_closet/blueshield,
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/blueshield)
-"kFK" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/bar)
+"kBn" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"kGC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -23484,6 +22343,29 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
+"kIR" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/structure/ladder{
+ pixel_y = 10
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/rift/turbolift/maint)
+"kJm" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/teleporter/departing)
+"kKC" = (
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/machinery/beehive,
+/turf/simulated/floor/grass,
+/area/hydroponics)
"kLO" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -23497,6 +22379,9 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/monotile,
/area/exploration)
+"kRX" = (
+/turf/simulated/wall/r_wall/prepainted/security,
+/area/security/checkpoint2)
"kTT" = (
/obj/machinery/computer/security{
dir = 1
@@ -23529,6 +22414,24 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacethree)
+"laR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/exploration{
+ dir = 1;
+ name = "Exploration Airlock";
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/excursion_dock)
+"lbu" = (
+/turf/simulated/wall/r_wall/prepainted/civilian,
+/area/crew_quarters/kitchen)
"lcP" = (
/obj/structure/bed/chair{
dir = 4
@@ -23557,6 +22460,18 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"lhu" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"lmh" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -23571,6 +22486,30 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"lmy" = (
+/turf/simulated/floor/plating,
+/area/rift/turbolift/maint)
+"lnn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/structure/closet/medical_wall{
+ pixel_y = -32
+ },
+/obj/item/storage/firstaid/toxin,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"loG" = (
/obj/structure/railing{
dir = 8
@@ -23587,6 +22526,30 @@
},
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfaceeva/airlock/arrivals)
+"lrF" = (
+/obj/structure/sink{
+ pixel_y = 18
+ },
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/dark,
+/area/exploration/showers)
"ltt" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -23606,6 +22569,26 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/dock)
+"lvw" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating/lythios43c,
+/area/rift/surfacebase/outside/outside3)
+"lxt" = (
+/obj/effect/paint/black,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/cargo)
+"lze" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai)
"lzf" = (
/obj/structure/cable/green,
/obj/machinery/power/apc{
@@ -23633,6 +22616,12 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab)
+"lEZ" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/open,
+/area/exploration)
"lJb" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -23723,6 +22712,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
+"lMp" = (
+/turf/simulated/wall/prepainted/science,
+/area/maintenance/research/xenobio)
+"lMv" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfaceeva/airlock/arrivals/secondary)
"lNq" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
@@ -23790,6 +22785,27 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"lWu" = (
+/obj/machinery/disposal,
+/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/structure/extinguisher_cabinet{
+ pixel_y = -30
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/camera/network/security{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/checkpoint2)
"lXf" = (
/obj/structure/railing{
dir = 8
@@ -23805,6 +22821,18 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
+"lYj" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/loading{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/heads/hop)
"lYx" = (
/obj/machinery/power/apc/direction_bump/north,
/obj/structure/cable/green{
@@ -23815,10 +22843,36 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"lYH" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "bridge";
+ layer = 3.1;
+ name = "Bridge Lockdown Shutters";
+ opacity = 0
+ },
+/obj/machinery/door/airlock/glass/command/polarized{
+ id_tint = "bridge_tint";
+ name = "Bridge"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/bridge)
"lZF" = (
/obj/machinery/holopad/ship,
/turf/simulated/floor/tiled/monowhite,
/area/shuttle/emt/general)
+"lZM" = (
+/turf/simulated/wall/prepainted/exploration,
+/area/exploration/meeting)
"mbP" = (
/obj/structure/bed/padded,
/obj/effect/debris/cleanable/fruit_smudge,
@@ -23883,6 +22937,11 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/shuttle/courser/general)
+"mnJ" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/maintenance/research/xenobio)
"mpH" = (
/obj/machinery/door/airlock/maintenance/sec,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -23893,6 +22952,18 @@
},
/turf/simulated/floor/plating,
/area/security/checkpoint2)
+"mpX" = (
+/turf/simulated/wall/prepainted/exploration,
+/area/exploration/pathfinder_office)
+"mpZ" = (
+/obj/machinery/disposal,
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/disposalpipe/trunk,
+/turf/simulated/floor/wood,
+/area/crew_quarters/bar)
"mrb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -23931,6 +23002,32 @@
},
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/general)
+"mtb" = (
+/obj/machinery/door/airlock/glass/command{
+ dir = 1;
+ name = "Bridge";
+ req_access = list(19)
+ },
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "bridge";
+ layer = 3.1;
+ name = "Bridge Lockdown Shutters";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/bridge)
+"mvz" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/hallway/secondary/docking_hallway)
"mxx" = (
/obj/effect/floor_decal/corner/beige/full{
dir = 8
@@ -23950,6 +23047,12 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/bar)
+"mAj" = (
+/turf/simulated/wall/prepainted,
+/area/hallway/secondary/docking_hallway2)
+"mAu" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/maintenance/commandmaint)
"mAP" = (
/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
dir = 8;
@@ -24021,12 +23124,31 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacethree)
+"mEN" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge/bunker)
"mFc" = (
/obj/structure/cable/orange{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
+"mHn" = (
+/turf/simulated/wall/prepainted/exploration,
+/area/exploration/courser_dock)
+"mHU" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cargo)
"mID" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -24057,20 +23179,6 @@
/obj/effect/debris/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"mPp" = (
-/obj/machinery/door/airlock/glass_research{
- name = "Exploration Airlock";
- req_one_access = list(19,43,67)
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/excursion_dock)
"mPB" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -24093,6 +23201,19 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/surface_three)
+"mRT" = (
+/obj/structure/sign/department/ai,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_upload_foyer)
+"mSI" = (
+/obj/machinery/light/spot{
+ dir = 4;
+ pixel_x = -32
+ },
+/obj/effect/paint/black,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/cargo)
"mTk" = (
/obj/machinery/power/breakerbox/activated{
RCon_tag = "Research Shuttles Substation Bypass"
@@ -24154,21 +23275,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
-"mXu" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- dir = 8;
- icon_state = "shutter0";
- id = "arv_check_shutter";
- name = "Arrivals Checkpoint Shutter";
- opacity = 0
- },
-/obj/structure/cable{
- icon_state = "0-2"
- },
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/checkpoint2)
"naw" = (
/obj/structure/bed/chair/sofa/black/left{
dir = 1
@@ -24185,21 +23291,24 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab)
-"ncx" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
+"ncw" = (
+/obj/structure/sign/warning/docking_area,
+/turf/simulated/wall/r_wall/prepainted/exploration,
+/area/exploration/excursion_dock)
+"ndT" = (
+/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/machinery/camera/network/civilian,
/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacethree)
+/area/hallway/secondary/docking_hallway)
"neB" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -24215,6 +23324,22 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"nfJ" = (
+/turf/simulated/wall/prepainted,
+/area/hallway/primary/surfacethree)
+"nfS" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/airlock/multi_tile/glass/exploration{
+ dir = 1;
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration/courser_dock)
"nin" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -24280,6 +23405,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacethree)
+"nnd" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/substation/dock)
"noy" = (
/obj/machinery/door/blast/regular{
dir = 4;
@@ -24309,22 +23437,6 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacethree)
-"nva" = (
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/rift/turbolift/maint)
"nxt" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/structure/cable{
@@ -24354,22 +23466,6 @@
},
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/general)
-"nzH" = (
-/obj/machinery/door/airlock/multi_tile/glass{
- dir = 1;
- name = "Bar"
- },
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled/steel,
-/area/crew_quarters/bar)
"nCn" = (
/obj/structure/ladder{
pixel_y = 8
@@ -24379,12 +23475,6 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
-"nDp" = (
-/obj/machinery/holosign/bar{
- id = "bar_sign"
- },
-/turf/simulated/wall,
-/area/crew_quarters/bar)
"nGT" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -24451,6 +23541,20 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"nNR" = (
+/obj/machinery/holopad,
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
+"nQb" = (
+/obj/machinery/door/airlock/maintenance/int,
+/turf/simulated/floor/plating,
+/area/rift/turbolift/maint)
"nSh" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24459,6 +23563,22 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacethree)
+"nVs" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cargo)
+"nYu" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway2)
"nYS" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -24468,6 +23588,23 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
+"ocs" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cockpit)
+"ocP" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/bar)
"odR" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -24552,6 +23689,24 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"otj" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/structure/table/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+ dir = 5
+ },
+/obj/item/storage/single_use/med_pouch/burn,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/department/armory{
+ desc = "A warning sign for anyone entering the station.";
+ name = "SUBMIT FIREARMS PRIOR TO ENTRY";
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
"otN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -24582,23 +23737,24 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
-"ovv" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- icon_state = "shutter0";
- id = "arv_check_shutter";
- name = "Arrivals Checkpoint Shutter";
- opacity = 0
+"owc" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
},
-/obj/structure/cable{
- icon_state = "0-4"
+/obj/effect/floor_decal/corner/lightgrey/bordercorner{
+ dir = 4
},
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/checkpoint2)
-"owM" = (
-/turf/simulated/wall/r_wall,
-/area/crew_quarters/heads/blueshield)
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
+"owP" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/security/nuke_storage)
"oxo" = (
/obj/structure/table/reinforced,
/obj/effect/floor_decal/corner/grey/diagonal,
@@ -24615,22 +23771,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
-"oxu" = (
-/obj/machinery/door/firedoor/glass/hidden,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
"oxv" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -24679,6 +23819,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacethree)
+"oCx" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/turbolift/maint)
"oEP" = (
/obj/machinery/light/small/emergency{
dir = 1
@@ -24707,6 +23850,32 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/exploration/courser_dock)
+"oGf" = (
+/turf/simulated/wall/prepainted/command,
+/area/bridge/bridge_hallway)
+"oGm" = (
+/obj/effect/paint/black,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/cockpit)
+"oGH" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 5
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
+ dir = 5
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
"oHL" = (
/obj/structure/table/hardwoodtable,
/obj/machinery/reagentgrinder{
@@ -24715,10 +23884,25 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
+"oJN" = (
+/obj/machinery/door/firedoor/glass,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/blueshield)
+"oLI" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/rift/surfaceeva/airlock/arrivals)
"oNh" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"oQY" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/old_tile/green,
+/area/shuttle/civvie/general)
"oRA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -24734,6 +23918,29 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/secondary/docking_hallway)
+"oRB" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ frequency = 1380;
+ id_tag = "civvie_dock";
+ req_one_access = list(67)
+ },
+/turf/simulated/wall/prepainted,
+/area/rift/surfacebase/outside/outside3)
+"oSz" = (
+/obj/machinery/door/airlock/glass/command{
+ dir = 1;
+ name = "Bridge";
+ req_access = list(19)
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/dark,
+/area/bridge)
"oVi" = (
/obj/structure/disposalpipe/down{
dir = 1
@@ -24751,6 +23958,13 @@
/obj/structure/lattice,
/turf/simulated/open,
/area/maintenance/research/xenobio)
+"oVr" = (
+/obj/structure/railing,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating/lythios43c,
+/area/rift/surfacebase/outside/outside3)
"oWm" = (
/obj/machinery/atmospherics/component/binary/pump/aux{
name = "Refill Pump"
@@ -24808,6 +24022,13 @@
},
/turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/shuttle/emt/general)
+"peI" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/rift/trade_shop/landing_pad)
"phy" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/monotile,
@@ -24828,12 +24049,38 @@
},
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/general)
+"ply" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/glass/exploration{
+ name = "Exploration Airlock";
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/courser_dock)
"pnb" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"pnT" = (
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration)
"pov" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24843,31 +24090,17 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
-"ppw" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 2
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5,
-/obj/machinery/camera/network/civilian,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
-"prz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/atmospherics/pipe/simple/visible/fuel,
-/obj/machinery/atmospherics/pipe/simple/visible/aux,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/spawner/window/reinforced/full/firelocks,
-/obj/structure/cable/orange{
- icon_state = "1-2"
+"ppQ" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 6
},
-/turf/simulated/floor/plating,
-/area/shuttle/excursion/general)
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/machinery/smartfridge/drinks,
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/bar)
+"psa" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/ai)
"psh" = (
/obj/machinery/light/small{
dir = 1
@@ -24891,19 +24124,6 @@
},
/turf/simulated/floor/tiled/white,
/area/shuttle/emt/general)
-"puj" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/structure/table/glass,
-/obj/effect/floor_decal/steeldecal/steel_decals6{
- dir = 6
- },
-/obj/item/storage/single_use/med_pouch/burn,
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
"pul" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -24916,6 +24136,41 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/secondary/docking_hallway)
+"pvZ" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
+"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,
+/turf/simulated/floor/plating,
+/area/rnd/telescience_lab/chamber)
+"pxw" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/station/exploration)
"pAk" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -24942,15 +24197,37 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
-"pEq" = (
-/obj/structure/bed/chair/backed_grey{
- dir = 8
+"pFg" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/maintenance/commandmaint)
+"pFn" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/surfacebase/outside/outside3)
+"pJa" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/crew_quarters/barrestroom)
+"pJi" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "arv_check_shutter";
+ name = "Arrivals Checkpoint Shutter";
+ opacity = 0
},
-/obj/structure/cable/orange{
- icon_state = "4-8"
+/obj/structure/window/reinforced{
+ dir = 4
},
-/turf/simulated/floor/tiled/steel,
-/area/exploration/excursion_dock)
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/checkpoint2)
"pKx" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -25044,6 +24321,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
+"pOJ" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway)
"pOY" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -25079,6 +24360,10 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"pVV" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/shuttle/civvie/general)
"qaO" = (
/obj/effect/debris/cleanable/fruit_smudge,
/obj/structure/catwalk,
@@ -25089,6 +24374,43 @@
/obj/effect/debris/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
+"qdg" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/structure/table/glass,
+/obj/effect/floor_decal/steeldecal/steel_decals6{
+ dir = 6
+ },
+/obj/item/storage/single_use/med_pouch/burn,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/sign/department/armory{
+ desc = "A warning sign for anyone entering the station.";
+ name = "SUBMIT FIREARMS PRIOR TO ENTRY";
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
+"qdx" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
"qgc" = (
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab/chamber)
@@ -25139,6 +24461,18 @@
},
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/blueshield)
+"qkT" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
"qlA" = (
/obj/item/trash/cheesie,
/obj/effect/debris/cleanable/flour,
@@ -25147,6 +24481,9 @@
/obj/effect/debris/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"qmp" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/crew_quarters/freezer)
"qmQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/universal,
/obj/effect/floor_decal/industrial/warning/corner{
@@ -25170,6 +24507,28 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
+"qnv" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/beige/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration)
"qnV" = (
/obj/structure/cable{
icon_state = "2-4"
@@ -25182,10 +24541,10 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/surface_three)
-"qrc" = (
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
+"qsA" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
/turf/simulated/floor/plating,
-/area/rnd/telescience_lab/chamber)
+/area/rift/trade_shop/landing_pad)
"qvL" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -25199,11 +24558,27 @@
/obj/structure/cable,
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacethree)
+"qxq" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/heads/hop)
"qzK" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/smartfridge,
/turf/simulated/floor/plating,
/area/hydroponics)
+"qAJ" = (
+/obj/structure/bed/chair/bay/chair{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/light,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
"qDi" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -25299,6 +24674,53 @@
},
/turf/simulated/floor/reinforced,
/area/rnd/telescience_lab)
+"qJf" = (
+/obj/machinery/beehive,
+/obj/structure/flora/ausbushes/stalkybush,
+/obj/machinery/camera/network/civilian,
+/turf/simulated/floor/grass,
+/area/hydroponics)
+"qKp" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 4;
+ icon_state = "shutter0";
+ id = "bridge";
+ layer = 3.1;
+ 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)
+"qKs" = (
+/turf/simulated/wall/prepainted/command,
+/area/bridge/meeting_room)
+"qSJ" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
+ dir = 4
+ },
+/obj/item/radio/intercom{
+ dir = 1;
+ name = "Station Intercom (General)";
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway)
+"qSL" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/crew_quarters/kitchen)
"qTg" = (
/obj/machinery/light/small/emergency,
/turf/simulated/floor/plating,
@@ -25318,6 +24740,9 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
+"qVU" = (
+/turf/simulated/wall/prepainted,
+/area/bridge/bridge_hallway)
"qWZ" = (
/obj/random/tech_supply,
/obj/structure/table/steel,
@@ -25328,6 +24753,25 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/dock)
+"qYn" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway2)
"qYP" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -25347,6 +24791,13 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint2)
+"rax" = (
+/turf/simulated/wall/prepainted,
+/area/maintenance/bar)
+"rba" = (
+/obj/machinery/smartfridge/food,
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/kitchen)
"rcq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -25362,6 +24813,14 @@
},
/turf/simulated/floor/plating,
/area/rift/turbolift/maint)
+"rdX" = (
+/turf/simulated/wall/r_wall/prepainted/civilian,
+/area/crew_quarters/barrestroom)
+"rgZ" = (
+/obj/spawner/window/low_wall/borosillicate/reinforced/full/firelocks,
+/obj/effect/paint/purplegray,
+/turf/simulated/floor/plating,
+/area/rnd/telescience_lab)
"riL" = (
/obj/structure/cable/orange{
icon_state = "1-4"
@@ -25380,12 +24839,53 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"rkD" = (
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
"rkJ" = (
/obj/structure/cable/orange{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"rnV" = (
+/obj/machinery/door/airlock/glass/command{
+ dir = 1;
+ name = "Bridge";
+ req_access = list(19)
+ },
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "bridge";
+ layer = 3.1;
+ name = "Bridge Lockdown Shutters";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/bridge)
"rtY" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -25395,6 +24895,10 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
+"run" = (
+/obj/machinery/status_display,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge)
"rxA" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 4
@@ -25412,6 +24916,12 @@
},
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/blueshield)
+"ryP" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_upload)
+"rAi" = (
+/turf/simulated/wall/r_wall/prepainted/exploration,
+/area/exploration/excursion_dock)
"rBb" = (
/obj/structure/catwalk,
/obj/structure/cable/orange{
@@ -25419,6 +24929,15 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"rEc" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"rFB" = (
/obj/machinery/door/airlock/voidcraft{
name = "battery hatch"
@@ -25466,6 +24985,31 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"rMH" = (
+/obj/machinery/door/airlock/command{
+ name = "Head of Personnel";
+ req_access = list(57)
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/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
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/dark,
+/area/crew_quarters/heads/hop)
"rMY" = (
/obj/machinery/power/breakerbox/activated{
RCon_tag = "Surface - Three Civilian"
@@ -25566,27 +25110,6 @@
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
-"sec" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/structure/closet/medical_wall{
- pixel_y = -32
- },
-/obj/item/storage/firstaid/toxin,
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
"slu" = (
/obj/structure/railing{
dir = 4
@@ -25594,6 +25117,15 @@
/obj/effect/overlay/snow/floor,
/turf/simulated/floor/plating/lythios43c,
/area/rift/surfacebase/outside/outside3)
+"slJ" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/old_tile/green,
+/area/shuttle/civvie/general)
"sny" = (
/obj/structure/railing,
/obj/structure/cable/green{
@@ -25614,6 +25146,27 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
+"suT" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
+"swD" = (
+/obj/machinery/light,
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacethree)
"sxg" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -25637,21 +25190,34 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
-"sBm" = (
-/obj/machinery/atmospherics/component/binary/passive_gate/on{
- dir = 1;
- pressure_resistance = 750;
- target_pressure = 750
+"sEW" = (
+/obj/machinery/light/spot{
+ dir = 4;
+ pixel_x = -32
},
-/obj/spawner/window/borosillicate/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rnd/telescience_lab)
+/obj/effect/paint/black,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"sFl" = (
/obj/structure/cable/orange{
icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"sHK" = (
+/obj/structure/sign/department/conference_room,
+/turf/simulated/wall/prepainted/command,
+/area/bridge/meeting_room)
+"sId" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
"sMa" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 1
@@ -25664,6 +25230,19 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/arrivals)
+"sMe" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/glass/exploration{
+ name = "Exploration Airlock";
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/courser_dock)
"sMy" = (
/obj/structure/railing{
dir = 8
@@ -25674,6 +25253,32 @@
/obj/structure/bed/chair/sofa/black/left,
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
+"sON" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/violet,
+/turf/simulated/floor/plating,
+/area/exploration/meeting)
+"sPT" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/extinguisher_cabinet{
+ pixel_y = 30
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
"sRD" = (
/obj/structure/railing{
dir = 8
@@ -25695,6 +25300,14 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
+"tai" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 8
+ },
+/obj/effect/paint/black,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"taq" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 9
@@ -25708,6 +25321,15 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/heads/blueshield)
+"taC" = (
+/obj/structure/symbol/sa,
+/turf/simulated/wall/prepainted/exploration,
+/area/exploration)
+"tbF" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/violet,
+/turf/simulated/floor/plating,
+/area/exploration/excursion_dock)
"tfz" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -25803,6 +25425,14 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/secondary/docking_hallway)
+"tpD" = (
+/obj/machinery/door/firedoor/glass,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/multi_tile/glass/exploration{
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration)
"trc" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -25838,33 +25468,60 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
+"tyY" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -24
+ },
+/obj/machinery/camera/network/civilian{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/crew_quarters/kitchen)
+"tAo" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge)
"tAt" = (
/turf/simulated/floor/plating,
/area/maintenance/ai)
-"tBo" = (
-/turf/simulated/wall,
-/area/maintenance/substation/research/docks)
-"tBC" = (
-/obj/machinery/door/blast/shutters{
- density = 0;
- icon_state = "shutter0";
- id = "arv_check_shutter";
- name = "Arrivals Checkpoint Shutter";
- opacity = 0
+"tCt" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
+"tEl" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
},
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/obj/structure/cable{
- icon_state = "2-8"
+ icon_state = "4-8"
},
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/checkpoint2)
-"tDF" = (
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/rift/trade_shop/landing_pad)
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
"tFR" = (
/obj/structure/railing,
/turf/simulated/open,
@@ -25886,6 +25543,24 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
+"tHW" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/bar)
"tIJ" = (
/obj/machinery/door/airlock/glass_external/public{
name = "Public External Airlock"
@@ -25905,6 +25580,24 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/arrivals/secondary)
+"tKy" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ icon_state = "shutter0";
+ id = "arv_check_shutter";
+ name = "Arrivals Checkpoint Shutter";
+ opacity = 0
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/checkpoint2)
"tLm" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -25914,6 +25607,28 @@
},
/turf/simulated/floor/tiled/monotile,
/area/hallway/primary/surfacethree)
+"tMx" = (
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/structure/table/woodentable,
+/obj/effect/floor_decal/borderfloorblack/corner2{
+ dir = 6
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
"tOD" = (
/obj/machinery/door/airlock/voidcraft/vertical,
/obj/map_helper/airlock/door/ext_door,
@@ -25937,24 +25652,39 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
-"tPP" = (
+"tQO" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/palebottlegreen,
+/turf/simulated/floor/plating,
+/area/crew_quarters/bar)
+"tSU" = (
/obj/machinery/door/blast/shutters{
density = 0;
dir = 8;
icon_state = "shutter0";
- id = "arv_check_shutter";
- name = "Arrivals Checkpoint Shutter";
+ id = "bridge";
+ layer = 3.1;
+ name = "Bridge Lockdown Shutters";
opacity = 0
},
-/obj/structure/cable{
- icon_state = "0-2"
+/obj/machinery/door/airlock/glass/command/polarized{
+ id_tint = "bridge_tint";
+ name = "Bridge"
},
-/obj/structure/cable{
- icon_state = "1-2"
+/obj/machinery/door/firedoor/glass{
+ dir = 4
},
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/security/checkpoint2)
+/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
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge)
"tVG" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -26036,24 +25766,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/crew_quarters/locker/laundry_arrival)
-"ukW" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/camera/network/civilian{
- dir = 10
- },
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -24
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
+"ung" = (
+/turf/simulated/wall/r_wall/prepainted/exploration,
+/area/exploration)
"uoa" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -26062,6 +25777,24 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
+"uok" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/atmospherics/pipe/simple/visible/fuel,
+/obj/machinery/atmospherics/pipe/simple/visible/aux,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/structure/cable/orange{
+ icon_state = "1-2"
+ },
+/obj/effect/paint_stripe/violet,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
+"uom" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai)
"uoG" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -26075,6 +25808,10 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
+"urI" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/shuttle/emt/general)
"use" = (
/obj/structure/closet/coffin,
/obj/random/trash,
@@ -26108,8 +25845,47 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
-"uye" = (
-/turf/simulated/wall,
+"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;
+ name = "Bridge Lockdown Shutters";
+ opacity = 0
+ },
+/obj/effect/paint/commandblue,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge)
+"uCG" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "arv_check_hall_shutter";
+ name = "Arrivals Hallway Shutter";
+ opacity = 0
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/crew_quarters/locker/laundry_arrival)
+"uEE" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
"uGZ" = (
/obj/machinery/atmospherics/component/binary/passive_gate/on{
@@ -26145,20 +25921,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
-"uIL" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
"uJh" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -26229,23 +25991,19 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
-"uQt" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
+"uQv" = (
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
},
-/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
"uQX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
@@ -26266,6 +26024,25 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/bar)
+"uSA" = (
+/obj/structure/handrail,
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 4
+ },
+/obj/overmap/entity/visitable/ship/landable/excursion/rift,
+/obj/effect/shuttle_landmark/rift/deck3/excursion,
+/obj/structure/cable/orange{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
+"uTt" = (
+/obj/machinery/door/airlock/exploration{
+ name = "Exploration Airlock";
+ req_one_access = list(19,43,67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/excursion_dock)
"uTN" = (
/obj/effect/floor_decal/industrial/warning/corner,
/obj/structure/cable/green{
@@ -26284,24 +26061,16 @@
},
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/bar)
-"uWL" = (
-/obj/machinery/light{
- dir = 1
- },
+"uVz" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
-/obj/structure/extinguisher_cabinet{
- pixel_y = 30
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel,
-/area/hallway/primary/surfacethree)
+/area/hallway/secondary/docking_hallway2)
"uWY" = (
/obj/machinery/computer/telescience,
/turf/simulated/floor/tiled,
@@ -26330,12 +26099,57 @@
},
/turf/simulated/floor/plating,
/area/maintenance/substation/research/docks)
+"vaJ" = (
+/obj/machinery/holosign/bar{
+ id = "bar_sign"
+ },
+/turf/simulated/wall/prepainted/civilian,
+/area/crew_quarters/bar)
"vcT" = (
/obj/structure/cable{
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/substation/surface_three)
+"vdu" = (
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/hallway/secondary/docking_hallway2)
+"vdC" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
+"veA" = (
+/obj/structure/sign/warning/secure_area,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/ai_upload)
+"veT" = (
+/turf/simulated/wall/prepainted/exploration,
+/area/exploration)
"vfQ" = (
/obj/machinery/door/airlock/glass_external/public{
name = "Public External Airlock"
@@ -26350,6 +26164,12 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/rift/surfaceeva/airlock/arrivals/secondary)
+"vfU" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating/lythios43c,
+/area/rift/surfacebase/outside/outside3)
"vgm" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -26398,12 +26218,29 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint2)
+"viW" = (
+/obj/machinery/door/airlock/multi_tile/glass{
+ dir = 2;
+ name = "Laundry"
+ },
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
"vjS" = (
/obj/structure/cable/green{
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
+"vlu" = (
+/turf/simulated/wall/prepainted/command,
+/area/bridge/bunker)
+"vlJ" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/turf/simulated/floor/plating,
+/area/rift/stairwell/primary/surfacethree)
"vmn" = (
/obj/structure/bed/chair/office/dark{
dir = 1
@@ -26437,25 +26274,23 @@
},
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/heads/blueshield)
-"vqt" = (
-/obj/structure/table/standard{
- name = "plastic table frame"
+"vpx" = (
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 1
},
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lime/border,
-/obj/item/destTagger{
- pixel_x = 4;
- pixel_y = 3
+/obj/effect/floor_decal/corner/beige/bordercorner{
+ dir = 1
},
-/obj/structure/cable/green,
-/obj/machinery/camera/network/civilian{
- dir = 10
+/obj/structure/cable/green{
+ icon_state = "1-4"
},
-/obj/item/packageWrap,
-/obj/item/packageWrap,
-/obj/machinery/power/apc/direction_bump/south,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
-/area/hydroponics)
+/area/exploration)
"vtz" = (
/obj/structure/sink/kitchen{
pixel_y = 26
@@ -26489,6 +26324,9 @@
/obj/machinery/holopad,
/turf/simulated/floor/tiled/steel_grid,
/area/bridge/bunker)
+"vwQ" = (
+/turf/simulated/wall/prepainted,
+/area/crew_quarters/heads/hop)
"vxt" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -26508,6 +26346,14 @@
},
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
+"vxH" = (
+/obj/structure/sign/securearea{
+ desc = "A warning sign which reads 'HIGH VOLTAGE'";
+ icon_state = "shock";
+ name = "HIGH VOLTAGE"
+ },
+/turf/simulated/wall/prepainted/engineering,
+/area/maintenance/substation/dock)
"vxW" = (
/obj/machinery/holoposter{
pixel_y = -32
@@ -26549,6 +26395,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint2)
+"vzF" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ icon_state = "shutter0";
+ id = "arv_check_shutter";
+ name = "Arrivals Checkpoint Shutter";
+ opacity = 0
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/checkpoint2)
"vzZ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
@@ -26559,48 +26420,47 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/steel,
/area/hallway/primary/surfacethree)
-"vCt" = (
+"vCA" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/outdoors/snow/lythios43c,
+/area/rift/surfacebase/outside/outside3)
+"vDH" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/turf/simulated/floor/reinforced,
+/area/rnd/telescience_lab/chamber)
+"vEd" = (
+/obj/machinery/light{
+ dir = 1
+ },
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
-/obj/effect/floor_decal/borderfloor/corner2{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/bordercorner2{
- dir = 4
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
+"vEh" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/door/firedoor/glass{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 1
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway2)
-"vCA" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/simulated/floor/outdoors/snow/lythios43c,
-/area/rift/surfacebase/outside/outside3)
-"vDH" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/turf/simulated/floor/reinforced,
-/area/rnd/telescience_lab/chamber)
+/area/hallway/secondary/docking_hallway)
"vEr" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 8
@@ -26657,6 +26517,29 @@
/obj/structure/lattice,
/turf/simulated/open,
/area/rnd/telescience_lab/chamber)
+"vLJ" = (
+/obj/machinery/door/blast/shutters{
+ density = 0;
+ dir = 8;
+ icon_state = "shutter0";
+ id = "arv_check_shutter";
+ name = "Arrivals Checkpoint Shutter";
+ opacity = 0
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint/darkred,
+/turf/simulated/floor/plating,
+/area/security/checkpoint2)
+"vMR" = (
+/obj/structure/symbol/sa,
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge/bunker)
"vMY" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -26677,28 +26560,12 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
-"vOR" = (
-/obj/machinery/atmospherics/component/unary/vent_pump/on{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/monotile,
-/area/hallway/secondary/docking_hallway2)
"vOW" = (
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
-"vPu" = (
-/turf/simulated/wall/r_wall,
-/area/rnd/telescience_lab)
"vRz" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -26737,21 +26604,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/exploration)
-"vVs" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/light,
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/turf/simulated/floor/tiled/steel,
-/area/rift/stairwell/primary/surfacethree)
"vVw" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -26765,6 +26617,21 @@
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
/area/maintenance/research/xenobio)
+"vZI" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/item/radio/intercom{
+ dir = 8;
+ name = "Station Intercom (General)";
+ pixel_x = -24
+ },
+/obj/machinery/washing_machine,
+/turf/simulated/floor/tiled/steel,
+/area/crew_quarters/locker/laundry_arrival)
"wbC" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/lightgrey/bordercorner,
@@ -26804,6 +26671,18 @@
},
/turf/simulated/shuttle/wall/voidcraft/green,
/area/shuttle/civvie/general)
+"wdU" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/red/border{
+ dir = 6
+ },
+/turf/simulated/floor/tiled/steel,
+/area/security/checkpoint2)
"wdY" = (
/obj/machinery/door/airlock/multi_tile/glass,
/obj/effect/floor_decal/borderfloor{
@@ -26826,6 +26705,39 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"wdZ" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/beige/border,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/beige/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/camera/network/civilian{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/primary/surfacethree)
+"wec" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/item/radio/intercom{
+ dir = 4;
+ name = "Station Intercom (General)";
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/camera/network/civilian{
+ dir = 8
+ },
+/turf/simulated/floor/wood,
+/area/crew_quarters/bar)
"wgh" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
@@ -26842,26 +26754,48 @@
},
/turf/simulated/floor/tiled/monotile,
/area/security/checkpoint2)
-"wgL" = (
-/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
+"wlu" = (
+/obj/structure/sign/department/commander,
+/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;
+ dir = 2;
+ icon_state = "shutter0";
+ id = "panic_shutters";
+ layer = 3.1;
+ name = "Bunker Lockdown Shutters";
+ opacity = 0
},
-/obj/structure/disposalpipe/segment{
- dir = 4
+/obj/effect/paint/commandblue,
+/turf/simulated/floor/plating,
+/area/bridge/bunker)
+"wmp" = (
+/obj/structure/bed/chair/bay/comfy/black,
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = 26
},
+/obj/landmark/spawnpoint/job/head_of_personnel,
+/turf/simulated/floor/carpet/blue,
+/area/crew_quarters/heads/hop)
+"wns" = (
/obj/machinery/door/firedoor/glass,
-/obj/structure/cable{
- icon_state = "4-8"
- },
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/commandblue,
/turf/simulated/floor/plating,
-/area/rift/turbolift/maint)
+/area/bridge/bridge_hallway)
+"wnH" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/bridge/bridge_hallway)
+"woK" = (
+/obj/machinery/status_display,
+/turf/simulated/wall/prepainted/civilian,
+/area/maintenance/substation/surface_three)
"wpI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -26923,6 +26857,9 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"wuI" = (
+/turf/simulated/wall/prepainted/security,
+/area/security/checkpoint2)
"wxd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -26953,6 +26890,9 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"wAD" = (
+/turf/simulated/wall/r_wall/prepainted/exploration,
+/area/maintenance/station/exploration)
"wBN" = (
/obj/machinery/computer/secure_data,
/obj/effect/floor_decal/borderfloor{
@@ -26963,6 +26903,13 @@
},
/turf/simulated/floor/tiled/steel,
/area/security/checkpoint2)
+"wCu" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor,
+/area/shuttle/emt/general)
"wCC" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -26972,6 +26919,14 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/bridge_hallway)
+"wEy" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 10
+ },
+/obj/effect/paint/black,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
"wIv" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -26989,6 +26944,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/exploration/excursion_dock)
+"wJJ" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/obj/effect/paint_stripe/violet,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cargo)
"wMt" = (
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
@@ -27014,31 +26974,21 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"wOC" = (
+/turf/simulated/wall/r_wall/prepainted/command,
+/area/crew_quarters/captain)
"wPr" = (
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
-"wTy" = (
-/obj/machinery/door/airlock/maintenance/common,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
+"wTS" = (
+/obj/machinery/door/firedoor/glass,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
+/obj/effect/paint/commandblue,
/turf/simulated/floor/plating,
-/area/rift/turbolift/maint)
+/area/bridge/meeting_room)
"wYf" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -27053,6 +27003,11 @@
},
/turf/simulated/floor/tiled/steel,
/area/rift/stairwell/primary/surfacethree)
+"wZh" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/palebottlegreen,
+/turf/simulated/floor/plating,
+/area/crew_quarters/bar)
"wZE" = (
/obj/machinery/power/breakerbox/activated{
RCon_tag = "Surface Civilian Substation Bypass"
@@ -27081,6 +27036,16 @@
/obj/machinery/door/firedoor/multi_tile,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"xbb" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/machinery/door/airlock/glass/exploration{
+ name = "Pilot Prep";
+ req_access = list(67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/exploration/explorer_prep)
"xbo" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -27100,19 +27065,16 @@
},
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
-"xgF" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_research{
- name = "Exploration Airlock";
- req_one_access = list(19,43,67)
+"xgk" = (
+/obj/structure/bed/chair/comfy/brown{
+ dir = 1
},
-/obj/structure/cable/orange{
- icon_state = "1-2"
+/obj/effect/floor_decal/spline/plain,
+/obj/machinery/light{
+ dir = 8
},
-/turf/simulated/floor/tiled/steel_grid,
-/area/exploration/courser_dock)
+/turf/simulated/floor/wood,
+/area/crew_quarters/captain)
"xgH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
@@ -27130,32 +27092,6 @@
/obj/random/maintenance/medical,
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
-"xjG" = (
-/obj/machinery/door/firedoor/glass/hidden{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
- dir = 4
- },
-/obj/structure/cable/orange{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/steel,
-/area/hallway/secondary/docking_hallway)
-"xlc" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 6
- },
-/obj/effect/floor_decal/corner/red/diagonal,
-/obj/machinery/smartfridge/drinks,
-/turf/simulated/floor/tiled/dark,
-/area/crew_quarters/bar)
"xmB" = (
/obj/structure/cable/orange{
icon_state = "1-8"
@@ -27179,26 +27115,30 @@
/obj/machinery/power/apc/direction_bump/west,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/barrestroom)
-"xtb" = (
+"xtN" = (
+/obj/machinery/light/small/emergency,
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/plating,
+/area/maintenance/commandmaint)
+"xuc" = (
/obj/machinery/door/blast/shutters{
density = 0;
- dir = 2;
+ dir = 8;
icon_state = "shutter0";
- id = "arv_check_hall_shutter";
- name = "Arrivals Hallway Shutter";
+ id = "hop_office_shutters";
+ name = "HoP Office Shutters";
opacity = 0
},
-/obj/structure/cable{
- icon_state = "0-8"
+/obj/structure/cable/green,
+/obj/structure/cable/green{
+ icon_state = "1-4"
},
-/obj/spawner/window/reinforced/full/firelocks,
-/turf/simulated/floor/plating,
-/area/crew_quarters/locker/laundry_arrival)
-"xtN" = (
-/obj/machinery/light/small/emergency,
-/obj/structure/closet/firecloset,
+/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
+ id = "hop_office"
+ },
+/obj/effect/paint/commandblue,
/turf/simulated/floor/plating,
-/area/maintenance/commandmaint)
+/area/crew_quarters/heads/hop)
"xug" = (
/obj/machinery/door/airlock/glass_external/public{
name = "Public External Airlock"
@@ -27246,6 +27186,14 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
+"xuN" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/borderfloorblack/corner2,
+/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
"xvv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9
@@ -27270,6 +27218,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/barrestroom)
+"xvY" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/maintenance/bar)
+"xxs" = (
+/obj/spawner/window/low_wall/reinforced/full/firelocks,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cargo)
+"xxP" = (
+/turf/simulated/wall/prepainted/civilian,
+/area/crew_quarters/bar_backroom)
"xyj" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -27286,9 +27244,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/rnd/telescience_lab)
-"xzV" = (
-/turf/simulated/wall,
-/area/maintenance/substation/dock)
"xBA" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -27297,6 +27252,20 @@
},
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway)
+"xCT" = (
+/turf/simulated/wall/prepainted/engineering,
+/area/maintenance/substation/dock)
+"xHc" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/security/nuke_storage)
"xHY" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -27359,6 +27328,25 @@
},
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/general)
+"xOZ" = (
+/obj/machinery/atmospherics/component/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/borderfloor/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/bordercorner{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel,
+/area/hallway/secondary/docking_hallway2)
"xVh" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -27386,6 +27374,13 @@
/obj/machinery/power/apc/direction_bump/south,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/kitchen)
+"xZp" = (
+/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/exploration)
"yaE" = (
/obj/machinery/power/apc/direction_bump/north,
/obj/structure/cable{
@@ -27393,6 +27388,22 @@
},
/turf/simulated/floor/plating,
/area/maintenance/commandmaint)
+"yaY" = (
+/obj/effect/floor_decal/borderfloorblack/corner{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/dark,
+/area/bridge/bridge_hallway)
+"ybn" = (
+/obj/spawner/window/low_wall/full/nogrille/firelocks,
+/obj/effect/paint/palebottlegreen,
+/turf/simulated/floor/plating,
+/area/hydroponics)
"ybP" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -27408,6 +27419,25 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/tiled/steel,
/area/hallway/secondary/docking_hallway2)
+"ycD" = (
+/turf/simulated/wall/prepainted/engineering,
+/area/maintenance/substation/research/docks)
+"ydU" = (
+/obj/machinery/door/firedoor/glass{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/airlock/exploration{
+ name = "Pathfinder's Office";
+ req_access = list(44)
+ },
+/turf/simulated/floor/tiled/steel,
+/area/exploration/pathfinder_office)
"yel" = (
/obj/machinery/door/airlock/voidcraft/vertical{
name = "fire control hatch"
@@ -27461,6 +27491,22 @@
},
/turf/simulated/floor/plating,
/area/maintenance/bar)
+"yku" = (
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/machinery/door/firedoor/glass{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel,
+/area/rift/stairwell/primary/surfacethree)
(1,1,1) = {"
aOC
@@ -28442,25 +28488,25 @@ aUZ
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
@@ -29447,25 +29493,25 @@ aUZ
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
aUZ
aUZ
aUZ
-aoU
+jWp
aUZ
aUZ
aUZ
@@ -29600,7 +29646,7 @@ aOC
aOC
aOi
aOi
-aoU
+jWp
aus
aus
aus
@@ -29630,7 +29676,7 @@ aus
aus
aus
aus
-aoU
+jWp
anp
aOi
aOi
@@ -30605,7 +30651,7 @@ anp
aOi
aOi
aOi
-aoU
+jWp
aus
aus
aus
@@ -30635,7 +30681,7 @@ aus
aus
aus
aus
-aoU
+jWp
anp
aOi
aOi
@@ -30682,21 +30728,21 @@ aOi
aOi
aOi
acH
-hiK
-qrc
-qrc
-hiK
-qrc
-qrc
-hiK
-vPu
-vPu
-eDa
-eDa
-eDa
-eDa
-vPu
-vPu
+edo
+pxd
+pxd
+edo
+pxd
+pxd
+edo
+dnb
+dnb
+iFT
+iFT
+iFT
+iFT
+dnb
+dnb
acH
acH
acH
@@ -30876,21 +30922,21 @@ aOi
aOi
acH
acH
-qrc
+pxd
jZk
jZk
jZk
jZk
jZk
jZk
-vPu
+dnb
wtK
mOy
mOy
mOy
mOy
eIi
-vPu
+dnb
acH
acH
aqG
@@ -30958,7 +31004,7 @@ aOC
aOC
aOi
aOi
-aoU
+jWp
aus
aus
aus
@@ -30988,7 +31034,7 @@ aus
aus
aus
aus
-aoU
+jWp
aQh
aIA
aIA
@@ -31070,21 +31116,21 @@ aOi
aOi
acH
afq
-qrc
+pxd
mTQ
jRd
jRd
jRd
jRd
jZk
-knK
+rgZ
tuh
mOy
mOy
mOy
mOy
mOy
-eDa
+iFT
acH
acH
afq
@@ -31095,9 +31141,9 @@ aqG
aqG
aqG
aqG
-aoU
-aoU
-aoU
+jWp
+jWp
+jWp
aqG
aqG
aqG
@@ -31264,21 +31310,21 @@ aOi
aOi
acH
acH
-hiK
+edo
cDv
esE
jRd
jRd
jRd
jZk
-knK
+rgZ
uWY
mOy
qYP
dRq
mOy
mOy
-eDa
+iFT
acH
acH
aqG
@@ -31289,9 +31335,9 @@ aqG
aqG
aqG
aqG
-aoU
-aoU
-aoU
+jWp
+jWp
+jWp
aqG
aqG
aqG
@@ -31413,9 +31459,9 @@ aus
aus
amn
avM
-aoU
-aoU
-aoU
+jWp
+jWp
+jWp
aOi
aOi
aOi
@@ -31465,14 +31511,14 @@ jRd
jRd
jRd
jZk
-knK
+rgZ
tuh
mOy
xmO
lSN
von
czm
-vPu
+dnb
acH
acH
acH
@@ -31659,14 +31705,14 @@ jRd
jRd
jRd
jZk
-vPu
+dnb
hAi
mOy
mOy
iCv
-vPu
-vPu
-vPu
+dnb
+dnb
+dnb
aOi
aOi
aOi
@@ -31734,7 +31780,7 @@ aOC
aOC
aOi
aOi
-aoU
+jWp
aus
aus
aus
@@ -31764,7 +31810,7 @@ aus
aus
aus
aus
-aoU
+jWp
abI
aIA
aIA
@@ -31801,8 +31847,8 @@ aus
aus
amn
aZo
-aoU
-aDi
+jWp
+bFr
aIA
ahS
aOi
@@ -31853,12 +31899,12 @@ mTQ
mTQ
mTQ
jZk
-vPu
+dnb
rZg
lPF
mOy
nin
-eDa
+iFT
aOi
aOi
aOi
@@ -31963,7 +32009,7 @@ aZo
aIA
aIA
afb
-aoU
+jWp
aus
aus
aus
@@ -31993,7 +32039,7 @@ aus
aus
aus
aus
-aoU
+jWp
aQh
aIA
aIA
@@ -32040,19 +32086,19 @@ aOi
aOi
acH
acH
-hiK
+edo
ifM
vDH
vDH
vDH
gTy
-vPu
-vPu
+dnb
+dnb
rZg
lPF
hAM
stD
-eDa
+iFT
aOi
aOi
aOi
@@ -32234,19 +32280,19 @@ aOi
aOi
acH
acH
-qrc
+pxd
qgc
qgc
qgc
qgc
uTN
-vPu
-vPu
-vPu
-vPu
+dnb
+dnb
+dnb
+dnb
bnf
nin
-eDa
+iFT
aOi
aOi
aOi
@@ -32428,7 +32474,7 @@ aOi
aOi
acH
acH
-qrc
+pxd
nCn
qgc
vmV
@@ -32440,7 +32486,7 @@ nbB
vEF
vVw
xbo
-vPu
+dnb
aOi
aOi
aOi
@@ -32622,19 +32668,19 @@ aOi
aOi
acH
acH
-hiK
-qrc
-qrc
-hiK
-qrc
-qrc
-vPu
+edo
+pxd
+pxd
+edo
+pxd
+pxd
+dnb
lDX
wgh
-sBm
+jbk
qmQ
eGn
-vPu
+dnb
aOi
aOi
aOi
@@ -32739,7 +32785,7 @@ aZo
aIA
aIA
aTj
-aoU
+jWp
aus
aus
aus
@@ -32769,7 +32815,7 @@ aus
aus
aus
aus
-aoU
+jWp
abI
aIA
aIA
@@ -32822,13 +32868,13 @@ acH
acH
aOi
aOi
-vPu
-vPu
-vPu
-vPu
+dnb
+dnb
+dnb
+dnb
lYx
qgL
-eDa
+iFT
aOi
aOi
aOi
@@ -33019,10 +33065,10 @@ aOi
aOi
aHj
aus
-eDa
+iFT
mOy
ebz
-eDa
+iFT
aOi
aOi
aOi
@@ -33092,7 +33138,7 @@ aOC
aOC
aOi
aOi
-aoU
+jWp
aus
aus
aus
@@ -33122,7 +33168,7 @@ aus
aus
aus
aus
-aoU
+jWp
aZo
aIA
aIA
@@ -33213,10 +33259,10 @@ aOi
aKW
aHj
aus
-eDa
+iFT
sdz
yfB
-eDa
+iFT
aOi
aOi
aOi
@@ -33407,10 +33453,10 @@ aOi
aKW
aHj
aus
-vPu
+dnb
wPr
xyj
-vPu
+dnb
aOi
aOi
aOi
@@ -33601,12 +33647,12 @@ aOi
aKW
aHj
aus
-vPu
-vPu
+dnb
+dnb
eQk
-vPu
-eml
-eml
+dnb
+lMp
+lMp
aOi
aKW
aHj
@@ -33796,11 +33842,11 @@ aKW
aHj
aus
aus
-eml
+lMp
lOr
jTJ
jTJ
-eml
+lMp
aOi
aKW
aHj
@@ -33990,11 +34036,11 @@ aKW
aHj
aHj
aHj
-eml
+lMp
vxt
hjc
oVi
-exb
+mnJ
aOi
aKW
aHj
@@ -34097,7 +34143,7 @@ avM
aIA
aIA
ahS
-aoU
+jWp
aus
aus
aus
@@ -34127,7 +34173,7 @@ aus
aus
aus
aus
-aoU
+jWp
aZo
aIA
aIA
@@ -34184,11 +34230,11 @@ aOi
aDY
aUN
aCA
-eml
+lMp
vXg
eGR
jTJ
-eml
+lMp
aOi
aKW
aHj
@@ -34262,25 +34308,25 @@ aTN
aTN
aTN
aTN
-aoU
+jWp
aTN
aTN
aTN
aTN
aTN
aTN
-aoU
+jWp
aTN
aTN
aTN
-aoU
+jWp
aTN
aTN
aTN
aTN
aTN
aTN
-aoU
+jWp
aTN
aTN
aTN
@@ -34378,11 +34424,11 @@ aTq
aTq
agJ
aCA
-eml
-eml
-eml
-eml
-eml
+lMp
+lMp
+lMp
+lMp
+lMp
aTq
agJ
aHj
@@ -35060,10 +35106,10 @@ aus
aus
amn
anp
-aoU
+jWp
aOi
-aoU
-aDi
+jWp
+bFr
aIA
aIA
aOP
@@ -35254,7 +35300,7 @@ aus
aus
amn
anp
-aoU
+jWp
aOi
aOi
aOi
@@ -35267,25 +35313,25 @@ aTN
aTN
aTN
aTN
-aoU
+jWp
aTN
aTN
aTN
aTN
aTN
aTN
-aoU
+jWp
aus
aus
aus
-aoU
+jWp
aTN
aTN
aTN
aTN
aTN
aTN
-aoU
+jWp
aTN
aTN
aTN
@@ -35448,10 +35494,10 @@ aus
aus
amn
anp
-aoU
-aoU
-aoU
-aoU
+jWp
+jWp
+jWp
+jWp
aIA
aIA
afb
@@ -37653,15 +37699,15 @@ acH
acH
aTq
aZd
-aCA
-aCA
-aCA
-aCA
-aCA
-aCA
-aCA
-aCA
-aCA
+aIA
+aIA
+aIA
+aIA
+aIA
+aIA
+aIA
+aIA
+aIA
aJO
aTq
aTq
@@ -37846,17 +37892,17 @@ acH
acH
aQK
aZv
-aCA
-aCA
-aTj
-asi
-aDY
-asi
-aDY
-asi
-aUN
-aCA
-aCA
+aIA
+aIA
+lvw
+vfU
+vfU
+vfU
+vfU
+vfU
+oVr
+aIA
+aIA
aZh
aAd
aQK
@@ -38030,34 +38076,34 @@ acH
acH
acH
acH
-aGi
-aGi
-aGi
-aGi
-aGi
-aGi
-aGi
-aGi
-aGi
-acO
-acO
-ars
-ars
-acO
-ars
-ars
-acO
-ars
-ars
-ars
-acO
-acO
-abx
-abx
-aaN
-aaN
-abx
-abx
+rdX
+rdX
+rdX
+rdX
+rdX
+rdX
+rdX
+rdX
+rdX
+jsv
+jsv
+tQO
+tQO
+jsv
+tQO
+tQO
+jsv
+tQO
+tQO
+tQO
+jsv
+jsv
+lbu
+lbu
+eyE
+eyE
+lbu
+lbu
aAd
aAd
aCA
@@ -38224,15 +38270,15 @@ acH
acH
acH
acH
-aGi
+rdX
dwX
axh
xvO
aat
aor
-aGi
+rdX
aRp
-aGi
+rdX
aoH
aII
abA
@@ -38245,14 +38291,14 @@ anP
arV
aUI
aAj
-acO
-abx
+jsv
+lbu
akB
ajM
ajM
atj
-abx
-abx
+lbu
+lbu
aAd
aAd
aCA
@@ -38418,15 +38464,15 @@ acH
acH
acH
acH
-aGi
-aGi
-aGi
+rdX
+rdX
+rdX
anx
aTf
aJp
-aGi
+rdX
aSq
-aGi
+fuM
ach
dMD
aaS
@@ -38446,7 +38492,7 @@ aLp
aaf
arI
aBy
-abx
+lbu
acH
acH
aAd
@@ -38611,8 +38657,8 @@ acH
acH
acH
acH
-aGi
-aGi
+fuM
+rdX
vLi
aGW
adB
@@ -38634,13 +38680,13 @@ aZm
aZm
aHQ
azG
-gfR
+rba
aCk
axB
alX
aLZ
aqy
-abx
+lbu
acH
acH
aAd
@@ -38660,7 +38706,7 @@ aOi
aOi
aOi
aOi
-aDi
+bFr
acH
aAd
acH
@@ -38805,17 +38851,17 @@ acH
acH
acH
acH
-aGi
-aZx
-aZx
-aZx
-aZx
+fuM
+pJa
+pJa
+pJa
+pJa
cEg
-aZx
-aZx
-aZx
-aZx
-aSR
+pJa
+pJa
+pJa
+pJa
+cBD
uTO
uTO
uTO
@@ -38833,11 +38879,11 @@ aCk
aYN
aiu
aFu
-aQI
-abx
-ane
-ane
-ane
+tyY
+lbu
+fua
+fua
+fua
acH
aAd
aAd
@@ -38943,12 +38989,12 @@ aej
acH
acH
acH
-akr
-akr
-akr
-akr
-akr
-akr
+fRp
+fRp
+fRp
+fRp
+fRp
+fRp
aej
acH
acH
@@ -38998,17 +39044,17 @@ acH
acH
acH
acH
-arX
-arX
+xvY
+xvY
aeM
aji
aRc
fyf
aRc
aXS
-aPo
+bQP
anm
-xlc
+ppQ
asL
aKG
pKJ
@@ -39028,11 +39074,11 @@ aKC
adj
aLZ
aCk
-azJ
+qSL
aJu
aJu
-ane
-ane
+fua
+fua
acH
acH
acH
@@ -39132,17 +39178,17 @@ aus
aus
aus
aus
-akr
-akr
-akr
-akr
+fRp
+fRp
+fRp
+fRp
acH
-akr
+fRp
aHs
aHs
-akr
+fRp
jTt
-akr
+fRp
aej
acH
acH
@@ -39169,9 +39215,9 @@ aus
aRK
acg
aMk
-amp
+pVV
aMk
-amp
+pVV
aMk
aTx
aGv
@@ -39186,21 +39232,21 @@ ail
acH
acH
acH
-aWU
-aWU
-aWU
-aWU
-aWU
+fMP
+fMP
+fMP
+fMP
+fMP
acH
-arX
+xvY
aRc
aRc
aRc
-aNS
-aNS
+bjs
+bjs
ykb
-aNS
-aPo
+bjs
+bQP
aYH
kkA
aMa
@@ -39226,7 +39272,7 @@ aAg
aaU
aAU
ayu
-ane
+fua
acH
acH
acH
@@ -39326,17 +39372,17 @@ aus
aus
aus
aus
-akr
+fRp
amL
aqs
-akr
-tDF
-akr
+fRp
+qsA
+fRp
aHs
aHs
-akr
+fRp
aHG
-akr
+fRp
aej
acH
acH
@@ -39360,7 +39406,7 @@ aus
aus
aQs
acg
-aSL
+dpK
aQs
aeZ
aGt
@@ -39380,17 +39426,17 @@ acH
acH
acH
acH
-aWU
+fMP
amW
-aWU
+fMP
amW
-aWU
+fMP
acH
-avz
+guB
aRc
asj
-aIs
-aIs
+xxP
+xxP
vtz
mLA
aLX
@@ -39407,7 +39453,7 @@ agN
aNx
aQg
amd
-asE
+wec
aNU
aMs
oxo
@@ -39416,11 +39462,11 @@ amJ
aWd
ghf
xYy
-azJ
+qSL
bUd
aGq
afw
-ane
+fua
acH
acH
acH
@@ -39526,11 +39572,11 @@ amT
aru
aux
aux
-aKh
-als
-akr
+kih
+dUS
+fRp
aOT
-akr
+fRp
aej
acH
acH
@@ -39574,21 +39620,21 @@ aBa
aBa
acH
acH
-aAM
+kJm
mDG
hfE
mhO
-aAM
+kJm
acH
-avz
+guB
aRc
amO
-aIs
+xxP
axb
anT
akO
aNq
-aIs
+xxP
hSS
aAx
hBM
@@ -39600,21 +39646,21 @@ ahK
axY
aZP
iIQ
-aNr
-aFm
-aFm
-aFm
-aFm
+woK
+exk
+exk
+exk
+exk
ake
aCk
arL
eGU
aAZ
-azJ
+qSL
aGx
aJl
aPK
-ane
+fua
acH
acH
acH
@@ -39722,9 +39768,9 @@ phy
auS
aux
aux
-akr
+fRp
dWj
-akr
+fRp
aej
acH
acH
@@ -39746,13 +39792,13 @@ acH
adx
aus
aus
-aSL
+dpK
aet
azT
alQ
aXZ
aoM
-akP
+oQY
aWK
aOr
aoI
@@ -39768,21 +39814,21 @@ aIA
apa
acH
acH
-aWU
+fMP
adM
apo
aWj
-aWU
+fMP
acH
-avz
+guB
aRc
pLB
-aIs
+xxP
jDU
aRF
eYo
aQa
-aIs
+xxP
tvp
kkA
oHL
@@ -39798,17 +39844,17 @@ fjB
vcT
qnV
age
-aFm
+exk
aBM
aCk
aYm
szx
axZ
-azJ
+qSL
aKu
aPi
aPK
-ane
+fua
acH
aQK
aQK
@@ -39908,17 +39954,17 @@ aus
aus
aus
aus
-akr
+fRp
apZ
aqS
-akr
+fRp
aux
kiL
phy
phy
hKE
xak
-akr
+fRp
aej
acH
acH
@@ -39940,13 +39986,13 @@ acH
adx
aus
aus
-aSL
+dpK
axT
aPv
ajt
aBe
aBe
-aXN
+slJ
aRh
aJt
aPq
@@ -39962,21 +40008,21 @@ baG
apa
acH
acH
-aWU
+fMP
aSU
-aWU
+fMP
aSU
-aWU
+fMP
acH
-arX
+xvY
aRc
ayb
-aIs
+xxP
psh
jVy
wxd
tXJ
-aIs
+xxP
fxA
kkA
jcq
@@ -39988,23 +40034,23 @@ ltt
aYK
tnR
qGh
-aFm
+exk
aLh
auW
ajf
-aFm
+exk
azR
aTs
aTa
eGU
aoP
-azJ
-aLn
-aLn
-aLn
-aLn
-aOY
-aOY
+qSL
+qmp
+qmp
+qmp
+fua
+cnu
+cnu
acH
acH
acH
@@ -40102,17 +40148,17 @@ aus
aus
aus
aus
-akr
-akr
-akr
-akr
+fRp
+fRp
+fRp
+fRp
aux
axH
aux
-akr
-akr
-akr
-akr
+fRp
+fRp
+fRp
+fRp
aej
acH
acH
@@ -40150,27 +40196,27 @@ aMk
aMk
aus
amn
-aeo
+oRB
aIA
fkw
-agI
-agI
-agI
-agI
+oLI
+oLI
+oLI
+oLI
ave
anN
ave
-agm
+mvz
acH
-arX
+xvY
aRc
azh
-aIs
+xxP
aDn
lAm
aMC
ezH
-aIs
+xxP
qgY
ayh
aZg
@@ -40179,14 +40225,14 @@ dOT
azm
awR
aRe
-aNw
+mpZ
iap
uYx
mQz
qEe
nKj
rMY
-aFm
+exk
aFF
aCk
lXN
@@ -40196,16 +40242,16 @@ mCR
eAl
aiR
arr
-aOY
+cnu
arp
-aOY
-aOY
+cnu
+cnu
acH
afk
aus
aus
-aOt
-aTg
+eor
+sEW
asd
aus
aus
@@ -40214,8 +40260,8 @@ aus
aus
aus
asd
-aNF
-aLA
+mSI
+lxt
aus
amj
aej
@@ -40299,14 +40345,14 @@ aus
amn
aej
acH
-akr
+fRp
aux
axH
aJi
-akr
+fRp
aVt
anu
-akr
+fRp
aej
acH
acH
@@ -40330,7 +40376,7 @@ aus
aus
aQs
acg
-aSL
+dpK
aQs
ash
aGt
@@ -40347,70 +40393,70 @@ amn
acF
aIA
qGN
-agI
+oLI
aPN
rQR
-agI
+oLI
awX
aGE
aOG
-aEu
+pOJ
acH
-avz
+guB
aRc
aBI
-aIs
-aIs
-aIs
-aIs
-aIs
-aIs
-aPo
-aPo
-aPo
-aPo
-nDp
-ars
-akx
-aSd
-ars
-kFK
-nzH
-aFm
-aFm
-aFm
-aFm
-aFm
-aXu
+xxP
+xxP
+xxP
+xxP
+xxP
+xxP
+bQP
+bQP
+bQP
+bQP
+vaJ
+wZh
+ocP
+hnU
+wZh
+tHW
+cYb
+exk
+exk
+exk
+exk
+exk
+cIq
aWv
-anV
+ybn
auq
-aXu
-aXu
+cIq
+cIq
sny
agR
atT
aks
aUi
alj
-aOY
+cnu
adx
aBl
aus
-aTg
-aOt
-aOt
-aOt
-aTg
+sEW
+eor
+eor
+eor
+sEW
anj
anj
anj
anj
-aTg
-aLA
-aLA
-aLA
-aNF
+sEW
+lxt
+lxt
+lxt
+mSI
aus
aBZ
aej
@@ -40493,10 +40539,10 @@ aus
amn
aej
acH
-akr
+fRp
aux
axH
-aTJ
+izC
aKn
amT
amT
@@ -40527,9 +40573,9 @@ aus
aGM
acg
aMk
-amp
+pVV
aMk
-amp
+pVV
aNe
amS
aUY
@@ -40548,9 +40594,9 @@ gnA
gDw
ezO
aRS
-aEu
+pOJ
acH
-avz
+guB
aRc
aaF
azv
@@ -40562,7 +40608,7 @@ aYa
flF
aex
afJ
-aNS
+rax
kps
axr
aIa
@@ -40570,7 +40616,7 @@ ask
axr
jIg
cqj
-aXu
+cIq
krG
avv
aHL
@@ -40580,32 +40626,32 @@ alH
aoF
apc
aJB
-aXu
+cIq
aAn
aiT
aUi
-aOY
+cnu
akT
alr
-aOY
+cnu
adx
aus
-aOt
-aOt
+eor
+eor
aAR
aHh
-aOt
-aOt
-aLy
-aLy
-aLy
-aLy
-aOt
-aLA
+eor
+eor
+hIO
+hIO
+hIO
+hIO
+eor
+lxt
aJk
aJk
-aLA
-aLA
+lxt
+lxt
amn
aej
acH
@@ -40687,10 +40733,10 @@ aus
amn
aej
acH
-akr
+fRp
aux
aBm
-axI
+peI
aRZ
aqz
asF
@@ -40742,9 +40788,9 @@ xug
tPD
mrb
mkq
-aEu
+pOJ
acH
-avz
+guB
aRc
aRc
aTT
@@ -40764,7 +40810,7 @@ kZx
mID
tLm
evR
-aKf
+kaE
aPz
aeO
aKv
@@ -40773,33 +40819,33 @@ aQl
alH
apx
alu
-vqt
-aXu
+fpt
+cIq
aQt
aiX
aUi
-aOY
+cnu
alc
-aOY
-aOY
+cnu
+cnu
adx
aus
-aOt
+eor
ajN
ajP
ajY
-aOt
+eor
aiM
aof
aof
aof
aof
aPc
-aLA
+lxt
awM
aoy
aZn
-aLA
+lxt
amn
aej
acH
@@ -40881,14 +40927,14 @@ aus
amn
aej
acH
-akr
+fRp
aux
aFx
aux
-akr
+fRp
aXx
aSS
-akr
+fRp
aej
aAd
aAd
@@ -40929,16 +40975,16 @@ acF
aIA
aIA
arg
-agI
+oLI
aSc
azn
-agI
+oLI
sxg
uag
imV
-agm
+mvz
acH
-arX
+xvY
aax
asI
aeN
@@ -40950,7 +40996,7 @@ pPw
aXS
aaF
asj
-aNS
+rax
eio
arH
avC
@@ -40968,32 +41014,32 @@ aii
aoF
apN
agS
-aXu
+cIq
aGy
abh
aUi
-aOY
-aOY
-aOY
+cnu
+cnu
+cnu
acH
adx
aus
-axQ
+uQv
avL
aqu
aNY
-aOV
+kBn
aRf
aNz
gbx
aoo
aJI
acT
-aCc
+xxs
aUr
auZ
aJk
-amM
+nVs
amn
aej
acH
@@ -41017,11 +41063,11 @@ afq
afq
afq
afq
-apv
-apv
+cYM
+cYM
aHX
-apv
-apv
+cYM
+cYM
afq
afq
afq
@@ -41075,14 +41121,14 @@ aus
amn
aej
acH
-akr
-akr
-akr
-akr
-akr
-akr
-akr
-akr
+fRp
+fRp
+fRp
+fRp
+fRp
+fRp
+fRp
+fRp
aej
aAd
aAd
@@ -41123,31 +41169,31 @@ aIA
aqr
aLj
aff
-agI
-agI
-agI
-agI
-ppw
-oxu
-uIL
-agm
-ayw
-arX
-aNS
-aNS
-aNS
-aNS
-aNS
-aNS
+oLI
+oLI
+oLI
+oLI
+eJi
+jHi
+vEh
+mvz
+nYu
+xvY
+rax
+rax
+rax
+rax
+rax
+rax
eOH
-aNS
-aNS
-aNS
-aNS
-aNS
-aNS
-aNS
-atH
+rax
+rax
+rax
+rax
+rax
+rax
+rax
+lhu
aWg
ajS
aWg
@@ -41166,13 +41212,13 @@ atY
kGP
aTv
wce
-akw
+aMM
acH
acH
acH
adx
aus
-aOt
+eor
aYX
agu
aEm
@@ -41187,7 +41233,7 @@ aMv
aYi
aGY
aZY
-aLA
+lxt
amn
aej
acH
@@ -41207,15 +41253,15 @@ afq
acH
afq
afq
-apv
-apv
-apv
-apv
-apv
+cYM
+cYM
+cYM
+cYM
+cYM
ahR
aEA
aPS
-apv
+cYM
afq
afq
afq
@@ -41320,7 +41366,7 @@ ary
aej
acH
acH
-aEu
+pOJ
gEu
oRA
ovg
@@ -41346,8 +41392,8 @@ nna
trc
nSh
odR
-aKf
-ilt
+kaE
+kKC
aKv
aiq
ans
@@ -41356,32 +41402,32 @@ aii
aoF
aEK
ahC
-aXu
+cIq
aWb
qaO
-aOY
-aOY
-aOY
+cnu
+cnu
+cnu
acH
acH
adx
aus
-aOt
-aOt
-aOV
+eor
+eor
+kBn
avp
-aOt
+eor
aON
ayk
ayk
ayk
ayk
aYY
-aLA
+lxt
aLo
-aCc
-aLA
-aLA
+xxs
+lxt
+lxt
amn
aej
acH
@@ -41401,16 +41447,16 @@ afq
afq
afq
afq
-apv
+cYM
axc
-apv
+cYM
aCS
-apv
-apv
+cYM
+cYM
aHX
-apv
-apv
-apv
+cYM
+cYM
+cYM
afq
afq
afq
@@ -41514,20 +41560,20 @@ aUu
aLD
aej
acH
-aEu
+pOJ
yfM
ooQ
wbC
aPd
-aco
-anq
-aTU
-anb
-aTU
-aTU
-aTU
-aTU
-vOR
+owc
+rkD
+aNI
+dSD
+aNI
+aNI
+aNI
+aNI
+xOZ
abz
aiE
aMD
@@ -41539,9 +41585,9 @@ ahx
apI
aaQ
aWg
-ukW
-aXu
-jLq
+eJQ
+kaE
+qJf
aKv
aeO
axj
@@ -41550,31 +41596,31 @@ aVT
aoF
aEK
agn
-aXu
+cIq
aBz
aTv
-aOY
+cnu
amc
-aOY
-aOY
+cnu
+cnu
acH
adx
aus
akX
-aOt
+eor
aHg
agH
-aCM
-aCM
-aBP
-aBP
-aBP
-aBP
-aCM
-aCM
+oGm
+oGm
+ocs
+ocs
+ocs
+ocs
+oGm
+oGm
aLi
apu
-aLA
+lxt
aqe
amn
aej
@@ -41595,7 +41641,7 @@ afq
afq
afq
afq
-apv
+cYM
aij
acn
aEA
@@ -41604,7 +41650,7 @@ aEA
aEA
aEM
aUe
-apv
+cYM
afq
afq
afq
@@ -41707,35 +41753,35 @@ aUu
aUu
aUu
agP
-agm
-agm
+mvz
+mvz
wNW
boP
rjI
-aoT
-akq
-aNI
-aNI
-aNI
-aNI
-aNI
-abQ
-ajE
+kRX
+wuI
+aEz
+aET
+iLp
+vLJ
+pJi
+wuI
+wuI
oqe
amz
-axl
-aOQ
-vVs
-axl
-axl
-axl
-azX
-ase
-aZM
-ase
-sec
-aXu
-aXu
+jiv
+hhF
+ikZ
+jiv
+jiv
+jiv
+jWV
+pvZ
+bnc
+pvZ
+lnn
+cIq
+cIq
aud
ans
arJ
@@ -41744,31 +41790,31 @@ aii
aoF
aEK
aBE
-aXu
+cIq
aJg
aTv
-aOY
+cnu
aYE
auU
-aOY
-aOY
+cnu
+cnu
adx
aus
avE
-axQ
+uQv
adc
auf
-aBP
+ocs
aJb
aOd
aLc
apV
aZL
anw
-aBP
+ocs
ang
axx
-amM
+mHU
aWk
amn
aej
@@ -41789,16 +41835,16 @@ afq
afq
afq
afq
-apv
+cYM
aLJ
-apv
+cYM
adP
aEA
aEA
aEA
-apv
+cYM
aem
-apv
+cYM
afq
afq
afq
@@ -41901,35 +41947,35 @@ aUu
aUu
aUu
aUu
-aEu
+pOJ
aIC
oWw
cpP
oti
-aSJ
-acZ
-aEz
-aET
-mXu
-tPP
-jDr
-acZ
-acZ
+kRX
+awT
+aTR
+aqL
+iyU
+jGl
+vzp
+adp
+wuI
eZd
-abC
-aDe
+abE
+vlJ
aTZ
aKx
aCu
aCu
-aDe
+vlJ
aYc
aWg
aaQ
aWg
kVd
dfy
-aKf
+kaE
aPz
ayg
aCG
@@ -41938,21 +41984,21 @@ alH
aoF
aEK
aqD
-aXu
+cIq
aCU
aTv
afU
aUi
aUi
aKl
-aOY
+cnu
adx
aus
avE
-axQ
+uQv
abn
aoo
-aBP
+ocs
aLk
ahE
ayR
@@ -41962,7 +42008,7 @@ aJr
aOO
alb
aTI
-amM
+mHU
aqt
amn
aej
@@ -41983,16 +42029,16 @@ afq
afq
afq
afq
-apv
-apv
-apv
+cYM
+cYM
+cYM
awr
aEA
aPX
aPX
-apv
-apv
-apv
+cYM
+cYM
+cYM
afq
afq
afq
@@ -42041,7 +42087,7 @@ aTN
aTN
aTN
aTN
-akf
+chf
aej
acH
acH
@@ -42094,36 +42140,36 @@ aUu
aUu
aUu
aUu
-agm
-agm
+mvz
+mvz
aHq
aoX
toB
uhz
-aSJ
-awT
-aTR
-aqL
-iyU
-jGl
-vzp
-adp
-acZ
-sdp
-abE
-aDe
+vzF
+wBN
+axL
+abY
+abY
+abY
+wgp
+aHU
+wuI
+vdu
+fHr
+gqJ
aBc
aUG
aCu
aCu
-aDe
+vlJ
aYO
aWg
aaQ
aWg
vyL
guk
-aKf
+kaE
adt
azI
aCb
@@ -42132,31 +42178,31 @@ aBr
aoF
aEK
acJ
-aXu
+cIq
aUi
aTv
-aOY
+cnu
aad
aUi
aKl
-aOY
+cnu
adx
aus
avE
-axQ
+uQv
aUo
aOB
-aCM
+oGm
aTm
-aBP
-aCM
-aCM
-aBP
-aCM
-aCM
+ocs
+oGm
+oGm
+gvt
+oGm
+oGm
afV
aQn
-amM
+mHU
avr
amn
aej
@@ -42179,12 +42225,12 @@ afq
afq
afq
afq
-apv
+cYM
aPa
aEA
awH
aSF
-apv
+cYM
afq
afq
afq
@@ -42294,23 +42340,23 @@ aRJ
aoX
toB
jsa
-ovv
-wBN
-axL
-abY
-abY
-abY
-wgp
-aHU
-acZ
-wgL
-apf
-apf
-apz
-apz
-apz
-apz
-apz
+tKy
+gHV
+vmn
+epp
+qZl
+viA
+oXU
+hLe
+mpH
+bDP
+oCx
+oCx
+gqJ
+gqJ
+gqJ
+gqJ
+gqJ
adi
aWg
aaQ
@@ -42326,18 +42372,18 @@ ado
aUE
arz
akg
-aXu
+cIq
fIY
aTv
-aOY
-aOY
+cnu
+cnu
afh
-aOY
-aOY
+cnu
+cnu
adx
aus
ape
-aOt
+eor
aib
aDx
ahZ
@@ -42347,10 +42393,10 @@ aRg
awY
awY
axn
-aLA
+lxt
aTS
-aCc
-aLA
+wJJ
+lxt
azE
amn
aej
@@ -42373,12 +42419,12 @@ afq
afq
afq
afq
-apv
+cYM
awr
aEA
aDV
aDV
-apv
+cYM
afq
afq
afq
@@ -42487,31 +42533,31 @@ hZy
aRJ
aoX
toB
-imL
-tBC
-gHV
-vmn
-cVa
-qZl
-viA
-oXU
-hLe
-mpH
-bDP
-apf
-aEi
+otj
+kRX
+ezI
+wdU
+wuI
+aOn
+wuI
+aWl
+lWu
+wuI
+rcq
+oCx
+kIR
aPk
aXM
aXM
aXM
aPk
-aZM
+anE
aWg
jpv
aWg
jJw
nYS
-aKf
+kaE
aRD
aYo
aDP
@@ -42520,21 +42566,21 @@ aUv
aCF
alN
aVf
-aXu
+cIq
aUi
aTv
-aOY
+cnu
aVh
aUi
aGo
-aOY
+cnu
adx
aus
-aNP
-afL
-afL
+wEy
+tai
+tai
aRR
-aOt
+eor
aPY
ayW
aSH
@@ -42544,8 +42590,8 @@ aHo
aYI
afV
aVj
-aLA
-aLA
+lxt
+lxt
amn
aej
acH
@@ -42567,12 +42613,12 @@ afq
afq
afq
afq
-apv
+cYM
atA
aEA
aEA
aEA
-apv
+cYM
afq
afq
afq
@@ -42676,59 +42722,59 @@ aUu
aUu
aUu
aUu
-agm
-agm
+mvz
+mvz
amK
aoX
toB
-oti
-aSJ
-aST
-aIX
-acZ
-aOn
-acZ
-aWl
-adY
-acZ
+qAJ
+kRX
+wuI
+wuI
+wuI
+wuI
+wuI
+wuI
+wuI
+wuI
rcq
-apf
+oCx
avf
aXM
aBU
aBU
aBU
aXM
-aYT
+suT
aWg
jpv
aWg
jZv
-uye
-aXu
-aXu
-aXu
+nfJ
+cIq
+cIq
+cIq
aKZ
aDP
abi
aVv
aUp
aJx
-aXu
+cIq
arS
aTv
-aOY
+cnu
aIt
aZQ
aXU
-aOY
+cnu
adx
aus
-aOt
+eor
aIW
asw
apA
-aOt
+eor
aew
aSe
aMq
@@ -42739,7 +42785,7 @@ aLu
apW
aKk
aSQ
-aLA
+lxt
amn
aej
acH
@@ -42761,12 +42807,12 @@ afq
afq
afq
afq
-apv
+cYM
awr
aBS
ajQ
aOD
-apv
+cYM
afq
afq
afq
@@ -42871,58 +42917,58 @@ aUu
aYD
aUu
aej
-aTP
+pFn
aoQ
ePV
eLH
-bja
-aSJ
-acZ
-acZ
-acZ
-acZ
-acZ
-acZ
-acZ
-acZ
-nva
-apf
+vNl
+nQb
+lmy
+lmy
+lmy
+lmy
+lmy
+lmy
+lmy
+lmy
+fAb
+oCx
ezU
aXM
aBU
aBU
aBU
aNC
-awI
+tCt
aWg
jpv
aWg
-vMY
-aOY
+bis
+cnu
use
aKd
-aXu
-aXu
+cIq
+cIq
arW
-aXu
-aXu
-aXu
-aXu
-aXu
-aOY
+cIq
+cIq
+cIq
+cIq
+cIq
+cnu
vuT
-aOY
-aOY
-aOY
-aOY
-aOY
+cnu
+cnu
+cnu
+cnu
+cnu
adx
aus
-axQ
+uQv
ayF
ivw
jrG
-prz
+uok
nJk
oWm
cPs
@@ -42933,7 +42979,7 @@ aCo
aZR
aFl
aou
-amM
+mHU
amn
aej
acH
@@ -42955,12 +43001,12 @@ afq
afq
afq
afq
-apv
-apv
-apv
-apv
-apv
-apv
+cYM
+cYM
+cYM
+cYM
+cYM
+cYM
afq
afq
afq
@@ -43064,21 +43110,21 @@ aUu
aUu
aUu
aUu
-agm
-agm
+mvz
+mvz
amK
aoX
toB
-oti
-aUR
-aFC
-abX
-aHm
-awo
-uka
-acb
-aBp
-ajs
+qAJ
+jJn
+jJn
+jJn
+jJn
+jJn
+jJn
+jJn
+jJn
+jJn
wpI
dLV
ewE
@@ -43087,15 +43133,15 @@ aBU
aBU
aBU
aXM
-aZM
+anE
aWg
jpv
aWg
vMY
-aOY
-aOY
-aOY
-aXu
+cnu
+cnu
+cnu
+cIq
aDX
alk
aWA
@@ -43105,29 +43151,29 @@ aUi
aMm
aUi
aTv
-aEV
+cnu
aUi
aIr
avH
-aOY
+cnu
adx
aus
-aOt
+eor
aCr
mAP
aoS
-aOt
+eor
aEO
aXt
aXt
awU
aXt
ayv
-aLA
+lxt
aKL
anI
aDd
-aLA
+lxt
amn
aej
acH
@@ -43263,65 +43309,65 @@ mic
aRJ
aoX
toB
-puj
-dvK
-grw
-grw
-grw
-grw
-hik
-rVV
-kGC
-esl
-kqN
-apf
+qdg
+eDm
+aFC
+abX
+aHm
+awo
+uka
+vZI
+eKt
+jJn
+rcq
+oCx
aoN
aPk
aXM
aXM
aXM
aPk
-aYT
+suT
aWg
jpv
aWg
vMY
-aOY
+cnu
qcL
arS
-aXu
+cIq
apF
aWA
aNV
-aXu
+cIq
arS
aUi
ahj
aUi
aTv
-awv
-awv
-awv
-awv
-awv
-aYg
-aus
-aOt
-aOt
-kmY
+pxw
+pxw
+pxw
+pxw
+pxw
+gpa
+aus
+eor
+eor
+uSA
aPl
-aOt
+eor
aLd
aLd
aLd
aLd
aLd
aLd
-aLA
+lxt
aqi
aSD
-aLA
-aLA
+lxt
+lxt
amn
aej
acH
@@ -43458,23 +43504,23 @@ aRJ
aoX
toB
gaF
-xtb
-akl
-akl
-atv
-aqM
-akI
-akI
-ath
-ajs
-wTy
-apf
-apf
-apz
-apz
-apz
-apz
-apz
+evb
+grw
+grw
+grw
+grw
+hik
+rVV
+kGC
+esl
+kqN
+oCx
+oCx
+gqJ
+gqJ
+gqJ
+gqJ
+gqJ
avG
aWg
aaQ
@@ -43483,38 +43529,38 @@ vMY
jyZ
aTv
aTv
-aXu
+cIq
aXY
afg
aws
-aXu
+cIq
aUi
aUi
akk
aUi
aTv
-awv
+pxw
aFg
aXf
aXQ
avx
-aYg
+gpa
aus
asd
-aOt
+eor
brl
aQN
-aOt
+eor
aIy
aus
aus
aus
aus
aQp
-aLA
+lxt
avT
aVN
-aLA
+lxt
aVJ
amn
aej
@@ -43646,60 +43692,60 @@ aUu
aUu
aUu
aUu
-agm
-agm
+mvz
+mvz
aSE
aoX
toB
uhz
-aUR
-avI
-aSy
-azc
-aWh
-akb
-aIn
-akG
-ajs
-sdp
-abK
-aDe
+uCG
+akl
+akl
+atv
+aqM
+akI
+akI
+ath
+jJn
+qYn
+fHr
+gqJ
akz
ahl
aCu
aCu
-aDe
+vlJ
aYc
aWg
aaQ
aWg
bNg
-aOY
+cnu
aUi
aTv
-aXu
+cIq
aws
aqW
aws
-aXu
+cIq
azw
aUi
aUi
aUi
aTv
-awv
+pxw
adJ
aKt
aKt
aKt
-aYg
+gpa
aBl
-aHN
-aHN
-mPp
-aQJ
-aHN
-aHN
+rAi
+rAi
+jil
+laR
+rAi
+rAi
aus
aus
aus
@@ -43841,41 +43887,41 @@ aUu
aUu
aUu
aUu
-aEu
+pOJ
aLg
bpn
eKI
oti
-aUR
-ajs
-ajs
-aUW
-afR
-ajs
-ajB
-ajs
-ajs
-vCt
-aZH
-aDe
+eDm
+avI
+aSy
+azc
+aWh
+akb
+aIn
+akG
+jJn
+sdp
+abK
+vlJ
azo
ajb
aCu
aCu
-aDe
+vlJ
aYO
aWg
aaQ
aWg
vMY
-aOY
+cnu
vOW
aTv
-aXu
-aXu
-aXu
-aXu
-aXu
+cIq
+cIq
+cIq
+cIq
+cIq
aPF
aUi
aUi
@@ -43886,14 +43932,14 @@ aif
aki
akA
akD
-aYg
+gpa
ame
-atc
+tbF
aPU
knj
aVm
azF
-atc
+tbF
auz
ayA
sRD
@@ -44035,34 +44081,34 @@ aUu
aUu
aUu
ayc
-agm
-agm
+mvz
+mvz
bHN
ooQ
vNl
-aDj
-aOv
-aYR
-aqq
-aMi
-aYR
-aYR
-acm
-auu
-ipm
+mvz
+mAj
+mAj
+uVz
+viW
+mAj
+gOf
+mAj
+mAj
+tEl
ayf
-axl
-aJy
-ncx
-axl
-axl
-axl
-azX
-aty
-aYT
-aty
-uQt
-aOY
+jiv
+yku
+swD
+jiv
+jiv
+jiv
+jHq
+uEE
+rEc
+uEE
+hAq
+cnu
fVL
aTv
aTv
@@ -44075,19 +44121,19 @@ aTv
aTv
aTv
aCQ
-akm
-akm
-akm
-akm
+ung
+ung
+ung
+ung
ajo
-aYg
+gpa
acH
-aHN
+rAi
acU
hDW
all
aZu
-aEB
+uTt
aIA
aIA
aQK
@@ -44230,20 +44276,20 @@ aUu
aWz
aej
acH
-aEu
+pOJ
gEu
ooQ
pKx
aHD
+aYR
+qkT
aqq
-aDh
-aTU
-anb
-aTU
-aTU
-aTU
-aTU
-fWF
+nNR
+aYR
+aYR
+aYR
+aYR
+qdx
aKq
ahP
axK
@@ -44256,32 +44302,32 @@ aHV
aaQ
aWg
fVI
-ayU
-ayU
-ayU
-ayU
-ayU
-ayU
-ayU
-ayU
-ayU
-ayU
-ayU
-adF
-ayU
-akm
+veT
+veT
+veT
+veT
+veT
+veT
+veT
+veT
+veT
+veT
+veT
+ipS
+veT
+ung
abm
abm
-akm
+ung
ajo
-aYg
+gpa
acH
-atc
+tbF
aRw
uxa
aEZ
atC
-atc
+tbF
aQK
aQK
acH
@@ -44424,7 +44470,7 @@ ary
aej
acH
acH
-aEu
+pOJ
yfM
vRB
bvV
@@ -44449,12 +44495,12 @@ xKM
icY
eoD
nSh
-fJi
-ayU
+wdZ
+veT
atm
auX
aww
-ayU
+veT
aFq
abF
ajR
@@ -44463,24 +44509,24 @@ aAb
arm
aNp
ayj
-akm
-abm
-abm
-akm
+ung
+lEZ
+lEZ
+ung
agz
-aYg
-aHN
-aHN
-aHN
-mPp
-aQJ
-aDs
-aHN
-aHN
-aHN
-acH
-acH
-aAC
+wAD
+rAi
+rAi
+rAi
+jil
+laR
+ncw
+rAi
+rAi
+rAi
+acH
+acH
+cvI
fbX
fbX
fbX
@@ -44492,7 +44538,7 @@ fbX
fbX
fbX
fbX
-aAC
+cvI
afq
afq
afq
@@ -44615,40 +44661,40 @@ aIA
aqr
aYn
aWW
-aUQ
-aUQ
-aUQ
-aUQ
-ppw
-xjG
-uIL
-aWN
-aPE
-ace
-aev
-aEc
-aEc
-awW
-aPg
-aPg
-aPg
-aPg
-aPg
-aPg
-aYF
-aYF
-aYF
-aYF
-uWL
+lMv
+lMv
+lMv
+lMv
+ndT
+iLC
+vEh
+bqs
+pFg
+vwQ
+lYj
+qxq
+qxq
+fin
+bPV
+bPV
+bPV
+bPV
+bPV
+bPV
+bWN
+bWN
+bWN
+bWN
+vEd
aIk
aaQ
awu
dCB
-kuP
+tpD
gcc
okY
okY
-kuP
+tpD
jFJ
kOx
egu
@@ -44657,10 +44703,10 @@ agp
aih
aJw
arY
-aRQ
-aLP
-abR
-aAt
+bnN
+vpx
+iEp
+jGy
akL
akN
akU
@@ -44670,11 +44716,11 @@ lJb
aAK
aRB
aYl
-aVU
-aAC
-auN
-auN
-aAC
+klE
+cvI
+fsv
+fsv
+cvI
uOE
oAw
oAw
@@ -44686,7 +44732,7 @@ oAw
oAw
oAw
riL
-aAC
+cvI
afq
afq
afq
@@ -44809,40 +44855,40 @@ acF
aIA
aIA
aHd
-aUQ
+lMv
aBX
aRr
-aUQ
+lMv
neB
uag
imV
-aWN
+bqs
atK
-ace
+vwQ
ayG
aBv
aBv
aBv
-aPg
+bPV
aNR
aiD
ajd
aIJ
-aPg
+bPV
alS
auF
aiP
-aYF
-kyK
+bWN
+sPT
aIk
aaQ
aLm
aED
-aGL
+xZp
aOm
aqK
auC
-aGL
+xZp
aqK
aAG
aTu
@@ -44865,10 +44911,10 @@ gtI
uJh
tiU
cvg
-dfP
+ply
vEr
oFR
-xgF
+sMe
cqU
aHp
aHZ
@@ -44880,7 +44926,7 @@ aHZ
aHZ
aHp
gtg
-aAC
+cvI
afq
afq
afq
@@ -44990,8 +45036,8 @@ aus
aus
aus
amD
-aoL
-aoL
+urI
+urI
amD
amD
amD
@@ -45010,19 +45056,19 @@ nmA
tPD
otN
tVG
-aEu
+pOJ
atK
-aPg
-ewK
+bPV
+ghR
aam
-hjM
-aeA
-aPg
-auG
+iBL
+xuc
+bPV
+wmp
aIp
aar
aGc
-aPg
+bPV
yaE
pnb
pnb
@@ -45032,11 +45078,11 @@ aID
afM
aIg
avD
-ayU
+veT
atx
avV
awF
-ayU
+veT
aFJ
aLC
aVd
@@ -45048,21 +45094,21 @@ aLC
aSk
agW
ako
-aJz
-aJz
-aJz
-aJz
-aJz
-aJz
+hXj
+hXj
+hXj
+hXj
+hXj
+hXj
aDp
aWi
aOW
-pEq
+aiU
rKC
-aAC
+cvI
adZ
aJR
-aAC
+cvI
auk
aHp
aIc
@@ -45074,7 +45120,7 @@ aNi
aXO
aHp
oxz
-aAC
+cvI
afq
afq
afq
@@ -45204,9 +45250,9 @@ vfQ
gDw
pul
xBA
-aEu
+pOJ
atK
-aPg
+bPV
agQ
aik
aJZ
@@ -45216,47 +45262,47 @@ abW
aVE
aTE
aMG
-aPg
+bPV
acY
aaA
avu
-aYF
+bWN
agb
aWg
aaQ
aWg
akp
-ayU
-ayU
-aYZ
-ayU
-aEq
-aEq
-ack
+veT
+veT
+taC
+veT
+lZM
+lZM
+sON
awd
-aUx
-ack
-ack
-aEq
-aEq
-aBs
-aZV
-aim
-aKY
+gYr
+sON
+sON
+lZM
+lZM
+qnv
+pnT
+jNZ
+dIa
asy
aTd
aTd
aTd
-aJz
-arv
-arv
-aRA
-dfD
-aAC
-aAC
-aAC
-aAC
-aAC
+hXj
+mHn
+mHn
+dYL
+nfS
+cvI
+cvI
+cvI
+cvI
+cvI
aJD
aHp
aIh
@@ -45268,7 +45314,7 @@ aWq
aYW
aHp
gtg
-aAC
+cvI
afq
afq
afq
@@ -45374,8 +45420,8 @@ aus
aus
aus
aaM
-agC
-agC
+bfN
+bfN
aop
apk
arO
@@ -45391,16 +45437,16 @@ amn
acF
fyl
aNB
-aUQ
+lMv
anr
cAo
-aUQ
-acf
+lMv
+qSJ
fef
dIm
-aEu
+pOJ
atK
-aPg
+bPV
aqQ
apn
arZ
@@ -45414,7 +45460,7 @@ alm
aaA
aaA
aoj
-aYF
+bWN
alM
aep
aES
@@ -45424,7 +45470,7 @@ atf
aky
awk
axM
-aEq
+lZM
aFL
aUL
aoz
@@ -45432,24 +45478,24 @@ ahb
ahJ
aFI
asU
-aEq
+lZM
ayt
aOp
arf
-ahT
+xbb
aAq
ark
ark
ajT
-aJz
+hXj
aHv
aHv
asg
oqb
-aAC
+cvI
aEg
aJE
-aAC
+cvI
aYe
aJD
aHp
@@ -45462,7 +45508,7 @@ aWu
aZr
aHp
gtg
-aAC
+cvI
afq
afq
afq
@@ -45582,19 +45628,19 @@ aGh
ayS
aus
amn
-afZ
+cbG
fyl
aIA
-aUQ
-aUQ
-aUQ
-aUQ
-aHO
+lMv
+lMv
+lMv
+lMv
+oGH
rkJ
lmh
-aWN
+bqs
atK
-aPg
+bPV
aXR
ayI
alf
@@ -45604,21 +45650,21 @@ aug
aaO
abM
aQC
-aPg
+bPV
ari
aaA
aGQ
-aGU
-aNs
-aeq
-afs
-amU
-aNs
-aGU
+tAo
+run
+rnV
+cQV
+mtb
+run
+tAo
aZb
azB
ahM
-aEq
+lZM
aFR
aIi
aIi
@@ -45626,24 +45672,24 @@ ayD
aIi
aHJ
aDT
-aEq
+lZM
aiZ
aeh
aAH
-aKY
+dIa
agr
aLw
aNW
aLw
-aJz
+hXj
aHv
aHv
apG
fUe
-aAC
+cvI
aLr
anc
-aAC
+cvI
aMV
aRi
aHp
@@ -45656,7 +45702,7 @@ aWB
aOZ
aHp
oxz
-aAC
+cvI
afq
afq
afq
@@ -45760,7 +45806,7 @@ aAd
adx
aus
aus
-agC
+bfN
ahI
akV
amk
@@ -45779,40 +45825,40 @@ aus
aNG
fyl
aIA
-xzV
-xzV
-xzV
-xzV
-xzV
+nnd
+xCT
+xCT
+xCT
+xCT
hCW
iio
-aYF
-aYF
-aPg
-aPg
-aPg
-aPg
+bWN
+bWN
+bPV
+bPV
+bPV
+bPV
aia
-aPg
-aPg
-aPg
-ewK
-agj
-arF
-aCh
+bPV
+bPV
+bPV
+fTJ
+rMH
+wnH
+oGf
aoK
-aCh
-aGU
+oGf
+tAo
amg
aer
aZX
aZa
aRn
-aGU
+tAo
aJc
aum
azj
-aEq
+lZM
adX
aIS
aaJ
@@ -45820,24 +45866,24 @@ aaJ
aQm
aHJ
aPQ
-ack
+sON
awO
agW
awh
-aJz
-aJz
-aJz
-aJz
-aJz
-aJz
+hXj
+hXj
+hXj
+hXj
+hXj
+hXj
aZW
aZW
aEt
wbT
-aAC
+cvI
awj
avs
-aAC
+cvI
ayN
aNv
aHp
@@ -45850,7 +45896,7 @@ aWD
aHB
aHB
gtg
-aAC
+cvI
afq
afq
afq
@@ -45954,7 +46000,7 @@ acH
adx
aus
aus
-agC
+bfN
ass
alq
amm
@@ -45973,40 +46019,40 @@ glL
avU
kIa
aIA
-xzV
+nnd
wZE
hFl
ube
-xzV
+xCT
eEi
gkp
aoa
aTi
-aPg
+bPV
aTE
aTE
aXF
aCB
aSP
aLE
-aPg
+bPV
abP
aCd
-arF
+wnH
ajv
adr
akt
-aCD
+oSz
adW
aez
aQF
aDl
aPJ
-aGU
+tAo
aHu
aqT
ayy
-aEq
+lZM
aBO
arM
azp
@@ -46014,16 +46060,16 @@ aLI
avn
aHJ
aFV
-ack
+sON
awO
agW
aJm
-aJz
+hXj
aas
akc
aFY
aul
-aJz
+hXj
aZW
aZW
aEt
@@ -46031,7 +46077,7 @@ mFc
aCT
aGX
aoV
-aXX
+glx
abq
aNv
aHp
@@ -46044,7 +46090,7 @@ aWM
aZI
arA
gtg
-aAC
+cvI
afq
afq
afq
@@ -46167,7 +46213,7 @@ amn
hPQ
auz
auz
-xzV
+nnd
nMx
lud
hEX
@@ -46176,21 +46222,21 @@ wuo
gkp
aaA
aaA
-aPg
+bPV
ahg
aWY
ajk
alh
aef
azt
-aPg
+bPV
ajO
aCd
-anh
+csw
adh
ads
apM
-aGU
+tAo
aXg
adO
aQF
@@ -46200,7 +46246,7 @@ aEf
aLL
qDv
aXs
-aEq
+lZM
aFR
azN
aaJ
@@ -46208,16 +46254,16 @@ aaJ
anQ
aHJ
aiS
-aEq
+lZM
ajc
agW
aiY
-aKY
+dIa
aas
aMj
arc
aIj
-aJz
+hXj
aCt
aFf
aEt
@@ -46238,7 +46284,7 @@ fdA
auv
tOD
xmB
-aAC
+cvI
afq
afq
afq
@@ -46344,8 +46390,8 @@ aus
aus
aus
aaM
-agC
-agC
+bfN
+bfN
aop
aqR
baX
@@ -46361,40 +46407,40 @@ amn
aej
acH
acH
-xzV
+nnd
bwq
qWZ
eNg
-eLO
+vxH
aEo
gkp
aaA
oNh
-aPg
-aPg
-aPg
-aPg
-aPg
-aPg
-aPg
-aPg
+bPV
+bPV
+bPV
+bPV
+bPV
+bPV
+bPV
+bPV
aeQ
aCd
-arF
+wnH
aCy
aDk
-aGU
-aGU
-aLM
-aeB
-aPH
-aJS
-aLM
-aGU
-aGU
+tAo
+tAo
+hMC
+tSU
+jrU
+fFo
+hMC
+tAo
+tAo
aYS
alV
-aEq
+lZM
aSj
adg
aWH
@@ -46402,16 +46448,16 @@ aEw
aQm
air
ajg
-aEq
+lZM
awO
agW
aiY
-aKY
+dIa
aas
aMj
arc
aJv
-aJz
+hXj
acI
alF
aPO
@@ -46419,7 +46465,7 @@ mFc
aCT
aGX
aSV
-aAC
+cvI
aRj
aNv
aHB
@@ -46432,7 +46478,7 @@ yel
aHB
aHB
aYe
-aAC
+cvI
afq
afq
afq
@@ -46545,7 +46591,7 @@ ayS
bPD
psu
haO
-hrU
+wCu
iXB
aDH
aGe
@@ -46555,29 +46601,29 @@ amn
aej
acH
acH
-xzV
+nnd
bQX
-eLO
-xzV
-xzV
+vxH
+xCT
+xCT
byz
gkp
aaA
aaA
-aYF
+bWN
avu
aEx
avu
aoa
aTi
-aMK
+mAu
ayp
ayQ
akd
aeu
aMQ
afA
-aGU
+tAo
aur
amt
aeE
@@ -46585,35 +46631,35 @@ aqh
aSn
aMp
aqw
-aGU
+tAo
aBh
aiv
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
+mpX
+mpX
+mpX
+mpX
+mpX
+mpX
+mpX
+mpX
+mpX
awO
agW
axe
-aJz
+hXj
aas
aMr
arc
aJv
-aJz
+hXj
aZk
axm
ayi
qmY
-aAC
+cvI
aJN
aVX
-aAC
+cvI
aYe
aNv
aHS
@@ -46626,7 +46672,7 @@ xvv
aHp
aHp
aYe
-aAC
+cvI
afq
afq
afq
@@ -46736,8 +46782,8 @@ aus
aus
aus
amD
-aoL
-aoL
+urI
+urI
amD
amD
amD
@@ -46749,7 +46795,7 @@ atI
aej
acH
acH
-aYF
+bWN
oyb
jEm
jEm
@@ -46771,7 +46817,7 @@ arR
acP
adk
aGI
-acK
+kdh
aee
aFS
aeE
@@ -46779,35 +46825,35 @@ aYB
aSn
apT
auM
-aGU
-aCh
-aCh
-aAA
+tAo
+oGf
+oGf
+oGf
+mpX
aGs
agw
aXb
aLR
aHC
-agw
aDK
-aAA
+mpX
awO
ajA
aZw
-aeL
+hRh
akM
akQ
awi
alw
-aJz
+hXj
aSG
aJo
amB
vxW
-aAC
+cvI
avi
aCx
-aAC
+cvI
aUh
aql
aYe
@@ -46820,7 +46866,7 @@ aHp
aHp
aYe
aoO
-aAC
+cvI
afq
afq
afq
@@ -46943,29 +46989,29 @@ aej
acH
acH
acH
-aYF
+bWN
aaA
aaA
aaA
aaA
aaA
aEo
-aYF
-aLK
-aLK
-aLK
-aLK
-aLK
-aLK
-aLK
-aLK
-aLK
+bWN
+wOC
+wOC
+wOC
+wOC
+wOC
+wOC
+wOC
+wOC
+wOC
azZ
aCq
-arF
+wnH
aSs
aIF
-aGU
+tAo
aOJ
aYB
aeE
@@ -46973,35 +47019,35 @@ aYB
aSn
aYC
avy
-aMA
+acs
anW
awV
-aAA
+oGf
+mpX
aqH
azz
aZT
aTW
ahO
-ajh
amq
-acd
+igJ
awO
agW
aAH
-aJz
+hXj
auT
aQr
asV
ahq
-aJz
+hXj
axm
axm
ciu
mXd
-aAC
+cvI
aJW
aIY
-aAC
+cvI
aYe
aYe
aYe
@@ -47014,7 +47060,7 @@ aHB
aYe
aYe
aYe
-aAC
+cvI
afq
afq
afq
@@ -47137,29 +47183,29 @@ acH
acH
acH
acH
-aYF
+bWN
aaA
aaA
aaA
aaA
aaA
aEo
-aLK
-aLK
+wOC
+wOC
abD
aRC
aqN
-acw
-aKR
+dcy
+xgk
aBD
aIE
-aLK
+wOC
aot
aNa
-anh
+csw
abZ
aIF
-aGU
+tAo
aVy
azM
arw
@@ -47167,36 +47213,36 @@ ayx
aeU
awg
afu
-aog
+lYH
afS
akS
-aAA
+oGf
+mpX
abf
aZU
agL
ahd
ahO
-azA
-aFt
-acd
+grq
+igJ
avA
agW
awh
-aJz
-aJz
-aJz
-aJz
-aJz
-aJz
+hXj
+hXj
+hXj
+hXj
+hXj
+hXj
aKb
pOa
flP
-arv
-aAC
-aAC
-aAC
-aAC
-aAC
+mHn
+cvI
+cvI
+cvI
+cvI
+cvI
aYe
aYe
aYe
@@ -47208,7 +47254,7 @@ aXC
aYe
aYe
aYe
-aAC
+cvI
afq
afq
afq
@@ -47331,14 +47377,14 @@ acH
acH
acH
acH
-aYF
+bWN
aaA
aaA
aaA
aaA
aaA
aEo
-aLK
+wOC
afy
aaw
aWa
@@ -47347,13 +47393,13 @@ aPs
aNT
ajj
aSu
-aLK
+wOC
azZ
abP
-arF
+wnH
abZ
aIF
-aGU
+tAo
aal
aea
aso
@@ -47361,36 +47407,36 @@ aYB
auc
aYC
avY
-aLM
+hMC
anv
aqk
-aAA
+oGf
+mpX
ana
aVI
aFE
aFE
ahU
aiw
-aiH
-aJF
+ydU
apl
aLf
aXG
-aKY
+dIa
asy
aqg
aSp
aWV
-aJz
-aJz
+hXj
+hXj
wrC
-awv
-awv
+fhj
+fhj
agh
-aYg
+gpa
afq
afq
-aAC
+cvI
acz
aYe
aYe
@@ -47402,7 +47448,7 @@ aHB
aYe
aYe
aoO
-aAC
+cvI
afq
afq
afq
@@ -47525,15 +47571,15 @@ acH
acH
acH
acH
-aYF
-aYF
+bWN
+bWN
aaA
aaA
oNh
-aYF
+bWN
exW
-aLK
-aLK
+wOC
+wOC
aCl
aYJ
aXc
@@ -47541,13 +47587,13 @@ aGk
aNT
aWw
abo
-aLK
-aNo
-aLK
-aLK
+wOC
+iZv
+wOC
+wOC
ajx
aIF
-acK
+kdh
amZ
aeg
aHH
@@ -47555,36 +47601,36 @@ aYC
aUJ
aYC
aRE
-aOL
+uyj
ayH
aaj
-aAA
+oGf
+mpX
abe
aPM
aXr
aKJ
aXl
-aLU
avd
-aAA
+mpX
adL
aca
aaB
-akZ
+iKg
aAq
afr
aku
aIz
aOy
-aJz
+hXj
tiv
aYp
-awv
+pxw
agh
-aYg
+gpa
afq
afq
-aAC
+cvI
aYe
aYe
aYe
@@ -47596,7 +47642,7 @@ aHp
aYe
aYe
aYe
-aAC
+cvI
afq
afq
afq
@@ -47677,11 +47723,11 @@ afq
afq
afq
afq
-arq
-arq
+jBo
+jBo
aNE
-arq
-arq
+jBo
+jBo
afq
afq
afq
@@ -47720,28 +47766,28 @@ afq
afq
aqG
acH
-aYF
+bWN
xhH
aaA
aaA
-aYF
+bWN
aEo
aaA
-aLK
-aLK
-aLK
-aLK
+wOC
+wOC
+wOC
+wOC
aGT
-aLK
-aLK
-aLK
-aLK
+wOC
+wOC
+wOC
+wOC
aAh
aCY
-aLK
+wOC
aIv
aIF
-aGU
+tAo
axf
aRo
aKE
@@ -47749,36 +47795,36 @@ aWF
aAp
aYx
acQ
-aGU
+tAo
ayH
aHY
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
-aAA
+oGf
+mpX
+mpX
+mpX
+mpX
+mpX
+mpX
+mpX
+mpX
anC
aEy
ayz
-aKY
+dIa
adV
aUT
aTQ
aro
ayY
-aJz
+hXj
lNq
agZ
-awv
+pxw
agh
-aYg
+gpa
afq
afq
-aAC
+cvI
aYe
aYe
aYe
@@ -47790,7 +47836,7 @@ aHp
aYe
aYe
aYe
-aAC
+cvI
afq
afq
afq
@@ -47867,15 +47913,15 @@ afq
afq
afq
afq
-arq
-arq
-arq
-arq
-arq
+jBo
+jBo
+jBo
+jBo
+jBo
aFN
apj
aqX
-arq
+jBo
afq
afq
afq
@@ -47914,14 +47960,14 @@ afq
afq
aqG
acH
-aYF
+bWN
aeH
aaA
alg
-aYF
+bWN
pRv
aaA
-aLK
+wOC
aUf
aBF
aQD
@@ -47932,47 +47978,47 @@ aRY
aWJ
aci
azL
-aLK
+wOC
abZ
aJj
-aGU
-aGU
+tAo
+tAo
azs
aWS
aOe
adC
aey
-aGU
-aGU
+tAo
+tAo
aZJ
apg
-aJf
+oGf
+ieJ
aGG
aMx
-aAm
ahk
aie
aiy
aiI
-aGR
+dDb
aCJ
ajH
aNm
-aKY
+dIa
aDo
aUz
aWQ
aWQ
-aJz
-aJz
+hXj
+hXj
rBb
aKt
-awv
+pxw
agh
-aYg
+gpa
afq
afq
-aAC
+cvI
aYe
aYe
aYe
@@ -47984,7 +48030,7 @@ aHp
aYe
aYe
aYe
-aAC
+cvI
afq
afq
afq
@@ -48061,16 +48107,16 @@ afq
afq
afq
afq
-arq
+jBo
ade
-arq
+jBo
aYq
-arq
-arq
+jBo
+jBo
aNE
-arq
-arq
-arq
+jBo
+jBo
+jBo
afq
afq
afq
@@ -48108,14 +48154,14 @@ afq
afq
afq
aqG
-aYF
-aYF
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
+bWN
+bWN
aEo
aaA
-aLK
+wOC
acS
aGC
aup
@@ -48126,47 +48172,47 @@ aSx
asT
aDF
aBC
-aLK
+wOC
adE
aIF
amv
-aGU
-aGU
+tAo
+tAo
ahD
aGl
aTr
-aGU
-aGU
+tAo
+tAo
agf
ayH
apg
-aJf
-aJf
-aJf
-aYk
-aho
+oGf
+ieJ
+ieJ
+ieJ
+lrF
aXD
aKD
aiJ
-aJf
+ieJ
aOF
ajI
aTF
-aJz
-aJz
-aJz
-aJz
-aJz
-aJz
+hXj
+hXj
+hXj
+hXj
+hXj
+hXj
uQd
fgP
aKt
-awv
+pxw
agh
-aYg
+gpa
afq
afq
-aAC
+cvI
aYe
aYe
aYe
@@ -48178,7 +48224,7 @@ aYe
aYe
aYe
aYe
-aAC
+cvI
afq
afq
afq
@@ -48255,7 +48301,7 @@ afq
afq
afq
afq
-arq
+jBo
apO
aVL
apj
@@ -48264,7 +48310,7 @@ abV
apj
ahm
aUA
-arq
+jBo
afq
afq
afq
@@ -48306,10 +48352,10 @@ aqG
aqG
afq
afq
-aYF
+bWN
aEo
aaA
-aLK
+wOC
aoY
amw
aFv
@@ -48320,33 +48366,33 @@ asA
atu
acq
aoe
-aLK
+wOC
abZ
aIF
-ava
-ava
-aGU
-aPP
-adG
-adG
-aGU
-ava
-ava
+qKs
+qKs
+tAo
+pwb
+qKp
+qKp
+tAo
+qKs
+qKs
ayH
apg
-aJf
+oGf
+ieJ
aGJ
aMZ
-aAm
ahw
-aJf
+ieJ
aqI
aiQ
-aJf
-ayU
+ieJ
+veT
ajL
-ayU
-ayU
+veT
+veT
aKt
ucp
fOb
@@ -48355,12 +48401,12 @@ fam
sFl
aif
cQT
-awv
+pxw
agh
-aYg
+gpa
afq
afq
-aAC
+cvI
acz
aYe
aYe
@@ -48372,7 +48418,7 @@ aYe
aYe
aYe
aoO
-aAC
+cvI
afq
afq
afq
@@ -48449,16 +48495,16 @@ afq
afq
afq
afq
-arq
+jBo
aTL
-arq
+jBo
apj
apj
apj
aXn
-arq
+jBo
awS
-arq
+jBo
afq
afq
afq
@@ -48500,10 +48546,10 @@ aqG
afq
afq
afq
-aYF
+bWN
aEo
aaA
-aLK
+wOC
aGu
aqJ
asS
@@ -48514,10 +48560,10 @@ aSx
aTh
aSI
aae
-aLK
+wOC
abZ
aTY
-ahW
+sHK
asz
amx
aUt
@@ -48525,21 +48571,21 @@ aUt
aUt
arh
afv
-adQ
+sHK
aCs
apg
-aJf
-aJf
-aJf
-aJf
-aJf
-aJf
-aJf
-aJf
-aJf
+oGf
+ieJ
+ieJ
+ieJ
+ieJ
+ieJ
+ieJ
+ieJ
+ieJ
aKt
ajo
-awv
+pxw
aKt
rMs
rRh
@@ -48549,12 +48595,12 @@ vVg
nNl
vVg
iLh
-awv
+pxw
agh
-aYg
+gpa
afq
afq
-aAC
+cvI
aYe
aYe
aYe
@@ -48566,7 +48612,7 @@ aYe
aYe
aYe
aYe
-aAC
+cvI
afq
afq
afq
@@ -48643,16 +48689,16 @@ afq
afq
afq
afq
-arq
-arq
-arq
+jBo
+jBo
+jBo
adH
apj
apj
auH
-arq
-arq
-arq
+jBo
+jBo
+jBo
afq
afq
afq
@@ -48694,10 +48740,10 @@ aqG
afq
afq
afq
-aYF
+bWN
aEo
uPI
-aLK
+wOC
aGp
apK
asn
@@ -48708,7 +48754,7 @@ aBF
alZ
awL
aHM
-aLK
+wOC
abZ
aMF
aPA
@@ -48722,14 +48768,14 @@ aju
afE
afT
apg
-aFZ
-aHe
-aNh
-aYP
-aLT
-aYP
-adf
-aFZ
+aEj
+aEj
+aEj
+aEj
+aEj
+aEj
+aEj
+aEj
aKt
aKt
mPB
@@ -48739,28 +48785,28 @@ oxv
khJ
aKt
aKt
-gGZ
+bsD
iGg
-tBo
+ycD
ify
-tBo
+ycD
agh
-aYg
+gpa
afq
afq
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
-aAC
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
+cvI
afq
afq
afq
@@ -48839,12 +48885,12 @@ afq
afq
afq
afq
-arq
+jBo
aaE
apj
apj
aYf
-arq
+jBo
afq
afq
afq
@@ -48888,24 +48934,24 @@ aqG
aqG
afq
afq
-aYF
+bWN
pRv
aaA
-aLK
-aLK
-aLK
-aLK
+wOC
+wOC
+wOC
+wOC
abO
-aob
-aob
-aob
-aob
-aob
-aob
-aob
+hgO
+hgO
+hgO
+hgO
+hgO
+hgO
+hgO
abZ
aSi
-aLV
+wTS
aFe
aMB
aeG
@@ -48913,33 +48959,33 @@ ain
acy
anZ
aoD
-aLV
+wTS
atN
-and
-aFZ
-ayO
-ahG
-aTX
-aBB
-aBB
-avX
-aFZ
+apg
+aEj
+aHe
+aNh
+aYP
+aLT
+aYP
+adf
+aEj
aKt
aje
ajV
-awv
-awv
+pxw
+pxw
jpO
aKt
aKt
aKt
-tBo
+ycD
eyO
bON
uZf
-tBo
+ycD
agh
-aYg
+gpa
afq
afq
afq
@@ -49033,12 +49079,12 @@ afq
afq
afq
afq
-arq
+jBo
aPV
apj
apj
aHy
-arq
+jBo
afq
afq
afq
@@ -49082,7 +49128,7 @@ afq
aqG
aqG
afq
-aYF
+bWN
aEo
aEo
aEo
@@ -49090,16 +49136,16 @@ aEo
aEo
aEo
aEo
-aob
-aob
+hgO
+hgO
aUB
auA
aDZ
avR
-acW
+wlu
ati
aIF
-aLV
+wTS
aFe
aMB
acy
@@ -49107,33 +49153,33 @@ ain
aeG
anZ
aoD
-aLV
-afW
-aRV
-aAD
-agk
-arT
-aYA
-ahy
-aPW
-acx
-aFZ
+wTS
+ayH
+and
+aEj
+ayO
+ahG
+aTX
+aBB
+aBB
+avX
+aEj
aKt
ajo
aUH
asC
-awv
+pxw
jpO
aKt
aKt
aKt
-tBo
+ycD
lSn
qEh
dvT
-tBo
+ycD
agh
-aYg
+gpa
afq
afq
afq
@@ -49227,12 +49273,12 @@ afq
afq
afq
afq
-arq
+jBo
apj
apj
apj
aDR
-arq
+jBo
agB
afq
aGO
@@ -49276,7 +49322,7 @@ afq
afq
aqG
aqG
-aYF
+bWN
aaA
aaA
aaA
@@ -49284,7 +49330,7 @@ aaA
aaA
aaA
aEo
-aob
+hgO
akv
aJH
atg
@@ -49293,7 +49339,7 @@ afH
axy
aba
aSA
-aLV
+wTS
aSN
ahA
aGA
@@ -49301,33 +49347,33 @@ aGA
aGA
ahA
aml
-aLV
-ayH
-alI
-aFZ
-aMg
-hGl
-aNO
-ahr
-aNO
-ahc
-aFZ
+wTS
+afW
+aRV
+aAD
+agk
+arT
+aYA
+ahy
+aPW
+acx
+aEj
aKt
ajo
aUH
ajz
-awv
+pxw
jpO
aKt
aKt
aKt
-tBo
+ycD
mTk
pAk
rXm
-tBo
+ycD
agh
-aYg
+gpa
afq
afq
afq
@@ -49421,7 +49467,7 @@ afq
afq
afq
afq
-arq
+jBo
aTH
aTO
aIq
@@ -49470,24 +49516,24 @@ afq
afq
afq
aqG
-aip
-aYF
-aYF
-aYF
+cYF
+bWN
+bWN
+bWN
ate
aaA
aEx
aEo
-aob
+hgO
aiO
aPe
abu
aoB
aQE
-aob
+hgO
alv
ady
-ava
+qKs
ast
aML
aSw
@@ -49495,33 +49541,33 @@ ant
aSw
aML
acM
-ava
+qKs
axu
-aUc
-aFZ
-aJs
-aFb
-aXy
-aFZ
-aVz
-aVz
-aFZ
+xuN
+aEj
+aMg
+hGl
+aNO
+ahr
+aNO
+ahc
+aEj
aKt
ajw
ajX
aKr
-awv
+pxw
jpO
awK
jmj
aKt
-tBo
-tBo
-tBo
-tBo
-tBo
+ycD
+ycD
+ycD
+ycD
+ycD
agh
-aYg
+gpa
afq
afq
afq
@@ -49615,7 +49661,7 @@ afq
afq
afq
afq
-arq
+jBo
aTH
atD
aMo
@@ -49667,7 +49713,7 @@ aqG
aiG
afq
afq
-aYF
+bWN
ate
aaA
aaA
@@ -49678,44 +49724,44 @@ aCn
aZO
acj
afO
-aob
+hgO
abZ
aYL
-ava
-aLV
-ava
+qKs
+wTS
+qKs
aoC
aKc
awD
-ava
-aLV
-ava
+qKs
+wTS
+qKs
ayH
apg
-aFZ
-aFZ
-aFZ
-aFZ
-aFZ
+aEj
+aJs
+aFb
+aXy
+aEj
aVz
aVz
-aFZ
+aEj
aKt
aif
-awv
-awv
-awv
+pxw
+pxw
+pxw
nxt
-awv
-awv
-awv
-awv
+pxw
+pxw
+pxw
+pxw
aKt
aKt
aKt
-awv
+pxw
agh
-aYg
+gpa
afq
afq
afq
@@ -49809,12 +49855,12 @@ afq
afq
afq
afq
-arq
-arq
-arq
-arq
-arq
-arq
+jBo
+jBo
+jBo
+jBo
+jBo
+jBo
agB
aGO
aGO
@@ -49866,35 +49912,35 @@ aaA
aEx
aKT
dsO
-aob
-aob
-aob
-aob
-aob
-aob
-aob
+hgO
+hgO
+hgO
+hgO
+hgO
+hgO
+hgO
abZ
aOE
-akE
+fDZ
adz
-aCh
-aXq
-aCh
-aXq
-aCh
+oGf
+wns
+oGf
+wns
+oGf
aMf
-akE
+fDZ
afX
-ahi
-aEa
-aEa
-agx
-aOs
-aFZ
-aFZ
-aFZ
-aFZ
-aKt
+apg
+aEj
+aEj
+aEj
+aEj
+aEj
+aVz
+aVz
+aEj
+aiz
aif
aQM
aRb
@@ -49907,9 +49953,9 @@ jSm
aKt
aKt
aKt
-awv
+pxw
agh
-aYg
+gpa
afq
afq
afq
@@ -50056,7 +50102,7 @@ aqG
aOa
asf
afq
-aYF
+bWN
aaA
aaA
ani
@@ -50069,7 +50115,7 @@ bUR
bUR
nGT
jtQ
-ais
+hNQ
aBV
aZq
aCW
@@ -50077,18 +50123,18 @@ aox
aCW
any
aUg
-aDb
+vdC
amI
-ayn
-ayn
-ayn
-dUX
-bmr
-ayq
-aKt
-aKt
-aMP
-aKt
+yaY
+fTe
+fTe
+tMx
+aOs
+aEj
+aEj
+aEj
+aEj
+aig
rMs
vVg
vVg
@@ -50097,13 +50143,13 @@ uIq
aif
aif
aKt
-awv
+pxw
aKt
aKt
aKt
-awv
+pxw
agh
-aYg
+gpa
afq
afq
afq
@@ -50250,11 +50296,11 @@ afq
afq
afq
afq
-aYF
+bWN
adI
aaA
aAN
-aCh
+qVU
hLQ
cZN
gqO
@@ -50263,7 +50309,7 @@ aeD
amb
amb
tvZ
-aeY
+hkX
aPm
aze
agt
@@ -50271,18 +50317,18 @@ anJ
aeD
aze
auJ
-aeY
+sId
amb
amb
amb
aHt
aBA
-aJU
-aCh
-aig
-aiz
-awv
-aXe
+hQo
+ayq
+aKt
+aKt
+aMP
+aKt
gYP
aKt
ayE
@@ -50291,13 +50337,13 @@ loG
sMy
aif
aKt
-awv
+pxw
aKt
aKt
aKt
-awv
+pxw
agh
-aYg
+gpa
afq
afq
afq
@@ -50444,54 +50490,54 @@ afq
afq
afq
afq
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
aHl
-aCh
-aCh
-owM
-owM
+qVU
+qVU
+dDI
+dDI
hBp
-owM
-etC
-aFs
-aFs
-aFs
-aFs
-arN
-arN
+dDI
+oJN
+gGW
+gGW
+gGW
+gGW
+jZP
+jZP
aSt
-aVF
-arN
-aCN
-aCN
-aCN
-azk
-azk
-azk
+mRT
+jZP
+iJw
+iJw
+iJw
+owP
+owP
+owP
aPn
-azk
-azk
-azk
-aov
-aov
-aov
+owP
+owP
+owP
+psa
+psa
+psa
wMt
-aov
-awv
-awv
-awv
-awv
-awv
-awv
-awv
-awv
-awv
-awv
-awv
-aYg
-aYg
+psa
+pxw
+pxw
+pxw
+pxw
+pxw
+pxw
+pxw
+pxw
+pxw
+pxw
+pxw
+gpa
+gpa
afq
afq
afq
@@ -50636,43 +50682,43 @@ aGO
aqG
afq
afq
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
aaA
aaA
aAN
aaA
aaA
-owM
+dDI
taq
bRh
eEa
lzf
-aFs
+gGW
atz
aFM
acE
-arN
+jZP
acC
aaq
atL
-aWZ
+hJz
agE
aMY
ahY
-azk
-azk
+owP
+owP
aIf
agD
ahu
-azk
-azk
+owP
+owP
aLa
-aov
+psa
tAt
arC
-aov
+psa
afq
afq
afq
@@ -50830,7 +50876,7 @@ afq
aGO
afq
afq
-aYF
+bWN
aaA
acp
aEx
@@ -50838,12 +50884,12 @@ uPI
aAN
aaA
avu
-owM
+dDI
eIs
xgH
lcP
fGK
-aFs
+gGW
axv
aWx
ama
@@ -50855,18 +50901,18 @@ awt
aav
aak
nlb
-azk
-azk
-aIL
+owP
+owP
+xHc
aQS
aFG
-azk
-azk
+owP
+owP
aLa
-aov
+psa
tAt
arC
-aov
+psa
afq
afq
afq
@@ -51023,44 +51069,44 @@ afq
afq
afq
afq
-aYF
-aYF
+bWN
+bWN
ayK
-aYF
+bWN
aaA
aaA
aAN
aaA
xtN
-owM
+dDI
jbR
qjW
fOF
tnY
-aFs
+gGW
amV
aBb
aEk
-arN
+jZP
aFA
adR
awB
-arN
+jZP
atW
adK
aHc
-azk
+owP
aDJ
aIR
aPp
aoZ
aCK
-azk
+owP
aLa
-aov
+psa
tAt
arC
-aov
+psa
afq
afq
afq
@@ -51217,44 +51263,44 @@ afq
afq
afq
afq
-aYF
+bWN
auj
aHA
-aYF
+bWN
avu
aaA
aAN
aaA
aTi
-owM
+dDI
vpd
eIk
rJB
kTT
-aFs
-aFs
-aFs
-aFs
-arN
-arN
+gGW
+gGW
+gGW
+gGW
+jZP
+jZP
aiK
-arN
-arN
-aCN
-aCN
-aCN
-azk
+jZP
+jZP
+iJw
+iJw
+iJw
+owP
aEn
aJd
aRx
asM
asD
-azk
+owP
aLa
-aov
+psa
uHs
arC
-aov
+psa
afq
afq
afq
@@ -51411,44 +51457,44 @@ afq
afq
afq
afq
-aYF
+bWN
auP
aLl
-aYF
-aYF
+bWN
+bWN
aaA
aAN
aaA
avu
-owM
+dDI
ryH
fea
fea
cgU
-arP
-arP
-arP
-arP
+ryP
+ryP
+ryP
+ryP
aYr
alY
asa
aps
aYr
-arP
-arP
-arP
-azk
+ryP
+ryP
+ryP
+owP
aFc
aJP
aRP
ayP
aLN
-azk
+owP
aLa
-aov
+psa
xHY
aeT
-aov
+psa
afq
afq
afq
@@ -51605,7 +51651,7 @@ afq
aGO
afq
afq
-aYF
+bWN
awb
aLO
ayK
@@ -51613,36 +51659,36 @@ acp
aaA
aAN
aaA
-aYF
-owM
+bWN
+dDI
fea
jLR
mrO
kAO
-arP
+ryP
aTk
aVG
-arP
+ryP
aUU
aTA
aIu
ayL
ami
-arP
+ryP
aOM
aqO
-azk
+owP
aFo
aKz
aUy
abG
aFD
-azk
+owP
aLa
-aov
+psa
arC
tAt
-aov
+psa
afq
afq
afq
@@ -51799,21 +51845,21 @@ afq
afq
aGO
afq
-aYF
+bWN
awA
ffg
lKG
-aYF
+bWN
aaA
aAN
qTg
-aYF
-owM
+bWN
+dDI
boK
-owM
-owM
-owM
-arP
+dDI
+dDI
+dDI
+ryP
axi
aGS
aEv
@@ -51825,18 +51871,18 @@ anH
aGb
aCw
azO
-azk
-azk
+owP
+owP
aKA
aUS
aIe
-azk
-azk
+owP
+owP
aLa
-aov
+psa
arC
fro
-aov
+psa
afq
afq
afq
@@ -51993,44 +52039,44 @@ afq
afq
aGO
aGO
-aYF
+bWN
dxW
axU
cRX
-aYF
+bWN
avu
aAN
aaA
-aYF
+bWN
alg
aaA
ayK
-aYF
+bWN
aXk
-arP
+ryP
aGa
aon
-arP
+ryP
aRu
aCm
awy
ann
aRu
-arP
+ryP
abN
aTV
-arP
-azk
-azk
-azk
-azk
-azk
+ryP
+owP
+owP
+owP
+owP
+owP
aLa
aLa
-aov
+psa
arC
tAt
-aov
+psa
afq
afq
afq
@@ -52187,44 +52233,44 @@ aGO
aGO
aGO
afq
-aYF
+bWN
cxI
iPo
mPf
-aYF
+bWN
pNP
aAN
aaA
-aYF
+bWN
alg
asQ
aaA
-aYF
+bWN
aXk
-arP
-arP
-arP
-arP
+ryP
+ryP
+ryP
+ryP
aYr
aIl
aHz
aOK
aYr
-arP
-arP
-arP
-arP
+ryP
+ryP
+ryP
+ryP
aLa
aLa
aLa
aLa
aLa
aLa
-aov
-aov
+psa
+psa
arC
tAt
-aov
+psa
afq
afq
afq
@@ -52381,11 +52427,11 @@ afq
afq
afq
afq
-aYF
+bWN
mbP
qlA
fPD
-aYF
+bWN
aaA
aAN
aaA
@@ -52393,32 +52439,32 @@ acp
aaA
aaA
aaA
-aYF
+bWN
aXk
aXk
aXk
aXk
-arP
-arP
-acA
+ryP
+ryP
+veA
awx
-adm
-arP
-arP
+auR
+ryP
+ryP
aLa
aLa
aLa
aLa
-aov
-aov
-aov
-aov
-aov
-aov
+psa
+psa
+psa
+psa
+psa
+psa
ajW
arC
tAt
-aov
+psa
afq
afq
afq
@@ -52571,40 +52617,40 @@ aGO
afq
afq
aGO
-aYF
-aYF
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
+bWN
+bWN
aDG
aVx
-aYF
-aYF
+bWN
+bWN
aaA
aAN
aaA
-aYF
+bWN
aEx
aaA
uPI
-aYF
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
+bWN
aXk
-arP
+ryP
aYr
aEd
awy
aRu
aYr
-arP
+ryP
aLa
-aov
-aov
-aov
-aov
-aov
+psa
+psa
+psa
+psa
+psa
aZt
tnS
idt
@@ -52612,7 +52658,7 @@ idt
idt
aeT
tAt
-aov
+psa
afq
afq
afq
@@ -52765,36 +52811,36 @@ aGO
aGO
afq
afq
-aYF
+bWN
tFR
aaA
aaA
-aYF
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
+bWN
aaA
aaA
aAN
aaA
-aYF
+bWN
aaA
aaA
aaA
aKT
aaA
aaA
-aYF
+bWN
aXk
-arP
+ryP
aMS
aXw
arD
aAX
aeF
-arP
+ryP
aLa
-aov
+psa
aAL
aZt
arU
@@ -52806,7 +52852,7 @@ uOH
tAt
tAt
tAt
-aov
+psa
afq
afq
afq
@@ -52959,48 +53005,48 @@ afq
aGO
aGO
afq
-aYF
+bWN
tFR
aaA
aaA
aaA
aoa
aTi
-aYF
+bWN
avu
aaA
aAN
qTg
-aYF
-aYF
+bWN
+bWN
aaA
aaA
aKT
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
aXk
-arP
+ryP
aNM
aXw
aHW
aCi
aCZ
-arP
+ryP
aLa
-aov
+psa
aLB
atB
aLB
-aov
-aov
-aov
-aov
-aov
-aov
-aov
-aov
-aov
+psa
+psa
+psa
+psa
+psa
+psa
+psa
+psa
+psa
afq
afq
afq
@@ -53153,7 +53199,7 @@ afq
afq
aGO
aGO
-aYF
+bWN
aaA
aaA
aaA
@@ -53166,27 +53212,27 @@ aaA
aAN
aaA
aaA
-aYF
+bWN
aaA
aaA
-aYF
-aYF
+bWN
+bWN
aXk
aXk
aXk
-arP
+ryP
aYr
aJJ
awy
azH
aYr
-arP
+ryP
aLa
-aov
+psa
aLa
avJ
aLa
-aip
+cYF
afq
afq
afq
@@ -53347,7 +53393,7 @@ afq
afq
afq
aGO
-aYF
+bWN
avS
aaA
aaA
@@ -53360,27 +53406,27 @@ aaA
aAN
aaA
aaA
-aYF
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
+bWN
aXk
aXk
aXk
-aHT
-aHT
-aHT
-aHT
+eod
+eod
+eod
+eod
aaT
-aHT
-aHT
-aHT
-aHT
-aHT
+eod
+eod
+eod
+eod
+eod
aLa
arC
aLa
-aip
+cYF
afq
afq
afq
@@ -53541,27 +53587,27 @@ afq
afq
afq
aGO
-aYF
+bWN
aaA
aaA
aaA
asl
aaA
aaA
-aYF
+bWN
oEP
aaA
aAN
aaA
aaA
-aYF
+bWN
aXk
aXk
aXk
aXk
aCI
-aHT
-aHT
+eod
+eod
awN
aAi
aow
@@ -53569,12 +53615,12 @@ aRT
awa
aAi
awN
-aHT
-aHT
+eod
+eod
aLa
alt
aLa
-aip
+cYF
afq
afq
afq
@@ -53735,27 +53781,27 @@ aGO
afq
afq
aGO
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
aaA
aaA
aAN
aaA
aaA
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
aXk
aXk
-aHT
-aHT
-aHT
+eod
+eod
+eod
aTG
aqZ
acD
@@ -53763,12 +53809,12 @@ avg
aAi
aJn
aTG
-aHT
-aHT
-aHT
+eod
+eod
+eod
arC
aLa
-aip
+cYF
afq
afq
afq
@@ -53931,24 +53977,24 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
aBL
aBL
aBL
-aMK
+hNS
avu
aFy
aAN
aCC
avu
-aMK
+hNS
aBL
-aYF
+bWN
aXk
aCI
-aHT
-aHT
+eod
+eod
asR
aTG
aSo
@@ -53958,11 +54004,11 @@ aza
aAi
aTG
ara
-aHT
-aHT
-aME
+eod
+eod
+lze
aXk
-aip
+cYF
afq
afq
afq
@@ -54125,23 +54171,23 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aYF
-aYF
-aYF
-aMK
-aMK
-aMK
+bWN
+bWN
+bWN
+hNS
+hNS
+hNS
aGg
-aMK
-aMK
-aMK
+hNS
+hNS
+hNS
aBL
-aYF
+bWN
aXk
aCI
-aHT
+eod
aCa
aAi
aAi
@@ -54153,10 +54199,10 @@ aEW
akH
akH
aVl
-aLF
-apB
+uom
+huX
aXk
-aip
+cYF
afq
afq
afq
@@ -54319,24 +54365,24 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aYF
+bWN
aVA
aVA
-aMK
+hNS
aja
aEo
acG
aEo
alx
-aMK
+hNS
aBL
-aYF
+bWN
aXk
aCI
-aHT
-aHT
+eod
+eod
awN
aTG
aSo
@@ -54346,11 +54392,11 @@ aza
agK
aTG
awN
-aHT
-aHT
-aHT
+eod
+eod
+eod
aXk
-aip
+cYF
afq
afq
afq
@@ -54511,11 +54557,11 @@ aGO
afq
afq
afq
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
aBL
-aYF
+bWN
aFh
aqj
aqf
@@ -54524,14 +54570,14 @@ afd
aDD
aSz
aEo
-aMK
+hNS
aBL
-aYF
+bWN
aXk
aXk
-aHT
-aHT
-aHT
+eod
+eod
+eod
aTG
acv
aza
@@ -54539,12 +54585,12 @@ aza
aza
aFj
aTG
-aHT
-aHT
-aHT
+eod
+eod
+eod
aXk
aXk
-aip
+cYF
afq
afq
afq
@@ -54705,27 +54751,27 @@ afq
aHF
afq
afq
-aYF
+bWN
aBL
aBL
aBL
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
akF
-aJX
-aJX
-aMK
+mEN
+mEN
+hNS
aBL
-aYF
+bWN
aXk
aXk
-aHT
-aHT
-aHT
+eod
+eod
+eod
awN
aOw
atr
@@ -54733,12 +54779,12 @@ aAi
aEW
anS
awN
-aHT
-aHT
+eod
+eod
aXk
aXk
-aip
-aip
+cYF
+cYF
afq
afq
afq
@@ -54899,39 +54945,39 @@ afq
aGO
aGO
afq
-aYF
+bWN
aBL
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
ajl
aEb
aLz
-arQ
+wlz
axF
aSB
aoG
-aJX
+mEN
aBL
aBL
-aYF
+bWN
aXk
aXk
aXk
-aHT
-aHT
-aHT
-aHT
+eod
+eod
+eod
+eod
ahF
aQU
aWy
-aHT
-aHT
-aHT
-aHT
+eod
+eod
+eod
+eod
aXk
-aip
-aip
+cYF
+cYF
afq
afq
afq
@@ -55093,38 +55139,38 @@ afq
aGO
agB
afq
-aYF
+bWN
aBL
-aJX
+mEN
aFd
-aJX
+mEN
aYG
aqU
apD
-arQ
+wlz
aHR
arj
azC
-aJX
+mEN
aBL
-aYF
-aYF
-aip
-aip
+bWN
+bWN
+cYF
+cYF
aXk
aXk
-aHT
-aHT
-aHT
-aHT
-aHT
-aHT
-aHT
-aHT
-aHT
+eod
+eod
+eod
+eod
+eod
+eod
+eod
+eod
+eod
aXk
aXk
-aip
+cYF
afq
afq
afq
@@ -55289,36 +55335,36 @@ aGO
agB
acr
aBL
-aJX
+mEN
atk
aOU
auE
aYu
aXW
-arQ
+wlz
aFB
aRG
aKX
-aJX
+mEN
aBL
-aYF
-aYF
+bWN
+bWN
afq
-aip
-aip
+cYF
+cYF
aXk
aXk
-aHT
-aHT
-aHT
-aHT
-aHT
-aHT
+eod
+eod
+eod
+eod
+eod
+eod
aXk
aXk
aXk
-aip
-aip
+cYF
+cYF
afq
afq
afq
@@ -55483,24 +55529,24 @@ agB
aRU
aDq
aZE
-aJX
+mEN
aUs
-aJX
+mEN
aiC
aui
abT
-arQ
+wlz
aER
aSB
apY
-aJX
+mEN
aBL
aBL
-aYF
+bWN
afq
afq
-aip
-aip
+cYF
+cYF
aXk
aXk
aXk
@@ -55509,9 +55555,9 @@ aXk
aXk
aXk
aXk
-aip
-aip
-aip
+cYF
+cYF
+cYF
afq
afq
afq
@@ -55677,33 +55723,33 @@ afq
aRU
aPx
aFW
-aJX
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
+mEN
awP
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
aVn
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
aBL
-aYF
+bWN
afq
afq
afq
-aip
-aip
-aip
-aip
-aip
-aip
-aip
-aip
-aip
-aip
+cYF
+cYF
+cYF
+cYF
+cYF
+cYF
+cYF
+cYF
+cYF
+cYF
afq
afq
afq
@@ -55871,7 +55917,7 @@ afq
afq
aDq
aFW
-atF
+vMR
aBG
aKH
acB
@@ -55880,11 +55926,11 @@ aay
aBQ
aEE
aKp
-aJX
+mEN
aBg
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -56063,22 +56109,22 @@ afq
afq
afq
afq
-aYF
+bWN
aZE
-aJX
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
+vlu
aDt
aIK
aiW
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
aqC
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -56257,22 +56303,22 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
aBL
-aJX
+mEN
aVo
avw
vvb
abk
auE
arK
-aJX
+mEN
aRI
alC
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -56451,10 +56497,10 @@ afq
afq
afq
afq
-aYF
-aYF
+bWN
+bWN
aBL
-aJX
+mEN
ajD
auE
acR
@@ -56464,9 +56510,9 @@ awJ
awq
aPu
amH
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -56646,21 +56692,21 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aJX
+mEN
aXa
auE
acR
aNt
aTC
ajZ
-aJX
+mEN
awl
aLH
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -56840,21 +56886,21 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aJX
+mEN
aXJ
auE
auE
abl
auE
aQf
-aJX
+mEN
aKa
aBJ
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -57034,21 +57080,21 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aJX
-aEh
+mEN
+cya
asO
aYj
aaK
aiW
axt
-aJX
+mEN
aKa
awf
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -57227,23 +57273,23 @@ afq
afq
afq
afq
-aYF
-aYF
+bWN
+bWN
aBL
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
aMc
aIT
aFz
-aJX
-aJX
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
+mEN
+mEN
aBL
-aYF
-aYF
+bWN
+bWN
afq
afq
afq
@@ -57421,10 +57467,10 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
aBL
-aJX
+mEN
aEF
aIH
aIH
@@ -57434,10 +57480,10 @@ ahB
aIH
aIH
alB
-aJX
+mEN
aBL
aBL
-aYF
+bWN
afq
afq
afq
@@ -57615,23 +57661,23 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aJX
-aJX
+mEN
+mEN
ank
-aJX
-aJX
+mEN
+mEN
aqF
-aJX
+mEN
avm
-aJX
-aJX
+mEN
+mEN
aio
-aJX
-aJX
+mEN
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -57809,23 +57855,23 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aJX
+mEN
amP
aun
-aJX
+mEN
aAY
aun
-aJX
+mEN
atP
aCX
-aJX
+mEN
atP
aVC
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -58003,23 +58049,23 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aJX
+mEN
aIN
ahH
-aJX
+mEN
aIN
ahH
-aJX
+mEN
ahH
aZl
-aJX
+mEN
ahH
aZl
-aJX
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -58197,23 +58243,23 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
-aJX
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
+mEN
aBL
-aYF
+bWN
afq
afq
afq
@@ -58391,7 +58437,7 @@ afq
afq
afq
afq
-aYF
+bWN
aBL
aBL
aBL
@@ -58407,7 +58453,7 @@ aBL
aBL
aBL
aBL
-aYF
+bWN
afq
afq
afq
@@ -58585,23 +58631,23 @@ afq
afq
afq
afq
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
-aYF
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
+bWN
afq
afq
afq
diff --git a/maps/rift/levels/rift-08-west_deep.dmm b/maps/rift/levels/rift-08-west_deep.dmm
index 05d809653173..81f23d808d7e 100644
--- a/maps/rift/levels/rift-08-west_deep.dmm
+++ b/maps/rift/levels/rift-08-west_deep.dmm
@@ -3087,7 +3087,7 @@
/turf/simulated/floor/tiled/monotile,
/area/gateway)
"BW" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security";
req_one_access = list()
},
@@ -4418,7 +4418,7 @@
"NR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Belter Control Room";
req_one_access = list(48,66)
},
diff --git a/maps/rift/levels/rift-09-west_caves.dmm b/maps/rift/levels/rift-09-west_caves.dmm
index a5cec575834b..20e17d4b79e1 100644
--- a/maps/rift/levels/rift-09-west_caves.dmm
+++ b/maps/rift/levels/rift-09-west_caves.dmm
@@ -1393,7 +1393,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
-/obj/machinery/door/airlock/glass_mining,
+/obj/machinery/door/airlock/glass/mining,
/obj/structure/cable/green{
icon_state = "4-8"
},
diff --git a/maps/rift/levels/rift-10-west_plains.dmm b/maps/rift/levels/rift-10-west_plains.dmm
index 9ea7794adcc6..a1f6a4f5458a 100644
--- a/maps/rift/levels/rift-10-west_plains.dmm
+++ b/maps/rift/levels/rift-10-west_plains.dmm
@@ -247,7 +247,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28
@@ -318,7 +318,7 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/eva)
"bJ" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1;
req_one_access = list(18,47)
},
@@ -1562,7 +1562,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
req_one_access = list(18,47)
},
/turf/simulated/floor/tiled,
@@ -2768,7 +2768,7 @@
/obj/effect/floor_decal/corner/purple/bordercorner{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
req_one_access = list(18,47)
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -4854,7 +4854,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -5260,7 +5260,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
req_one_access = list(18,47)
},
/turf/simulated/floor/tiled,
@@ -5501,7 +5501,7 @@
/obj/machinery/camera/network/research_outpost{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/rnd/outpost)
"yH" = (
@@ -5755,7 +5755,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2;
req_one_access = list(18,47)
},
@@ -5893,7 +5893,7 @@
/obj/machinery/camera/network/research_outpost{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1;
req_one_access = list(18,47)
},
@@ -7507,7 +7507,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
req_one_access = list(18,47)
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -8271,7 +8271,7 @@
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1;
req_one_access = list(18,47)
},
@@ -8414,7 +8414,7 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"Na" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8;
req_one_access = list(18,47)
},
@@ -9489,7 +9489,7 @@
dir = 8;
pixel_x = -24
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1;
req_one_access = list(18,47)
},
@@ -10097,7 +10097,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2;
req_one_access = list(18,47)
},
@@ -10124,7 +10124,7 @@
/obj/effect/floor_decal/corner/purple/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -10757,7 +10757,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1;
req_one_access = list(18,47)
},
@@ -10941,7 +10941,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1;
req_one_access = list(18,47)
},
diff --git a/maps/rift/levels/rift-11-orbital.dmm b/maps/rift/levels/rift-11-orbital.dmm
index ad5c5e25309a..6d2bfc7ddacd 100644
--- a/maps/rift/levels/rift-11-orbital.dmm
+++ b/maps/rift/levels/rift-11-orbital.dmm
@@ -1293,13 +1293,6 @@
},
/turf/simulated/floor/tiled/steel,
/area/centcom/simulated/evac)
-"en" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/obj/machinery/door/blast/regular/open,
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/evac)
"eo" = (
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
@@ -4031,12 +4024,6 @@
},
/turf/simulated/floor/tiled,
/area/centcom/simulated/terminal)
-"mt" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/turf/unsimulated/floor/steel,
-/area/centcom/simulated/main_hall)
"mu" = (
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
@@ -7257,6 +7244,13 @@
/obj/machinery/vending/loadout/loadout_misc,
/turf/unsimulated/floor/steel,
/area/centcom/command)
+"Ae" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/machinery/door/blast/regular/open,
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/evac)
"Ah" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/multi_tile/metal{
@@ -8877,6 +8871,12 @@
/obj/item/storage/firstaid/insiderepair,
/turf/unsimulated/floor/dark,
/area/centcom/specops)
+"Pn" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/turf/unsimulated/floor/steel,
+/area/centcom/simulated/main_hall)
"Pr" = (
/obj/machinery/atmospherics/pipe/tank/phoron{
dir = 1
@@ -15223,9 +15223,9 @@ cN
cN
cN
cN
-en
-en
-en
+Ae
+Ae
+Ae
fC
gk
gG
@@ -15239,9 +15239,9 @@ fC
fC
ls
aD
-mt
-mt
-mt
+Pn
+Pn
+Pn
aD
nx
nx
diff --git a/maps/rift/rift.dm b/maps/rift/rift.dm
index 50f8f081b87f..2cb44d26f935 100644
--- a/maps/rift/rift.dm
+++ b/maps/rift/rift.dm
@@ -303,7 +303,7 @@
ZTRAIT_STATION,
ZTRAIT_GRAVITY,
)
- base_turf = /turf/simulated/mineral/floor/icerock/lythios43c/indoors
+ base_turf = /turf/simulated/floor/outdoors/icesand/lythios43c/indoor
flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER
planet_path = /datum/planet/lythios43c
link_above = /datum/map_level/rift/deep
@@ -333,7 +333,7 @@
ZTRAIT_GRAVITY,
ZTRAIT_LEGACY_BELTER_DOCK,
)
- base_turf = /turf/simulated/mineral/floor/icerock/lythios43c/indoors
+ base_turf = /turf/simulated/floor/outdoors/icesand/lythios43c/indoor
flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_PLAYER
planet_path = /datum/planet/lythios43c
link_below = /datum/map_level/rift/base
@@ -363,7 +363,7 @@
ZTRAIT_STATION,
ZTRAIT_GRAVITY,
)
- base_turf = /turf/simulated/mineral/floor/icerock/lythios43c/indoors
+ base_turf = /turf/simulated/floor/outdoors/icesand/lythios43c/indoor
flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_PLAYER
planet_path = /datum/planet/lythios43c
link_below = /datum/map_level/rift/deep
diff --git a/maps/sectors/lavaland_140/levels/lavaland_140.dmm b/maps/sectors/lavaland_140/levels/lavaland_140.dmm
index 145d7e4e0a81..1ab8da76cbd3 100644
--- a/maps/sectors/lavaland_140/levels/lavaland_140.dmm
+++ b/maps/sectors/lavaland_140/levels/lavaland_140.dmm
@@ -2611,7 +2611,7 @@
/turf/simulated/floor/wood,
/area/lavaland/central/base/common)
"Yb" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Triage";
req_one_access = list(48)
},
diff --git a/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm b/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm
index 9f90645f1889..139102698c1d 100644
--- a/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm
+++ b/maps/sectors/lavaland_140/levels/lavaland_140_east.dmm
@@ -1323,7 +1323,7 @@
/turf/simulated/floor/outdoors/lavaland,
/area/lavaland/east/ashlander_village)
"zl" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Infirmary"
},
/turf/simulated/floor/tiled/lavaland,
@@ -1709,7 +1709,7 @@
/turf/simulated/floor/tiled/lavaland,
/area/lavaland/east/ashlander_village)
"IK" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Surgery"
},
/turf/simulated/floor/tiled/lavaland,
@@ -2229,7 +2229,7 @@
/turf/simulated/floor/wood/lavaland,
/area/lavaland/east/ashlander_village)
"TB" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Triage"
},
/turf/simulated/floor/tiled/lavaland,
@@ -2362,7 +2362,7 @@
/turf/simulated/floor/outdoors/lava/lavaland,
/area/lavaland/east/ashlander_village)
"Wn" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Refinery"
},
/turf/simulated/floor/tiled/lavaland,
diff --git a/maps/sectors/lavaland_192/levels/lavaland_192.dmm b/maps/sectors/lavaland_192/levels/lavaland_192.dmm
index a803bc601f2b..0ecbf80e7998 100644
--- a/maps/sectors/lavaland_192/levels/lavaland_192.dmm
+++ b/maps/sectors/lavaland_192/levels/lavaland_192.dmm
@@ -2434,7 +2434,7 @@
/turf/simulated/floor/sandstone/lavaland,
/area/lavaland/central/explored)
"Yb" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Triage";
req_one_access = list(48)
},
diff --git a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm
index 733fefae5e85..575fd067f8e4 100644
--- a/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm
+++ b/maps/sectors/miaphus_192/levels/miaphus_192_beach.dmm
@@ -5232,7 +5232,7 @@
/turf/simulated/floor/wood,
/area/tether_away/beach/mineshaft)
"ST" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "First Aid Staton";
req_one_access = list()
},
diff --git a/maps/sectors/tradeport_140/levels/tradeport_140.dmm b/maps/sectors/tradeport_140/levels/tradeport_140.dmm
index 5bc57c4ff348..f62836efb22f 100644
--- a/maps/sectors/tradeport_140/levels/tradeport_140.dmm
+++ b/maps/sectors/tradeport_140/levels/tradeport_140.dmm
@@ -536,7 +536,7 @@
/turf/simulated/floor/carpet/bcarpet,
/area/tradeport/cyndishow)
"cb" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/catwalk,
@@ -620,7 +620,7 @@
/turf/simulated/floor/tiled/old_tile/gray,
/area/shuttle/trade_ship/general)
"cq" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/old_tile/blue,
@@ -784,7 +784,7 @@
/turf/simulated/floor/wood,
/area/tradeport/safarizoo)
"cV" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(160);
req_one_access = null
@@ -2920,7 +2920,7 @@
/turf/simulated/floor/tiled/old_tile/purple,
/area/tradeport/spine)
"lk" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light{
dir = 1
},
@@ -3092,7 +3092,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/old_tile/red,
@@ -4106,7 +4106,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/old_tile/red,
@@ -5436,7 +5436,7 @@
/turf/simulated/floor/plating,
/area/tradeport/pads)
"up" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/light,
@@ -6520,7 +6520,7 @@
/turf/simulated/floor/tiled/neutral,
/area/tradeport)
"xU" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/catwalk,
@@ -9982,7 +9982,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/catwalk,
@@ -10504,7 +10504,7 @@
/turf/simulated/floor/plating,
/area/tradeport/pads)
"NY" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/old_tile/blue,
@@ -10594,7 +10594,7 @@
/turf/simulated/floor/plating,
/area/tradeport)
"Ov" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/light{
@@ -10950,7 +10950,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Infirmary";
req_one_access = null
},
@@ -10987,7 +10987,7 @@
/turf/simulated/floor/wood,
/area/tradeport/cafeteria)
"Qe" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light,
/turf/simulated/floor/tiled/old_tile/red,
/area/tradeport/spine)
@@ -11687,7 +11687,7 @@
/turf/simulated/floor/wood,
/area/tradeport/cyndi)
"SL" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(160);
req_one_access = null
@@ -13279,7 +13279,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/catwalk,
diff --git a/maps/sectors/tradeport_192/levels/tradeport_192.dmm b/maps/sectors/tradeport_192/levels/tradeport_192.dmm
index 9e3373c96504..625d90e4882d 100644
--- a/maps/sectors/tradeport_192/levels/tradeport_192.dmm
+++ b/maps/sectors/tradeport_192/levels/tradeport_192.dmm
@@ -1608,7 +1608,7 @@
/turf/simulated/shuttle/floor/white,
/area/shuttle/trade_ship/cockpit)
"gj" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(160);
req_one_access = null
@@ -3692,7 +3692,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/old_tile/red,
@@ -3827,7 +3827,7 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/trade_ship/general)
"oM" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/light,
@@ -4358,7 +4358,7 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Infirmary";
req_one_access = null
},
@@ -5519,7 +5519,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/old_tile/red,
@@ -5823,7 +5823,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/catwalk,
@@ -6029,7 +6029,7 @@
/turf/simulated/floor/tiled/old_tile/blue,
/area/tradeport)
"xm" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/catwalk,
@@ -7008,7 +7008,7 @@
/turf/simulated/floor/wood,
/area/tradeport/cafeteria)
"Bc" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/old_tile/blue,
@@ -8066,7 +8066,7 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/trade_ship/cockpit)
"EQ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/old_tile/blue,
@@ -9298,7 +9298,7 @@
/turf/simulated/floor/tiled/steel,
/area/tradeport)
"JA" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light{
dir = 1
},
@@ -9354,7 +9354,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/catwalk,
@@ -10618,7 +10618,7 @@
/turf/simulated/floor/plating,
/area/tradeport/engineering)
"OE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/catwalk,
@@ -12018,7 +12018,7 @@
/turf/simulated/floor/wood,
/area/tradeport/commons)
"TZ" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(160);
req_one_access = null
@@ -12406,7 +12406,7 @@
/turf/simulated/floor/tiled/old_tile/blue,
/area/tradeport)
"Vy" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light,
/turf/simulated/floor/tiled/old_tile/red,
/area/tradeport/spine)
@@ -12673,7 +12673,7 @@
/turf/simulated/floor/plating,
/area/tradeport)
"WM" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/light{
diff --git a/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm b/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm
index 8ffc38ff034b..86619dafd99c 100644
--- a/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm
+++ b/maps/sectors/virgo4_140/levels/virgo4_140_beach.dmm
@@ -1900,7 +1900,7 @@
/turf/simulated/floor/outdoors/grass,
/area/tether_away/beach/cavebase)
"ST" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "First Aid Staton";
req_one_access = list()
},
diff --git a/maps/submaps/level_specific/class_d/broken_reactor_D.dmm b/maps/submaps/level_specific/class_d/broken_reactor_D.dmm
index 78464711938a..bd2263fd42df 100644
--- a/maps/submaps/level_specific/class_d/broken_reactor_D.dmm
+++ b/maps/submaps/level_specific/class_d/broken_reactor_D.dmm
@@ -6,7 +6,7 @@
/turf/simulated/wall/classd/indoors,
/area/class_d/explored)
"c" = (
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/effect/debris/cleanable/dirt,
/turf/simulated/floor/tiled/classd/indoors,
/area/class_d/explored)
diff --git a/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm b/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm
index cb8809b6d06d..ed5dd97e1377 100644
--- a/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm
+++ b/maps/submaps/level_specific/class_h/AuxiliaryResearchFacility.dmm
@@ -36,7 +36,7 @@
/turf/simulated/floor/tiled/dark,
/area/class_h/POIs/AuxiliaryResearchFacility)
"aA" = (
-/obj/machinery/door/airlock/glass_security,
+/obj/machinery/door/airlock/glass/security,
/turf/simulated/floor/tiled/steel,
/area/class_h/POIs/AuxiliaryResearchFacility)
"aB" = (
@@ -1645,7 +1645,7 @@
/turf/simulated/floor/wood/classh,
/area/class_h/POIs/AuxiliaryResearchFacility)
"Lm" = (
-/obj/machinery/door/airlock/glass_research,
+/obj/machinery/door/airlock/glass/research,
/turf/simulated/floor/tiled/white,
/area/class_h/POIs/AuxiliaryResearchFacility)
"Lr" = (
diff --git a/maps/submaps/level_specific/class_h/BunkerH.dmm b/maps/submaps/level_specific/class_h/BunkerH.dmm
index f2a97f2a9a8a..d36650651213 100644
--- a/maps/submaps/level_specific/class_h/BunkerH.dmm
+++ b/maps/submaps/level_specific/class_h/BunkerH.dmm
@@ -426,7 +426,7 @@
/area/class_h/POIs/vault)
"If" = (
/obj/effect/debris/cleanable/dirt,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/turf/simulated/floor/tiled,
diff --git a/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm b/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm
index 2b37ad63f4e0..b3e9f3907d7f 100644
--- a/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm
+++ b/maps/submaps/level_specific/class_p/HeadscientistHQ.dmm
@@ -689,7 +689,7 @@
/turf/simulated/shuttle/floor/classp,
/area/submap/HeadscientistHQ)
"Fs" = (
-/obj/machinery/door/airlock/glass_command,
+/obj/machinery/door/airlock/glass/command,
/obj/effect/debris/cleanable/dirt,
/turf/simulated/shuttle/floor/yellow,
/area/submap/HeadscientistHQ)
@@ -739,7 +739,7 @@
/turf/simulated/floor/outdoors/dirt/classp,
/area/template_noop)
"Ga" = (
-/obj/machinery/door/airlock/glass_security,
+/obj/machinery/door/airlock/glass/security,
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/shuttle/floor/red/classp,
/area/submap/HeadscientistHQ)
@@ -1006,7 +1006,7 @@
/turf/simulated/shuttle/floor/purple/classp,
/area/submap/HeadscientistHQ)
"Tw" = (
-/obj/machinery/door/airlock/glass_security,
+/obj/machinery/door/airlock/glass/security,
/turf/simulated/shuttle/floor/red/classp,
/area/submap/HeadscientistHQ)
"Ty" = (
diff --git a/maps/submaps/level_specific/underdark/broken_engine.dmm b/maps/submaps/level_specific/underdark/broken_engine.dmm
index be8a9dc49721..0d402098857b 100644
--- a/maps/submaps/level_specific/underdark/broken_engine.dmm
+++ b/maps/submaps/level_specific/underdark/broken_engine.dmm
@@ -6,7 +6,7 @@
/turf/simulated/wall,
/area/mine/explored/underdark)
"c" = (
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/mine/explored/underdark)
"d" = (
diff --git a/maps/templates/admin/dhael_centcom.dmm b/maps/templates/admin/dhael_centcom.dmm
index d42d706ed65a..1eee3b6c6411 100644
--- a/maps/templates/admin/dhael_centcom.dmm
+++ b/maps/templates/admin/dhael_centcom.dmm
@@ -2301,7 +2301,7 @@
/turf/unsimulated/floor/steel,
/area/centcom/control)
"fB" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research and Development";
req_access = list(7)
},
@@ -2494,7 +2494,7 @@
},
/area/centcom/control)
"fS" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Robotics Lab";
req_access = list(29,47)
},
@@ -3727,7 +3727,7 @@
/turf/unsimulated/floor/steel,
/area/centcom/security)
"kQ" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Virology Laboratory"
},
/turf/unsimulated/floor/steel{
@@ -4259,7 +4259,7 @@
/turf/unsimulated/floor/steel,
/area/centcom/security)
"mO" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security";
req_access = list()
},
@@ -6809,7 +6809,7 @@
/turf/unsimulated/floor/steel,
/area/centcom/security)
"si" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Warden's Office";
req_access = list(3)
},
@@ -10337,7 +10337,7 @@
},
/area/centcom/restaurant)
"Fg" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security";
req_access = list()
},
@@ -10924,7 +10924,7 @@
},
/area/centcom/security)
"HA" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "innerS";
name = "Colonial Security Airlock";
req_access = list(63)
@@ -12561,7 +12561,7 @@
},
/area/centcom/security)
"Of" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Colonial Security Airlock";
req_access = list(63)
},
@@ -12791,7 +12791,7 @@
/turf/unsimulated/floor/techfloor_grid,
/area/centcom/evac)
"Pj" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Confiscated Items";
req_access = list(3)
},
@@ -14696,7 +14696,7 @@
},
/area/centcom/security)
"Xn" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security Processing";
req_access = list(1)
},
diff --git a/maps/templates/admin/ert.dmm b/maps/templates/admin/ert.dmm
index 59c852701c94..c8597658c1f9 100644
--- a/maps/templates/admin/ert.dmm
+++ b/maps/templates/admin/ert.dmm
@@ -388,7 +388,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/med)
"dA" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -1069,7 +1069,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/teleporter)
"jK" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(103)
},
@@ -1592,7 +1592,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/med_surg)
"nn" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(103)
},
@@ -1662,7 +1662,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
req_one_access = list(103)
},
/turf/simulated/floor/tiled/techmaint,
@@ -1977,7 +1977,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/barracks)
"po" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -2365,7 +2365,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/atmos)
"rV" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -2677,7 +2677,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/eng_storage)
"un" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -2775,7 +2775,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/atmos)
"vi" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(103)
},
@@ -3477,7 +3477,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/bridge)
"Ay" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(103)
},
/obj/machinery/door/blast/regular{
@@ -3605,7 +3605,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/armoury_dl)
"Bq" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(103)
},
/obj/structure/cable/yellow{
@@ -4112,7 +4112,7 @@
/turf/space,
/area/space)
"FJ" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
req_one_access = list(103)
},
/obj/machinery/door/firedoor/border_only,
@@ -4167,7 +4167,7 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/ert/med_surg)
"FQ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(103)
},
/obj/machinery/door/firedoor/multi_tile{
@@ -4298,7 +4298,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/hallways)
"GO" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(103)
},
/obj/machinery/door/firedoor/border_only,
@@ -5367,7 +5367,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/armoury_dl)
"NY" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
req_one_access = list(103)
},
/obj/structure/cable/yellow{
@@ -5395,7 +5395,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/engineering)
"Oa" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(103)
},
@@ -5908,7 +5908,7 @@
/obj/machinery/door/firedoor/multi_tile{
dir = 1
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -5919,7 +5919,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/barracks)
"Rz" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(103)
},
/obj/machinery/door/blast/regular{
@@ -5959,7 +5959,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/engine)
"RQ" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(103)
},
@@ -5997,7 +5997,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/engineering)
"Sh" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -6291,7 +6291,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/teleporter)
"UT" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(103)
},
/obj/structure/cable/yellow{
@@ -6359,7 +6359,7 @@
/obj/machinery/door/firedoor/multi_tile{
dir = 1
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -6437,7 +6437,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/bridge)
"Wu" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list(103)
},
/obj/machinery/door/firedoor/border_only,
@@ -6779,7 +6779,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/med)
"ZX" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
req_one_access = list(103)
},
/obj/structure/cable/yellow{
diff --git a/maps/templates/admin/ert_base.dmm b/maps/templates/admin/ert_base.dmm
index ed026be8c75d..7c01b7fb14db 100644
--- a/maps/templates/admin/ert_base.dmm
+++ b/maps/templates/admin/ert_base.dmm
@@ -537,7 +537,7 @@
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/specops/centcom)
"be" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(103)
},
@@ -1519,7 +1519,7 @@
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/specops/centcom)
"dj" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(103)
},
@@ -2082,7 +2082,7 @@
/turf/simulated/shuttle/floor/black,
/area/shuttle/specops/centcom)
"zV" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
req_one_access = list(103)
},
/turf/simulated/shuttle/floor/black,
diff --git a/maps/templates/admin/kk_mercship.dmm b/maps/templates/admin/kk_mercship.dmm
index 1cc76377197e..d97b3e902749 100644
--- a/maps/templates/admin/kk_mercship.dmm
+++ b/maps/templates/admin/kk_mercship.dmm
@@ -4833,7 +4833,7 @@
/area/ship/manta/hallways_star)
"xQ" = (
/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
req_one_access = list(150)
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -9245,7 +9245,7 @@
/obj/structure/cable/orange{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_one_access = list(150)
},
diff --git a/maps/templates/archive/tradeship.dmm b/maps/templates/archive/tradeship.dmm
index e528cc9e74ad..9b1d7bba5dd3 100644
--- a/maps/templates/archive/tradeship.dmm
+++ b/maps/templates/archive/tradeship.dmm
@@ -584,7 +584,7 @@
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/trade)
"bB" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medical Bay";
req_access = list(160);
req_one_access = list()
@@ -1437,7 +1437,7 @@
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
"du" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering";
req_access = list(160);
req_one_access = list()
diff --git a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
index 79ea315beb57..9c6c815ba80c 100644
--- a/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
+++ b/maps/templates/shuttles/overmaps/generic/curashuttle.dmm
@@ -531,7 +531,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Rescue Ship Cockpit";
req_one_access = null
},
diff --git a/maps/templates/shuttles/overmaps/generic/itglight.dmm b/maps/templates/shuttles/overmaps/generic/itglight.dmm
index ea12bee9c96a..872707ed77c4 100644
--- a/maps/templates/shuttles/overmaps/generic/itglight.dmm
+++ b/maps/templates/shuttles/overmaps/generic/itglight.dmm
@@ -708,7 +708,7 @@
/obj/structure/cable/pink{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Bridge";
req_one_access = list(777)
},
@@ -1716,7 +1716,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Bridge";
req_one_access = list(777)
},
@@ -4142,7 +4142,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
id_tag = "dauntlessportcargobolts";
name = "Port Cargo Access";
req_one_access = list(777)
@@ -4194,7 +4194,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
id_tag = "dauntlessstarboardcargobolts";
name = "Starboard Cargo Access";
req_one_access = list(777)
diff --git a/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm b/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm
index df0946a1e181..ebeb0a520dba 100644
--- a/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm
+++ b/maps/templates/shuttles/overmaps/generic/mercenarybase.dmm
@@ -610,7 +610,7 @@
/turf/simulated/floor/tiled/dark,
/area/mercbase/command)
"hd" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Modified Security Airlock";
req_one_access = list(150)
},
@@ -717,7 +717,7 @@
/turf/simulated/floor/tiled/dark,
/area/mercbase/barracks)
"hp" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Modified Security Airlock";
req_one_access = list(150)
},
@@ -1200,7 +1200,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Modified Security Airlock";
req_one_access = list(150)
},
@@ -1276,7 +1276,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Modified Security Airlock";
req_one_access = list(150)
},
diff --git a/maps/templates/shuttles/overmaps/generic/vespa.dmm b/maps/templates/shuttles/overmaps/generic/vespa.dmm
index 640d932cbe16..29a6f0194ec4 100644
--- a/maps/templates/shuttles/overmaps/generic/vespa.dmm
+++ b/maps/templates/shuttles/overmaps/generic/vespa.dmm
@@ -836,7 +836,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/expe/hangarcontrol)
"cx" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
req_one_access = list()
},
/turf/simulated/floor/tiled/techfloor,
@@ -849,7 +849,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/expe/hangarcontrol)
"cz" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/turf/simulated/floor/tiled/techfloor,
@@ -4570,7 +4570,7 @@
/turf/simulated/floor/tiled/white,
/area/ship/expe/medicalchem)
"kq" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
req_one_access = list()
},
/obj/machinery/door/firedoor/glass,
@@ -5012,7 +5012,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
req_one_access = list()
},
/turf/simulated/floor/tiled/techfloor,
@@ -5552,7 +5552,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/expe/seceq)
"ms" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/obj/machinery/door/firedoor,
@@ -6308,7 +6308,7 @@
/turf/simulated/wall/rpshull,
/area/ship/expe/seclobby2)
"nN" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/obj/machinery/door/firedoor,
@@ -6867,7 +6867,7 @@
/turf/simulated/wall/rpshull,
/area/ship/expe/seccells)
"oT" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/obj/machinery/door/firedoor,
@@ -7939,7 +7939,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/expe/seccells)
"rg" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/turf/simulated/floor/tiled/techfloor,
@@ -7998,7 +7998,7 @@
/turf/simulated/wall/rpshull,
/area/ship/expe/medicalmain)
"rq" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
req_one_access = list()
},
/obj/machinery/door/firedoor/glass,
@@ -9827,14 +9827,14 @@
/turf/simulated/wall/rpshull,
/area/ship/expe/corridor2)
"vG" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/techfloor,
/area/ship/expe/corridor2)
"vH" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
req_one_access = list()
},
/obj/machinery/door/firedoor,
diff --git a/maps/tether/engines/rust.dmm b/maps/tether/engines/rust.dmm
index 82fa587365af..c6143dc774d3 100644
--- a/maps/tether/engines/rust.dmm
+++ b/maps/tether/engines/rust.dmm
@@ -183,7 +183,7 @@
/area/engineering/engine_room)
"aE" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/turf/simulated/floor,
/area/engineering/engine_room)
"aF" = (
diff --git a/maps/tether/engines/singulo.dmm b/maps/tether/engines/singulo.dmm
index afca606c7fa8..e9b0d1f38e9b 100644
--- a/maps/tether/engines/singulo.dmm
+++ b/maps/tether/engines/singulo.dmm
@@ -660,7 +660,7 @@
/obj/structure/cable/cyan{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/turf/simulated/floor/tiled,
/area/submap/pa_room)
"bk" = (
@@ -1052,7 +1052,7 @@
/turf/simulated/floor,
/area/submap/pa_room)
"ca" = (
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/turf/simulated/floor/tiled,
/area/submap/pa_room)
"cb" = (
diff --git a/maps/tether/engines/tesla.dmm b/maps/tether/engines/tesla.dmm
index d420f3acc41a..0a1e59e1cd10 100644
--- a/maps/tether/engines/tesla.dmm
+++ b/maps/tether/engines/tesla.dmm
@@ -621,7 +621,7 @@
/obj/structure/cable/cyan{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/turf/simulated/floor/tiled,
/area/submap/pa_room)
"bk" = (
@@ -1413,7 +1413,7 @@
/turf/simulated/floor/tiled,
/area/submap/pa_room)
"cH" = (
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
diff --git a/maps/tether/levels/midpoint.dmm b/maps/tether/levels/midpoint.dmm
index ca370b813518..9f4b0031a14a 100644
--- a/maps/tether/levels/midpoint.dmm
+++ b/maps/tether/levels/midpoint.dmm
@@ -152,7 +152,7 @@
/area/tether/midpoint)
"qD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/structure/cable{
@@ -200,7 +200,7 @@
/area/maintenance/tether_midpoint)
"tl" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/obj/structure/cable{
@@ -240,7 +240,7 @@
/area/tether/midpoint)
"vC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/structure/cable{
icon_state = "1-2"
},
diff --git a/maps/tether/levels/mining.dmm b/maps/tether/levels/mining.dmm
index 49dbdb6784d9..f98019a02d0e 100644
--- a/maps/tether/levels/mining.dmm
+++ b/maps/tether/levels/mining.dmm
@@ -1145,7 +1145,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/outpost/mining_main/break_room)
"cB" = (
-/obj/machinery/door/airlock/glass_mining,
+/obj/machinery/door/airlock/glass/mining,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -1455,7 +1455,7 @@
/turf/simulated/floor/tiled,
/area/outpost/mining_main/secondary_gear_storage)
"db" = (
-/obj/machinery/door/airlock/glass_mining,
+/obj/machinery/door/airlock/glass/mining,
/obj/structure/cable/green{
icon_state = "1-2"
},
diff --git a/maps/tether/levels/misc.dmm b/maps/tether/levels/misc.dmm
index f36e02e6de1f..8929af68d457 100644
--- a/maps/tether/levels/misc.dmm
+++ b/maps/tether/levels/misc.dmm
@@ -108,6 +108,9 @@
/obj/effect/step_trigger/teleporter/random,
/turf/space,
/area/space)
+"ar" = (
+/turf/unsimulated/wall,
+/area/space)
"as" = (
/obj/structure/window/reinforced,
/turf/unsimulated/wall,
@@ -1045,9 +1048,6 @@
/obj/item/towel/random,
/turf/simulated/shuttle/floor/alien,
/area/unknown/dorm6)
-"dg" = (
-/turf/unsimulated/wall,
-/area/space)
"dh" = (
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
@@ -2289,6 +2289,13 @@
},
/turf/space/transit/west,
/area/space)
+"iR" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/machinery/door/blast/regular/open,
+/turf/simulated/floor/tiled/steel,
+/area/centcom/simulated/evac)
"iU" = (
/obj/structure/bed/chair/shuttle,
/obj/effect/floor_decal/borderfloor/corner{
@@ -4282,6 +4289,12 @@
/obj/item/chess/brook,
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_chess)
+"Mw" = (
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/turf/unsimulated/floor/steel,
+/area/centcom/simulated/terminal)
"MA" = (
/obj/machinery/door/airlock,
/turf/simulated/floor/lino,
@@ -5522,12 +5535,6 @@
"Vu" = (
/turf/unsimulated/wall,
/area/centcom/simulated/main_hall)
-"Vv" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/turf/unsimulated/floor/steel,
-/area/centcom/simulated/terminal)
"Vw" = (
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/steel,
@@ -5561,13 +5568,6 @@
/obj/effect/floor_decal/corner_steel_grid/diagonal,
/turf/simulated/floor/tiled/steel,
/area/centcom/simulated/evac)
-"VE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/obj/machinery/door/blast/regular/open,
-/turf/simulated/floor/tiled/steel,
-/area/centcom/simulated/evac)
"VF" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 8
@@ -11086,48 +11086,48 @@ NH
(32,1,1) = {"
Hy
Hy
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
Hy
ap
ap
@@ -11269,7 +11269,7 @@ Mb
in
sN
Mb
-dg
+ar
Av
ap
ap
@@ -11411,7 +11411,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -11553,7 +11553,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -11695,7 +11695,7 @@ cq
cq
yk
cq
-dg
+ar
Hy
ap
ap
@@ -11837,7 +11837,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -11979,7 +11979,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -12121,7 +12121,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -12263,7 +12263,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -12405,7 +12405,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -12547,7 +12547,7 @@ cq
cq
yk
cq
-dg
+ar
Hy
ap
ap
@@ -12689,7 +12689,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -12831,7 +12831,7 @@ FT
FT
uG
FT
-dg
+ar
Hy
ap
ap
@@ -12973,7 +12973,7 @@ PU
is
FX
PU
-dg
+ar
Fp
ap
ap
@@ -13074,48 +13074,48 @@ NH
(46,1,1) = {"
Hy
Hy
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
-dg
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
Hy
ap
ap
@@ -13924,7 +13924,7 @@ ap
ap
"}
(52,1,1) = {"
-dg
+ar
aI
aI
aI
@@ -13935,7 +13935,7 @@ aI
aI
aI
aI
-dg
+ar
aI
aI
aI
@@ -13946,7 +13946,7 @@ aI
aI
aI
aI
-dg
+ar
ap
ap
ap
@@ -15486,7 +15486,7 @@ El
iO
"}
(63,1,1) = {"
-dg
+ar
aL
aL
aL
@@ -15497,7 +15497,7 @@ aL
aL
aL
aL
-dg
+ar
aL
aL
aL
@@ -15508,7 +15508,7 @@ aL
aL
aL
aL
-dg
+ar
ap
ap
ap
@@ -17048,7 +17048,7 @@ El
iO
"}
(74,1,1) = {"
-dg
+ar
aL
aL
aL
@@ -17059,7 +17059,7 @@ aL
aL
aL
aL
-dg
+ar
aL
aL
aL
@@ -17070,7 +17070,7 @@ aL
aL
aL
aL
-dg
+ar
ap
ap
ap
@@ -18610,7 +18610,7 @@ El
iO
"}
(85,1,1) = {"
-dg
+ar
aL
aL
aL
@@ -18621,7 +18621,7 @@ aL
aL
aL
aL
-dg
+ar
aL
aL
aL
@@ -18632,7 +18632,7 @@ aL
aL
aL
aL
-dg
+ar
ae
ae
ae
@@ -19640,9 +19640,9 @@ wl
wl
wl
wl
-VE
-VE
-VE
+iR
+iR
+iR
wl
sT
Rc
@@ -20083,9 +20083,9 @@ Nq
Nq
wd
dZ
-Vv
-Vv
-Vv
+Mw
+Mw
+Mw
dZ
VM
VQ
@@ -20172,7 +20172,7 @@ El
iO
"}
(96,1,1) = {"
-dg
+ar
aL
aL
aL
@@ -20183,7 +20183,7 @@ aL
aL
aL
aL
-dg
+ar
aL
aL
aL
@@ -20194,7 +20194,7 @@ aL
aL
aL
aL
-dg
+ar
Vu
YE
Ru
@@ -21734,7 +21734,7 @@ jf
Jz
"}
(107,1,1) = {"
-dg
+ar
aL
aL
aL
@@ -21745,7 +21745,7 @@ aL
aL
aL
aL
-dg
+ar
aL
aL
aL
@@ -21756,7 +21756,7 @@ aL
aL
aL
aL
-dg
+ar
aq
uc
ue
@@ -23296,7 +23296,7 @@ jf
Jz
"}
(118,1,1) = {"
-dg
+ar
aL
aL
aL
@@ -23307,7 +23307,7 @@ aL
aL
aL
aL
-dg
+ar
aL
aL
aL
@@ -23318,7 +23318,7 @@ aL
aL
aL
aL
-dg
+ar
aq
aq
aq
@@ -23464,15 +23464,15 @@ fZ
aI
aI
aI
-dg
+ar
aI
aI
aI
-dg
+ar
aI
aI
aI
-dg
+ar
ap
ap
ae
@@ -24458,15 +24458,15 @@ fZ
aL
aL
aL
-dg
+ar
aL
aL
aL
-dg
+ar
aL
aL
aL
-dg
+ar
ap
ap
ae
@@ -24858,7 +24858,7 @@ jf
Jz
"}
(129,1,1) = {"
-dg
+ar
aL
aL
aL
@@ -24869,7 +24869,7 @@ aL
aL
aL
aL
-dg
+ar
aL
aL
aL
@@ -25452,15 +25452,15 @@ fZ
aL
aL
aL
-dg
+ar
aL
aL
aL
-dg
+ar
aL
aL
aL
-dg
+ar
ap
ap
ae
@@ -26420,7 +26420,7 @@ jf
Jz
"}
(140,1,1) = {"
-dg
+ar
bb
bb
bb
@@ -26431,7 +26431,7 @@ bb
bb
bb
bb
-dg
+ar
bb
bb
bb
@@ -26442,19 +26442,19 @@ bb
bb
bb
bb
-dg
+ar
bb
bb
bb
-dg
+ar
bb
bb
bb
-dg
+ar
bb
bb
bb
-dg
+ar
ap
ap
ae
diff --git a/maps/tether/levels/solars.dmm b/maps/tether/levels/solars.dmm
index f7e141b19390..2a81c63f2d68 100644
--- a/maps/tether/levels/solars.dmm
+++ b/maps/tether/levels/solars.dmm
@@ -1645,7 +1645,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -1660,7 +1660,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light_switch{
dir = 4;
pixel_x = -28
@@ -2276,7 +2276,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2;
req_one_access = list(18,47)
},
@@ -2534,7 +2534,7 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost)
"fw" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8;
req_one_access = list(18,47)
},
@@ -2777,7 +2777,7 @@
/obj/machinery/camera/network/research_outpost{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1;
req_one_access = list(18,47)
},
@@ -3050,7 +3050,7 @@
/obj/machinery/camera/network/research_outpost{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/rnd/outpost)
"gm" = (
@@ -3210,7 +3210,7 @@
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1;
req_one_access = list(18,47)
},
@@ -3245,7 +3245,7 @@
dir = 8;
pixel_x = -24
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1;
req_one_access = list(18,47)
},
@@ -5531,7 +5531,7 @@
/obj/effect/floor_decal/corner/purple/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -5574,7 +5574,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
req_one_access = list(18,47)
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -5635,8 +5635,8 @@
/obj/effect/floor_decal/corner/purple/bordercorner{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
- req_one_access = list(18,47)
+/obj/machinery/door/firedoor{
+ req_one_access = list(18, 47)
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
@@ -6298,7 +6298,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2;
req_one_access = list(18,47)
},
@@ -6402,7 +6402,7 @@
/turf/simulated/floor/tiled/monotile,
/area/rnd/outpost/anomaly_lab)
"ms" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1;
req_one_access = list(18,47)
},
@@ -6514,8 +6514,8 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- req_one_access = list(18,47)
+/obj/machinery/door/firedoor/glass{
+ req_one_access = list(18, 47)
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
@@ -6689,8 +6689,8 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
- req_one_access = list(18,47)
+/obj/machinery/door/firedoor/glass{
+ req_one_access = list(18, 47)
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
@@ -6920,7 +6920,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1;
req_one_access = list(18,47)
},
@@ -7127,7 +7127,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1;
req_one_access = list(18,47)
},
diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm
index 0b8ff6be7369..0f5e1c0d693b 100644
--- a/maps/tether/levels/station1.dmm
+++ b/maps/tether/levels/station1.dmm
@@ -2053,7 +2053,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engine Monitoring Room";
req_access = list(11)
},
@@ -2185,7 +2185,7 @@
},
/area/tether/elevator)
"aeP" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -2238,7 +2238,7 @@
/turf/simulated/floor/tiled/dark,
/area/bridge/secondary)
"aeU" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"aeV" = (
@@ -2643,7 +2643,7 @@
/turf/simulated/floor/holofloor/tiled/dark,
/area/tether/elevator)
"afz" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -3544,7 +3544,7 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/disposalpipe/segment{
@@ -3916,7 +3916,7 @@
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"ahG" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/disposalpipe/segment{
@@ -4169,7 +4169,7 @@
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -5007,7 +5007,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -5215,7 +5215,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -5373,7 +5373,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -5578,7 +5578,7 @@
/obj/effect/floor_decal/corner/yellow/bordercorner2{
dir = 9
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -6163,7 +6163,7 @@
dir = 1;
pixel_y = 32
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -7054,7 +7054,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Backup Atmospherics";
req_access = list(24)
},
@@ -7242,7 +7242,7 @@
/obj/effect/floor_decal/corner/yellow/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -7696,7 +7696,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -8018,7 +8018,7 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"arg" = (
@@ -8180,7 +8180,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Workshop";
req_access = list();
req_one_access = list(14,24)
@@ -8226,7 +8226,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Workshop";
req_access = list();
req_one_access = list(14,24)
@@ -8351,7 +8351,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Break Room";
req_access = list(10)
},
@@ -8564,7 +8564,7 @@
/turf/simulated/floor,
/area/constructionsite)
"asF" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/borderfloor{
dir = 8
},
@@ -9257,7 +9257,7 @@
"aug" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -9875,7 +9875,7 @@
/turf/simulated/floor/tiled/monotile,
/area/engineering/workshop)
"avn" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/disposalpipe/segment,
@@ -9997,7 +9997,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Break Room";
req_access = list(10)
},
@@ -10583,7 +10583,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10767,7 +10767,7 @@
dir = 1
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Workshop";
req_access = list();
req_one_access = list(14,24)
@@ -11239,7 +11239,7 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/borderfloor/corner2{
@@ -11691,7 +11691,7 @@
/area/maintenance/station/spacecommandmaint)
"aBy" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Workshop";
req_access = list();
req_one_access = list(14,24)
@@ -11820,7 +11820,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Secondary Control Room"
},
/obj/structure/cable/green{
@@ -12031,7 +12031,7 @@
/turf/simulated/floor/tiled,
/area/hallway/station/atrium)
"aCu" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -12087,7 +12087,7 @@
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"aCA" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/camera/network/tether{
@@ -12134,7 +12134,7 @@
"aCH" = (
/obj/machinery/door/airlock/glass,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/steel_grid,
@@ -12148,7 +12148,7 @@
/area/hallway/station/docks)
"aCM" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering EVA Storage";
req_one_access = list(11,24)
},
@@ -12157,11 +12157,11 @@
"aCN" = (
/obj/machinery/door/airlock/glass,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/station/docks)
"aCO" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/camera/network/tether{
dir = 4
},
@@ -12493,7 +12493,7 @@
/turf/simulated/floor/carpet/purcarpet,
/area/bridge/meeting_room)
"aDJ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden,
@@ -12674,7 +12674,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -13242,7 +13242,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering EVA Storage";
req_one_access = list(11,24)
},
@@ -13252,7 +13252,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Workshop";
req_access = list();
req_one_access = list(14,24)
@@ -13462,7 +13462,7 @@
"aJD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -14088,7 +14088,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Monitoring Room";
req_one_access = list(11,24)
},
@@ -14499,7 +14499,7 @@
/area/crew_quarters/heads/chief)
"aSz" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Monitoring Room";
req_one_access = list(11,24)
},
@@ -15110,6 +15110,20 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor,
/area/crew_quarters/sleep/cryo)
+"bbb" = (
+/obj/machinery/door/airlock/glass,
+/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"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/hallway/station/docks)
"bbs" = (
/obj/structure/bed/chair/office/dark{
dir = 4
@@ -16189,7 +16203,7 @@
name = "Engineering Lockdown";
opacity = 0
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Lobby";
req_one_access = list()
},
@@ -16424,7 +16438,7 @@
/turf/simulated/floor,
/area/tether/station/stairs_one)
"bQx" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -16737,7 +16751,7 @@
/area/tether/exploration/hallway)
"ceq" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway"
},
/obj/structure/cable{
@@ -16911,7 +16925,7 @@
/turf/simulated/floor,
/area/constructionsite)
"cuX" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18259,7 +18273,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
"fsk" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Holdings and Transit";
req_one_access = list(38,63)
},
@@ -18959,7 +18973,7 @@
/turf/simulated/floor/tiled/white,
/area/shuttle/medivac/general)
"hcl" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Screening Area";
req_one_access = list(38,63)
},
@@ -19119,7 +19133,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
},
@@ -19415,7 +19429,7 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/holoposter{
@@ -20755,7 +20769,7 @@
/turf/simulated/floor/plating,
/area/shuttle/securiship/general)
"mbQ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Customs";
req_one_access = list(38,63)
},
@@ -21537,7 +21551,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
"ohx" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Exploration Security Station";
req_one_access = list(38,63)
},
@@ -21665,7 +21679,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor/{
dir = 1
},
/turf/simulated/floor/tiled/steel_grid,
@@ -23217,7 +23231,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/disposalpipe/segment,
@@ -23481,7 +23495,7 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 10
},
@@ -23567,7 +23581,7 @@
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"tal" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24294,7 +24308,7 @@
name = "Engineering Lockdown";
opacity = 0
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Lobby";
req_one_access = list()
},
@@ -25411,7 +25425,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
"xDU" = (
@@ -34224,7 +34238,7 @@ tal
nll
lnN
gUX
-oxI
+bbb
wBw
fMv
oqY
diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm
index 3c8f4c9b3208..43c1966b3707 100644
--- a/maps/tether/levels/station2.dmm
+++ b/maps/tether/levels/station2.dmm
@@ -694,19 +694,6 @@
/obj/structure/catwalk,
/turf/simulated/floor,
/area/maintenance/station/eng_upper)
-"afp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"afq" = (
/turf/simulated/shuttle/wall/voidcraft/green{
hard_corner = 1
@@ -2229,31 +2216,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
-"alm" = (
-/obj/machinery/computer/guestpass{
- pixel_y = 32
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/starboard)
"aln" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
@@ -2458,12 +2420,6 @@
/obj/random/maintenance/clean,
/turf/simulated/floor/plating,
/area/maintenance/station/eng_upper)
-"alI" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/starboard)
"alJ" = (
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
@@ -2793,10 +2749,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/eng_upper)
-"amt" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/turf/simulated/floor/tiled,
-/area/hallway/station/starboard)
"amu" = (
/obj/item/radio/beacon,
/turf/simulated/floor/tiled,
@@ -3095,23 +3047,6 @@
"amX" = (
/turf/simulated/wall,
/area/quartermaster/belterdock)
-"amY" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 1
- },
-/obj/structure/sign/poster/nanotrasen{
- pixel_y = -32
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/starboard)
"amZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -3417,12 +3352,6 @@
},
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
-"anJ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/starboard)
"anL" = (
/obj/item/storage/toolbox/electrical{
pixel_x = 1;
@@ -3468,6 +3397,19 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
+"anR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"anT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -4011,39 +3953,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/tether/station/burial)
-"aps" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/glass_engineering{
- closed_layer = 8;
- layer = 2;
- name = "Engineering Mezzenine";
- open_layer = 2;
- req_one_access = list()
- },
-/obj/machinery/door/firedoor/glass{
- closed_layer = 7;
- layer = 1.5;
- open_layer = 1.5
- },
-/obj/machinery/door/blast/regular{
- closed_layer = 10;
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "englockdown";
- layer = 1;
- level = 1;
- name = "Engineering Lockdown";
- opacity = 0;
- open_layer = 1
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/foyer_mezzenine)
"apt" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -4170,33 +4079,6 @@
},
/turf/simulated/floor/plating,
/area/engineering/foyer_mezzenine)
-"apL" = (
-/obj/machinery/door/airlock/glass_engineering{
- closed_layer = 8;
- layer = 2;
- name = "Engineering Mezzenine";
- open_layer = 2;
- req_one_access = list()
- },
-/obj/machinery/door/firedoor/glass{
- closed_layer = 7;
- layer = 1.5;
- open_layer = 1.5
- },
-/obj/machinery/door/blast/regular{
- closed_layer = 10;
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "englockdown";
- layer = 1;
- level = 1;
- name = "Engineering Lockdown";
- opacity = 0;
- open_layer = 1
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/engineering/foyer_mezzenine)
"apN" = (
/obj/machinery/requests_console{
department = "Tech storage";
@@ -4325,13 +4207,6 @@
"aqc" = (
/turf/simulated/floor/tiled/dark,
/area/ai_monitored/storage/eva)
-"aqd" = (
-/obj/machinery/door/airlock/glass_medical{
- name = "Medical Hardsuits"
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/ai_monitored/storage/eva)
"aqe" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -4355,14 +4230,6 @@
},
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
-"aqi" = (
-/obj/machinery/door/airlock/glass_security{
- name = "Security Hardsuits";
- req_access = list(1)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/ai_monitored/storage/eva)
"aqj" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -4532,24 +4399,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/foyer_mezzenine)
-"aqy" = (
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"aqA" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloor,
@@ -4635,54 +4484,6 @@
/obj/item/nullrod,
/turf/simulated/floor/carpet/bcarpet,
/area/chapel/office)
-"aqN" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 6
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 5
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
-"aqO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
-"aqP" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 10
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 9
- },
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"aqQ" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -5257,14 +5058,6 @@
"aso" = (
/turf/simulated/floor/tiled/techfloor,
/area/quartermaster/belterdock)
-"asp" = (
-/obj/machinery/door/airlock/glass_engineering{
- name = "Engineering Hardsuits";
- req_one_access = list(11,24)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/ai_monitored/storage/eva)
"asq" = (
/obj/machinery/power/breakerbox/activated{
RCon_tag = "Cargo Substation Bypass"
@@ -5887,14 +5680,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/ai_monitored/storage/eva)
-"aue" = (
-/obj/machinery/door/airlock/glass_command{
- name = "E.V.A. Cycler Access";
- req_one_access = list(18)
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/ai_monitored/storage/eva)
"aug" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -5913,17 +5698,6 @@
},
/turf/simulated/floor/tiled,
/area/ai_monitored/storage/eva)
-"aui" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
- name = "E.V.A.";
- req_one_access = list()
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/ai_monitored/storage/eva)
"auj" = (
/obj/machinery/atmospherics/component/binary/passive_gate/on{
dir = 4
@@ -6271,24 +6045,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
-"avp" = (
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/turf/simulated/floor/tiled,
-/area/tether/station/stairs_two)
"avq" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -6418,10 +6174,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
-"avT" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/turf/simulated/floor/wood,
-/area/tether/station/burial)
"avU" = (
/obj/structure/bed/chair/wood,
/obj/landmark/spawnpoint/job/chaplain,
@@ -6594,20 +6346,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
-"axi" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"axj" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -6662,16 +6400,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
-"axs" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/turf/simulated/floor/tiled,
-/area/tether/station/stairs_two)
"axt" = (
/obj/structure/closet/secure_closet/pathfinder,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -6733,33 +6461,6 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
-"axE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/aux{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
- dir = 1;
- frequency = 1380;
- id_tag = "expshuttle_docker_pump_out_external"
- },
-/obj/map_helper/airlock/atmos/chamber_pump,
-/obj/machinery/light,
-/obj/effect/shuttle_landmark{
- base_area = /area/tether/exploration;
- base_turf = /turf/simulated/floor/reinforced;
- docking_controller = "expshuttle_dock";
- landmark_tag = "tether_excursion_hangar";
- name = "Excursion Shuttle Dock"
- },
-/obj/overmap/entity/visitable/ship/landable/excursion/tether,
-/turf/simulated/floor/tiled/techmaint,
-/area/shuttle/excursion/general)
"axK" = (
/obj/structure/closet/crate/bin{
desc = "A large bin for medical and other personnel that deals with bio-grade waste.";
@@ -7727,18 +7428,6 @@
/obj/structure/closet/emcloset,
/turf/simulated/shuttle/floor/yellow/airless,
/area/shuttle/belter)
-"aDO" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"aDP" = (
/obj/machinery/firealarm{
dir = 4;
@@ -8159,15 +7848,6 @@
/obj/random/maintenance/engineering,
/turf/simulated/floor,
/area/maintenance/station/eng_upper)
-"aFD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/machinery/camera/network/tether{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/tether/station/stairs_two)
"aFJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/window/reinforced{
@@ -8479,14 +8159,6 @@
/obj/structure/table/reinforced,
/turf/simulated/floor,
/area/maintenance/station/eng_upper)
-"aGX" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_mining{
- name = "Production Area";
- req_access = list(48)
- },
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock/refinery)
"aGY" = (
/obj/machinery/shipsensors{
dir = 1
@@ -8538,27 +8210,6 @@
/obj/structure/catwalk,
/turf/simulated/floor,
/area/maintenance/station/eng_upper)
-"aHi" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/tether/station/stairs_two)
"aHj" = (
/obj/structure/cable/cyan{
icon_state = "1-8"
@@ -8728,12 +8379,6 @@
"aHC" = (
/turf/simulated/wall,
/area/maintenance/station/cargo)
-"aHD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/tether/station/stairs_two)
"aHE" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
@@ -9611,15 +9256,6 @@
/obj/machinery/light,
/turf/simulated/open,
/area/tether/exploration)
-"aLb" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/machinery/camera/network/tether{
- dir = 8
- },
-/turf/simulated/floor/wood,
-/area/tether/station/burial)
"aLc" = (
/obj/structure/closet/wardrobe/chaplain_black,
/obj/item/storage/fancy/crayons,
@@ -10231,24 +9867,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar)
-"aNI" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 4
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 9
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 10
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"aNL" = (
/obj/machinery/button/windowtint{
dir = 1;
@@ -11369,19 +10987,6 @@
},
/turf/simulated/floor,
/area/maintenance/station/eng_upper)
-"aRH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_mining{
- name = "Mining Outpost Shuttle";
- req_access = list(48)
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar)
"aRI" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -11518,14 +11123,6 @@
},
/turf/simulated/floor/tiled,
/area/gateway/prep_room)
-"aSl" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/wood,
-/area/tether/station/burial)
"aSm" = (
/obj/effect/floor_decal/corner/lightgrey{
dir = 5
@@ -11546,19 +11143,6 @@
},
/turf/simulated/floor/wood,
/area/hallway/station/port)
-"aSo" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"aSp" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -11962,22 +11546,6 @@
},
/turf/simulated/floor,
/area/maintenance/station/eng_upper)
-"aTX" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 6
- },
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"aTY" = (
/obj/structure/railing{
dir = 1
@@ -12044,6 +11612,20 @@
/obj/random/junk,
/turf/simulated/mineral/floor/cave,
/area/maintenance/station/eng_upper)
+"aUh" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 8
+ },
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"aUk" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -13396,19 +12978,6 @@
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/quartermaster/storage)
-"aZd" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/obj/structure/cable{
- 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/wood,
-/area/tether/station/burial)
"aZf" = (
/obj/machinery/gateway{
dir = 5
@@ -13851,6 +13420,23 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
+"bDR" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 1
+ },
+/obj/structure/sign/poster/nanotrasen{
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/starboard)
"bEX" = (
/obj/structure/closet/crate,
/obj/machinery/alarm{
@@ -13929,6 +13515,18 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
+"bLE" = (
+/obj/machinery/light{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 8
+ },
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/tether/station/dock_one)
"bMv" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment,
@@ -14036,6 +13634,24 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/visitorhallway/lounge)
+"bWO" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 9
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 10
+ },
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"bZO" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -14249,34 +13865,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
-"cCE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/machinery/door/airlock/glass_mining{
- name = "Cargo Bay";
- req_access = list(31);
- req_one_access = list()
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/quartermaster/storage)
-"cDc" = (
-/obj/machinery/light{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/turf/simulated/floor/tiled,
-/area/tether/station/dock_one)
"cEi" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14330,6 +13918,20 @@
},
/turf/simulated/floor/tiled/dark,
/area/quartermaster/warehouse)
+"cIr" = (
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/glass/mining{
+ name = "Mining Operations";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/quartermaster/storage)
"cJY" = (
/obj/effect/floor_decal/rust/part_rusted1,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -14637,6 +14239,18 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
+"dsA" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/machinery/door/airlock/glass/security{
+ name = "Trading Security Station";
+ req_one_access = list(38,63)
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/security/customs)
"dvk" = (
/obj/structure/disposalpipe/trunk,
/obj/structure/disposaloutlet{
@@ -14652,6 +14266,33 @@
/obj/effect/floor_decal/borderfloor,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/gear)
+"dxp" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/aux{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{
+ dir = 1;
+ frequency = 1380;
+ id_tag = "expshuttle_docker_pump_out_external"
+ },
+/obj/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/light,
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether/exploration;
+ base_turf = /turf/simulated/floor/reinforced;
+ docking_controller = "expshuttle_dock";
+ landmark_tag = "tether_excursion_hangar";
+ name = "Excursion Shuttle Dock"
+ },
+/obj/overmap/entity/visitable/ship/landable/excursion/tether,
+/turf/simulated/floor/tiled/techmaint,
+/area/shuttle/excursion/general)
"dxL" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14690,6 +14331,18 @@
},
/turf/simulated/shuttle/floor,
/area/shuttle/large_escape_pod1)
+"dzr" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/command{
+ id_tag = "evadoors";
+ name = "E.V.A.";
+ req_one_access = list(18,19,43,67)
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/ai_monitored/storage/eva)
"dzD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14712,6 +14365,28 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
+"dBp" = (
+/obj/machinery/door/airlock/glass/security{
+ name = "Security Hardsuits";
+ req_access = list(1)
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/ai_monitored/storage/eva)
+"dBM" = (
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/monotile,
+/area/quartermaster/foyer)
+"dCe" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled,
+/area/tether/station/stairs_two)
"dDn" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -14732,18 +14407,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
-"dDr" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/door/airlock/glass_security{
- name = "Trading Security Station";
- req_one_access = list(38,63)
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled,
-/area/security/customs)
"dEr" = (
/obj/structure/table/woodentable,
/obj/item/storage/box/glasses/meta,
@@ -14944,10 +14607,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/excursion/cargo)
-"dRV" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/foyer)
"dSb" = (
/turf/simulated/floor/tiled,
/area/tether/station/visitorhallway/lounge)
@@ -14999,6 +14658,13 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
+"dXT" = (
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/station/dock_one)
"dYn" = (
/obj/machinery/conveyor{
dir = 4;
@@ -15258,18 +14924,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/cargo)
-"emv" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/airlock/glass_mining{
- name = "Cargo Bay";
- req_access = list(31);
- req_one_access = list()
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
-/area/quartermaster/office)
"emT" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -15513,6 +15167,20 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
+"eIB" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"eJv" = (
/obj/structure/grille,
/obj/machinery/door/firedoor/glass,
@@ -15580,6 +15248,39 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/office)
+"eSQ" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/glass/engineering{
+ closed_layer = 8;
+ layer = 2;
+ name = "Engineering Mezzenine";
+ open_layer = 2;
+ req_one_access = list()
+ },
+/obj/machinery/door/firedoor/glass{
+ closed_layer = 7;
+ layer = 1.5;
+ open_layer = 1.5
+ },
+/obj/machinery/door/blast/regular{
+ closed_layer = 10;
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "englockdown";
+ layer = 1;
+ level = 1;
+ name = "Engineering Lockdown";
+ opacity = 0;
+ open_layer = 1
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/engineering/foyer_mezzenine)
"eTb" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -15693,6 +15394,19 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
+"fjz" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"fjH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -15733,6 +15447,12 @@
/obj/machinery/door/firedoor/border_only,
/turf/simulated/floor/tiled,
/area/tether/station/visitorhallway/office)
+"fmo" = (
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/starboard)
"fmV" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -15941,6 +15661,14 @@
},
/turf/simulated/floor,
/area/maintenance/station/cargo)
+"fIP" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Production Area";
+ req_access = list(48)
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/belterdock/refinery)
"fKh" = (
/obj/structure/bed/chair/shuttle{
dir = 1
@@ -16038,18 +15766,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
-"fNW" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
- id_tag = "evadoors";
- name = "E.V.A.";
- req_one_access = list(18,19,43,67)
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/ai_monitored/storage/eva)
"fPo" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -16456,15 +16172,41 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/foyer)
-"gsU" = (
-/obj/machinery/door/airlock/glass_mining{
- name = "Cargo Bay";
- req_access = list(31);
- req_one_access = list()
+"grN" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/brown/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 6
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 5
+ },
+/obj/machinery/light{
+ dir = 8
+ },
+/obj/machinery/door/firedoor{
+ dir = 2
},
-/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
-/area/quartermaster/storage)
+/area/quartermaster/foyer)
+"guG" = (
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 5
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals4{
+ dir = 8
+ },
+/obj/machinery/door/airlock/glass/security{
+ name = "Trading Security Station";
+ req_one_access = list(38,63)
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/simulated/floor/tiled,
+/area/security/customs)
"gvC" = (
/obj/structure/disposalpipe/trunk{
dir = 4
@@ -16497,6 +16239,13 @@
/obj/machinery/door/firedoor/border_only,
/turf/simulated/floor/tiled,
/area/tether/station/visitorhallway/lounge)
+"gwr" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled/monotile,
+/area/quartermaster/foyer)
"gwX" = (
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
@@ -16771,17 +16520,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
-"hce" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_mining{
- name = "Mining Operations";
- req_access = list(31);
- req_one_access = list()
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock/gear)
"hcg" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate/engineering,
@@ -17013,6 +16751,12 @@
/obj/machinery/light,
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
+"hrv" = (
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/foyer)
"htC" = (
/obj/machinery/door/airlock{
name = "Backroom"
@@ -17212,17 +16956,30 @@
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/quartermaster/belterdock/gear)
+"hSb" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/foyer)
+"hSk" = (
+/obj/machinery/door/airlock/glass/mining{
+ name = "Cargo Bay";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/quartermaster/storage)
"hSD" = (
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/cargo)
-"hTe" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_mining{
- name = "Mining Outpost Shuttle";
- req_access = list(48)
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar)
"hTA" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17418,6 +17175,18 @@
},
/turf/simulated/mineral/floor/vacuum,
/area/mine/explored/upper_level)
+"ifq" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Cargo Bay";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled,
+/area/quartermaster/office)
"igL" = (
/obj/effect/floor_decal/industrial/warning{
dir = 9
@@ -17464,6 +17233,22 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
+"imB" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 5
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 6
+ },
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"imJ" = (
/obj/structure/closet/firecloset/full/double,
/turf/simulated/floor/tiled/techfloor,
@@ -17484,6 +17269,22 @@
},
/turf/simulated/floor/tiled/dark,
/area/ai_monitored/storage/eva)
+"iqe" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7,
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"iqi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -17625,6 +17426,10 @@
/obj/random/contraband,
/turf/simulated/floor/tiled/dark,
/area/tether/station/visitorhallway/lounge)
+"iCq" = (
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/tiled,
+/area/hallway/station/starboard)
"iCE" = (
/obj/structure/table/steel,
/obj/item/storage/belt/utility,
@@ -17762,14 +17567,6 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
-"iOk" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_mining{
- name = "Belter Control Room";
- req_one_access = list(48,66)
- },
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock)
"iOs" = (
/obj/effect/floor_decal/industrial/outline,
/obj/machinery/portable_atmospherics/canister/air,
@@ -17813,6 +17610,13 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/visitorhallway/lounge)
+"iRA" = (
+/obj/machinery/door/airlock/glass/medical{
+ name = "Medical Hardsuits"
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/ai_monitored/storage/eva)
"iSs" = (
/obj/structure/disposalpipe/segment,
/obj/item/stool/padded,
@@ -17860,6 +17664,24 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/eng_upper)
+"jbo" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"jbx" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -17876,27 +17698,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
-"jcp" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_mining{
- name = "Mining Operations";
- req_access = list(31);
- req_one_access = list()
- },
-/turf/simulated/floor/tiled,
-/area/quartermaster/belterdock/gear)
-"jcK" = (
-/obj/machinery/door/airlock/glass_mining{
- id_tag = "cargodoor";
- name = "Cargo Office";
- req_access = list(31);
- req_one_access = list()
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/quartermaster/storage)
"jdx" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18070,15 +17871,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/exploration)
-"jsW" = (
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
- id_tag = "evadoors";
- name = "E.V.A.";
- req_one_access = list(18,19,43,67)
- },
-/turf/simulated/floor/tiled/steel_grid,
-/area/ai_monitored/storage/eva)
"jtP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -18735,6 +18527,14 @@
"ktB" = (
/turf/space,
/area/mine/explored/upper_level)
+"kvE" = (
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/wood,
+/area/tether/station/burial)
"kvM" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
@@ -18890,6 +18690,14 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/exploration)
+"kNd" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Mining Outpost Shuttle";
+ req_access = list(48)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar)
"kNq" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -19020,6 +18828,12 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/eng_upper)
+"laH" = (
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/tether/station/stairs_two)
"lbR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -19029,6 +18843,14 @@
/obj/machinery/door/firedoor/multi_tile,
/turf/simulated/floor/wood,
/area/tether/station/burial)
+"lcA" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Belter Control Room";
+ req_one_access = list(48,66)
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/belterdock)
"lfm" = (
/obj/machinery/door/airlock/glass_external,
/obj/map_helper/airlock/door/int_door,
@@ -19193,13 +19015,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/visitorhallway/lounge)
-"lJH" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden,
-/turf/simulated/floor/tiled/monotile,
-/area/tether/station/dock_one)
"lKH" = (
/obj/machinery/conveyor{
dir = 4;
@@ -19227,6 +19042,18 @@
/obj/structure/table/woodentable,
/turf/simulated/floor/wood,
/area/tether/station/visitorhallway/lounge)
+"lLX" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Cargo Bay";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/quartermaster/storage)
"lMb" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/vehicle_old/train/trolley{
@@ -19365,6 +19192,14 @@
/obj/structure/table/standard,
/turf/simulated/floor/tiled,
/area/quartermaster/office)
+"lZv" = (
+/obj/machinery/door/airlock/glass/command{
+ name = "E.V.A. Cycler Access";
+ req_one_access = list(18)
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/ai_monitored/storage/eva)
"maf" = (
/obj/structure/cable/green{
icon_state = "2-8"
@@ -19548,6 +19383,18 @@
},
/turf/simulated/floor,
/area/maintenance/station/cargo)
+"mqG" = (
+/obj/machinery/door/airlock/glass/mining{
+ name = "Cargo Bay";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/simulated/floor/tiled,
+/area/quartermaster/office)
"mwj" = (
/turf/simulated/floor/carpet/oracarpet,
/area/chapel/main)
@@ -19773,6 +19620,24 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock/refinery)
+"mPH" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/tether/station/stairs_two)
"mPN" = (
/obj/machinery/light/small{
dir = 4
@@ -19861,6 +19726,15 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/exploration)
+"mVK" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/command{
+ id_tag = "evadoors";
+ name = "E.V.A.";
+ req_one_access = list(18,19,43,67)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/ai_monitored/storage/eva)
"mVP" = (
/obj/structure/table/bench/steel,
/turf/simulated/floor/tiled/techmaint,
@@ -19928,6 +19802,16 @@
},
/turf/simulated/floor,
/area/maintenance/station/cargo)
+"ndg" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/foyer)
"neg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20053,17 +19937,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
-"npB" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/door/airlock/glass_command,
-/obj/machinery/door/firedoor/border_only,
-/turf/simulated/floor/tiled,
-/area/tether/station/visitorhallway/office)
"npO" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 8
@@ -20112,22 +19985,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
/area/quartermaster/qm)
-"nxa" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 1
- },
-/obj/effect/floor_decal/corner/lightgrey/border{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"nyS" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -20449,20 +20306,6 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/quartermaster/belterdock)
-"obn" = (
-/obj/effect/floor_decal/borderfloor,
-/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 1
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/port)
"obA" = (
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 4
@@ -20650,6 +20493,19 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/shuttle/excursion/general)
+"omF" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Mining Outpost Shuttle";
+ req_access = list(48)
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar)
"onT" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock{
@@ -20718,18 +20574,25 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
-"ovH" = (
-/obj/machinery/door/airlock/glass_mining{
- name = "Cargo Bay";
- req_access = list(31);
- req_one_access = list()
+"ouH" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
},
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 10
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 9
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/light{
+ dir = 4
},
-/obj/machinery/door/firedoor/border_only,
/turf/simulated/floor/tiled,
-/area/quartermaster/office)
+/area/hallway/station/port)
"owH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20841,6 +20704,15 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/tether/station/visitorhallway/lounge)
+"oJY" = (
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/machinery/camera/network/tether{
+ dir = 8
+ },
+/turf/simulated/floor/wood,
+/area/tether/station/burial)
"oKM" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on{
dir = 4
@@ -21218,16 +21090,6 @@
dir = 4
},
/area/tether/exploration)
-"phU" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/turf/simulated/floor/tiled,
-/area/quartermaster/foyer)
"pih" = (
/obj/structure/grille,
/obj/structure/window/reinforced/polarized/full{
@@ -21244,6 +21106,22 @@
},
/turf/simulated/floor/plating,
/area/quartermaster/belterdock)
+"pkJ" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/machinery/door/airlock/glass/mining{
+ name = "Cargo Bay";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/quartermaster/storage)
"pkL" = (
/obj/machinery/alarm{
dir = 8;
@@ -21579,13 +21457,6 @@
},
/turf/simulated/floor/tiled/monotile,
/area/quartermaster/foyer)
-"pPH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/turf/simulated/floor/tiled/monotile,
-/area/quartermaster/foyer)
"pPZ" = (
/obj/machinery/alarm{
dir = 8;
@@ -21694,18 +21565,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/quartermaster/warehouse)
-"qdp" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_mining{
- name = "Cargo Bay";
- req_access = list(31);
- req_one_access = list()
- },
-/obj/machinery/door/firedoor/glass,
-/turf/simulated/floor/tiled,
-/area/quartermaster/storage)
"qea" = (
/obj/machinery/portable_atmospherics/canister/air/airlock,
/obj/machinery/atmospherics/portables_connector{
@@ -22126,6 +21985,16 @@
/obj/structure/table/bench/standard,
/turf/simulated/floor/tiled/dark,
/area/tether/exploration/pilot_office)
+"qOa" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/camera/network/tether{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/tether/station/dock_one)
"qOb" = (
/obj/machinery/door/airlock/glass_external,
/obj/map_helper/airlock/door/int_door,
@@ -22142,6 +22011,18 @@
},
/turf/simulated/floor/tiled/dark,
/area/quartermaster/warehouse)
+"qOP" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"qRd" = (
/obj/item/deck/tarot,
/obj/structure/table/wooden_reinforced,
@@ -22353,27 +22234,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/chapel/main)
-"riS" = (
-/obj/effect/floor_decal/borderfloor{
- dir = 8
- },
-/obj/effect/floor_decal/corner/brown/border{
- dir = 8
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 6
- },
-/obj/effect/floor_decal/steeldecal/steel_decals7{
- dir = 5
- },
-/obj/machinery/light{
- dir = 8
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/turf/simulated/floor/tiled,
-/area/quartermaster/foyer)
"rmj" = (
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/turf/simulated/floor,
@@ -22413,6 +22273,18 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
+"rqN" = (
+/obj/machinery/door/airlock/glass/mining{
+ id_tag = "cargodoor";
+ name = "Cargo Office";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/quartermaster/storage)
"rrB" = (
/obj/structure/table/bench/wooden,
/turf/simulated/floor/tiled{
@@ -22823,6 +22695,10 @@
},
/turf/space,
/area/space)
+"sdt" = (
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/wood,
+/area/tether/station/burial)
"sdL" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/vehicle_old/train/trolley{
@@ -22976,6 +22852,15 @@
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
+"svk" = (
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/machinery/camera/network/tether{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/tether/station/stairs_two)
"swl" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -23223,24 +23108,6 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/station/visitorhallway/laundry)
-"tgb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled,
-/area/hallway/station/starboard)
"tgk" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -23383,16 +23250,17 @@
},
/turf/simulated/floor/tiled/monotile,
/area/tether/station/dock_one)
-"tqJ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
-/obj/machinery/camera/network/tether{
- dir = 4
- },
-/obj/effect/floor_decal/steeldecal/steel_decals5{
- dir = 4
+"tra" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Mining Operations";
+ req_access = list(31);
+ req_one_access = list()
},
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled,
-/area/tether/station/dock_one)
+/area/quartermaster/belterdock/gear)
"trG" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
@@ -23638,6 +23506,24 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
+"tKh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/starboard)
"tKw" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -23704,6 +23590,17 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/spacedorm1)
+"tSi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/door/airlock/glass/command,
+/obj/machinery/door/firedoor/border_only,
+/turf/simulated/floor/tiled,
+/area/tether/station/visitorhallway/office)
"tSZ" = (
/obj/machinery/light/small{
dir = 4
@@ -23997,6 +23894,27 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/office)
+"uuR" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 4
+ },
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/tether/station/stairs_two)
"uwA" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24085,6 +24003,17 @@
"uGv" = (
/turf/simulated/floor/tiled/dark,
/area/tether/station/visitorhallway/lounge)
+"uGL" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/command{
+ name = "E.V.A.";
+ req_one_access = list()
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/ai_monitored/storage/eva)
"uGU" = (
/obj/machinery/status_display/supply_display,
/turf/simulated/wall,
@@ -24292,6 +24221,12 @@
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/tether/exploration)
+"vcZ" = (
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/starboard)
"vdm" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -24384,6 +24319,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/maintenance/station/cargo)
+"vns" = (
+/obj/machinery/door/airlock/glass/engineering{
+ name = "Engineering Hardsuits";
+ req_one_access = list(11,24)
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/tiled,
+/area/ai_monitored/storage/eva)
"vnL" = (
/obj/structure/disposalpipe/segment,
/obj/structure/closet/emcloset,
@@ -24448,6 +24391,17 @@
/obj/item/radio/beacon,
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
+"vvZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/door/firedoor{
+ dir = 1
+ },
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"vxc" = (
/obj/effect/floor_decal/rust/mono_rusted1,
/turf/simulated/floor/tiled{
@@ -24550,6 +24504,15 @@
},
/turf/simulated/wall/rshull,
/area/shuttle/excursion/cargo)
+"vFD" = (
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass/mining{
+ name = "Mining Operations";
+ req_access = list(31);
+ req_one_access = list()
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/belterdock/gear)
"vFT" = (
/obj/machinery/camera/network/tether{
dir = 1
@@ -24733,18 +24696,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
/area/shuttle/excursion/general)
-"vTJ" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
- },
-/turf/simulated/floor/tiled,
-/area/quartermaster/foyer)
"vUq" = (
/obj/structure/flora/pottedplant/smallcactus,
/turf/simulated/floor/tiled,
@@ -24839,20 +24790,6 @@
},
/turf/simulated/floor,
/area/maintenance/station/cargo)
-"wiw" = (
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 5
- },
-/obj/effect/floor_decal/steeldecal/steel_decals4{
- dir = 8
- },
-/obj/machinery/door/airlock/glass_security{
- name = "Trading Security Station";
- req_one_access = list(38,63)
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/simulated/floor/tiled,
-/area/security/customs)
"wkK" = (
/obj/structure/disposalpipe/trunk{
dir = 8
@@ -25013,6 +24950,31 @@
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/tether/exploration/pathfinder_office)
+"wBk" = (
+/obj/machinery/computer/guestpass{
+ pixel_y = 32
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 1
+ },
+/obj/machinery/door/firedoor{
+ dir = 2
+ },
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/starboard)
"wBW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -25107,6 +25069,33 @@
},
/turf/simulated/floor/tiled/dark,
/area/quartermaster/warehouse)
+"wML" = (
+/obj/machinery/door/airlock/glass/engineering{
+ closed_layer = 8;
+ layer = 2;
+ name = "Engineering Mezzenine";
+ open_layer = 2;
+ req_one_access = list()
+ },
+/obj/machinery/door/firedoor/glass{
+ closed_layer = 7;
+ layer = 1.5;
+ open_layer = 1.5
+ },
+/obj/machinery/door/blast/regular{
+ closed_layer = 10;
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "englockdown";
+ layer = 1;
+ level = 1;
+ name = "Engineering Lockdown";
+ opacity = 0;
+ open_layer = 1
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/engineering/foyer_mezzenine)
"wMT" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/maintenance/common,
@@ -25341,6 +25330,24 @@
/obj/machinery/computer/supplycomp/control,
/turf/simulated/floor/wood,
/area/quartermaster/qm)
+"xaV" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/lightgrey/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 6
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+ dir = 5
+ },
+/obj/machinery/door/firedoor{
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
"xdu" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
dir = 1
@@ -25884,20 +25891,6 @@
},
/turf/simulated/floor/plating,
/area/maintenance/station/eng_upper)
-"yaL" = (
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/machinery/door/airlock/glass_mining{
- name = "Mining Operations";
- req_access = list(31);
- req_one_access = list()
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/quartermaster/storage)
"ybc" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
@@ -25913,12 +25906,19 @@
},
/turf/simulated/floor/tiled/dark,
/area/quartermaster/warehouse)
-"ycw" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
- dir = 2
+"ycB" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ icon_state = "4-8"
},
-/turf/simulated/floor/tiled,
-/area/quartermaster/foyer)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/wood,
+/area/tether/station/burial)
"ydj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -33020,8 +33020,8 @@ asw
asw
asw
auQ
-avp
-aFD
+mPH
+svk
asw
aac
aac
@@ -33463,7 +33463,7 @@ aQX
aQX
aQX
aQX
-aSl
+kvE
arg
aMl
aGP
@@ -33583,7 +33583,7 @@ apK
aqp
are
arS
-axs
+dCe
atf
atI
auo
@@ -33605,7 +33605,7 @@ aTI
aJE
pkL
nSo
-aLb
+oJY
aMA
aDS
aHA
@@ -33725,7 +33725,7 @@ apK
aUU
aWe
aSQ
-aHD
+laH
aIC
auP
aXl
@@ -33739,8 +33739,8 @@ aMe
pPZ
aOK
axO
-aZd
-avT
+ycB
+sdt
aJb
aJb
aJb
@@ -33863,11 +33863,11 @@ aGg
aSv
aoh
aox
-aps
+eSQ
aOf
aRO
aOL
-aHi
+uuR
aHn
aHm
aZo
@@ -34147,7 +34147,7 @@ anD
aoj
aoN
aqx
-apL
+wML
aIv
aOa
aTc
@@ -35145,7 +35145,7 @@ apO
aFk
aei
arS
-aTX
+imB
aIA
aIA
aIA
@@ -35287,7 +35287,7 @@ apP
aKs
aDh
aZq
-aDO
+qOP
aZq
aZq
aZq
@@ -35429,7 +35429,7 @@ aeJ
arW
aQt
auz
-aNI
+bWO
aNQ
aNQ
aNQ
@@ -35710,9 +35710,9 @@ afq
akj
akj
apO
-aqy
-afp
-axi
+jbo
+anR
+eIB
avy
aTr
aTr
@@ -35844,10 +35844,10 @@ akj
sEu
qqu
akZ
-alI
-amt
-amt
-anJ
+vcZ
+iCq
+iCq
+fmo
wWe
aXQ
apk
@@ -35856,7 +35856,7 @@ aFp
ark
agx
atr
-aqN
+xaV
atr
atr
atr
@@ -35998,7 +35998,7 @@ aFr
afH
aop
asK
-aqO
+vvZ
asK
asK
asK
@@ -36140,7 +36140,7 @@ aFB
apU
apt
app
-aqP
+ouH
app
app
app
@@ -36982,9 +36982,9 @@ aac
aac
aac
aDL
-alm
-tgb
-amY
+wBk
+tKh
+bDR
aDL
aMP
xnf
@@ -37280,9 +37280,9 @@ aac
aac
aac
aTr
-nxa
-aSo
-obn
+iqe
+fjz
+aUh
aTr
aTr
aTr
@@ -38137,13 +38137,13 @@ avQ
arP
aoY
apx
-aqd
+iRA
aoY
apx
-asp
+vns
aoY
apx
-aue
+lZv
auF
atD
aoY
@@ -38419,7 +38419,7 @@ aTr
auW
avQ
awP
-jsW
+mVK
apz
aqc
aqR
@@ -38703,7 +38703,7 @@ aTr
auW
aWX
aOH
-fNW
+dzr
neJ
aqg
aqT
@@ -38989,13 +38989,13 @@ krn
udH
aoY
apD
-aqi
+dBp
aoY
arL
asr
asT
atD
-aui
+uGL
auI
atD
aoY
@@ -39536,7 +39536,7 @@ fNi
axM
amE
bgk
-riS
+grN
tGi
tWy
iSP
@@ -39678,7 +39678,7 @@ xzR
lPe
sEX
jyq
-vTJ
+hSb
aXw
kZa
mGn
@@ -39820,7 +39820,7 @@ wYR
vKh
fro
uLY
-phU
+ndg
gPi
gif
kqY
@@ -39962,7 +39962,7 @@ wYR
iNE
aTU
aTU
-ycw
+hrv
alJ
txY
mEP
@@ -40106,7 +40106,7 @@ wXU
wXU
wXU
wXU
-npB
+tSi
wXU
wXU
wNc
@@ -40218,7 +40218,7 @@ aVJ
asd
mlc
aOs
-axE
+dxp
asd
asd
aDK
@@ -41228,7 +41228,7 @@ osM
sEy
nLt
rPb
-gsU
+hSk
vGY
viM
oSr
@@ -41356,7 +41356,7 @@ kHp
gob
man
xZz
-yaL
+cIr
fKw
qnC
neg
@@ -41370,13 +41370,13 @@ rAH
qIC
aVf
tTg
-cCE
+pkJ
fpe
qxm
gdP
cRY
mQK
-ovH
+mqG
jNd
aQC
iNE
@@ -41518,7 +41518,7 @@ nAM
fyD
fbD
jdx
-emv
+ifq
qan
aIm
doQ
@@ -41654,7 +41654,7 @@ vAp
oWk
gik
vhr
-qdp
+lLX
pTS
hTA
eSL
@@ -41796,7 +41796,7 @@ osM
lOw
aUV
wqf
-gsU
+hSk
vGY
viM
hvA
@@ -41928,7 +41928,7 @@ hQX
fGD
qlt
vLn
-jcK
+rqN
aYV
jxC
gMP
@@ -42203,7 +42203,7 @@ aCd
eve
lCM
nBX
-hce
+tra
hcR
wOC
vxc
@@ -42238,7 +42238,7 @@ lgC
liP
icB
rsm
-wiw
+guG
puL
obA
wpi
@@ -42345,12 +42345,12 @@ hyB
gMv
dUp
ayM
-jcp
+vFD
aIe
aLT
mjP
dvQ
-jcp
+vFD
aUV
pNu
kWk
@@ -42479,7 +42479,7 @@ aHY
aes
amX
amX
-iOk
+lcA
amX
kBy
ggc
@@ -42521,7 +42521,7 @@ svj
eJB
vrZ
uhE
-dDr
+dsA
swl
vMX
aaq
@@ -42800,9 +42800,9 @@ aJe
bAl
aHC
aHC
-dRV
-pPH
-dRV
+dBM
+gwr
+dBM
xfq
xfq
pRM
@@ -42848,7 +42848,7 @@ oKM
jlM
wmU
fbc
-tqJ
+qOa
wFP
xGc
wFP
@@ -42907,9 +42907,9 @@ amX
azu
azu
azu
-aGX
+fIP
tlN
-aGX
+fIP
azu
azu
aNj
@@ -42990,7 +42990,7 @@ wUG
pmJ
tTN
pmJ
-lJH
+dXT
pmJ
wtN
pmJ
@@ -43132,7 +43132,7 @@ mUg
coE
xGc
coE
-cDc
+bLE
coE
xGc
coE
@@ -43196,7 +43196,7 @@ qHR
hMm
aKh
aKh
-aRH
+omF
aNw
gXk
gCj
@@ -43338,7 +43338,7 @@ aEs
jML
oSS
dJH
-hTe
+kNd
jWv
fkd
aUt
diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm
index 2fb0df0a7dc4..6a868415de1c 100644
--- a/maps/tether/levels/surface1.dmm
+++ b/maps/tether/levels/surface1.dmm
@@ -868,7 +868,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 6
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled{
icon_state = "monotile"
},
@@ -1004,7 +1004,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/wood,
@@ -1310,7 +1310,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/disposalpipe/segment,
@@ -1656,7 +1656,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/paramed)
"adc" = (
@@ -1896,7 +1896,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/disposalpipe/segment{
@@ -2021,7 +2021,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -2191,7 +2191,7 @@
/area/tether/surfacebase/medical/mentalhealth)
"adU" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Mental Health";
req_one_access = list()
},
@@ -2265,7 +2265,7 @@
/area/tether/surfacebase/medical/lowerhall)
"adY" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
id_tag = "Psych";
name = "Mental Health"
},
@@ -2285,7 +2285,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lowerhall)
"adZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
},
@@ -2361,7 +2361,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lowerhall)
"aee" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/borderfloorwhite{
@@ -2976,7 +2976,7 @@
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
@@ -3457,7 +3457,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -3780,7 +3780,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoarch Storage";
req_access = list(65)
},
@@ -4219,7 +4219,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Chemical Research"
},
/turf/simulated/floor/tiled/white,
@@ -4346,7 +4346,7 @@
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"ahJ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloor{
@@ -5368,7 +5368,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/borderfloor,
@@ -7906,7 +7906,7 @@
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"anO" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -9955,7 +9955,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/first_aid_west)
"arH" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "First-Aid Station";
req_one_access = list()
},
@@ -11084,7 +11084,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lowerhall)
"atP" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloorwhite{
@@ -11942,7 +11942,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = null;
layer = 2.8;
name = "Security Checkpoint";
@@ -12789,7 +12789,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/xenoflora)
"awE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/borderfloorwhite,
@@ -13081,7 +13081,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -13118,7 +13118,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 5
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/dark,
@@ -13253,7 +13253,7 @@
/obj/machinery/station_map{
pixel_y = 32
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -13714,7 +13714,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/xenoflora)
"axT" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
"axU" = (
@@ -13973,7 +13973,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/virology)
"aym" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/loading{
@@ -14884,7 +14884,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/xenoflora)
"azL" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -15132,7 +15132,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 10
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -15867,7 +15867,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"aBx" = (
@@ -15920,7 +15920,7 @@
"aBA" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -17005,7 +17005,7 @@
/obj/effect/floor_decal/corner/brown/border{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
@@ -17015,7 +17015,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/lowernorthhall)
"aDG" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17033,7 +17033,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -17941,7 +17941,7 @@
/turf/simulated/floor/plating,
/area/vacant/vacant_site/east)
"aFt" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Warehouse"
},
/obj/machinery/door/firedoor/glass,
@@ -18898,7 +18898,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/cargostore)
"aGQ" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
id_tag = "cargodoor";
name = "Cargo Office";
req_access = list(31);
@@ -21835,7 +21835,7 @@
/area/engineering/atmos/gas_storage)
"aMj" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Canister Storage";
req_access = list(24)
},
@@ -22149,7 +22149,7 @@
/area/engineering/atmos/gas_storage)
"aMQ" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Canister Storage";
req_access = list(24)
},
@@ -30020,7 +30020,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/corner/lightgrey/border{
@@ -31420,7 +31420,7 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/weaponsrange)
"gnW" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "briginner";
name = "Brig";
req_access = list(2);
@@ -31810,7 +31810,7 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/brig)
"hDd" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Firing Range";
req_access = list(1)
},
@@ -32356,7 +32356,7 @@
"jkt" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/mauve/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
@@ -32439,7 +32439,7 @@
/turf/simulated/floor/carpet,
/area/crew_quarters/visitor_dining)
"jCD" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "briginner";
name = "Brig";
req_access = list(2);
@@ -33227,7 +33227,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
"lwL" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "brigouter";
name = "Brig";
req_access = list(2);
@@ -33653,7 +33653,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -34431,7 +34431,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/extinguisher_cabinet{
@@ -34634,7 +34634,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/disposalpipe/segment{
@@ -34768,7 +34768,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
"oVr" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -35110,7 +35110,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
"qnh" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = null;
layer = 2.8;
name = "Security Checkpoint";
@@ -35147,7 +35147,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
"qpp" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Construction Tram Airlock";
req_access = list()
},
@@ -36409,7 +36409,7 @@
/area/tether/surfacebase/security/gasstorage)
"ucv" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Solitary Confinement";
req_access = list(2)
},
@@ -37116,7 +37116,7 @@
},
/area/tether/surfacebase/old_tram)
"wpZ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "brigouter";
name = "Brig";
req_access = list(2);
@@ -37454,7 +37454,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/extinguisher_cabinet{
diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm
index 4ee071adf263..28bf2f04f8b7 100644
--- a/maps/tether/levels/surface2.dmm
+++ b/maps/tether/levels/surface2.dmm
@@ -343,7 +343,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"aaD" = (
@@ -367,13 +367,13 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"aaF" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -586,7 +586,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"aaV" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloorwhite{
@@ -900,7 +900,7 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -922,7 +922,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"abt" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloorwhite{
@@ -944,7 +944,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -1053,7 +1053,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppernorthstairwell)
"abD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -1079,7 +1079,7 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 5
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -1101,7 +1101,7 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -1324,7 +1324,7 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 5
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -1904,7 +1904,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_medical/polarized{
+/obj/machinery/door/airlock/glass/medical/polarized{
id_tag = "SurfMedicalResleeving";
name = "Resleeving Lab";
req_access = list(5)
@@ -2917,7 +2917,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/security/detective)
"aeN" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Forensics Lab";
req_access = list(4)
@@ -3212,7 +3212,7 @@
/obj/structure/cable/green{
icon_state = "2-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -3316,7 +3316,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 6
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -3796,7 +3796,7 @@
dir = 8;
pixel_x = -24
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -4009,7 +4009,7 @@
/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/examroom)
"agq" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/centralhall)
"agr" = (
@@ -4018,7 +4018,7 @@
"ags" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tag = "detdoor";
id_tint = "detoffice1";
name = "Forensics Lab";
@@ -4030,7 +4030,7 @@
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tag = "detdoor";
id_tint = "detoffice0";
name = "Forensics Lab";
@@ -4357,7 +4357,7 @@
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -4381,7 +4381,7 @@
dir = 4;
pixel_x = -28
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"aha" = (
@@ -4732,7 +4732,7 @@
/area/tether/surfacebase/security/armory)
"ahB" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled/techmaint,
@@ -4750,7 +4750,7 @@
/obj/structure/window/basic{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
@@ -4784,7 +4784,7 @@
name = "CMO Office";
sortType = "CMO Office"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -4803,7 +4803,7 @@
dir = 8;
icon_state = "pipe-c"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -5500,7 +5500,7 @@
/turf/simulated/wall,
/area/tether/surfacebase/medical/uppersouthstairwell)
"aiL" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -6248,7 +6248,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -6370,7 +6370,7 @@
/area/tether/surfacebase/security/middlehall)
"akg" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Equipment Storage"
},
/obj/structure/cable/green{
@@ -6387,7 +6387,7 @@
/area/tether/surfacebase/security/outfitting)
"aki" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Equipment Storage"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6448,7 +6448,7 @@
/area/tether/surfacebase/security/armory)
"akp" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -6475,7 +6475,7 @@
name = "Medical Breakroom";
sortType = "Medical Breakroom"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -6584,7 +6584,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"akE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -6953,7 +6953,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -7275,7 +7275,7 @@
/turf/simulated/wall,
/area/maintenance/substation/medsec)
"alE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -7532,7 +7532,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -7720,7 +7720,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"amn" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/structure/disposalpipe/segment{
@@ -8258,7 +8258,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tag = "detdoor";
id_tint = "detoffice1";
name = "Detective";
@@ -8274,7 +8274,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tag = "detdoor";
id_tint = "detoffice0";
name = "Detective";
@@ -8344,7 +8344,7 @@
/area/tether/surfacebase/security/evastorage)
"ans" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security EVA";
req_one_access = list(1,2,18)
},
@@ -8874,7 +8874,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/middlehall)
"aor" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/obj/effect/floor_decal/borderfloor{
@@ -9769,7 +9769,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/obj/structure/disposalpipe/segment{
@@ -14770,11 +14770,11 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"azg" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 1
},
/turf/simulated/floor/tiled/techmaint,
@@ -14786,7 +14786,7 @@
/obj/machinery/camera/network/tether{
dir = 9
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
@@ -15856,7 +15856,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloor{
@@ -15900,7 +15900,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable{
@@ -16184,7 +16184,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_two_hall)
"aCy" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/borderfloor,
@@ -16240,7 +16240,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable{
@@ -19535,7 +19535,7 @@
/obj/machinery/station_map{
pixel_y = 32
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/turf/simulated/floor/tiled/techmaint,
@@ -19561,13 +19561,13 @@
/obj/machinery/camera/network/tether{
dir = 5
},
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"aKt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/turf/simulated/floor/tiled/techmaint,
@@ -19582,7 +19582,7 @@
/obj/structure/window/basic{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
@@ -19624,11 +19624,11 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"aKA" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/turf/simulated/floor/tiled/techmaint,
@@ -19637,7 +19637,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
@@ -19843,7 +19843,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/rnd)
"aKZ" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"aLa" = (
@@ -21466,7 +21466,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Locker Room";
req_access = list(47)
},
@@ -21875,7 +21875,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Lounge";
req_access = list(47)
},
@@ -22012,7 +22012,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics";
req_access = list(24)
},
@@ -23002,7 +23002,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics";
req_access = list(24)
},
@@ -23037,7 +23037,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics";
req_access = list(24)
},
@@ -24105,7 +24105,7 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics EVA";
req_access = list(24)
},
@@ -24184,7 +24184,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Locker Room";
req_access = list(24)
},
@@ -24778,7 +24778,7 @@
"aVj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics EVA";
req_access = list(24)
},
@@ -24796,7 +24796,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics";
req_access = list(24)
},
@@ -24813,7 +24813,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics";
req_access = list(24)
},
@@ -25078,7 +25078,7 @@
/obj/effect/floor_decal/corner/yellow/bordercorner2{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -25184,7 +25184,7 @@
/obj/effect/floor_decal/corner/yellow/bordercorner2{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -25293,7 +25293,7 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -25401,7 +25401,7 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -25667,7 +25667,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -25746,7 +25746,7 @@
/obj/structure/closet/hydrant{
pixel_y = -32
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -25811,7 +25811,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -25879,7 +25879,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -26050,7 +26050,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_atmos{
+/obj/machinery/door/airlock/glass/atmos{
name = "Atmospherics Monitoring Room";
req_access = list(24)
},
@@ -29843,19 +29843,19 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"bhM" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"bhN" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_slimepens)
"bhO" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 8
},
/turf/simulated/floor/tiled/dark,
diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm
index d6da8a769d3d..ab6517371d60 100644
--- a/maps/tether/levels/surface3.dmm
+++ b/maps/tether/levels/surface3.dmm
@@ -372,7 +372,7 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/medsec_maintenance)
"aaG" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Break Room";
req_one_access = list(1,38)
},
@@ -475,7 +475,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"aaO" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -993,7 +993,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"abE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -2013,7 +2013,7 @@
/turf/simulated/floor/plating,
/area/tether/surfacebase/security/iaa/officecommon)
"adi" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "BrigFoyer";
layer = 2.8;
name = "Security";
@@ -2101,7 +2101,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/briefingroom)
"adn" = (
-/obj/machinery/door/airlock/glass_security,
+/obj/machinery/door/airlock/glass/security,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -2327,7 +2327,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -2339,7 +2339,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -2639,7 +2639,7 @@
dir = 8;
pixel_x = -24
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/uppersouthstairwell)
"aee" = (
@@ -2939,7 +2939,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security/polarized{
+/obj/machinery/door/airlock/glass/security/polarized{
id_tint = "sec_processing";
name = "Security Processing";
req_access = list(63)
@@ -3784,7 +3784,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/white,
@@ -4165,7 +4165,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -4821,7 +4821,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/iaa/officecommon)
"ahw" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "BrigFoyer";
layer = 2.8;
name = "Security";
@@ -6004,7 +6004,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/white,
@@ -6672,7 +6672,7 @@
dir = 1;
pixel_y = -25
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -7206,7 +7206,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -7983,7 +7983,7 @@
/obj/effect/floor_decal/corner/mauve/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -9707,7 +9707,7 @@
/area/crew_quarters/pool)
"aqw" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
frequency = 1392;
icon_state = "door_locked";
id_tag = "xenobiology_north_airlock_inner";
@@ -10023,7 +10023,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -10082,7 +10082,7 @@
dir = 9
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
frequency = 1392;
icon_state = "door_locked";
id_tag = "xenobiology_north_airlock_outer";
@@ -10224,7 +10224,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -10332,7 +10332,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -10642,7 +10642,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Robotics Lab";
req_access = list(29,47)
},
@@ -10663,7 +10663,7 @@
"asn" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/mauve/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -11660,7 +11660,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Circuitry Workshop";
req_access = list(7);
req_one_access = list(7)
@@ -11968,7 +11968,7 @@
/turf/simulated/floor/plating,
/area/rnd/research)
"auZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
"ava" = (
@@ -12482,7 +12482,7 @@
},
/area/tether/elevator)
"avZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -12838,7 +12838,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research and Development";
req_access = list(7)
},
@@ -13256,7 +13256,7 @@
/turf/simulated/floor/plating,
/area/rnd/xenobiology/xenoflora)
"axn" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Front Desk";
req_access = list(63);
req_one_access = list(63)
@@ -13840,7 +13840,7 @@
/area/rnd/research)
"ayo" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research and Development";
req_access = list(7)
},
@@ -13928,7 +13928,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/rnd/research/researchdivision)
"ayv" = (
@@ -14046,7 +14046,7 @@
/turf/simulated/floor/carpet,
/area/library)
"ayK" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -14118,7 +14118,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -14140,7 +14140,7 @@
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -14597,7 +14597,7 @@
/area/hallway/lower/third_south)
"azG" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Staircase"
},
/obj/structure/disposalpipe/segment{
@@ -14627,7 +14627,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -14862,7 +14862,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Lobby";
req_one_access = null
},
@@ -15447,7 +15447,7 @@
/area/rnd/research/researchdivision)
"aBj" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Staircase"
},
/obj/structure/disposalpipe/segment{
@@ -15577,7 +15577,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Staircase"
},
/obj/structure/disposalpipe/segment{
@@ -15684,7 +15684,7 @@
/obj/effect/floor_decal/corner/lime/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -15718,7 +15718,7 @@
"aBK" = (
/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/borderfloorblack,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
frequency = 1392;
icon_state = "door_locked";
id_tag = "xenobiology_north_airlock_inner";
@@ -16193,7 +16193,7 @@
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -16205,7 +16205,7 @@
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -16922,7 +16922,7 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"aEa" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Bridge";
req_access = list(19)
},
@@ -17640,7 +17640,7 @@
dir = 10
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
frequency = 1392;
icon_state = "door_locked";
id_tag = "xenobiology_north_airlock_outer";
@@ -18517,7 +18517,7 @@
/turf/simulated/wall,
/area/rnd/outpost/xenobiology/outpost_hallway)
"aGM" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/obj/effect/floor_decal/borderfloorblack{
@@ -19062,7 +19062,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Robotics Lab";
req_access = list(29,47)
},
@@ -19161,7 +19161,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -19222,7 +19222,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -19279,7 +19279,7 @@
/obj/effect/floor_decal/corner/beige/bordercorner2{
dir = 5
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -19576,7 +19576,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/corner/lightgrey/border{
@@ -20518,7 +20518,7 @@
/turf/simulated/floor/plating,
/area/rnd/outpost/xenobiology/outpost_first_aid)
"aKA" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Xenobiology First Aid";
req_one_access = list(5,47)
},
@@ -21940,7 +21940,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -22484,7 +22484,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -23357,7 +23357,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -23763,7 +23763,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -23785,13 +23785,13 @@
/turf/simulated/wall,
/area/rnd/outpost/xenobiology/outpost_autopsy)
"aRR" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"aRS" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -23825,7 +23825,7 @@
icon_state = "1-4"
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -23874,7 +23874,7 @@
/turf/simulated/wall,
/area/tether/surfacebase/medical/uppersouthstairwell)
"aSc" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -23884,7 +23884,7 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/xenobiology/outpost_main)
"aSd" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -24070,7 +24070,7 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/outpost/xenobiology/outpost_main)
"aSt" = (
-/obj/machinery/door/firedoor/glass/hidden,
+/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -24406,7 +24406,7 @@
/area/tether/surfacebase/medical/chemistry)
"aTe" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Weapons Testing Range";
req_access = list(47)
},
@@ -24566,7 +24566,7 @@
/area/bridge/bridge_hallway)
"aTu" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
dir = 1;
name = "Bridge";
req_access = list(19)
@@ -24996,7 +24996,7 @@
/area/hallway/lower/third_south)
"aUl" = (
/obj/effect/floor_decal/borderfloor,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -25007,7 +25007,7 @@
"aUm" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -25109,7 +25109,7 @@
/area/shuttle/tourbus/general)
"aUy" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Bridge";
req_access = list(19)
},
@@ -25386,7 +25386,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Chemistry";
req_one_access = list(33)
},
@@ -26491,7 +26491,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/briefingroom)
"aWZ" = (
-/obj/machinery/door/airlock/glass_security,
+/obj/machinery/door/airlock/glass/security,
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -26976,7 +26976,7 @@
/turf/simulated/floor/plating,
/area/rnd/research_storage)
"aXK" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -27075,7 +27075,7 @@
/obj/effect/floor_decal/corner/lime/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -27230,7 +27230,7 @@
/area/bridge)
"aYj" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Bridge";
req_access = list(19)
},
@@ -27320,7 +27320,7 @@
/area/crew_quarters/heads/hop)
"aYr" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Bridge";
req_access = list(19)
},
@@ -27666,7 +27666,7 @@
/turf/simulated/shuttle/plating/carry,
/area/shuttle/tether)
"aZh" = (
-/obj/machinery/door/airlock/glass_command{
+/obj/machinery/door/airlock/glass/command{
name = "Bridge";
req_access = list(19)
},
@@ -27920,7 +27920,7 @@
/obj/machinery/station_map{
pixel_y = 32
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/disposalpipe/segment{
@@ -28859,7 +28859,7 @@
/obj/machinery/door/window/westright{
req_one_access = list(35,28)
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/grass,
@@ -29137,7 +29137,7 @@
/obj/effect/floor_decal/corner/lime/border{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -29679,7 +29679,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/corner/beige/border{
dir = 8
},
@@ -30363,7 +30363,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/disposalpipe/segment{
@@ -30693,7 +30693,7 @@
/obj/structure/window/basic{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/grass,
@@ -31614,7 +31614,7 @@
/turf/simulated/floor/plating,
/area/tether/surfacebase/southhall)
"bhm" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/southhall)
"bhn" = (
@@ -31662,7 +31662,7 @@
/turf/simulated/floor/plating,
/area/tether/surfacebase/southhall)
"bhs" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/monotile,
@@ -31725,7 +31725,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/southhall)
"bhy" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -34279,7 +34279,7 @@
"box" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/white,
@@ -35169,7 +35169,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/chemistry)
"drR" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/obj/effect/floor_decal/borderfloorblack{
@@ -35233,7 +35233,7 @@
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hallway/lower/third_south)
"dyV" = (
@@ -35826,7 +35826,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/crew_quarters/recreation_area)
"fyZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -35869,7 +35869,7 @@
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/surface_three_hall)
"fGm" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Briefing Room";
req_access = list();
req_one_access = list(1,38)
@@ -36314,7 +36314,7 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"hgf" = (
-/obj/machinery/door/firedoor/glass/hidden{
+/obj/machinery/door/firedoor/glass{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -36824,7 +36824,7 @@
/obj/structure/window/basic{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/grass,
@@ -37038,7 +37038,7 @@
/area/crew_quarters/panic_shelter)
"jCE" = (
/obj/structure/disposalpipe/segment,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
@@ -37047,7 +37047,7 @@
/obj/structure/window/basic{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/grass,
@@ -37380,7 +37380,7 @@
"kmS" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/orange{
@@ -37676,7 +37676,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Weapons Testing Range";
req_access = list(47)
},
@@ -39043,7 +39043,7 @@
/obj/structure/cable/orange{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/monotile,
@@ -39165,7 +39165,7 @@
/obj/effect/floor_decal/borderfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/corner/red/border{
@@ -39445,7 +39445,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
"pSu" = (
@@ -39705,7 +39705,7 @@
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/upperhall)
"qDF" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/monotile,
@@ -40000,7 +40000,7 @@
/area/tether/surfacebase/security/iaa/officea)
"rDX" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Chemistry";
req_one_access = list(33)
},
@@ -40103,7 +40103,7 @@
dir = 1;
req_access = list(28,35)
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/grass,
@@ -40716,7 +40716,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -40742,7 +40742,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
diff --git a/maps/triumph/engines/burn.dmm b/maps/triumph/engines/burn.dmm
index 72cb50c5d860..d85344952ae5 100644
--- a/maps/triumph/engines/burn.dmm
+++ b/maps/triumph/engines/burn.dmm
@@ -606,7 +606,7 @@
/turf/simulated/floor/reinforced/oxygen,
/area/engineering/engine_room)
"yQ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning{
@@ -737,13 +737,13 @@
/turf/simulated/floor/reinforced/airless,
/area/engineering/engine_room)
"CF" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/techmaint,
/area/engineering/engine_room)
"Dc" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning{
@@ -791,7 +791,7 @@
/obj/machinery/camera/network/engine{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning/corner{
@@ -800,7 +800,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/engine_room)
"FI" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -892,7 +892,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
diff --git a/maps/triumph/engines/fission.dmm b/maps/triumph/engines/fission.dmm
index 5af03aa11845..e477013b7751 100644
--- a/maps/triumph/engines/fission.dmm
+++ b/maps/triumph/engines/fission.dmm
@@ -266,7 +266,7 @@
/obj/machinery/camera/network/engineering{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -708,7 +708,7 @@
/area/engineering/engine_room)
"II" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -1116,7 +1116,7 @@
/turf/simulated/floor/reinforced,
/area/engineering/engine_room)
"Tx" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -1332,7 +1332,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/techfloor/grid,
diff --git a/maps/triumph/engines/rust.dmm b/maps/triumph/engines/rust.dmm
index 87edade8fbc9..2b69a29a0b27 100644
--- a/maps/triumph/engines/rust.dmm
+++ b/maps/triumph/engines/rust.dmm
@@ -614,7 +614,7 @@
/obj/structure/cable/cyan{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning{
@@ -795,7 +795,7 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -984,7 +984,7 @@
/turf/simulated/floor/tiled/techfloor/grid,
/area/engineering/engine_room)
"JD" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning{
@@ -1174,7 +1174,7 @@
/obj/machinery/camera/network/engine{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning/corner{
@@ -1224,7 +1224,7 @@
/turf/simulated/floor/plating,
/area/engineering/engine_room)
"Sg" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1265,7 +1265,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/industrial/warning/corner{
diff --git a/maps/triumph/engines/sme.dmm b/maps/triumph/engines/sme.dmm
index 5656181ea94d..dcb2adc1a573 100644
--- a/maps/triumph/engines/sme.dmm
+++ b/maps/triumph/engines/sme.dmm
@@ -33,7 +33,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning{
@@ -157,7 +157,7 @@
/obj/machinery/camera/network/engine{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning/corner{
@@ -905,7 +905,7 @@
/obj/structure/cable/cyan{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning{
diff --git a/maps/triumph/levels/deck1.dmm b/maps/triumph/levels/deck1.dmm
index 11bd40bc8526..45ea8973eab3 100644
--- a/maps/triumph/levels/deck1.dmm
+++ b/maps/triumph/levels/deck1.dmm
@@ -466,7 +466,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"bM" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Telecomms Control Room"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -875,7 +875,7 @@
/obj/machinery/status_display{
pixel_y = 30
},
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/engineering/hallway)
@@ -1070,7 +1070,7 @@
/area/maintenance/engi_engine)
"dW" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -1194,7 +1194,7 @@
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -1600,7 +1600,7 @@
/area/maintenance/engi_engine)
"gc" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -1651,7 +1651,7 @@
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/turf/simulated/floor/tiled/techmaint,
@@ -1742,7 +1742,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Atmospherics"
},
/obj/structure/cable/green{
@@ -2799,7 +2799,7 @@
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Telecomms Control Room"
},
/turf/simulated/floor/tiled{
@@ -3251,7 +3251,7 @@
/obj/effect/floor_decal/techfloor/orange{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -3496,7 +3496,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"mX" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/catwalk,
/obj/effect/floor_decal/spline/fancy/wood,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -3521,7 +3521,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/turf/simulated/floor/tiled/techmaint,
@@ -3703,7 +3703,7 @@
/area/engineering/atmos)
"nG" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Atmospherics"
},
/obj/structure/cable/green{
@@ -3729,7 +3729,7 @@
/area/tcommsat/entrance)
"nL" = (
/obj/structure/railing,
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/computer/guestpass{
dir = 4;
pixel_x = -28
@@ -3776,7 +3776,7 @@
dir = 4
},
/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/machinery/door/firedoor,
/obj/structure/cable{
icon_state = "4-8"
@@ -4237,7 +4237,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 1
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Atmospherics"
},
/turf/simulated/floor/tiled,
@@ -4292,7 +4292,7 @@
/area/maintenance/engi_engine)
"pE" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/turf/simulated/floor/tiled/techmaint,
@@ -4598,7 +4598,7 @@
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/alarm{
@@ -4933,7 +4933,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/turf/simulated/floor/tiled/techmaint,
@@ -5914,7 +5914,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 1
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -5970,7 +5970,7 @@
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -7725,7 +7725,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/locker_room)
"Cy" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8266,7 +8266,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/techfloor/orange{
@@ -8410,7 +8410,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Break Room"
},
/obj/machinery/door/firedoor,
@@ -8475,7 +8475,7 @@
/area/engineering/atmos/storage)
"EZ" = (
/obj/structure/railing,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor/orange,
@@ -8526,7 +8526,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -8580,7 +8580,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/obj/machinery/door/firedoor,
@@ -8730,7 +8730,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/obj/structure/cable/green{
@@ -8827,7 +8827,6 @@
/area/engineering/storage)
"Gf" = (
/obj/structure/table/reinforced,
-/obj/item/closet_painter,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/multitool{
pixel_x = 5
@@ -8953,7 +8952,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/turf/simulated/floor/tiled/techmaint,
@@ -9876,7 +9875,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 8
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -9899,7 +9898,7 @@
/area/space)
"Ka" = (
/obj/effect/floor_decal/techfloor/orange,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -9950,7 +9949,7 @@
/obj/effect/floor_decal/techfloor/orange{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"Ko" = (
@@ -10284,7 +10283,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -10399,7 +10398,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"LE" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -10849,7 +10848,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/techfloor/orange{
dir = 9
},
@@ -10903,7 +10902,7 @@
/turf/simulated/floor/tiled/white,
/area/engineering/foyer_mezzenine)
"NB" = (
-/obj/machinery/door/airlock/glass_engineering,
+/obj/machinery/door/airlock/glass/engineering,
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/engineering/hallway)
@@ -11363,7 +11362,7 @@
/area/engineering/storage)
"OR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Shield Room"
},
/turf/simulated/floor/tiled,
@@ -11589,7 +11588,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"PX" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -11669,7 +11668,7 @@
/obj/structure/sign/department/ass{
pixel_x = 29
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11858,7 +11857,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Hallway";
req_one_access = null
},
@@ -11903,7 +11902,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Break Room"
},
/turf/simulated/floor/tiled,
@@ -12327,7 +12326,7 @@
/turf/simulated/wall/r_wall,
/area/engineering/portnacelle)
"Sl" = (
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/obj/machinery/door/firedoor,
@@ -13290,7 +13289,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"VF" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13408,7 +13407,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Atmospherics"
},
/turf/simulated/floor/tiled/techmaint,
@@ -13713,7 +13712,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Engineering Equipment"
},
/turf/simulated/floor/tiled/techmaint,
@@ -13879,7 +13878,7 @@
dir = 4
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineering{
+/obj/machinery/door/airlock/glass/engineering{
name = "Shield Room"
},
/turf/simulated/floor/tiled,
@@ -13927,7 +13926,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/catwalk,
@@ -14463,7 +14462,7 @@
/area/storage/tech)
"ZW" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_engineeringatmos{
+/obj/machinery/door/airlock/glass/engineeringatmos{
name = "Damage Control Storage"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
diff --git a/maps/triumph/levels/deck2.dmm b/maps/triumph/levels/deck2.dmm
index 12dc79f2838f..cd45262ef016 100644
--- a/maps/triumph/levels/deck2.dmm
+++ b/maps/triumph/levels/deck2.dmm
@@ -288,7 +288,7 @@
/turf/simulated/floor/tiled/steel,
/area/shuttle/belter)
"aS" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1178,7 +1178,7 @@
/area/crew_quarters/lounge/kitchen_freezer)
"dT" = (
/obj/structure/railing,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -1207,7 +1207,7 @@
/turf/simulated/floor/carpet/bcarpet,
/area/crew_quarters/sleep/Dorm_10)
"dY" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/station/stairs_two)
"dZ" = (
@@ -2173,7 +2173,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -2270,7 +2270,7 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -2576,7 +2576,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Storage"
},
/turf/simulated/floor/tiled,
@@ -2904,7 +2904,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay"
},
/turf/simulated/floor/tiled,
@@ -2967,7 +2967,7 @@
/turf/simulated/floor/wood,
/area/vacant/vacant_shop)
"iS" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable/green{
@@ -4431,7 +4431,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/window{
@@ -4723,7 +4723,7 @@
req_access = list(25);
req_one_access = list(25)
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/dark,
@@ -5011,7 +5011,7 @@
/turf/simulated/floor/tiled/dark,
/area/janitor)
"oI" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/firealarm{
@@ -5770,7 +5770,7 @@
/turf/simulated/floor/crystal,
/area/station/stairs_two)
"rg" = (
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Magmatic Rift Leap Pad"
},
/turf/simulated/floor/tiled,
@@ -6285,7 +6285,7 @@
/turf/simulated/floor/carpet/sblucarpet,
/area/quartermaster/foyer)
"sF" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -6326,7 +6326,7 @@
/turf/simulated/floor/tiled/dark,
/area/vacant/vacant_shop)
"sK" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -6591,7 +6591,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Prep Room"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6602,7 +6602,7 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -7424,7 +7424,7 @@
/turf/simulated/floor/plating,
/area/maintenance/bar/lower)
"vS" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/structure/cable/green{
icon_state = "1-2"
},
@@ -7471,7 +7471,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Prep Room"
},
/turf/simulated/floor/tiled,
@@ -8030,7 +8030,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay"
},
/turf/simulated/floor/tiled,
@@ -8169,7 +8169,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Bay"
},
/turf/simulated/floor/tiled,
@@ -8460,7 +8460,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/coffee_shop)
"zg" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -8765,7 +8765,7 @@
/turf/simulated/floor/plating,
/area/triumph/surfacebase/mining_main/refinery)
"Ae" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/table/marble,
@@ -9442,7 +9442,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Prep Room"
},
/turf/simulated/floor/tiled,
@@ -9567,7 +9567,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -9618,7 +9618,7 @@
"CM" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Airlock Storage"
},
/turf/simulated/floor/tiled,
@@ -10309,7 +10309,7 @@
/area/quartermaster/foyer)
"EZ" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_mining,
+/obj/machinery/door/airlock/glass/mining,
/turf/simulated/floor/plating,
/area/triumph/surfacebase/mining_main/eva)
"Fa" = (
@@ -10412,7 +10412,7 @@
/turf/simulated/floor/wood,
/area/vacant/vacant_shop)
"Fk" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/blast/shutters{
@@ -10507,7 +10507,7 @@
/area/hallway/primary/starboard)
"FB" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Airlock Storage"
},
/obj/structure/cable/green{
@@ -10558,7 +10558,7 @@
"FG" = (
/obj/structure/table/marble,
/obj/item/storage/box/wings,
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters{
dir = 4;
id = "bar";
@@ -10767,7 +10767,7 @@
/area/hallway/primary/starboard)
"Gn" = (
/obj/structure/table/marble,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/blast/shutters{
@@ -10984,7 +10984,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -11682,7 +11682,7 @@
/turf/simulated/floor/tiled,
/area/quartermaster/warehouse)
"Je" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/techfloor{
@@ -11925,7 +11925,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
id_tag = "cargodoor";
name = "Cargo Office";
req_access = list(31);
@@ -11955,7 +11955,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -12339,7 +12339,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Stroage"
},
/turf/simulated/floor/tiled,
@@ -12537,7 +12537,7 @@
/area/quartermaster/office)
"Md" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Cargo Storage"
},
/turf/simulated/floor/tiled,
@@ -12852,7 +12852,7 @@
dir = 8;
pixel_x = 25
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/blast/shutters{
@@ -13065,7 +13065,7 @@
/turf/simulated/floor/carpet/sblucarpet,
/area/quartermaster/foyer)
"NQ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/blast/shutters{
@@ -13091,7 +13091,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -13195,7 +13195,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light{
dir = 1
},
@@ -13273,7 +13273,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/Dorm_11)
"Ow" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/blast/shutters{
@@ -13296,7 +13296,7 @@
/area/crew_quarters/fitness)
"Oz" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
name = "Mining Prep Room"
},
/turf/simulated/floor/tiled,
@@ -13560,7 +13560,7 @@
/turf/simulated/open,
/area/maintenance/bar/lower)
"Pr" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/cable{
@@ -14549,7 +14549,7 @@
req_access = list(25);
req_one_access = list(25)
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/dark,
@@ -15017,7 +15017,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/dark,
@@ -15137,7 +15137,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
"Ua" = (
@@ -15160,7 +15160,7 @@
layer = 3.3;
name = "Bar Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/bar)
"Uc" = (
@@ -15305,7 +15305,7 @@
/area/vacant/vacant_shop)
"UD" = (
/obj/effect/floor_decal/techfloor,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -15566,7 +15566,7 @@
/area/crew_quarters/barrestroom)
"Vt" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_mining{
+/obj/machinery/door/airlock/glass/mining{
id_tag = "cargodoor";
name = "Cargo Office";
req_access = list(31);
@@ -15627,7 +15627,7 @@
/turf/simulated/floor/wood,
/area/triumph/surfacebase/bar_backroom)
"VA" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -16060,7 +16060,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
@@ -16202,7 +16202,7 @@
layer = 3.3;
name = "Kitchen Service Shutters"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/monotile,
@@ -17069,7 +17069,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -17185,7 +17185,7 @@
/area/shuttle/belter)
"ZI" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_mining,
+/obj/machinery/door/airlock/glass/mining,
/obj/structure/catwalk,
/obj/structure/cable/green{
icon_state = "4-8"
diff --git a/maps/triumph/levels/deck3.dmm b/maps/triumph/levels/deck3.dmm
index bbf4f7ebd223..9a0133bed2ba 100644
--- a/maps/triumph/levels/deck3.dmm
+++ b/maps/triumph/levels/deck3.dmm
@@ -820,7 +820,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/medical/ward)
"aHo" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Weapons Testing Range";
req_access = list(47)
},
@@ -1329,7 +1329,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -1987,7 +1987,7 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "XenoArcheology"
},
/turf/simulated/floor/tiled,
@@ -2237,7 +2237,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/camera/network/research,
@@ -2297,7 +2297,7 @@
/area/rnd/xenobiology)
"bXB" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Paramedic Storage"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -2488,7 +2488,7 @@
/turf/simulated/floor/tiled,
/area/rnd/xenobiology)
"ciB" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/blast/regular{
@@ -3309,7 +3309,7 @@
/obj/item/radio/intercom{
pixel_y = -24
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -3727,7 +3727,7 @@
/turf/simulated/floor/tiled,
/area/medical/sleeper)
"djB" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -4050,7 +4050,7 @@
name = "Station Intercom (General)";
pixel_y = 21
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -4077,7 +4077,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Patient Psychiatric Ward B"
},
/obj/machinery/door/blast/regular{
@@ -4365,7 +4365,7 @@
/turf/simulated/floor/tiled,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"dPB" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Circuitry Workshop";
req_access = list(7);
req_one_access = list(7)
@@ -4653,7 +4653,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -5011,7 +5011,7 @@
/obj/machinery/atmospherics/portables_connector{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -5261,7 +5261,7 @@
dir = 4
},
/obj/machinery/meter,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -5288,7 +5288,7 @@
/turf/simulated/floor/tiled,
/area/rnd/research_foyer_auxiliary)
"eDt" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/door/blast/regular{
@@ -5607,14 +5607,14 @@
/turf/simulated/floor/plating,
/area/rnd/rdoffice)
"eOy" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
/area/triumph/station/stairs_three)
"eOY" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Lounge";
req_access = list(47)
},
@@ -5770,7 +5770,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/red{
dir = 6
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -6070,7 +6070,7 @@
/turf/simulated/floor/tiled,
/area/rnd/test_area)
"fno" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/alarm{
dir = 4;
pixel_x = -23
@@ -7027,7 +7027,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Chemistry";
req_access = list();
req_one_access = list(33)
@@ -7349,7 +7349,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -7385,7 +7385,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -8111,7 +8111,7 @@
/area/medical/virology)
"gWN" = (
/obj/machinery/atmospherics/component/unary/vent_scrubber/on,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor{
@@ -8649,7 +8649,7 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -8689,7 +8689,7 @@
/area/shuttle/emt/general)
"htI" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research Lounge";
req_access = list(47)
},
@@ -8775,7 +8775,7 @@
/area/rnd/research/testingrange)
"hvU" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Medbay Reception";
req_access = list(5)
},
@@ -9046,7 +9046,7 @@
/turf/simulated/floor/tiled/old_cargo/purple,
/area/assembly/robotics)
"hMA" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/holodeck_control)
"hMD" = (
@@ -9099,7 +9099,7 @@
/turf/simulated/floor/tiled,
/area/rnd/xenobiology/xenoflora/lab_atmos)
"hNf" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -9776,7 +9776,7 @@
/turf/simulated/floor/wood,
/area/hallway/primary/aft)
"isq" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/industrial/warning/dust{
@@ -10073,7 +10073,7 @@
/turf/simulated/floor/carpet/blue,
/area/crew_quarters/medbreak/surgery)
"iJE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/triumph/station/stairs_three)
"iKf" = (
@@ -10574,7 +10574,7 @@
/turf/simulated/floor/tiled/old_cargo/gray,
/area/assembly/robotics/surgery)
"jgE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/techfloor{
@@ -11031,7 +11031,7 @@
/turf/simulated/floor/plating,
/area/triumph/station/stairs_three)
"jDh" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/door/blast/regular{
@@ -11398,7 +11398,7 @@
/turf/simulated/floor/wood,
/area/hallway/primary/aft)
"jSv" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/techfloor{
dir = 10
},
@@ -11510,7 +11510,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Psychiatric Play-Area Access"
},
/turf/simulated/floor/tiled/white,
@@ -12466,7 +12466,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research)
"kKl" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/techfloor{
@@ -12772,7 +12772,7 @@
/area/rnd/hallway)
"kZS" = (
/obj/machinery/light,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -13157,7 +13157,7 @@
name = "Firing Range Door";
req_access = list(47)
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/rnd/research/testingrange)
"ltR" = (
@@ -13324,7 +13324,7 @@
/turf/simulated/floor/plating,
/area/maintenance/fore)
"lFY" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/cable/green{
@@ -14073,7 +14073,7 @@
/turf/simulated/floor/tiled,
/area/medical/sleeper)
"mjp" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Paramedic Storage"
},
/obj/structure/cable/green{
@@ -14220,7 +14220,7 @@
name = "Toxins Input Connector"
},
/obj/effect/floor_decal/industrial/outline/blue,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -14341,7 +14341,7 @@
dir = 4
},
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Patient Psychiatric Ward A"
},
/obj/machinery/door/blast/regular{
@@ -14732,7 +14732,7 @@
/area/medical/patient_d)
"mJq" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
id_tag = "psychewaiting";
name = "Psyche Lobby Room";
req_one_access = null
@@ -14969,7 +14969,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research)
"mQO" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloor{
@@ -15697,7 +15697,7 @@
/turf/simulated/floor/tiled,
/area/rnd/test_area)
"nAL" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border,
@@ -15883,7 +15883,7 @@
/turf/simulated/floor/tiled/old_cargo/gray,
/area/assembly/robotics)
"nIl" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/door/blast/regular{
@@ -16956,7 +16956,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -18990,7 +18990,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/camera/network/research{
@@ -20992,7 +20992,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research)
"rpZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloor{
@@ -21575,7 +21575,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/reception)
"rNa" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/effect/floor_decal/borderfloor,
@@ -22384,7 +22384,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/triumph/station/stairs_three)
"sxa" = (
@@ -22680,7 +22680,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -22745,7 +22745,7 @@
/turf/simulated/floor/wood,
/area/medical/psych/psych_2)
"sJv" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloor{
@@ -22865,7 +22865,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/triumph/station/stairs_three)
"sPu" = (
@@ -23132,7 +23132,7 @@
},
/area/triumph/station/stairs_three)
"sZn" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -23160,7 +23160,7 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medbreak/surgery)
"taT" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/techfloor{
dir = 9
},
@@ -23329,7 +23329,7 @@
/turf/simulated/floor/tiled,
/area/rnd/xenobiology)
"tix" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -24161,7 +24161,7 @@
/turf/simulated/floor/tiled/old_cargo/gray,
/area/assembly/robotics/surgery)
"tLH" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
id = "mechbay-inner";
name = "Mech Bay"
@@ -25053,7 +25053,7 @@
/obj/machinery/camera/network/civilian{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -25531,7 +25531,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloor{
@@ -25657,7 +25657,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -25715,7 +25715,7 @@
/turf/simulated/floor/tiled,
/area/hallway/primary/starboard)
"vaS" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/door/blast/regular{
@@ -25945,7 +25945,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Psychiatric Play-Area Access"
},
/obj/machinery/door/blast/regular{
@@ -26653,7 +26653,7 @@
/area/rnd/xenobiology)
"vSO" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Xenoflora Research";
req_one_access = list(30,35,47,77)
},
@@ -27362,7 +27362,7 @@
/obj/machinery/ai_status_display{
pixel_x = -32
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -27975,7 +27975,7 @@
/turf/simulated/floor/tiled,
/area/medical/virologyaccess)
"wQJ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/machinery/door/blast/regular{
@@ -28325,7 +28325,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/rnd/research/testingrange)
"xhl" = (
@@ -28399,7 +28399,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/camera/network/research{
dir = 1
},
@@ -28521,7 +28521,7 @@
/turf/simulated/floor/tiled,
/area/rnd/test_area)
"xoj" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/item/radio/intercom{
@@ -28970,7 +28970,7 @@
/turf/simulated/floor/tiled,
/area/medical/medbay_emt_bay)
"xFO" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
dir = 4;
id = "mechbay";
@@ -29688,7 +29688,7 @@
/turf/simulated/floor/plating,
/area/maintenance/medbay/fore)
"yjF" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/techfloor{
@@ -29758,7 +29758,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light_switch{
pixel_x = -9;
pixel_y = 30
diff --git a/maps/triumph/levels/deck4.dmm b/maps/triumph/levels/deck4.dmm
index 82fd587fbe19..52f0e79cc095 100644
--- a/maps/triumph/levels/deck4.dmm
+++ b/maps/triumph/levels/deck4.dmm
@@ -66,7 +66,7 @@
/turf/simulated/floor/carpet,
/area/security/detectives_office)
"adt" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/techfloor{
dir = 8
},
@@ -339,7 +339,7 @@
"aoK" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/corner/red/border,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/dark,
@@ -1126,7 +1126,7 @@
/area/security/security_lockerroom)
"aWA" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
layer = 2.8;
name = "Security Tool Storage";
req_one_access = list(1,38)
@@ -1450,7 +1450,7 @@
name = "Security Blast Doors";
opacity = 0
},
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
layer = 2.8;
name = "Security Tool Storage";
req_one_access = list(1,38)
@@ -1489,7 +1489,7 @@
/area/security/breakroom)
"bky" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
layer = 2.8;
name = "Security";
req_one_access = list(1,38)
@@ -1756,7 +1756,7 @@
/area/hydroponics/garden)
"bvC" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Firing Range";
req_one_access = list(1,2,4)
},
@@ -3001,7 +3001,7 @@
/area/exploration/meeting)
"cok" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Holding Room";
req_one_access = list(1,2,4,38)
},
@@ -3216,7 +3216,7 @@
/area/gateway)
"cwG" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
layer = 2.8;
name = "Security";
req_one_access = list(1,38)
@@ -3305,7 +3305,7 @@
/area/shuttle/excursion/cockpit)
"cAS" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Locker Room";
req_one_access = list(2)
},
@@ -3511,7 +3511,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -4509,7 +4509,7 @@
/obj/effect/floor_decal/techfloor/orange{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled/dark,
@@ -5350,7 +5350,7 @@
/area/exploration/courser_dock)
"ecm" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Visitation";
req_access = list(2)
},
@@ -5569,7 +5569,7 @@
/turf/simulated/floor/tiled/dark,
/area/security/hallway)
"eiZ" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/crew_quarters/lounge)
"ejc" = (
@@ -5765,7 +5765,7 @@
/area/bridge/meeting_room)
"esl" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Cell Block";
req_one_access = list(1,38)
},
@@ -5892,7 +5892,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/item/gun/energy/laser/practice,
/obj/machinery/light_switch{
pixel_y = -26
@@ -6206,7 +6206,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
"eGN" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/structure/cable/green{
@@ -6276,7 +6276,7 @@
/area/gateway/prep_room)
"eIs" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Processing";
req_one_access = list(1,2,4,38)
},
@@ -6311,7 +6311,7 @@
/obj/effect/floor_decal/techfloor{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/dark,
@@ -6334,7 +6334,7 @@
/turf/simulated/floor/tiled,
/area/exploration)
"eJE" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -6474,7 +6474,7 @@
/turf/simulated/floor/tiled/dark,
/area/triumph/station/stairs_four)
"eND" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/structure/cable/green{
@@ -7456,7 +7456,7 @@
/area/maintenance/tool_storage)
"fvA" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security Reception";
req_access = list();
req_one_access = list(2,4)
@@ -7963,7 +7963,7 @@
/area/bridge/hallway)
"fPC" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Forensics Lab";
req_access = list(4)
@@ -8012,7 +8012,7 @@
/turf/simulated/floor/tiled/old_cargo/gray,
/area/security/security_processing)
"fRc" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/dark,
@@ -8899,7 +8899,7 @@
/area/exploration/explorer_prep)
"gCl" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Detective";
req_access = list(4)
@@ -9241,7 +9241,7 @@
/area/exploration)
"gRj" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Processing";
req_one_access = list(1,2,4,38)
},
@@ -9525,7 +9525,7 @@
/area/exploration/courser_dock)
"hcP" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Shuttle Bay";
req_one_access = list(2)
},
@@ -9695,7 +9695,7 @@
/area/hallway/secondary/civilian_hallway_mid)
"hhC" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Checkpoint Airlock";
req_one_access = list(1,2,5,19,43,67)
},
@@ -9809,7 +9809,7 @@
/area/security/hallway)
"hlA" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Light Armory";
req_access = list(3)
},
@@ -10839,7 +10839,7 @@
/obj/structure/cable/cyan{
icon_state = "4-8"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/old_tile/green,
@@ -11957,7 +11957,7 @@
/obj/effect/floor_decal/techfloor{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -14500,7 +14500,7 @@
dir = 8
},
/obj/effect/floor_decal/spline/fancy,
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"kJB" = (
@@ -14665,7 +14665,7 @@
/obj/effect/floor_decal/corner/red/border{
dir = 1
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/dark,
@@ -14973,7 +14973,7 @@
/turf/simulated/floor/tiled,
/area/security/lobby)
"kZr" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -15630,7 +15630,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/floor_decal/spline/fancy,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -18195,7 +18195,7 @@
/area/exploration/excursion_dock)
"nnL" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Forensics Lab";
req_access = list(4)
@@ -18251,7 +18251,7 @@
},
/obj/effect/floor_decal/spline/fancy,
/obj/structure/flora/pottedplant/stoutbush,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -19972,7 +19972,7 @@
/area/security/brig)
"oFw" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Confinement Processing";
req_access = list(2)
},
@@ -20157,7 +20157,7 @@
/area/hallway/secondary/docking_hallway)
"oKe" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Cell Block";
req_one_access = list(1,38)
},
@@ -20196,7 +20196,7 @@
/area/triumph/station/stairs_four)
"oLh" = (
/obj/effect/floor_decal/spline/fancy,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled,
@@ -20256,7 +20256,7 @@
/turf/simulated/floor/carpet,
/area/bridge/office)
"oOP" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20812,7 +20812,7 @@
/area/chapel/main)
"pfJ" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Solitary Confinement 1";
req_access = list(2)
},
@@ -21661,7 +21661,7 @@
/area/security/lobby)
"pOh" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Brig";
req_one_access = list(2)
},
@@ -22608,7 +22608,7 @@
/area/security/eva)
"qpa" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Firing Range";
req_one_access = list(1,2,4)
},
@@ -23256,7 +23256,7 @@
/turf/simulated/floor/tiled,
/area/exploration/explorer_prep)
"qKd" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled/old_tile/green,
@@ -23804,7 +23804,7 @@
/area/hallway/secondary/docking_hallway)
"raA" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Brig";
req_one_access = list(2)
},
@@ -24031,7 +24031,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/structure/cable/green{
@@ -24132,7 +24132,7 @@
/area/maintenance/central)
"rno" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Permanent Confinement";
req_access = list(2)
},
@@ -24396,7 +24396,7 @@
/area/security/hanger)
"rvG" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Shuttle Bay";
req_one_access = list(2)
},
@@ -24486,7 +24486,7 @@
/turf/simulated/floor/wood,
/area/crew_quarters/sleep/CMO_quarters)
"rBJ" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Shuttle Bay Control Room";
req_one_access = list(2,4)
},
@@ -24514,7 +24514,7 @@
/area/crew_quarters/lounge)
"rCx" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Recreation Room";
req_one_access = list(1,2,4)
},
@@ -24527,7 +24527,7 @@
/area/security/breakroom)
"rCz" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Locker Room";
req_one_access = list(2)
},
@@ -24554,7 +24554,7 @@
/area/crew_quarters/lounge)
"rDs" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Warden's Office";
req_access = list(3)
},
@@ -25664,7 +25664,7 @@
/obj/effect/floor_decal/steeldecal/steel_decals5{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/effect/floor_decal/borderfloor{
dir = 8
},
@@ -26953,7 +26953,7 @@
/turf/simulated/floor/tiled,
/area/exploration/pilot_prep)
"tpd" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "Checkpoint";
layer = 2.8;
name = "Security";
@@ -27056,7 +27056,7 @@
/obj/effect/floor_decal/techfloor{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/machinery/light{
dir = 8
},
@@ -27372,7 +27372,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
@@ -27585,7 +27585,7 @@
/area/security/security_lockerroom)
"tLP" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Holding Room";
req_one_access = list(1,2,4,38)
},
@@ -28612,7 +28612,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
@@ -29401,7 +29401,7 @@
/area/exploration/courser_dock)
"vfS" = (
/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Shuttle Bay Control Room";
req_one_access = list(2,4)
},
@@ -29821,7 +29821,7 @@
/turf/simulated/floor/tiled/dark,
/area/security/warden)
"vtg" = (
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hallway/primary/aft)
"vtn" = (
@@ -30043,7 +30043,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/carpet/bcarpet,
@@ -30822,7 +30822,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 1
},
/obj/machinery/camera/network/civilian{
@@ -31595,7 +31595,7 @@
/turf/simulated/floor/tiled/old_tile/green,
/area/shuttle/civvie/cockpit)
"wxx" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/obj/effect/floor_decal/techfloor{
@@ -31998,7 +31998,7 @@
/area/library)
"wNw" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "detdoor";
name = "Forensics Lab";
req_access = list(4)
@@ -32614,7 +32614,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/door/firedoor/glass/hidden/steel,
+/obj/machinery/door/firedoor,
/obj/item/gun/energy/laser/practice,
/turf/simulated/floor/tiled/old_tile/gray,
/area/security/range)
@@ -32737,7 +32737,7 @@
/turf/simulated/wall/r_wall,
/area/security/riot_control)
"xqd" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/obj/effect/floor_decal/borderfloorblack{
@@ -33471,7 +33471,7 @@
/turf/simulated/floor/tiled/dark,
/area/hallway/secondary/civilian_hallway_mid)
"xPq" = (
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 8
},
/turf/simulated/floor/tiled,
@@ -33828,7 +33828,7 @@
/area/security/brig)
"ycR" = (
/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security EVA";
req_access = list(2,18);
req_one_access = null
@@ -33907,7 +33907,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/machinery/door/firedoor/glass/hidden/steel{
+/obj/machinery/door/firedoor{
dir = 2
},
/turf/simulated/floor/tiled,
diff --git a/maps/triumph/levels/flagship.dmm b/maps/triumph/levels/flagship.dmm
index 441357484d21..557a60818b64 100644
--- a/maps/triumph/levels/flagship.dmm
+++ b/maps/triumph/levels/flagship.dmm
@@ -3124,7 +3124,7 @@
},
/area/centcom/control)
"fB" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Research and Development";
req_access = list(7)
},
@@ -3342,7 +3342,7 @@
},
/area/centcom/control)
"fS" = (
-/obj/machinery/door/airlock/glass_research{
+/obj/machinery/door/airlock/glass/research{
name = "Robotics Lab";
req_access = list(29,47)
},
@@ -5720,7 +5720,7 @@
/turf/unsimulated/floor/steel,
/area/centcom/evac)
"kQ" = (
-/obj/machinery/door/airlock/glass_medical{
+/obj/machinery/door/airlock/glass/medical{
name = "Virology Laboratory"
},
/turf/unsimulated/floor/steel{
@@ -5816,7 +5816,7 @@
},
/area/centcom/security)
"la" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Colonial Security Airlock";
req_access = list(63)
},
@@ -6856,7 +6856,7 @@
},
/area/centcom/security)
"mO" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security";
req_access = list()
},
@@ -11887,7 +11887,7 @@
},
/area/centcom/security)
"wA" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Confiscated Items";
req_access = list(3)
},
@@ -12642,7 +12642,7 @@
},
/area/centcom/restaurant)
"xS" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
id_tag = "innerS";
name = "Colonial Security Airlock";
req_access = list(63)
@@ -12652,7 +12652,7 @@
},
/area/centcom/security)
"xT" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Warden's Office";
req_access = list(3)
},
@@ -12867,7 +12867,7 @@
},
/area/centcom/security)
"yi" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security Processing";
req_access = list(1)
},
@@ -13108,7 +13108,7 @@
},
/area/centcom/restaurant)
"yD" = (
-/obj/machinery/door/airlock/glass_security{
+/obj/machinery/door/airlock/glass/security{
name = "Security";
req_access = list()
},