diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
index 865308664975..d90b2c7487f9 100644
--- a/code/__DEFINES/__game.dm
+++ b/code/__DEFINES/__game.dm
@@ -258,7 +258,7 @@
/// Frequency stuff only works with 45kbps oggs.
#define GET_RANDOM_FREQ rand(32000, 55000)
-
+#define GET_RANDOM_FREQ_MINOR rand(42000, 48000)
// Ceilings
// Ceiling types
diff --git a/code/__DEFINES/chat.dm b/code/__DEFINES/chat.dm
index 1edc2bd7b5a1..f7ea29044c1e 100644
--- a/code/__DEFINES/chat.dm
+++ b/code/__DEFINES/chat.dm
@@ -2,6 +2,11 @@
* Copyright (c) 2020 Aleksej Komarov
* SPDX-License-Identifier: MIT
*/
+
+/// How many chat payloads to keep in history
+#define CHAT_RELIABILITY_HISTORY_SIZE 5
+/// How many resends to allow before giving up
+#define CHAT_RELIABILITY_MAX_RESENDS 3
#define MESSAGE_TYPE_SYSTEM "system"
#define MESSAGE_TYPE_LOCALCHAT "localchat"
diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm
index 6095e8b10f4d..ddd302048a3a 100644
--- a/code/controllers/subsystem/chat.dm
+++ b/code/controllers/subsystem/chat.dm
@@ -5,39 +5,97 @@
SUBSYSTEM_DEF(chat)
name = "Chat"
- flags = SS_TICKER
+ flags = SS_TICKER|SS_NO_INIT
wait = 1
priority = SS_PRIORITY_CHAT
init_order = SS_INIT_CHAT
- var/list/payload_by_client = list()
+ /// Assosciates a ckey with a list of messages to send to them.
+ var/list/list/datum/chat_payload/client_to_payloads = list()
-/datum/controller/subsystem/chat/Initialize()
- // Just used by chat system to know that initialization is nearly finished.
- // The to_chat checks could probably check the runlevel instead, but would require testing.
- return SS_INIT_SUCCESS
+ /// Associates a ckey with an assosciative list of their last CHAT_RELIABILITY_HISTORY_SIZE messages.
+ var/list/list/datum/chat_payload/client_to_reliability_history = list()
+
+ /// Assosciates a ckey with their next sequence number.
+ var/list/client_to_sequence_number = list()
+
+ /// Keeps track of resends to see how often chat bugs out
+ var/resends = 0
+
+/datum/controller/subsystem/chat/stat_entry(msg)
+ msg = "Messages resent: [resends]"
+ return ..()
+
+/datum/controller/subsystem/chat/Shutdown()
+ log_world("SSchat shutting down, Number of messages resent: [resends]")
+ return ..()
+
+/datum/controller/subsystem/chat/proc/generate_payload(client/target, message_data)
+ var/sequence = client_to_sequence_number[target.ckey]
+ client_to_sequence_number[target.ckey] += 1
+
+ var/datum/chat_payload/payload = new
+ payload.sequence = sequence
+ payload.content = message_data
+
+ if(!(target.ckey in client_to_reliability_history))
+ client_to_reliability_history[target.ckey] = list()
+ var/list/client_history = client_to_reliability_history[target.ckey]
+ client_history["[sequence]"] = payload
+
+ if(length(client_history) > CHAT_RELIABILITY_HISTORY_SIZE)
+ var/oldest = text2num(client_history[1])
+ for(var/index in 2 to length(client_history))
+ var/test = text2num(client_history[index])
+ if(test < oldest)
+ oldest = test
+ client_history -= "[oldest]"
+ return payload
+
+/datum/controller/subsystem/chat/proc/send_payload_to_client(client/target, datum/chat_payload/payload)
+ target.tgui_panel.window.send_message("chat/message", payload.into_message())
+ SEND_TEXT(target, payload.get_content_as_html())
/datum/controller/subsystem/chat/fire()
- for(var/key in payload_by_client)
- var/client/client = key
- var/payload = payload_by_client[key]
- payload_by_client -= key
- if(client)
- // Send to tgchat
- client.tgui_panel?.window.send_message("chat/message", payload)
- // Send to old chat
- for(var/message in payload)
- SEND_TEXT(client, message_to_html(message))
+ for(var/ckey in client_to_payloads)
+ var/client/target = GLOB.directory[ckey]
+ if(isnull(target)) // verify client still exists
+ LAZYREMOVE(client_to_payloads, ckey)
+ continue
+
+ for(var/datum/chat_payload/payload as anything in client_to_payloads[ckey])
+ send_payload_to_client(target, payload)
+ LAZYREMOVE(client_to_payloads, ckey)
+
if(MC_TICK_CHECK)
return
-/datum/controller/subsystem/chat/proc/queue(target, message)
- if(islist(target))
- for(var/_target in target)
- var/client/client = CLIENT_FROM_VAR(_target)
- if(client)
- LAZYADD(payload_by_client[client], list(message))
+/datum/controller/subsystem/chat/proc/queue(queue_target, list/message_data)
+ var/list/targets = islist(queue_target) ? queue_target : list(queue_target)
+ for(var/target in targets)
+ var/client/client = CLIENT_FROM_VAR(target)
+ if(isnull(client))
+ continue
+ LAZYADDASSOCLIST(client_to_payloads, client.ckey, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/send_immediate(send_target, list/message_data)
+ var/list/targets = islist(send_target) ? send_target : list(send_target)
+ for(var/target in targets)
+ var/client/client = CLIENT_FROM_VAR(target)
+ if(isnull(client))
+ continue
+ send_payload_to_client(client, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/handle_resend(client/client, sequence)
+ var/list/client_history = client_to_reliability_history[client.ckey]
+ sequence = "[sequence]"
+ if(isnull(client_history) || !(sequence in client_history))
+ return
+
+ var/datum/chat_payload/payload = client_history[sequence]
+ if(payload.resends > CHAT_RELIABILITY_MAX_RESENDS)
return
- var/client/client = CLIENT_FROM_VAR(target)
- if(client)
- LAZYADD(payload_by_client[client], list(message))
+
+ payload.resends += 1
+ resends += 1
+ send_payload_to_client(client, client_history[sequence])
diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm
index ffd28a132dea..912375a007c6 100644
--- a/code/datums/ammo/rocket.dm
+++ b/code/datums/ammo/rocket.dm
@@ -288,7 +288,7 @@
if(rocket.fuel && rocket.fuel.reagents.get_reagent_amount(rocket.fuel_type) >= rocket.fuel_requirement)
rocket.forceMove(projectile.loc)
rocket.warhead.cause_data = projectile.weapon_cause_data
- rocket.warhead.dir = get_dir(launcher, atom)
+ rocket.warhead.hit_angle = Get_Angle(launcher, atom)
rocket.warhead.prime()
qdel(rocket)
smoke.set_up(1, get_turf(atom))
diff --git a/code/datums/chat_payload.dm b/code/datums/chat_payload.dm
new file mode 100644
index 000000000000..fd35bbc4eecf
--- /dev/null
+++ b/code/datums/chat_payload.dm
@@ -0,0 +1,16 @@
+/// Stores information about a chat payload
+/datum/chat_payload
+ /// Sequence number of this payload
+ var/sequence = 0
+ /// Message we are sending
+ var/list/content
+ /// Resend count
+ var/resends = 0
+
+/// Converts the chat payload into a JSON string
+/datum/chat_payload/proc/into_message()
+ return "{\"sequence\":[sequence],\"content\":[json_encode(content)]}"
+
+/// Returns an HTML-encoded message from our contents.
+/datum/chat_payload/proc/get_content_as_html()
+ return message_to_html(content)
diff --git a/code/datums/crew_manifest.dm b/code/datums/crew_manifest.dm
index f632521916ca..62d6efafcd2c 100644
--- a/code/datums/crew_manifest.dm
+++ b/code/datums/crew_manifest.dm
@@ -37,14 +37,14 @@ GLOBAL_DATUM_INIT(crew_manifest, /datum/crew_manifest, new)
var/list/data = list()
for(var/datum/data/record/record_entry in GLOB.data_core.general)
- if(record_entry.fields["mob_faction"] != FACTION_MARINE)
- continue
var/name = record_entry.fields["name"]
var/rank = record_entry.fields["rank"]
var/squad = record_entry.fields["squad"]
if(isnull(name) || isnull(rank))
continue
+ if(record_entry.fields["mob_faction"] != FACTION_MARINE && rank != JOB_CORPORATE_LIAISON)
+ continue
var/entry_dept = null
var/list/entry = list(
diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index cb80e3be2d82..3b3cff0ae282 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -56,8 +56,9 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
assignment = "Unassigned"
var/id = add_zero(num2hex(target.gid), 6) //this was the best they could come up with? A large random number? *sigh*
- //var/icon/front = new(get_id_photo(H), dir = SOUTH)
- //var/icon/side = new(get_id_photo(H), dir = WEST)
+ var/icon/front = new(get_id_photo(target), dir = SOUTH)
+ var/icon/side = new(get_id_photo(target), dir = WEST)
+
//General Record
var/datum/data/record/record_general = new()
@@ -77,8 +78,8 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
record_general.fields["mob_faction"] = target.faction
record_general.fields["religion"] = target.religion
record_general.fields["ref"] = WEAKREF(target)
- //record_general.fields["photo_front"] = front
- //record_general.fields["photo_side"] = side
+ record_general.fields["photo_front"] = front
+ record_general.fields["photo_side"] = side
if(target.gen_record && !jobban_isbanned(target, "Records"))
record_general.fields["notes"] = target.gen_record
@@ -219,8 +220,9 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
eyes_s.Blend(facial_s, ICON_OVERLAY)
var/icon/clothes_s = null
- clothes_s = new /icon('icons/mob/humans/onmob/clothing/uniforms/underwear_uniforms.dmi', "marine_underpants_s")
- clothes_s.Blend(new /icon('icons/mob/humans/onmob/clothing/feet.dmi', "black"), ICON_UNDERLAY)
+ clothes_s = new /icon('icons/mob/humans/body_mask.dmi', "marine_uniform")
+ clothes_s.Blend(new /icon('icons/mob/humans/onmob/clothing/feet.dmi', "marine"), ICON_UNDERLAY)
+
preview_icon.Blend(eyes_s, ICON_OVERLAY)
if(clothes_s)
preview_icon.Blend(clothes_s, ICON_OVERLAY)
diff --git a/code/datums/entities/player.dm b/code/datums/entities/player.dm
index 41ee35fbe179..72f75f5ab0b3 100644
--- a/code/datums/entities/player.dm
+++ b/code/datums/entities/player.dm
@@ -511,8 +511,6 @@ BSQL_PROTECT_DATUM(/datum/entity/player)
error("ALARM: MISMATCH. Loaded player data for client [ckey], player data ckey is [player.ckey], id: [player.id]")
player_data = player
player_data.owning_client = src
- if(!player_data.discord_link_id)
- add_verb(src, /client/proc/discord_connect)
if(!player_data.last_login)
player_data.first_join_date = "[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]"
if(!player_data.first_join_date)
diff --git a/code/datums/tutorial/marine/reqs_line.dm b/code/datums/tutorial/marine/reqs_line.dm
index dc63706bf0ce..c3fb991d137e 100644
--- a/code/datums/tutorial/marine/reqs_line.dm
+++ b/code/datums/tutorial/marine/reqs_line.dm
@@ -228,7 +228,7 @@
for(var/agent_i in 1 to agents_to_spawn)
var/items_requested = 1 + survival_wave * survival_difficulty * 0.5
items_requested *= (1 + survival_request_random_factor * rand())
- spawn_survival_agent(round(items_requested))
+ spawn_survival_agent(round(items_requested, 1))
/// Called to generate a single agent and request
/datum/tutorial/marine/reqs_line/proc/spawn_survival_agent(items_to_request)
diff --git a/code/defines/procs/records.dm b/code/defines/procs/records.dm
index 33a11e98cfaf..6ede64f9573b 100644
--- a/code/defines/procs/records.dm
+++ b/code/defines/procs/records.dm
@@ -24,6 +24,7 @@
security_record.fields["id"] = id
security_record.name = text("Security Record #[id]")
security_record.fields["incidents"] = "None"
+ security_record.fields["criminal"] = "None"
GLOB.data_core.security += security_record
return security_record
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/defines/unit_tests.dm
similarity index 80%
rename from code/modules/unit_tests/_unit_tests.dm
rename to code/defines/unit_tests.dm
index 031ad9583b54..89cb8af77b11 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/defines/unit_tests.dm
@@ -54,6 +54,9 @@
#define UNIT_TEST_FAILED 1
#define UNIT_TEST_SKIPPED 2
+#define TEST_STAGE_PREGAME "PREGAME"
+#define TEST_STAGE_GAME "GAME"
+
#define TEST_PRE 0
#define TEST_DEFAULT 1
/// After most test steps, used for tests that run long so shorter issues can be noticed faster
@@ -78,24 +81,25 @@
#define TRAIT_SOURCE_UNIT_TESTS "unit_tests"
// Unit tests
-#include "autowiki.dm"
-#include "check_runtimes.dm"
-#include "create_and_destroy.dm"
-#include "duplicate_sprite_accessories.dm"
-#include "emote_panels.dm"
-#include "missing_icons.dm"
-#include "resist.dm"
-#include "spawn_humans.dm"
-#include "spritesheets.dm"
-#include "subsystem_init.dm"
-#include "tgui_create_message.dm"
-#include "timer_sanity.dm"
-#include "tutorials.dm"
-#include "xeno_strains.dm"
+#include "..\modules\unit_tests\areas_unpowered.dm"
+#include "..\modules\unit_tests\autowiki.dm"
+#include "..\modules\unit_tests\check_runtimes.dm"
+#include "..\modules\unit_tests\create_and_destroy.dm"
+#include "..\modules\unit_tests\duplicate_sprite_accessories.dm"
+#include "..\modules\unit_tests\emote_panels.dm"
+#include "..\modules\unit_tests\missing_icons.dm"
+#include "..\modules\unit_tests\resist.dm"
+#include "..\modules\unit_tests\spawn_humans.dm"
+#include "..\modules\unit_tests\spritesheets.dm"
+#include "..\modules\unit_tests\subsystem_init.dm"
+#include "..\modules\unit_tests\tgui_create_message.dm"
+#include "..\modules\unit_tests\timer_sanity.dm"
+#include "..\modules\unit_tests\tutorials.dm"
+#include "..\modules\unit_tests\xeno_strains.dm"
// Unit tests backend
-#include "focus_only_tests.dm"
-#include "unit_test.dm"
+#include "..\modules\unit_tests\focus_only_tests.dm"
+#include "..\modules\unit_tests\unit_test.dm"
#undef TEST_ASSERT
#undef TEST_ASSERT_EQUAL
diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm
index 78091f7387a8..058f6847e721 100644
--- a/code/game/area/BigRed.dm
+++ b/code/game/area/BigRed.dm
@@ -312,6 +312,7 @@
ceiling = CEILING_MAX
icon = 'icons/turf/area_kutjevo.dmi'
icon_state = "oob"
+ requires_power = FALSE
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE
can_build_special = FALSE
diff --git a/code/game/area/Corsat.dm b/code/game/area/Corsat.dm
index 6006ea6b0f8e..810a9cf86aac 100644
--- a/code/game/area/Corsat.dm
+++ b/code/game/area/Corsat.dm
@@ -9,17 +9,18 @@
/area/corsat/landing/console
name = "\improper LZ1 'Gamma'"
icon_state = "corsat_telecomms"
- requires_power = 0
+ requires_power = FALSE
/area/corsat/landing/console2
name = "\improper LZ2 'Sigma'"
icon_state = "corsat_telecomms"
- requires_power = 0
+ requires_power = FALSE
/area/corsat/emergency_access
name = "\improper Unknown Area"
icon_state = "corsat_hull"
ceiling = CEILING_REINFORCED_METAL
+ requires_power = FALSE
//SIGMA SECTOR
@@ -570,5 +571,6 @@
/area/corsat/inaccessible
name = "\improper Unknown Location"
icon_state = "corsat_hull"
+ requires_power = FALSE
ceiling = CEILING_REINFORCED_METAL
flags_area = AREA_NOTUNNEL
diff --git a/code/game/area/LV522_Chances_Claim.dm b/code/game/area/LV522_Chances_Claim.dm
index 1df454cdb0d0..8265fa824309 100644
--- a/code/game/area/LV522_Chances_Claim.dm
+++ b/code/game/area/LV522_Chances_Claim.dm
@@ -24,6 +24,7 @@
/area/lv522/oob
name = "LV522 - Out Of Bounds"
icon_state = "unknown"
+ requires_power = FALSE
ceiling = CEILING_MAX
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE
@@ -186,6 +187,7 @@
name = "LV522 - Outdoor Toilets"
icon_state = "green"
linked_lz = DROPSHIP_LZ2
+ requires_power = FALSE
/area/lv522/indoors/lone_buildings/engineering
name = "Emergency Engineering"
@@ -206,9 +208,20 @@
/area/lv522/indoors/lone_buildings/storage_blocks
name = "Outdoor Storage"
- icon_state = "blue"
linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1)
+/area/lv522/indoors/lone_buildings/storage_blocks/south
+ name = "Southern Outdoor Storage"
+ icon_state = "red"
+
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west
+ name = "Northwestern Outdoor Storage"
+ icon_state = "blue"
+
+/area/lv522/indoors/lone_buildings/storage_blocks/east
+ name = "Eastern Outdoor Storage"
+ icon_state = "yellow"
+
/area/lv522/indoors/lone_buildings/chunk
name = "Chunk 'N Dump"
icon_state = "blue"
diff --git a/code/game/area/LV759_Hybrisa_Prospera.dm b/code/game/area/LV759_Hybrisa_Prospera.dm
index 979b6bad5135..1ceba77a1d78 100644
--- a/code/game/area/LV759_Hybrisa_Prospera.dm
+++ b/code/game/area/LV759_Hybrisa_Prospera.dm
@@ -32,6 +32,7 @@
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL
minimap_color = MINIMAP_AREA_OOB
+ requires_power = FALSE
/area/lv759/bunker
name = "Out Of Bounds"
@@ -50,6 +51,7 @@
minimap_color = MINIMAP_AREA_OOB
soundscape_playlist = SCAPE_PL_LV759_INDOORS
ambience_exterior = AMBIENCE_HYBRISA_INTERIOR
+ requires_power = FALSE
/area/lv759/bunker/checkpoint
name = "Checkpoint & Hidden Bunker - Entrance"
@@ -189,6 +191,16 @@
// Caves
+/area/lv759/indoors/caves
+ name = "Caves"
+ icon_state = "caves_plateau"
+ ceiling = CEILING_UNDERGROUND_BLOCK_CAS
+ ambience_exterior = AMBIENCE_HYBRISA_CAVES_ALARM
+ soundscape_playlist = SCAPE_PL_LV759_DEEPCAVES
+ ceiling_muffle = FALSE
+ minimap_color = MINIMAP_AREA_HYBRISACAVES
+ unoviable_timer = FALSE
+
/area/lv759/indoors/caves/wy_research_complex_entrance
name = "Weyland-Yutani - Advanced Bio-Genomic Research Complex - North Main Entrance"
icon_state = "wylab"
@@ -208,6 +220,31 @@
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
unoviable_timer = FALSE
+ always_unpowered = TRUE
+
+/area/lv759/indoors/caves/electric_fence1
+ name = "Electrical Fence - West Caves"
+ icon_state = "power0"
+
+/area/lv759/indoors/caves/electric_fence2
+ name = "Electrical Fence - East Caves"
+ icon_state = "power0"
+
+/area/lv759/indoors/caves/electric_fence3
+ name = "Electrical Fence - Central Caves"
+ icon_state = "power0"
+
+/area/lv759/indoors/caves/electric_fence2
+ name = "Electrical Fence - East Caves"
+ icon_state = "power0"
+
+/area/lv759/indoors/caves/comms_tower
+ name = "Comms Tower - Central Caves"
+ icon_state = "power0"
+
+/area/lv759/indoors/caves/sensory_tower
+ name = "Sensory Tower - Plateau Caves"
+ icon_state = "power0"
/area/lv759/indoors/caves/west_caves_alarm
name = "Caverns - West"
@@ -226,6 +263,7 @@
soundscape_playlist = SCAPE_PL_LV759_DEEPCAVES
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
+ always_unpowered = TRUE
/area/lv759/indoors/caves/east_caves/north
name = "Caverns - East"
@@ -240,11 +278,13 @@
soundscape_playlist = SCAPE_PL_LV759_DEEPCAVES
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
+ always_unpowered = TRUE
/area/lv759/indoors/caves/south_caves/derelict_ship
name = "Caverns - South"
icon_state = "caves_south"
unoviable_timer = FALSE
+ always_unpowered = TRUE
/area/lv759/indoors/caves/south_east_caves
name = "Caverns - Southeast"
@@ -254,6 +294,7 @@
soundscape_playlist = SCAPE_PL_LV759_DEEPCAVES
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
+ always_unpowered = TRUE
/area/lv759/indoors/caves/south_west_caves
name = "Caverns - Southwest"
@@ -263,6 +304,7 @@
soundscape_playlist = SCAPE_PL_LV759_DEEPCAVES
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
+ always_unpowered = TRUE
/area/lv759/indoors/caves/south_west_caves_alarm
name = "Caverns - Southwest"
@@ -302,6 +344,7 @@
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
linked_lz = DROPSHIP_LZ1
+ always_unpowered = TRUE
/area/lv759/indoors/caves/north_east_caves/south
linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2)
@@ -314,9 +357,11 @@
soundscape_playlist = SCAPE_PL_LV759_DEEPCAVES
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
+ always_unpowered = TRUE
/area/lv759/indoors/caves/north_caves/east
linked_lz = DROPSHIP_LZ1
+ always_unpowered = TRUE
/area/lv759/indoors/caves/central_caves
name = "Caverns - Central"
@@ -327,6 +372,7 @@
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
unoviable_timer = FALSE
+ always_unpowered = TRUE
/area/lv759/indoors/caves/central_caves_north
name = "Caverns - Central"
@@ -336,6 +382,7 @@
soundscape_playlist = SCAPE_PL_LV759_CAVES
ceiling_muffle = FALSE
minimap_color = MINIMAP_AREA_HYBRISACAVES
+ always_unpowered = TRUE
/area/lv759/indoors/caves/north_east_caves_comms
name = "KMCC - Mining Outpost - East - Subspace-Communications"
@@ -360,6 +407,7 @@
soundscape_playlist = SCAPE_PL_LV759_PLATEAU_OUTDOORS
minimap_color = MINIMAP_AREA_HYBRISACAVES
unoviable_timer = FALSE
+ always_unpowered = TRUE
// Colony Streets
@@ -1288,6 +1336,7 @@
ambience_exterior = AMBIENCE_LAB
soundscape_playlist = SCAPE_PL_LV759_INDOORS
minimap_color = MINIMAP_AREA_COLONY
+ requires_power = FALSE
/area/lv759/indoors/wy_research_complex/hallwaynorth
name = "Weyland-Yutani - Advanced Bio-Genomic Research Complex - North Hallway"
diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm
index 1007f155ace4..fc85fdeceaa4 100644
--- a/code/game/area/almayer.dm
+++ b/code/game/area/almayer.dm
@@ -158,6 +158,7 @@
/area/almayer/engineering/upper_engineering/notunnel
flags_area = AREA_NOTUNNEL
+ requires_power = FALSE
/area/almayer/engineering/ce_room
name = "\improper Upper Deck Chief Engineer Office"
@@ -169,9 +170,9 @@
icon_state = "starboardatmos"
fake_zlevel = 1 // upperdeck
-/area/almayer/engineering/port_atmos
- name = "\improper Upper Deck Port Atmospherics"
- icon_state = "portatmos"
+/area/almayer/command/intel_bunks
+ name = "\improper Upper Deck Intel Officer's Bunks"
+ icon_state = "blue"
fake_zlevel = 1 // upperdeck
/area/almayer/engineering/laundry
@@ -212,6 +213,7 @@
/area/almayer/shipboard/weapon_room/notunnel
flags_area = AREA_NOTUNNEL
+ requires_power = FALSE
/area/almayer/shipboard/starboard_point_defense
name = "\improper Lower Deck Starboard Point Defense"
@@ -384,16 +386,44 @@
//area that are used for transition between decks.
/area/almayer/stair_clone
- name = "\improper Lower Deck Stairs"
+ name = "\improper Stairs"
icon_state = "stairs_lowerdeck"
- fake_zlevel = 2 // lowerdeck
resin_construction_allowed = FALSE
+/area/almayer/stair_clone/lower
+ name = "\improper Lower Deck Stairs"
+ icon_state = "stairs_upperdeck"
+ fake_zlevel = 2 // lowerdeck
+
+/area/almayer/stair_clone/lower/starboard_aft
+ name = "\improper Lower Deck Starboard Aft Stairs"
+
+/area/almayer/stair_clone/lower/port_aft
+ name = "\improper Lower Deck Port Aft Stairs"
+
+/area/almayer/stair_clone/lower/starboard_fore
+ name = "\improper Lower Deck Starboard Fore Stairs"
+
+/area/almayer/stair_clone/lower/port_fore
+ name = "\improper Lower Deck Port Fore Stairs"
+
/area/almayer/stair_clone/upper
name = "\improper Upper Deck Stairs"
icon_state = "stairs_upperdeck"
fake_zlevel = 1 // upperdeck
+/area/almayer/stair_clone/upper/starboard_aft
+ name = "\improper Upper Deck Starboard Aft Stairs"
+
+/area/almayer/stair_clone/upper/port_aft
+ name = "\improper Upper Deck Port Aft Stairs"
+
+/area/almayer/stair_clone/upper/starboard_fore
+ name = "\improper Upper Deck Starboard Fore Stairs"
+
+/area/almayer/stair_clone/upper/port_fore
+ name = "\improper Upper Deck Port Fore Stairs"
+
// maintenance areas
/area/almayer/maint
diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm
index 52ce5b56f257..438abe8f9216 100644
--- a/code/game/area/kutjevo.dm
+++ b/code/game/area/kutjevo.dm
@@ -39,6 +39,7 @@
name = "Kutjevo - Out Of Bounds"
ceiling = CEILING_MAX
icon_state = "oob"
+ requires_power = FALSE
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE
@@ -253,6 +254,18 @@
icon_state = "construction_int"
unoviable_timer = FALSE
+/area/kutjevo/interior/construction/north
+ name = "Kutjevo - Northern Abandoned Construction Interior"
+ icon_state = "construction"
+
+/area/kutjevo/interior/construction/east
+ name = "Kutjevo - Eastern Abandoned Construction Interior"
+ icon_state = "construction"
+
+/area/kutjevo/interior/construction/signal_tower
+ name = "Kutjevo - Abandoned Signal Tower"
+ icon_state = "construction2"
+
/area/kutjevo/interior/foremans_office
name = "Kutjevo - Foreman's Office"
ceiling = CEILING_METAL
diff --git a/code/game/area/prison_v3_fiorina.dm b/code/game/area/prison_v3_fiorina.dm
index ef9c5fa31913..4475cdfdacef 100644
--- a/code/game/area/prison_v3_fiorina.dm
+++ b/code/game/area/prison_v3_fiorina.dm
@@ -14,6 +14,7 @@
/area/fiorina/oob
name = "Fiorina - Out Of Bounds"
icon_state = "oob"
+ requires_power = FALSE
ceiling = CEILING_MAX
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE
diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm
index 66e087626944..2c44ba6fa452 100644
--- a/code/game/area/strata.dm
+++ b/code/game/area/strata.dm
@@ -563,6 +563,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed
/area/strata/ag/interior/restricted
name = "Super Secret Credits Room"
icon_state = "marshwater"
+ requires_power = FALSE
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE
diff --git a/code/game/area/varadero.dm b/code/game/area/varadero.dm
index b22cb5c8d936..f92b7d4d8a8d 100644
--- a/code/game/area/varadero.dm
+++ b/code/game/area/varadero.dm
@@ -331,6 +331,10 @@
name = "New Varadero - Dig Site"
icon_state = "deepcaves3"
+/area/varadero/interior_protected/caves/makeshift_tent
+ name = "New Varadero - Makeshift Tent"
+ icon_state = "offices4"
+
/area/varadero/interior_protected/caves/swcaves
name = "New Varadero - Southwest Caves"
icon_state = "deepcaves3"
diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm
index 1056e866744f..f84dd7866f85 100644
--- a/code/game/gamemodes/cm_process.dm
+++ b/code/game/gamemodes/cm_process.dm
@@ -236,7 +236,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES)
for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list)
if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space) && !istype(current_human.loc, /area/adminlevel/ert_station/fax_response_station)))
continue
- if((current_human.faction in FACTION_LIST_WY) || current_human.job == "Corporate Liaison") //The CL is assigned the USCM faction for gameplay purposes
+ if(current_human.faction in FACTION_LIST_WY)
num_WY++
num_headcount++
continue
diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm
index 4fae09ce808b..69169d82a2ee 100644
--- a/code/game/jobs/job/command/cic/captain.dm
+++ b/code/game/jobs/job/command/cic/captain.dm
@@ -5,14 +5,60 @@
selection_class = "job_co"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED
flags_whitelist = WHITELIST_COMMANDER
- gear_preset = /datum/equipment_preset/uscm_ship/commander
+ gear_preset = /datum/equipment_preset/uscm_co
+
+
+/datum/job/command/commander/proc/check_career_path(client/player)
+ switch(player.prefs.co_career_path)
+ if("Infantry")
+ gear_preset_whitelist = list(
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co/infantry,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/infantry/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/infantry/council/plus,
+ )
+ if("Intel")
+ gear_preset_whitelist = list(
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co/intel,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/intel/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/intel/council/plus,
+ )
+ if("Medical")
+ gear_preset_whitelist = list(
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co/medical,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/medical/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/medical/council/plus,
+ )
+ if("Aviation")
+ gear_preset_whitelist = list(
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co/aviation,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/aviation/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/aviation/council/plus,
+ )
+ if("Tanker")
+ gear_preset_whitelist = list(
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co/tanker,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/tanker/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/tanker/council/plus,
+ )
+ if("Engineering")
+ gear_preset_whitelist = list(
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co/engineering,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/engineering/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/engineering/council/plus,
+ )
+ if("Logistics")
+ gear_preset_whitelist = list(
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co/logistics,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/logistics/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/logistics/council/plus,
+ )
/datum/job/command/commander/New()
. = ..()
gear_preset_whitelist = list(
- "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_ship/commander,
- "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_ship/commander/council,
- "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_ship/commander/council/plus
+ "[JOB_CO][WHITELIST_NORMAL]" = /datum/equipment_preset/uscm_co,
+ "[JOB_CO][WHITELIST_COUNCIL]" = /datum/equipment_preset/uscm_co/council,
+ "[JOB_CO][WHITELIST_LEADER]" = /datum/equipment_preset/uscm_co/council/plus
)
/datum/job/command/commander/generate_entry_message()
@@ -23,7 +69,7 @@
. = ..()
if(!.)
return
-
+ check_career_path(player)
if(player.check_whitelist_status(WHITELIST_COMMANDER_LEADER|WHITELIST_COMMANDER_COLONEL))
return get_desired_status(player.prefs.commander_status, WHITELIST_LEADER)
if(player.check_whitelist_status(WHITELIST_COMMANDER_COUNCIL|WHITELIST_COMMANDER_COUNCIL_LEGACY))
diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm
index 1d1a17baa46b..0e38631b6276 100644
--- a/code/game/machinery/atmoalter/scrubber.dm
+++ b/code/game/machinery/atmoalter/scrubber.dm
@@ -1,6 +1,6 @@
/obj/structure/machinery/portable_atmospherics/powered/scrubber
name = "Portable Air Scrubber"
-
+ needs_power = FALSE
icon = 'icons/obj/structures/machinery/atmos.dmi'
icon_state = "pscrubber:0"
density = TRUE
diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm
index 65f6fe1842f4..b0eb6c17a140 100644
--- a/code/game/machinery/bioprinter.dm
+++ b/code/game/machinery/bioprinter.dm
@@ -179,10 +179,10 @@
title = "synthetic right arm"
path = /obj/item/robot_parts/arm/r_arm
-/datum/bioprinter_recipe/l_leg
- title = "synthetic left leg"
- path = /obj/item/robot_parts/leg/l_leg
-
/datum/bioprinter_recipe/r_leg
title = "synthetic right leg"
path = /obj/item/robot_parts/leg/r_leg
+
+/datum/bioprinter_recipe/l_leg
+ title = "synthetic left leg"
+ path = /obj/item/robot_parts/leg/l_leg
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index 84cbf7bded55..0e4bd81863e8 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -6,6 +6,7 @@
light_system = MOVABLE_LIGHT
light_range = 3
use_power = USE_POWER_NONE
+ needs_power = FALSE
var/obj/item/card/id/botcard // the ID card that the bot "holds"
var/on = 1
unslashable = TRUE
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 8a4e0b2f98b2..701ae94069f8 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -3,6 +3,7 @@
desc = "It's used to monitor rooms."
icon = 'icons/obj/structures/machinery/monitors.dmi'
icon_state = "autocam_editor"
+ needs_power = FALSE
use_power = USE_POWER_ACTIVE
idle_power_usage = 5
active_power_usage = 10
diff --git a/code/game/machinery/computer/hybrisa_slotmachine.dm b/code/game/machinery/computer/hybrisa_slotmachine.dm
index 6134a00696c0..85cc57c5dd2b 100644
--- a/code/game/machinery/computer/hybrisa_slotmachine.dm
+++ b/code/game/machinery/computer/hybrisa_slotmachine.dm
@@ -78,7 +78,7 @@
if(!.)
return .
- prize_money += round(seconds_per_tick / 2) //SPESSH MAJICKS
+ prize_money += round(seconds_per_tick / 2, 1) //SPESSH MAJICKS
/obj/structure/machinery/computer/hybrisa/misc/slotmachine/update_icon()
..()
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 2e849a4f8843..3a04c69eb6f5 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -8,19 +8,7 @@
circuit = /obj/item/circuitboard/computer/secure_data
var/obj/item/card/id/scan = null
var/obj/item/device/clue_scanner/scanner = null
- var/rank = null
- var/screen = 1
- var/datum/data/record/active1 = null
- var/datum/data/record/active2 = null
- var/a_id = null
- var/temp = null
var/printing = null
- var/can_change_id = 0
- var/list/Perp
- var/tempname = null
- //Sorting Variables
- var/sortBy = "name"
- var/order = 1 // -1 = Descending - 1 = Ascending
/obj/structure/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob)
@@ -33,13 +21,75 @@
if(usr.drop_held_item())
O.forceMove(src)
scanner = O
- to_chat(user, "You insert [O].")
+ to_chat(user, SPAN_NOTICE("You insert [O]."))
+ playsound(loc, 'sound/machines/scanning.ogg', 15, 1)
. = ..()
+/obj/structure/machinery/computer/secure_data/ui_data(mob/user)
+ . = ..()
+
+ // Pass scanner data
+ var/list/prints_data = list()
+ if (scanner && scanner.print_list)
+ for (var/obj/effect/decal/prints/prints in scanner.print_list)
+ var/print_entry = list(
+ "name" = prints.criminal_name,
+ "squad" = prints.criminal_squad,
+ "rank" = prints.criminal_rank,
+ "description" = prints.description
+ )
+ prints_data += list(print_entry)
+
+ var/scanner_status = list(
+ "connected" = !!scanner,
+ "count" = scanner && scanner.print_list ? length(scanner.print_list) : 0,
+ "data" = prints_data,
+ )
+ .["scanner"] = scanner_status
+
+ // Map security records via id
+ var/list/records = list()
+ var/list/security_map = list()
+ for (var/datum/data/record/security in GLOB.data_core.security)
+ security_map[security.fields["id"]] = security
+
+ for (var/datum/data/record/general in GLOB.data_core.general)
+ var/id = general.fields["id"]
+ var/datum/data/record/security = security_map[id]
+
+ var/list/record = list(
+ "id" = id,
+ "general_name" = general.fields["name"],
+ "general_rank" = general.fields["rank"],
+ "general_age" = general.fields["age"],
+ "general_sex" = general.fields["sex"],
+ "general_m_stat" = general.fields["m_stat"],
+ "general_p_stat" = general.fields["p_stat"],
+ "security_criminal" = security ? security.fields["criminal"] : "",
+ "security_comments" = security ? security.fields["comments"] : null,
+ "security_incident" = security ? security.fields["incident"] : null,
+ )
+ records += list(record)
+
+ .["records"] = records
+
+ var/icon/photo_icon = new /icon('icons/misc/buildmode.dmi', "buildhelp")
+ var/photo_data = icon2html(photo_icon, user.client, sourceonly=TRUE)
+
+ // Attach to the UI data
+ .["fallback_image"] = photo_data
+
/obj/structure/machinery/computer/secure_data/attack_remote(mob/user as mob)
return attack_hand(user)
+/obj/structure/machinery/computer/secure_data/tgui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if (!ui)
+ // Open TGUI with records data
+ ui = new(user, src, "SecurityRecords", "Security Records")
+ ui.open()
+
//Someone needs to break down the dat += into chunks instead of long ass lines.
/obj/structure/machinery/computer/secure_data/attack_hand(mob/user as mob)
if(..() || inoperable())
@@ -53,472 +103,11 @@
if(!is_mainship_level(z))
to_chat(user, SPAN_DANGER("Unable to establish a connection : \black You're too far away from the station!"))
return
- var/dat
- if (temp)
- dat = text("[] Clear Screen ", temp, src)
- else
- switch(screen)
- if(1.0)
- dat += {"
-
Should the defendant fail to submit to arrest they are to be further charged with Resisting Arrest and may face additional disciplinary action during a court marshal at a later date.
"
- dat += "The following missive is an order to surrender the named person (hereinafter known as the defendant) into the legal custody of a third party (hereinafter known as the custodian).
"
dat += ""
dat += "
Disclaimer
"
dat += "
"
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 2334806fc9f7..91623df40e19 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1464,4 +1464,21 @@ GLOBAL_LIST_INIT(apc_wire_descriptions, list(
pixel_x = -30
dir = 8
+// apc that start broken
+/obj/structure/machinery/power/apc/fully_broken/no_cell/north
+ pixel_y = 32
+ dir = 1
+
+/obj/structure/machinery/power/apc/fully_broken/no_cell/south
+ pixel_y = -26
+ dir = 2
+
+/obj/structure/machinery/power/apc/fully_broken/no_cell/east
+ pixel_x = 30
+ dir = 4
+
+/obj/structure/machinery/power/apc/fully_broken/no_cell/west
+ pixel_x = -30
+ dir = 8
+
#undef APC_UPDATE_ICON_COOLDOWN
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index f09d5c7407d2..5d4a3c8103ce 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -790,6 +790,7 @@
anchored = TRUE
density = FALSE
layer = BELOW_TABLE_LAYER
+ needs_power = FALSE
use_power = USE_POWER_ACTIVE
idle_power_usage = 2
active_power_usage = 20
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 5b4e1951c6a0..c46558fce0be 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -1709,7 +1709,7 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed
var/scatter_debuff = 1 + (SETTLE_SCATTER_MULTIPLIER - 1) * pct_settled
projectile_to_fire.scatter *= scatter_debuff
- projectile_to_fire.damage = round(projectile_to_fire.damage * damage_mult) // Apply gun damage multiplier to projectile damage
+ projectile_to_fire.damage = round(projectile_to_fire.damage * damage_mult, 0.1) // Apply gun damage multiplier to projectile damage
// Apply effective range and falloffs/buildups
projectile_to_fire.damage_falloff = damage_falloff_mult * projectile_to_fire.ammo.damage_falloff
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index c1fb8d0f51a2..e388459b2211 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -548,7 +548,7 @@
var/ex_falloff = base_ex_falloff
var/ex_falloff_shape = EXPLOSION_FALLOFF_SHAPE_LINEAR
var/dir = null
- var/angle = 360
+ var/shrapnel_spread = 360
//For chemical fire
var/radius = 0
var/intensity = 0
@@ -556,6 +556,8 @@
var/supplemented = 0 //for determining fire shape. Intensifying chems add, moderating chems remove.
var/smokerad = 0
var/fire_penetrating = FALSE
+ var/hit_angle
+
var/list/supplements = list()
for(var/datum/reagent/R in reagent_list)
if(R.explosive)
@@ -576,7 +578,8 @@
if(istype(my_atom, /obj/item/explosive))
var/obj/item/explosive/E = my_atom
ex_falloff_shape = E.falloff_mode
- angle = E.angle
+ shrapnel_spread = E.shrapnel_spread
+ hit_angle = E.hit_angle
if(E.use_dir)
if(E.last_move_dir) // Higher precision for grenade and what not.
dir = E.last_move_dir
@@ -588,7 +591,7 @@
intensity = floor(intensity)
duration = floor(duration)
if(ex_power > 0)
- explode(sourceturf, ex_power, ex_falloff, ex_falloff_shape, dir, angle)
+ explode(sourceturf, ex_power, ex_falloff, ex_falloff_shape, dir, shrapnel_spread, hit_angle)
if(intensity > 0)
var/firecolor = mix_burn_colors(supplements)
combust(sourceturf, radius, intensity, duration, supplemented, firecolor, smokerad, fire_penetrating) // TODO: Implement directional flames
@@ -598,7 +601,7 @@
trigger_volatiles = FALSE
return exploded
-/datum/reagents/proc/explode(turf/sourceturf, ex_power, ex_falloff, ex_falloff_shape, dir, angle)
+/datum/reagents/proc/explode(turf/sourceturf, ex_power, ex_falloff, ex_falloff_shape, dir, shrapnel_angle, hit_angle)
if(!sourceturf)
return
if(sourceturf.chemexploded)
@@ -644,7 +647,7 @@
//Note: No need to log here as that is done in cell_explosion()
var/datum/cause_data/cause_data = create_cause_data("chemical explosion", source_atom)
- create_shrapnel(sourceturf, shards, dir, angle, shard_type, cause_data)
+ create_shrapnel(sourceturf, shards, isnum(hit_angle) ? hit_angle : dir, shrapnel_angle, shard_type, cause_data, FALSE, 0.15, isnum(hit_angle))
if((istype(my_atom, /obj/item/explosive/plastic) || istype(my_atom, /obj/item/explosive/grenade)) && (ismob(my_atom.loc) || isStructure(my_atom.loc)))
addtimer(CALLBACK(my_atom.loc, TYPE_PROC_REF(/atom, ex_act), ex_power), 0.2 SECONDS)
ex_power = ex_power / 2
diff --git a/code/modules/tgchat/to_chat.dm b/code/modules/tgchat/to_chat.dm
index 00996e341d34..51f589b001bf 100644
--- a/code/modules/tgchat/to_chat.dm
+++ b/code/modules/tgchat/to_chat.dm
@@ -43,23 +43,8 @@
if(text) message["text"] = text
if(html) message["html"] = html
if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting
- var/message_blob = TGUI_CREATE_MESSAGE("chat/message", message)
- var/message_html = message_to_html(message)
- if(islist(target))
- for(var/_target in target)
- var/client/client = CLIENT_FROM_VAR(_target)
- if(client)
- // Send to tgchat
- client.tgui_panel?.window.send_raw_message(message_blob)
- // Send to old chat
- SEND_TEXT(client, message_html)
- return
- var/client/client = CLIENT_FROM_VAR(target)
- if(client)
- // Send to tgchat
- client.tgui_panel?.window.send_raw_message(message_blob)
- // Send to old chat
- SEND_TEXT(client, message_html)
+ // send it immediately
+ SSchat.send_immediate(target, message)
/**
* Sends the message to the recipient (target).
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
index 987a2aca92a8..57ca66d03b0b 100644
--- a/code/modules/tgui/tgui_window.dm
+++ b/code/modules/tgui/tgui_window.dm
@@ -384,6 +384,8 @@
client << link(href_list["url"])
if("cacheReloaded")
reinitialize()
+ if("chat/resend")
+ SSchat.handle_resend(client, payload)
/*
/datum/tgui_window/vv_edit_var(var_name, var_value)
diff --git a/code/modules/unit_tests/areas_unpowered.dm b/code/modules/unit_tests/areas_unpowered.dm
new file mode 100644
index 000000000000..879d088baec9
--- /dev/null
+++ b/code/modules/unit_tests/areas_unpowered.dm
@@ -0,0 +1,70 @@
+/datum/unit_test/areas_unpowered
+ priority = TEST_PRE // Don't want machines from other tests
+ stage = TEST_STAGE_GAME
+
+ /// Assoc list per area containing an assoc list per machine.type containing count of that type
+ var/list/areas_with_machines = list()
+ /// Assoc list of machine.types containing notes that don't have an area
+ var/list/types_with_no_area = list()
+
+/datum/unit_test/areas_unpowered/pre_game
+ stage = TEST_STAGE_PREGAME // Also run the test during pregame to test w/o nightmare inserts
+
+/datum/unit_test/areas_unpowered/pre_game/Run()
+ return ..() // Just to satisfy Tgstation Test Explorer extension
+
+/datum/unit_test/areas_unpowered/proc/determine_areas_needing_power()
+ for(var/obj/structure/machinery/machine as anything in GLOB.machines)
+ if(!machine)
+ types_with_no_area[""] = "NULL at Invalid location"
+ continue
+ if(machine.needs_power)
+ var/area/machine_area = get_step(machine, 0)?.loc // get_area without the area check
+ if(!machine_area)
+ if(!types_with_no_area[machine.type])
+ types_with_no_area[machine.type] = "[machine][QDELETED(machine) ? " (QDELETED)" : ""] at [get_location_in_text(machine, FALSE)]"
+ continue
+ if(!areas_with_machines[machine_area])
+ areas_with_machines[machine_area] = list()
+ areas_with_machines[machine_area][machine.type]++
+
+/datum/unit_test/areas_unpowered/Run()
+ determine_areas_needing_power()
+
+ for(var/bad_machine_type in types_with_no_area)
+ TEST_FAIL("[types_with_no_area[bad_machine_type]] ([bad_machine_type]) has no area!")
+
+ for(var/area/cur_area as anything in areas_with_machines)
+ var/apc_count = 0
+ for(var/obj/structure/machinery/power/apc/cur_apc in cur_area)
+ apc_count++
+
+ if(apc_count == 1)
+ continue // Pass
+ if(apc_count > 1)
+ TEST_FAIL("[cur_area] ([cur_area.type]) has [apc_count] APCs!")
+ continue
+
+ if(!cur_area.requires_power)
+ continue
+ if(cur_area.unlimited_power)
+ continue
+ if(cur_area.always_unpowered)
+ continue
+
+ // Count all machines and note the first 5 types
+ var/machine_type_count = length(areas_with_machines[cur_area])
+ var/machine_total_count = 0
+ var/i = 0
+ var/machine_notes = "Machine types: "
+ for(var/machine_type in areas_with_machines[cur_area])
+ machine_total_count += areas_with_machines[cur_area][machine_type]
+ if(++i <= 5)
+ machine_notes += "[machine_type]"
+ if(i != machine_type_count)
+ machine_notes += ", "
+
+ if(machine_type_count > 5)
+ machine_notes += "..."
+
+ TEST_FAIL("[cur_area] ([cur_area.type]) lacks an APC but requires power for [machine_total_count] machine\s!\n\t[machine_notes]")
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index 62a7c1589a3c..6c59e4b7ac33 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -33,11 +33,13 @@ GLOBAL_VAR_INIT(focused_test, focused_test())
/// The bottom left floor turf of the testing zone
var/turf/run_loc_floor_bottom_left
-
/// The top right floor turf of the testing zone
var/turf/run_loc_floor_top_right
+
///The priority of the test, the larger it is the later it fires
var/priority = TEST_DEFAULT
+ ///When the test will run
+ var/stage = TEST_STAGE_GAME
//internal shit
var/focus = FALSE
@@ -218,15 +220,18 @@ GLOBAL_VAR_INIT(focused_test, focused_test())
qdel(test)
-/proc/RunUnitTests()
+/proc/RunUnitTests(stage)
CHECK_TICK
- var/list/tests_to_run = subtypesof(/datum/unit_test)
+ var/list/tests_to_run = list()
var/list/focused_tests = list()
- for (var/_test_to_run in tests_to_run)
- var/datum/unit_test/test_to_run = _test_to_run
- if (initial(test_to_run.focus))
+ for(var/datum/unit_test/test_to_run as anything in subtypesof(/datum/unit_test))
+ if(initial(test_to_run.stage) != stage)
+ continue
+ if(initial(test_to_run.focus))
focused_tests += test_to_run
+ continue
+ tests_to_run += test_to_run
if(length(focused_tests))
tests_to_run = focused_tests
@@ -234,17 +239,23 @@ GLOBAL_VAR_INIT(focused_test, focused_test())
var/list/test_results = list()
+ var/file_name = "data/unit_tests.json"
+ if(stage == TEST_STAGE_GAME)
+ test_results = json_decode(file2text(file_name))
+ fdel(file_name)
+
for(var/unit_path in tests_to_run)
CHECK_TICK //We check tick first because the unit test we run last may be so expensive that checking tick will lock up this loop forever
RunUnitTest(unit_path, test_results)
- var/file_name = "data/unit_tests.json"
- fdel(file_name)
file(file_name) << json_encode(test_results)
- SSticker.force_ending = TRUE
- //We have to call this manually because del_text can preceed us, and SSticker doesn't fire in the post game
- world.Reboot()
+ if(stage == TEST_STAGE_GAME)
+ SSticker.force_ending = TRUE
+ //We have to call this manually because del_text can preceed us, and SSticker doesn't fire in the post game
+ world.Reboot()
+ else
+ SSticker.delay_start = FALSE
/datum/map_template/unit_tests
name = "Unit Tests Zone"
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 3387bfa79de5..bc6d36c77967 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -342,6 +342,7 @@
#include "code\datums\bug_report.dm"
#include "code\datums\callback.dm"
#include "code\datums\changelog.dm"
+#include "code\datums\chat_payload.dm"
#include "code\datums\combat_personalized.dm"
#include "code\datums\computerfiles.dm"
#include "code\datums\crew_manifest.dm"
@@ -760,6 +761,7 @@
#include "code\datums\xeno_shields\shield_types\hedgehog_shield.dm"
#include "code\datums\xeno_shields\shield_types\king_shield.dm"
#include "code\datums\xeno_shields\shield_types\vanguard_shield.dm"
+#include "code\defines\unit_tests.dm"
#include "code\defines\procs\admin.dm"
#include "code\defines\procs\announcement.dm"
#include "code\defines\procs\AStar.dm"
@@ -1851,6 +1853,7 @@
#include "code\modules\gear_presets\synths.dm"
#include "code\modules\gear_presets\upp.dm"
#include "code\modules\gear_presets\uscm.dm"
+#include "code\modules\gear_presets\uscm_co.dm"
#include "code\modules\gear_presets\uscm_dress.dm"
#include "code\modules\gear_presets\uscm_event.dm"
#include "code\modules\gear_presets\uscm_forecon.dm"
@@ -2498,7 +2501,6 @@
#include "code\modules\tgui_panel\telemetry.dm"
#include "code\modules\tgui_panel\tgui_panel.dm"
#include "code\modules\tooltip\tooltip.dm"
-#include "code\modules\unit_tests\_unit_tests.dm"
#include "code\modules\vehicles\cargo_train.dm"
#include "code\modules\vehicles\powerloader.dm"
#include "code\modules\vehicles\souto_mobile.dm"
diff --git a/html/changelogs/archive/2025-02.yml b/html/changelogs/archive/2025-02.yml
index 37ca651bed23..2c400e088c05 100644
--- a/html/changelogs/archive/2025-02.yml
+++ b/html/changelogs/archive/2025-02.yml
@@ -73,3 +73,88 @@
VileBeggar:
- balance: Predator melee weapons now have click delay for clicking on empty adjacent
tiles.
+2025-02-05:
+ Diegoflores31:
+ - bugfix: Queen no longer stomps on dead and resting xenomorphs
+ - bugfix: Uniforms can no longer be removed if you are wearing a suit on top of
+ it
+ FebrezeNinja:
+ - bugfix: Dropship weapon console can see stasis bags in activated stretchers instead
+ of "Empty"
+ Mikrel0712:
+ - bugfix: ASO Jacket icon in the vendor now shows up as the actual jacket instead
+ of a bloodbag
+ Red-byte3D:
+ - bugfix: Fixes boiler speed being stuck if you buy a strain while zoomed in
+ - rscadd: Adds a bunch of career options for the commanding officer whitelist, currently
+ only used for fluff and RP.
+ - bugfix: Queens can no longer leader the dead.
+ - code_imp: Removes one letter vars
+ - bugfix: fixes the healing / aura effect from recovery nodes applying to dead xenos
+ / xenos who died while resting
+ - bugfix: Dead huggers can no longer be used to hug people
+ - bugfix: You can no longer apply the black holocard to people who are still revivable
+ - bugfix: Extuingishers can no longer be filled by harmful chemicals
+ - bugfix: Praetorian's acid ball no longer uses plasma if you cancel / do not use
+ it.
+ - bugfix: Mutated hive hugger icons work again.
+ - code_imp: Removes some one letter vars from smartpack code.
+ - bugfix: Airlock assemblies are no longer unslashable.
+ - bugfix: You can no longer use telekinesis to grab paper from far away.
+ ZephyrTFA, san7890, Nivrak:
+ - rscadd: Chat Reliability Layer
+ - code_imp: TGUI chat messages now track their sequence and will be resent if the
+ client notices a discrepenency
+ efzapa:
+ - maptweak: Replaced the Security Cabinet in the Security Office on LV624 with a
+ regular Cabinet. Almayer Crew Records should no longer spawn.
+ jupyterkat:
+ - bugfix: fixed cas ammo's icons not updating after ammo transfer
+ - bugfix: fixed ot rocket's blast wave only going in one direction
+ realforest2001:
+ - rscadd: Added multifaction support to crew monitors
+ - bugfix: cl not showing up on crew manifest
+ - rscadd: Giving Survivors/Other factions with IFF will let you track them.
+2025-02-06:
+ BartDrown:
+ - rscadd: migrate security records console to tgui
+ - bugfix: highcom cannot change rank in record
+ - bugfix: photo in security records console does not show
+ - bugfix: photo in security records console cannot be updated
+ - bugfix: fingerprint scanner report cannot be viewed if clue detector is not ejected
+ and cleared
+ - qol: add focus and listen on enter in inputs of security console
+ - qol: add cursor pointer to TGUI Button component
+ - refactor: refactor security records console code
+ - code_imp: security records client side sorting and filtering
+ Drathek Nanu:
+ - rscadd: Added unit test to check whether areas needing power have a single APC
+ - rscadd: Unit testing can now be performed during pre-game
+ - bugfix: Fixed various machines that didn't actually use power still marked as
+ requiring power
+ - bugfix: Fixed /obj/structure/closet/secure_closet/freezer/industry not properly
+ using the area's power
+ - maptweak: Fixes, adds & changes areas on all maps to make more sense.
+ - maptweak: Fixes areas that should have APC's getting them, also fixes areas that
+ had more than one APC.
+ - maptweak: Minor bugfixes, and moving some non-significant objects around.
+ Git-Nivrak:
+ - rscadd: Added distant screeches when a new xenomorph evolution becomes available
+ Red-byte3D:
+ - rscadd: You can no longer devolve from being a drone as the last xenomorph alive
+ - bugfix: fixes an issue with CO's not being able to access the techweb, tacmap
+ and get their icon.
+ - bugfix: Synthetic limbs are now named properly
+ efzapa:
+ - rscadd: CMB Fax Responders now start as a Deputy, then rank up to Marshal at 25
+ Hours of Playtime.
+ hry-gh:
+ - bugfix: fixes tgui windows sometimes offsetting weirdly
+ realforest2001:
+ - rscadd: Fax Responders now understand all human languages.
+ - bugfix: CL Radio Key now appropriately gives access to Almayer General Comms.
+ thebleh:
+ - qol: Removed client window side padding to prevent accidental dragging
+ zzzmike:
+ - bugfix: mitigates bug where you can't close or unlock an opened locked locker
+ - qol: message added when someone opens a stasis bag
diff --git a/icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi b/icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi
index 1ad5715463f6..aac132c20798 100644
Binary files a/icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi and b/icons/mob/xenonids/castes/tier_0/xenonid_crab.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 8ec126e3a553..b79a569f62ce 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -25,8 +25,8 @@ window "mainwindow"
menu = "menu"
elem "split"
type = CHILD
- pos = 3,0
- size = 634x440
+ pos = 0,0
+ size = 640x440
anchor1 = 0,0
anchor2 = 100,100
saved-params = "splitter"
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm
index 8d679018b20b..fdb4e378c447 100644
--- a/maps/map_files/BigRed/BigRed.dmm
+++ b/maps/map_files/BigRed/BigRed.dmm
@@ -719,6 +719,14 @@
/obj/structure/surface/table,
/turf/open/floor/white,
/area/bigredv2/outside/marshal_office)
+"acN" = (
+/obj/structure/machinery/power/apc/power/east,
+/turf/open/floor/asteroidfloor/north,
+/area/bigredv2/outside/space_port_lz2)
+"acO" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/asteroidwarning,
+/area/bigredv2/outside/w)
"acP" = (
/turf/open/mars,
/area/bigredv2/outside/n)
@@ -757,6 +765,9 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/white,
/area/bigredv2/outside/marshal_office)
+"acW" = (
+/turf/open/floor/asteroidfloor/north,
+/area/bigredv2/outside/cargo)
"acX" = (
/obj/structure/machinery/washing_machine,
/turf/open/floor/white,
@@ -769,6 +780,10 @@
"acZ" = (
/turf/open/floor/greengrid,
/area/bigredv2/outside/telecomm)
+"ada" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/plating,
+/area/bigredv2/outside/cargo)
"adb" = (
/obj/structure/surface/table,
/obj/item/tool/hand_labeler,
@@ -824,6 +839,20 @@
/obj/structure/machinery/computer/arcade,
/turf/open/floor/white,
/area/bigredv2/outside/marshal_office)
+"adn" = (
+/obj/structure/machinery/power/apc/no_power/south,
+/turf/open/floor/whitebluefull/northeast,
+/area/bigredv2/outside/general_store)
+"ado" = (
+/turf/open/asphalt/cement_sunbleached/cement_sunbleached14,
+/area/bigredv2/outside/lambda_cave_cas)
+"adp" = (
+/turf/open/asphalt/cement_sunbleached/cement_sunbleached12,
+/area/bigredv2/outside/lambda_cave_cas)
+"adq" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/asphalt/cement_sunbleached/cement_sunbleached12,
+/area/bigredv2/outside/lambda_cave_cas)
"adr" = (
/obj/structure/machinery/light{
dir = 4
@@ -860,6 +889,9 @@
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/asteroidwarning/east,
/area/bigredv2/outside/space_port)
+"adx" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/lambda_cave_cas)
"ady" = (
/obj/structure/bed/chair,
/turf/open/floor/darkish,
@@ -896,6 +928,13 @@
},
/turf/open/floor/freezerfloor,
/area/bigredv2/outside/marshal_office)
+"adF" = (
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/generic,
+/turf/open/asphalt/cement_sunbleached,
+/area/bigredv2/outside/lambda_cave_cas)
"adG" = (
/obj/item/shard,
/obj/effect/decal/cleanable/blood{
@@ -923,12 +962,19 @@
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/asteroidwarning/east,
/area/bigredv2/outside/space_port)
+"adK" = (
+/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
+/area/bigredv2/outside/lambda_cave_cas)
"adL" = (
/obj/structure/machinery/light{
dir = 4
},
/turf/open/floor/plating,
/area/bigredv2/outside/space_port)
+"adM" = (
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/plating,
+/area/bigredv2/caves_lambda)
"adN" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/white,
@@ -962,9 +1008,25 @@
/obj/item/clothing/suit/storage/CMB,
/turf/open/floor/floor4,
/area/bigredv2/outside/marshal_office)
+"adU" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/plating,
+/area/bigredv2/outside/nw/ceiling)
+"adV" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"adW" = (
/turf/open/floor/wood,
/area/bigredv2/outside/marshal_office)
+"adX" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "E-corner"
+ },
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/plating,
+/area/bigredv2/caves_north)
"adZ" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/caves/lambda/xenobiology)
@@ -8664,7 +8726,7 @@
/area/bigredv2/caves/eta/research)
"aOn" = (
/turf/open/floor/asteroidwarning/east,
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/lambda_cave_cas)
"aOo" = (
/obj/structure/bed/chair/office/light{
dir = 8
@@ -17370,9 +17432,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached3,
/area/bigredv2/outside/s)
-"bGQ" = (
-/turf/open/asphalt/cement/cement4,
-/area/bigredv2/caves_lambda)
"bGX" = (
/obj/item/tool/weldingtool{
pixel_x = 9;
@@ -17770,7 +17829,7 @@
dir = 4
},
/turf/open/mars_cave/mars_dirt_4,
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/lambda_cave_cas)
"cfr" = (
/obj/item/explosive/grenade/baton{
dir = 8
@@ -19227,8 +19286,9 @@
/turf/open/mars_cave/mars_cave_2,
/area/bigredv2/caves/mining)
"dIb" = (
+/obj/structure/machinery/power/apc/power/north,
/turf/open/floor,
-/area/bigredv2/caves)
+/area/bigredv2/outside/filtration_cave_cas)
"dIn" = (
/obj/structure/sink{
dir = 4;
@@ -20170,7 +20230,7 @@
"eGf" = (
/obj/structure/machinery/light/double,
/turf/open/mars_cave/mars_cave_2,
-/area/bigredv2/caves_sw)
+/area/bigredv2/caves/mining)
"eGq" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
dir = 4;
@@ -20743,9 +20803,6 @@
/obj/structure/platform_decoration/metal/almayer,
/turf/open/floor/dark,
/area/bigredv2/outside/admin_building)
-"fjP" = (
-/turf/open/floor/delivery,
-/area/bigredv2/caves)
"fkD" = (
/obj/item/ammo_magazine/shotgun/slugs,
/turf/closed/wall/solaris/rock,
@@ -20923,7 +20980,7 @@
"fwV" = (
/obj/structure/surface/table,
/turf/open/floor,
-/area/bigredv2/caves)
+/area/bigredv2/outside/filtration_cave_cas)
"fxa" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached18,
@@ -22640,7 +22697,7 @@
dir = 1
},
/turf/open/mars_cave/mars_cave_17,
-/area/bigredv2/caves_research)
+/area/bigredv2/caves/mining)
"hot" = (
/obj/structure/platform_decoration/stone/kutjevo/north,
/turf/open/mars/mars_dirt_12,
@@ -22959,7 +23016,7 @@
"hGv" = (
/obj/structure/machinery/light,
/turf/open/floor/asteroidwarning/north,
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/medical)
"hGy" = (
/obj/structure/flora/grass/desert/lightgrass_11,
/turf/open/mars,
@@ -23151,7 +23208,7 @@
dir = 4
},
/turf/open/floor/asteroidwarning/northwest,
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/w)
"hUe" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached1,
/area/bigredv2/outside/se)
@@ -24108,10 +24165,6 @@
"iXx" = (
/turf/open/mars_cave,
/area/bigredv2/outside/n)
-"iXD" = (
-/obj/structure/machinery/power/apc/power/south,
-/turf/open/floor/plating,
-/area/bigredv2/outside/general_offices)
"iXN" = (
/obj/item/ore{
pixel_x = -7;
@@ -24153,7 +24206,7 @@
"iZA" = (
/obj/structure/surface/rack,
/turf/open/floor,
-/area/bigredv2/caves)
+/area/bigredv2/outside/filtration_cave_cas)
"jay" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 5
@@ -24767,7 +24820,7 @@
icon_state = "S"
},
/turf/open/mars_cave/mars_cave_2,
-/area/bigredv2/caves_sw)
+/area/bigredv2/caves/mining)
"jMn" = (
/obj/structure/machinery/light{
dir = 8
@@ -25614,7 +25667,7 @@
},
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/asteroidfloor/north,
-/area/bigredv2/outside/ne)
+/area/bigredv2/outside/general_offices)
"kwQ" = (
/turf/open/floor/asteroidwarning/southwest,
/area/bigredv2/outside/se)
@@ -25748,10 +25801,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/asteroidwarning/north,
/area/bigredv2/outside/eta)
-"kGr" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/turf/open/floor/plating,
-/area/bigredv2/outside/general_store)
"kGw" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor,
@@ -27045,7 +27094,7 @@
dir = 8
},
/turf/open/asphalt/cement_sunbleached/cement_sunbleached2,
-/area/bigredv2/outside/nw)
+/area/bigred/ground/garage_workshop)
"mda" = (
/turf/open/mars_cave/mars_cave_16,
/area/bigredv2/caves_lambda)
@@ -27076,7 +27125,7 @@
dir = 8
},
/turf/open/asphalt/cement_sunbleached/cement_sunbleached14,
-/area/bigredv2/outside/nw)
+/area/bigred/ground/garage_workshop)
"mes" = (
/obj/structure/machinery/light{
dir = 8
@@ -27376,9 +27425,6 @@
/obj/structure/flora/grass/desert/lightgrass_2,
/turf/open/mars/mars_dirt_10,
/area/bigredv2/outside/nw)
-"muP" = (
-/turf/closed/wall/wood,
-/area/bigredv2/caves_research)
"mvk" = (
/obj/item/tool/shovel,
/turf/open/mars,
@@ -27388,7 +27434,7 @@
dir = 4
},
/turf/open/floor/asteroidwarning/northwest,
-/area/bigredv2/outside/e)
+/area/bigredv2/outside/lambda_cave_cas)
"mwI" = (
/obj/structure/surface/table,
/obj/item/evidencebag{
@@ -27625,7 +27671,7 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/turf/open/asphalt/cement/cement15,
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/lambda_cave_cas)
"mIc" = (
/obj/effect/landmark/static_comms/net_two,
/turf/open/floor/podhatchfloor,
@@ -27823,11 +27869,6 @@
},
/turf/open/asphalt/cement,
/area/bigredv2/outside/lambda_cave_cas)
-"mRD" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/computer/atmos_alert,
-/turf/open/floor,
-/area/bigredv2/caves)
"mRP" = (
/obj/structure/surface/table/woodentable,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
@@ -27954,8 +27995,11 @@
/area/bigredv2/caves/mining)
"mYo" = (
/obj/effect/decal/strata_decals/grime/grime3,
+/obj/effect/landmark/nightmare{
+ insert_tag = "cargo_containers"
+ },
/turf/open/asphalt/cement_sunbleached/cement_sunbleached1,
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/w)
"mYp" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -28623,6 +28667,7 @@
/area/bigredv2/outside/nw)
"nJu" = (
/obj/structure/flora/grass/desert/lightgrass_7,
+/obj/structure/machinery/power/apc/power/north,
/turf/open/mars,
/area/bigredv2/outside/eta)
"nKL" = (
@@ -29014,7 +29059,7 @@
pixel_y = 12
},
/turf/open/asphalt/cement_sunbleached/cement_sunbleached3,
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/w)
"ohD" = (
/turf/open/mars_cave/mars_cave_11,
/area/bigredv2/caves_east)
@@ -29846,7 +29891,7 @@
dir = 1
},
/turf/open/mars_cave/mars_cave_2,
-/area/bigredv2/caves_sw)
+/area/bigredv2/caves/mining)
"oWe" = (
/obj/structure/machinery/photocopier{
density = 0;
@@ -30074,7 +30119,7 @@
dir = 8
},
/turf/open/floor/asteroidwarning/southeast,
-/area/bigredv2/caves_east)
+/area/bigredv2/outside/lambda_cave_cas)
"phi" = (
/turf/open/mars_cave/mars_cave_6,
/area/bigredv2/caves_research)
@@ -30189,10 +30234,6 @@
},
/turf/open/floor/freezerfloor,
/area/bigredv2/outside/general_offices)
-"poS" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/turf/open/floor/plating,
-/area/bigredv2/outside/cargo)
"poV" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -30684,7 +30725,7 @@
/obj/structure/surface/table,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor,
-/area/bigredv2/caves)
+/area/bigredv2/outside/filtration_cave_cas)
"pQE" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
@@ -32495,7 +32536,7 @@
"rGz" = (
/obj/structure/machinery/light/double,
/turf/open/mars_cave/mars_cave_5,
-/area/bigredv2/caves_sw)
+/area/bigredv2/caves/mining)
"rGD" = (
/obj/structure/machinery/power/apc/no_power/north,
/turf/open/floor/red/north,
@@ -33324,7 +33365,7 @@
"snZ" = (
/obj/structure/flora/grass/desert/lightgrass_11,
/turf/open/mars_cave/mars_dirt_4,
-/area/bigredv2/outside/space_port_lz2)
+/area/bigredv2/outside/w)
"sog" = (
/obj/item/explosive/grenade/slug/baton{
dir = 1;
@@ -33360,7 +33401,7 @@
"spd" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/asteroidwarning/east,
-/area/bigredv2/caves_east)
+/area/bigredv2/outside/lambda_cave_cas)
"sqc" = (
/obj/effect/decal/cleanable/blood{
base_icon = 'icons/obj/items/weapons/grenade.dmi';
@@ -33400,7 +33441,7 @@
"ssE" = (
/obj/structure/window/framed/solaris,
/turf/open/floor/plating,
-/area/bigredv2/caves)
+/area/bigredv2/outside/filtration_cave_cas)
"ssI" = (
/obj/structure/prop/dam/truck/damaged,
/turf/open/mars_cave/mars_dirt_4,
@@ -34652,10 +34693,6 @@
},
/turf/open/asphalt/cement/cement15,
/area/bigredv2/outside/space_port)
-"tEc" = (
-/obj/structure/machinery/light/small,
-/turf/open/mars_cave/mars_dirt_4,
-/area/bigredv2/caves_research)
"tEA" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
@@ -35874,7 +35911,7 @@
/area/bigredv2/caves/lambda/research)
"uUY" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/no_power/west,
+/obj/structure/machinery/power/apc/power/west,
/turf/open/floor/darkyellow2/west,
/area/bigredv2/outside/filtration_plant)
"uVd" = (
@@ -36023,7 +36060,7 @@
icon_state = "S"
},
/turf/open/mars_cave/mars_cave_5,
-/area/bigredv2/caves_sw)
+/area/bigredv2/caves/mining)
"vcy" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{
@@ -36493,7 +36530,7 @@
/obj/structure/surface/table,
/obj/structure/machinery/light,
/turf/open/floor/asteroidfloor/north,
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/medical)
"vxI" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -36896,7 +36933,7 @@
dir = 8
},
/turf/open/floor/asteroidwarning/northeast,
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/lambda_cave_cas)
"vTh" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -37064,7 +37101,7 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/turf/open/asphalt/cement/cement12,
-/area/bigredv2/caves_lambda)
+/area/bigredv2/outside/lambda_cave_cas)
"wdn" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/barricade/metal{
@@ -37283,10 +37320,6 @@
/obj/structure/window_frame/solaris,
/turf/open/floor/plating,
/area/bigredv2/outside/medical)
-"woe" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/mars_cave/mars_dirt_4,
-/area/bigredv2/outside/space_port_lz2)
"wog" = (
/turf/open/mars_cave/mars_cave_2,
/area/bigredv2/caves_sw)
@@ -37951,7 +37984,7 @@
"wZv" = (
/obj/structure/machinery/light,
/turf/open/floor/asteroidfloor/north,
-/area/bigredv2/outside/c)
+/area/bigredv2/outside/cargo)
"wZC" = (
/turf/open/mars/mars_dirt_11,
/area/bigredv2/outside/eta)
@@ -38987,10 +39020,6 @@
"yar" = (
/turf/open/floor/darkyellow2/east,
/area/bigredv2/outside/filtration_plant)
-"yaM" = (
-/obj/structure/machinery/power/apc/power/north,
-/turf/open/floor,
-/area/bigredv2/outside/cargo)
"ybk" = (
/turf/open/mars_cave/mars_cave_17,
/area/bigredv2/caves_research)
@@ -46692,7 +46721,7 @@ aSB
aSB
rZn
aSB
-tVp
+aSB
mMf
mMf
tVp
@@ -46909,7 +46938,7 @@ aSB
beP
beP
beP
-tVp
+aSB
tVp
tVp
tVp
@@ -47522,7 +47551,7 @@ axZ
avT
azn
avT
-avT
+adU
anp
siK
siG
@@ -47560,7 +47589,7 @@ jzO
jzO
uyS
vDS
-woe
+beP
tVp
tVp
eRN
@@ -47777,7 +47806,7 @@ qMG
vna
jlJ
rvU
-woe
+beP
tVp
wbD
tVp
@@ -47994,7 +48023,7 @@ jzO
vna
jzO
rvU
-woe
+beP
tVp
tVp
tVp
@@ -48203,7 +48232,7 @@ aoH
aXH
aXH
asK
-beQ
+acO
aYF
pGp
mQY
@@ -48211,7 +48240,7 @@ jzO
vna
jzO
rvU
-tVp
+aSB
aao
aao
tVp
@@ -48428,7 +48457,7 @@ jzO
jzO
jzO
rvU
-tVp
+aSB
tVp
aao
aao
@@ -48862,7 +48891,7 @@ bjT
jzO
jzO
woP
-tVp
+aSB
buk
tVp
tVp
@@ -49079,7 +49108,7 @@ jzO
jzO
jzO
sym
-tVp
+aSB
tVp
tVp
tVp
@@ -49137,7 +49166,7 @@ lQN
kgx
kgx
kgx
-feS
+buj
uHQ
uHQ
uHQ
@@ -49518,7 +49547,7 @@ eWd
eWd
eWd
asK
-eWd
+acN
eWd
crl
kHK
@@ -51668,7 +51697,7 @@ aSI
aOB
aNo
aNo
-aNm
+adn
aoH
hmJ
aXH
@@ -52104,7 +52133,7 @@ aPv
aNm
aWB
aoH
-aXH
+ada
aXH
mOc
aZu
@@ -52537,7 +52566,7 @@ aNo
aVe
aVM
aoH
-poS
+aXH
aXH
aXH
asK
@@ -52556,7 +52585,7 @@ aZu
aZu
aZu
asK
-yaM
+aZu
aZu
aZO
biN
@@ -52754,7 +52783,7 @@ aNo
aVf
aOB
aoH
-kGr
+aXH
aXH
aXH
asK
@@ -53622,9 +53651,9 @@ aQS
aQS
aQS
aoH
-aHF
-aHF
-aHF
+acW
+acW
+acW
asK
aZv
aZR
@@ -53839,9 +53868,9 @@ apQ
apQ
apQ
aoH
-aHF
-aHF
-aHF
+acW
+acW
+acW
asK
aZu
aZu
@@ -54056,8 +54085,8 @@ aGV
aVh
aVP
aoH
-aHF
-aHF
+acW
+acW
wZv
asK
aZw
@@ -54273,9 +54302,9 @@ aSO
aVi
aVO
aoH
-aHF
-aHF
-aHF
+acW
+acW
+acW
asK
aZx
aZx
@@ -54490,9 +54519,9 @@ aoH
aoH
aoH
aoH
-aHF
-aHF
-aHF
+acW
+acW
+acW
asK
atw
atw
@@ -54795,14 +54824,14 @@ aao
aao
aao
aao
-muP
+vHw
hnh
-xkq
-nXC
-nny
-gpB
-tEc
-muP
+rsv
+sZh
+nSP
+szw
+fRW
+vHw
aao
aao
aao
@@ -65742,7 +65771,7 @@ atD
sih
sih
ako
-atE
+adV
awu
apc
ako
@@ -67472,7 +67501,7 @@ aou
aph
aou
uzD
-iXD
+aou
ako
bqA
atG
@@ -67519,7 +67548,7 @@ asv
asv
asv
lhN
-cDG
+bda
bdA
kIX
tUa
@@ -67736,7 +67765,7 @@ baj
baP
bbC
eUX
-bda
+cDG
bLG
kIX
jYP
@@ -68200,8 +68229,8 @@ hUe
nBd
lvy
lvy
-lvy
-bes
+eWo
+mzV
mzV
pvp
uvZ
@@ -68854,13 +68883,13 @@ fCb
fCb
aao
pcF
-kBn
-kBn
-kBn
-kBn
-kBn
-kBn
-kBn
+vVZ
+vVZ
+vVZ
+vVZ
+vVZ
+vVZ
+vVZ
aao
aao
kBn
@@ -69071,13 +69100,13 @@ fCb
rjw
fCb
pcF
-kBn
+vVZ
iZA
-dIb
+fCb
pQv
fwV
fwV
-kBn
+vVZ
aao
aao
aao
@@ -69288,13 +69317,13 @@ aao
aao
aao
pcF
-fjP
-dIb
-dIb
-dIb
-dIb
+myY
+fCb
+fCb
+fCb
+fCb
fwV
-kBn
+vVZ
aao
aao
aao
@@ -69505,13 +69534,13 @@ fCb
aao
aao
pcF
-kBn
-dIb
-dIb
-dIb
-dIb
-dIb
-kBn
+vVZ
+fCb
+fCb
+fCb
+fCb
+fCb
+vVZ
aao
aao
fOx
@@ -69722,13 +69751,13 @@ vVZ
vVZ
vVZ
pcF
-kBn
-dIb
-dIb
-dIb
-dIb
+vVZ
+fCb
+fCb
+fCb
+fCb
iZA
-kBn
+vVZ
aao
fOx
fOx
@@ -69939,13 +69968,13 @@ fCb
fCb
aao
pcF
-kBn
-dIb
-dIb
-dIb
+vVZ
dIb
-kBn
-kBn
+fCb
+fCb
+fCb
+vVZ
+vVZ
kSL
fOx
fOx
@@ -70156,11 +70185,11 @@ fCb
aao
aao
pcF
-kBn
+vVZ
fwV
-dIb
-dIb
-dIb
+fCb
+fCb
+fCb
ssE
kSL
fOx
@@ -70373,11 +70402,11 @@ aao
aao
aao
pcF
-kBn
-mRD
-dIb
-dIb
-dIb
+vVZ
+fwV
+fCb
+fCb
+fCb
ssE
kSL
fOx
@@ -70590,12 +70619,12 @@ aao
aao
aao
pcF
-kBn
+vVZ
fwV
-dIb
-dIb
-kBn
-kBn
+fCb
+fCb
+vVZ
+vVZ
fOx
fOx
fOx
@@ -70807,11 +70836,11 @@ fCb
fCb
brE
pcF
-kBn
-kBn
-kBn
-fjP
-kBn
+vVZ
+vVZ
+vVZ
+myY
+vVZ
fOx
fOx
fOx
@@ -70921,8 +70950,8 @@ aao
aao
aao
aao
-aao
-mEC
+gNH
+adX
fGK
fGK
fGK
@@ -74234,7 +74263,7 @@ aQu
dpU
mNP
mlt
-dmE
+ado
mwq
aTu
aTu
@@ -74451,7 +74480,7 @@ aQu
oCK
poV
fFs
-uxk
+adp
dTB
rbs
rbs
@@ -74665,10 +74694,10 @@ aQu
aQu
aQu
ceA
-oCK
-uDe
-haV
-yfY
+adK
+adF
+adx
+adq
rbs
oPM
eKZ
@@ -76401,10 +76430,10 @@ aao
aao
aao
aao
-bGQ
-eJu
-iyp
-oBy
+ruo
+rnv
+sML
+dWx
rbs
lAR
oJv
@@ -79433,7 +79462,7 @@ aIN
aJG
anI
aao
-gmN
+adM
tQw
xFZ
tQw
@@ -79650,7 +79679,7 @@ aIO
tkN
anI
aao
-aao
+gNH
amG
aao
wQC
diff --git a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm
index 61784949f25a..10f0470cd59a 100644
--- a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm
+++ b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm
@@ -562,9 +562,6 @@
/obj/effect/landmark/survivor_spawner,
/turf/open/floor,
/area/bigredv2/outside/marshal_office)
-"dj" = (
-/turf/closed/wall/solaris/reinforced,
-/area/bigredv2/outside/medical)
"dk" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
@@ -1196,7 +1193,7 @@
name = "\improper Marshal Offices Shutters"
},
/turf/open/floor/plating,
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/marshal_office)
"MS" = (
/obj/structure/bed/chair{
dir = 4
@@ -1375,7 +1372,7 @@ cN
ah
ah
ah
-dj
+ah
"}
(2,1,1) = {"
ab
@@ -1399,7 +1396,7 @@ bi
bG
cZ
gJ
-dj
+ah
"}
(3,1,1) = {"
ab
@@ -1423,7 +1420,7 @@ cO
cU
cZ
ci
-dj
+ah
"}
(4,1,1) = {"
ac
@@ -1447,7 +1444,7 @@ cP
bG
cZ
df
-dj
+ah
"}
(5,1,1) = {"
ab
@@ -1471,7 +1468,7 @@ bk
ah
ah
ah
-dj
+ah
"}
(6,1,1) = {"
zv
@@ -1495,7 +1492,7 @@ bk
bG
cZ
ix
-dj
+ah
"}
(7,1,1) = {"
ac
@@ -1519,7 +1516,7 @@ bk
cV
cZ
ci
-dj
+ah
"}
(8,1,1) = {"
af
@@ -1543,7 +1540,7 @@ wm
bG
cZ
df
-dj
+ah
"}
(9,1,1) = {"
aa
@@ -1567,7 +1564,7 @@ bi
ah
ah
ah
-dj
+ah
"}
(10,1,1) = {"
VX
@@ -1591,7 +1588,7 @@ bi
bG
cZ
de
-dj
+ah
"}
(11,1,1) = {"
ah
@@ -1615,7 +1612,7 @@ bi
Px
cZ
ci
-dj
+ah
"}
(12,1,1) = {"
ah
@@ -1639,7 +1636,7 @@ cR
bG
cZ
qm
-dj
+ah
"}
(13,1,1) = {"
ah
@@ -1663,7 +1660,7 @@ cS
ah
ah
ah
-dj
+ah
"}
(14,1,1) = {"
ai
@@ -1687,7 +1684,7 @@ FK
bG
cZ
de
-dj
+ah
"}
(15,1,1) = {"
aj
@@ -1711,7 +1708,7 @@ bk
cV
cZ
ci
-dj
+ah
"}
(16,1,1) = {"
aj
@@ -1735,7 +1732,7 @@ bk
bG
cZ
df
-dj
+ah
"}
(17,1,1) = {"
aj
@@ -1759,7 +1756,7 @@ bk
ah
ah
ah
-dj
+ah
"}
(18,1,1) = {"
aj
@@ -1831,7 +1828,7 @@ bk
ah
bG
bG
-dj
+ah
"}
(21,1,1) = {"
cb
diff --git a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm
index 42c8551d2395..78f22d3b4958 100644
--- a/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm
+++ b/maps/map_files/BigRed/sprinkles/25.containerroom_xenos.dmm
@@ -1,4 +1,8 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/plating,
+/area/bigredv2/outside/nw)
"b" = (
/turf/closed/wall/solaris/reinforced,
/area/bigredv2/outside/nw)
@@ -184,7 +188,7 @@ q
j
u
j
-j
+a
b
"}
(3,1,1) = {"
diff --git a/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm b/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm
index 1ac16477f905..18f3504003e2 100644
--- a/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm
+++ b/maps/map_files/BigRed/sprinkles/30.cargo_containers.dmm
@@ -309,10 +309,6 @@
/obj/structure/largecrate,
/turf/open/floor/bot/north,
/area/bigredv2/outside/cargo)
-"bk" = (
-/obj/structure/machinery/power/apc/power/north,
-/turf/open/floor,
-/area/bigredv2/outside/cargo)
"bm" = (
/obj/item/device/flashlight,
/obj/item/reagent_container/spray/cleaner,
@@ -932,7 +928,7 @@ av
av
av
ai
-bk
+av
av
af
bD
diff --git a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm
index c60a4e6854af..ef4c73d4f8a2 100644
--- a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm
+++ b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm
@@ -71,7 +71,8 @@
/area/bigredv2/outside/filtration_cave_cas)
"pI" = (
/obj/structure/machinery/light{
- dir = 1
+ dir = 1;
+ needs_power = 0
},
/turf/open/asphalt/cement/cement2,
/area/bigredv2/outside/filtration_cave_cas)
@@ -267,7 +268,8 @@
/area/bigredv2/outside/filtration_cave_cas)
"RA" = (
/obj/structure/machinery/light{
- dir = 1
+ dir = 1;
+ needs_power = 0
},
/turf/open/asphalt/cement/cement4,
/area/bigredv2/outside/filtration_cave_cas)
diff --git a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
index fc9e6f1c4454..43397f230096 100644
--- a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
+++ b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm
@@ -158,6 +158,10 @@
icon_state = "wy23"
},
/area/bigredv2/outside/general_offices)
+"aG" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor,
+/area/bigredv2/outside/general_offices)
"aH" = (
/turf/closed/shuttle/ert{
icon_state = "wy25"
@@ -1408,7 +1412,7 @@ oi
oi
oi
aB
-aK
+aG
aK
aK
aB
diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
index a2d21911a893..9e7fd9c00f3d 100644
--- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
+++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm
@@ -231,6 +231,13 @@
/obj/item/stack/rods,
/turf/open/floor/plating/panelscorched,
/area/bigredv2/outside/office_complex)
+"aS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/power/apc/power/north{
+ name = "Interview Room APC"
+ },
+/turf/open/floor/platingdmg1,
+/area/bigredv2/outside/office_complex)
"aT" = (
/turf/closed/shuttle/ert{
icon_state = "wy18"
@@ -449,22 +456,12 @@
},
/turf/open/floor,
/area/bigredv2/outside/office_complex)
-"dm" = (
-/turf/closed/shuttle/ert{
- icon_state = "wy1"
- },
-/area/bigredv2/outside/se)
"dn" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 2
},
/turf/open/floor/plating,
-/area/bigredv2/outside/se)
-"do" = (
-/turf/closed/shuttle/ert{
- icon_state = "wy3"
- },
-/area/bigredv2/outside/se)
+/area/bigredv2/outside/office_complex)
"ds" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/mars,
@@ -1724,7 +1721,7 @@ zH
ws
hl
cE
-dm
+dg
Is
"}
(13,1,1) = {"
@@ -1778,7 +1775,7 @@ KK
KK
Wd
cF
-do
+di
ds
"}
(15,1,1) = {"
@@ -1832,7 +1829,7 @@ ue
Fc
UR
cE
-dm
+dg
Ct
"}
(17,1,1) = {"
@@ -1886,7 +1883,7 @@ Eo
ql
oc
cF
-do
+di
jl
"}
(19,1,1) = {"
@@ -1981,7 +1978,7 @@ WB
ap
UB
ap
-Cy
+aS
nn
Oi
WB
diff --git a/maps/map_files/BigRed/standalone/medbay-v3.dmm b/maps/map_files/BigRed/standalone/medbay-v3.dmm
index 522c65f07b89..bdc3d9fafcef 100644
--- a/maps/map_files/BigRed/standalone/medbay-v3.dmm
+++ b/maps/map_files/BigRed/standalone/medbay-v3.dmm
@@ -608,7 +608,7 @@
},
/obj/structure/surface/table,
/turf/open/floor/asteroidfloor/north,
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/medical)
"xv" = (
/obj/structure/bed/chair{
dir = 1
@@ -776,7 +776,7 @@
/area/bigredv2/outside/medical)
"Db" = (
/turf/open/floor/asteroidfloor/north,
-/area/bigredv2/outside/medical)
+/area/bigredv2/outside/c)
"Dj" = (
/obj/item/stack/rods,
/turf/open/floor/plating/panelscorched,
@@ -1146,9 +1146,6 @@
},
/turf/closed/wall/solaris,
/area/bigredv2/outside/medical)
-"OM" = (
-/turf/open/floor/asteroidwarning,
-/area/bigredv2/outside/medical)
"ON" = (
/obj/structure/surface/table/reinforced,
/turf/open/floor/platingdmg1,
@@ -1449,7 +1446,7 @@
"YF" = (
/obj/structure/machinery/light,
/turf/open/floor/asteroidwarning/north,
-/area/bigredv2/outside/n)
+/area/bigredv2/outside/medical)
"YQ" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -2001,7 +1998,7 @@ aa
Xr
Ml
HQ
-OM
+rm
"}
(19,1,1) = {"
af
diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm
index 2d2bb83172d7..a10af6fcb4a0 100644
--- a/maps/map_files/CORSAT/Corsat.dmm
+++ b/maps/map_files/CORSAT/Corsat.dmm
@@ -195,6 +195,10 @@
"aaS" = (
/turf/open/floor/plating/warnplate/west,
/area/corsat/gamma/hangar)
+"aaT" = (
+/obj/structure/machinery/power/apc/upgraded/no_power/north,
+/turf/open/floor/corsat/purple/north,
+/area/corsat/omega/hallways)
"aaU" = (
/turf/open/floor/plating/warnplate/east,
/area/corsat/gamma/hangar)
@@ -463,6 +467,10 @@
"abV" = (
/turf/open/floor/plating/warnplate/southwest,
/area/corsat/gamma/hangar)
+"abW" = (
+/obj/structure/machinery/power/apc/no_power/south,
+/turf/open/floor/corsat/green,
+/area/corsat/gamma/hallwaysouth)
"abX" = (
/turf/open/floor/plating/icefloor/warnplate,
/area/corsat/gamma/hangar)
@@ -481,6 +489,10 @@
},
/turf/open/floor/plating/icefloor/warnplate,
/area/corsat/gamma/hangar)
+"acb" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/corsat/darkgreen/north,
+/area/corsat/sigma/hangar/arrivals)
"acc" = (
/obj/structure/closet/cabinet,
/turf/open/floor/wood,
@@ -1061,6 +1073,10 @@
/obj/structure/bed/chair/comfy/beige,
/turf/open/floor/carpet6_2/west,
/area/corsat/gamma/residential/lounge)
+"aeh" = (
+/obj/structure/machinery/power/apc/upgraded/no_power/south,
+/turf/open/floor/corsat/white,
+/area/corsat/gamma/residential/east)
"aei" = (
/obj/structure/bed,
/obj/structure/machinery/light{
@@ -5308,10 +5324,6 @@
/obj/structure/machinery/power/apc/upgraded/no_power/east,
/turf/open/floor/corsat/whitebluefull/southwest,
/area/corsat/gamma/residential/lavatory)
-"avy" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/turf/open/floor/corsat/brown/north,
-/area/corsat/omega/cargo)
"avz" = (
/turf/open/floor/carpet9_4/west,
/area/corsat/gamma/administration)
@@ -5707,6 +5719,7 @@
name = "Security Shutters";
use_power = 0
},
+/obj/structure/machinery/power/apc/upgraded/no_power/south,
/turf/open/floor/corsat/red,
/area/corsat/gamma/airlock/north/id)
"awX" = (
@@ -7692,7 +7705,7 @@
/turf/closed/shuttle/ert{
icon_state = "wy20"
},
-/area/corsat/omega/hangar)
+/area/prison/hangar_storage/research/shuttle)
"aDZ" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "Control Room";
@@ -7720,17 +7733,17 @@
/turf/closed/shuttle/ert{
icon_state = "wy27"
},
-/area/corsat/omega/hangar)
+/area/prison/hangar_storage/research/shuttle)
"aEd" = (
/turf/closed/shuttle/ert{
icon_state = "wy25"
},
-/area/corsat/omega/hangar)
+/area/prison/hangar_storage/research/shuttle)
"aEe" = (
/turf/closed/shuttle/ert{
icon_state = "wy21"
},
-/area/corsat/omega/hangar)
+/area/prison/hangar_storage/research/shuttle)
"aEf" = (
/obj/structure/window/framed/corsat/hull,
/obj/structure/machinery/door/poddoor/almayer/open{
@@ -7757,9 +7770,6 @@
},
/turf/open/floor/corsat/squares,
/area/corsat/omega/hallways)
-"aEj" = (
-/turf/open/floor/plating/warnplate,
-/area/prison/hangar_storage/research/shuttle)
"aEk" = (
/turf/open/floor/corsat/purplecorner/east,
/area/corsat/omega/airlocknorth)
@@ -9953,7 +9963,6 @@
/area/corsat/omega/airlocknorth/id)
"aMx" = (
/obj/structure/surface/table/reinforced,
-/obj/structure/machinery/power/apc/no_power/north,
/obj/structure/machinery/computer/station_alert,
/turf/open/floor/corsat/plate,
/area/corsat/omega/airlocknorth/id)
@@ -11911,9 +11920,6 @@
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/corsat/squareswood/north,
/area/corsat/gamma/biodome/complex)
-"aTP" = (
-/turf/open/floor/corsat/marked,
-/area/corsat/omega/biodome)
"aTQ" = (
/obj/structure/machinery/light{
dir = 1
@@ -16762,7 +16768,7 @@
name = "Omega Lockdown"
},
/turf/open/floor/corsat/marked,
-/area/corsat/omega/biodome)
+/area/corsat/omega/airlocknorth)
"bkP" = (
/obj/structure/window/framed/corsat/cell/security,
/turf/open/floor/plating,
@@ -26298,6 +26304,7 @@
"cpU" = (
/obj/structure/surface/rack,
/obj/item/device/flashlight,
+/obj/structure/machinery/power/apc/upgraded/no_power/west,
/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down,
/area/prison/hangar_storage/research/shuttle)
"cqv" = (
@@ -39880,10 +39887,6 @@
/obj/structure/machinery/light,
/turf/open/floor/corsat/yellow,
/area/corsat/gamma/airlock/control)
-"qLo" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/turf/open/floor/corsat/yellow/north,
-/area/corsat/gamma/hallwaysouth)
"qLz" = (
/obj/structure/prop/mech/tesla_energy_relay,
/turf/open/floor/corsat,
@@ -42361,10 +42364,6 @@
/obj/structure/surface/table,
/turf/open/floor/corsat/whitetan/north,
/area/corsat/gamma/residential/west)
-"ttJ" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/turf/open/floor/corsat/plate,
-/area/corsat/gamma/hallwaysouth)
"ttK" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 8
@@ -42936,6 +42935,7 @@
pixel_x = -2;
use_power = 0
},
+/obj/structure/machinery/power/apc/upgraded/no_power/north,
/turf/open/floor/corsat/red/northeast,
/area/corsat/omega/airlocknorth)
"tXo" = (
@@ -52231,7 +52231,7 @@ auL
baU
baU
baU
-azX
+auL
sWP
sWP
avX
@@ -52721,7 +52721,7 @@ goe
aoC
aoC
aoC
-aTP
+aGB
hwe
hwe
avX
@@ -52966,7 +52966,7 @@ goe
aoC
aoC
aoC
-aTP
+aGB
hwe
qgF
avX
@@ -53211,7 +53211,7 @@ goe
aoG
aMc
aoG
-aTP
+aGB
hwe
hwe
avX
@@ -53456,7 +53456,7 @@ auG
baU
baU
baU
-azX
+auL
sWP
sWP
avX
@@ -56616,7 +56616,7 @@ iOe
azf
anG
xMJ
-iOe
+aaT
bhk
azf
anG
@@ -60633,7 +60633,7 @@ ffp
pCT
ack
uMD
-kUp
+aeh
abD
abD
abD
@@ -62234,7 +62234,7 @@ aSa
arA
arA
arA
-avy
+kpS
avN
nDs
avN
@@ -63780,7 +63780,7 @@ aiv
aiz
aiH
apj
-ahW
+apk
apk
gcM
apk
@@ -64026,7 +64026,7 @@ aie
aie
aie
apm
-ahW
+apk
gcM
oHU
ahZ
@@ -64272,7 +64272,7 @@ aip
aip
aiw
apm
-aEj
+gcM
sJk
ahZ
xfT
@@ -64517,7 +64517,7 @@ aiF
dXp
aiF
fSX
-aEj
+gcM
apk
ahZ
xfT
@@ -64762,7 +64762,7 @@ gGR
ilo
aiA
aQf
-aEj
+gcM
apk
ahZ
xfT
@@ -65007,7 +65007,7 @@ aiF
aiF
aQe
ahW
-aEj
+gcM
apk
ahZ
xfT
@@ -65252,7 +65252,7 @@ jjb
gGR
aiw
apm
-aEj
+gcM
apk
ahZ
xfT
@@ -65497,7 +65497,7 @@ aiF
aiF
aiF
fSX
-aEj
+gcM
apk
ahZ
xfT
@@ -65742,7 +65742,7 @@ aiu
aiu
aiA
aQf
-aEj
+gcM
oHU
ahZ
xfT
@@ -65986,7 +65986,7 @@ aiq
aiq
aiq
aQf
-ahW
+apk
gcM
sJk
ahZ
@@ -66230,7 +66230,7 @@ aiE
aiG
aiI
aQg
-ahW
+apk
apk
gcM
apk
@@ -71235,7 +71235,7 @@ aqH
aqH
aqH
eaL
-gCO
+abW
aqN
aRP
bAb
@@ -73682,7 +73682,7 @@ aqi
aqi
aqi
aqi
-qLo
+heo
aqH
eaL
gCO
@@ -78582,7 +78582,7 @@ qIU
bqo
hqX
qIU
-ttJ
+aSb
cjs
exY
aqI
@@ -99162,7 +99162,7 @@ ylo
ylo
ylo
alx
-aeC
+acb
aeV
dkK
aeV
diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm
index f7fb4c90b4ee..ec0d7c73a8cd 100644
--- a/maps/map_files/DesertDam/Desert_Dam.dmm
+++ b/maps/map_files/DesertDam/Desert_Dam.dmm
@@ -95,7 +95,7 @@
/area/desert_dam/exterior/landing_pad_two)
"aaw" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached1,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"aax" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 4
@@ -341,6 +341,11 @@
"abs" = (
/turf/open/desert/desert_shore/shore_corner2/west,
/area/desert_dam/exterior/valley/valley_labs)
+"abt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/prison/kitchen/southwest,
+/area/desert_dam/building/cafeteria/cafeteria)
"abu" = (
/obj/effect/blocker/toxic_water,
/turf/open/gm/river/desert/shallow_edge/northwest,
@@ -375,6 +380,16 @@
name = "reinforced metal wall"
},
/area/desert_dam/exterior/river/riverside_east)
+"abB" = (
+/turf/open/desert/dirt/rock1,
+/area/desert_dam/interior/caves/central_caves)
+"abC" = (
+/obj/effect/decal/sand_overlay/sand1,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/desert_dam/exterior/valley/valley_crashsite)
"abD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -384,11 +399,18 @@
},
/turf/open/asphalt,
/area/desert_dam/exterior/valley/valley_wilderness)
+"abE" = (
+/turf/open/desert/rock/deep/rock3,
+/area/desert_dam/interior/caves/central_caves)
"abF" = (
/obj/effect/blocker/toxic_water/Group_2,
/obj/item/trash/boonie,
/turf/open/desert/desert_shore/shore_edge1,
/area/desert_dam/exterior/river/riverside_central_north)
+"abG" = (
+/obj/structure/prop/dam/boulder/boulder3,
+/turf/open/desert/dirt,
+/area/desert_dam/interior/caves/central_caves)
"abH" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/queen_spawn,
@@ -425,6 +447,13 @@
/obj/structure/surface/rack,
/turf/open/floor/prison,
/area/desert_dam/exterior/valley/south_valley_dam)
+"abP" = (
+/obj/effect/decal/sand_overlay/sand1/corner1,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/asphalt/cement_sunbleached,
+/area/desert_dam/exterior/valley/valley_crashsite)
"abQ" = (
/obj/structure/machinery/landinglight/ds1/delayone,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
@@ -467,6 +496,9 @@
/obj/structure/largecrate/random,
/turf/open/asphalt,
/area/desert_dam/exterior/valley/valley_labs)
+"abY" = (
+/turf/open/desert/rock/deep/transition/northeast,
+/area/desert_dam/interior/caves/central_caves)
"abZ" = (
/obj/structure/desertdam/decals/road_edge,
/turf/open/asphalt,
@@ -490,6 +522,9 @@
},
/turf/closed/wall/indestructible/invisible,
/area/desert_dam/exterior/river/riverside_east)
+"ace" = (
+/turf/open/asphalt/cement_sunbleached,
+/area/desert_dam/interior/caves/central_caves)
"acf" = (
/obj/structure/surface/table,
/turf/open/floor/whitegreen/west,
@@ -503,6 +538,12 @@
"ach" = (
/turf/open/gm/river/desert/deep,
/area/desert_dam/exterior/valley/valley_labs)
+"aci" = (
+/obj/effect/decal/sand_overlay/sand1{
+ dir = 8
+ },
+/turf/open/asphalt/tile,
+/area/desert_dam/interior/caves/central_caves)
"acj" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 10
@@ -514,10 +555,19 @@
/obj/effect/blocker/toxic_water,
/turf/open/gm/river/desert/shallow_corner/east,
/area/desert_dam/exterior/river/riverside_east)
+"acl" = (
+/turf/open/floor/prison/southwest,
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
+"acm" = (
+/turf/open/desert/rock/deep/transition/east,
+/area/desert_dam/interior/caves/central_caves)
"acn" = (
/obj/item/trash/eat,
/turf/open/asphalt,
/area/desert_dam/exterior/valley/valley_labs)
+"aco" = (
+/turf/open/floor/plating,
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"acp" = (
/obj/structure/flora/bush/desert{
icon_state = "tree_4"
@@ -544,6 +594,9 @@
icon_state = "pwall"
},
/area/desert_dam/exterior/rock)
+"acv" = (
+/turf/open/floor/plating/warnplate/west,
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"acw" = (
/turf/closed/wall/r_wall/bunker,
/area/desert_dam/interior/dam_interior/east_tunnel_entrance)
@@ -670,6 +723,13 @@
/obj/structure/largecrate/random/secure,
/turf/open/desert/dirt,
/area/desert_dam/exterior/valley/valley_northwest)
+"acX" = (
+/obj/structure/surface/rack,
+/obj/item/stack/sheet/mineral/phoron{
+ amount = 50
+ },
+/turf/open/floor/plating/warnplate/west,
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"acY" = (
/turf/open/desert/rock/deep/rock3,
/area/desert_dam/interior/caves/east_caves)
@@ -812,6 +872,10 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/desert/rock,
/area/desert_dam/interior/caves/east_caves)
+"adE" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/plating,
+/area/desert_dam/building/substation/northwest)
"adF" = (
/turf/open/desert/rock/deep/rock3,
/area/desert_dam/interior/dam_interior/north_tunnel)
@@ -1127,11 +1191,11 @@
/area/desert_dam/interior/dam_interior/western_dam_cave)
"afl" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached12,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"afm" = (
/obj/effect/decal/sand_overlay/sand1/corner1,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached12,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"afn" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/desert/rock/deep/transition/north,
@@ -1861,15 +1925,15 @@
icon_state = "tree_4"
},
/turf/open/desert/dirt,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"aik" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/desert/dirt,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"ail" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/desert/rock,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"aim" = (
/obj/structure/largecrate/random/case/double,
/turf/open/desert/dirt,
@@ -1956,7 +2020,7 @@
},
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"aiK" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -3618,10 +3682,6 @@
"aqd" = (
/turf/open/floor/prison/darkred2/east,
/area/desert_dam/interior/lab_northeast/east_lab_security_armory)
-"aqe" = (
-/obj/structure/machinery/power/apc/no_power/west,
-/turf/open/floor/prison/darkred2/west,
-/area/desert_dam/interior/lab_northeast/east_lab_security_armory)
"aqf" = (
/obj/structure/desertdam/decals/road_edge,
/obj/effect/decal/sand_overlay/sand1{
@@ -3899,10 +3959,6 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/darkred2/west,
/area/desert_dam/interior/lab_northeast/east_lab_security_armory)
-"arl" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/turf/open/floor/prison/darkredcorners2/north,
-/area/desert_dam/interior/lab_northeast/east_lab_security_armory)
"arm" = (
/obj/structure/closet/secure_closet/security,
/turf/open/floor/prison/darkred2/north,
@@ -4114,7 +4170,7 @@
name = "\improper Research Substation"
},
/turf/open/floor/prison/bright_clean2,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"asq" = (
/obj/structure/machinery/light,
/turf/open/desert/dirt/desert_transition_edge1/east,
@@ -4225,7 +4281,7 @@
/area/desert_dam/interior/lab_northeast/east_lab_security_armory)
"asM" = (
/turf/open/floor/darkyellow2/west,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"asN" = (
/obj/structure/machinery/sentry_holder/colony{
dir = 1;
@@ -4265,17 +4321,17 @@
/area/desert_dam/building/water_treatment_two/floodgate_control)
"asW" = (
/turf/open/floor/darkyellowcorners2/east,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"asX" = (
/obj/structure/machinery/power/smes/batteryrack/substation,
/turf/open/floor/darkyellow2/northeast,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"asY" = (
/obj/structure/machinery/light{
dir = 1
},
/turf/open/floor/darkyellow2/northeast,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"ata" = (
/obj/structure/surface/table/reinforced,
/obj/structure/machinery/door/window/brigdoor/eastleft{
@@ -4311,7 +4367,7 @@
/area/desert_dam/building/security/lobby)
"ath" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached9,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"ati" = (
/obj/structure/machinery/sentry_holder/colony{
dir = 8;
@@ -4454,10 +4510,6 @@
},
/turf/open/floor/prison/bright_clean/southwest,
/area/desert_dam/interior/lab_northeast/east_lab_security_armory)
-"atG" = (
-/obj/structure/machinery/power/apc/no_power/west,
-/turf/open/floor/darkyellow2/west,
-/area/desert_dam/building/substation/northeast)
"atH" = (
/obj/effect/decal/sand_overlay/sand2,
/turf/open/asphalt/cement/cement4,
@@ -4467,7 +4519,7 @@
dir = 8
},
/turf/open/asphalt/cement/cement9,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"atJ" = (
/turf/open/floor/prison/red/north,
/area/desert_dam/interior/lab_northeast/east_lab_east_entrance)
@@ -4477,7 +4529,7 @@
/area/desert_dam/interior/lab_northeast/east_lab_east_entrance)
"atL" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached15,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"atM" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -4526,7 +4578,7 @@
/area/desert_dam/interior/lab_northeast/east_lab_maintenence)
"atV" = (
/turf/open/floor/vault2/northeast,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"atY" = (
/obj/structure/surface/table,
/obj/item/paper_bin,
@@ -4545,10 +4597,10 @@
dir = 1
},
/turf/open/floor/vault2/northeast,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"aub" = (
/turf/open/floor/darkyellow2/east,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"auc" = (
/turf/open/floor/plating/warnplate/west,
/area/desert_dam/building/substation/northeast)
@@ -4621,13 +4673,10 @@
"aus" = (
/turf/open/floor/prison/southwest,
/area/desert_dam/interior/lab_northeast/east_lab_east_entrance)
-"aut" = (
-/turf/open/desert/rock/deep/transition/southwest,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"auu" = (
/obj/structure/flora/grass/desert/lightgrass_3,
/turf/open/desert/rock,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"auw" = (
/obj/structure/machinery/power/apc/no_power/north,
/turf/open/floor/prison/darkpurple2/northeast,
@@ -4675,15 +4724,6 @@
"auF" = (
/turf/open/floor/whiteblue/north,
/area/desert_dam/interior/lab_northeast/east_lab_lobby)
-"auG" = (
-/turf/open/desert/rock,
-/area/desert_dam/interior/dam_interior/west_tunnel)
-"auH" = (
-/obj/effect/decal/sand_overlay/sand2{
- dir = 4
- },
-/turf/open/asphalt/cement/cement1,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"auI" = (
/obj/structure/machinery/door/airlock/almayer/security/glass/colony,
/turf/open/floor/dark2,
@@ -4753,12 +4793,6 @@
/obj/structure/toilet,
/turf/open/floor/freezerfloor,
/area/desert_dam/interior/lab_northeast/east_lab_lobby)
-"avb" = (
-/turf/open/desert/rock/deep/rock3,
-/area/desert_dam/interior/dam_interior/west_tunnel)
-"avc" = (
-/turf/open/desert/rock/deep/transition/west,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"ave" = (
/turf/open/floor/whiteblue/west,
/area/desert_dam/interior/lab_northeast/east_lab_lobby)
@@ -4800,7 +4834,7 @@
dir = 1
},
/turf/open/asphalt/tile,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"avl" = (
/obj/structure/bed/chair/office/dark{
dir = 1
@@ -4812,7 +4846,7 @@
dir = 1
},
/turf/open/asphalt/cement/cement13,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"avn" = (
/obj/structure/closet/secure_closet/security,
/obj/item/clothing/suit/armor/vest/security,
@@ -4952,7 +4986,7 @@
"avQ" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/darkyellow2/southwest,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"avR" = (
/obj/effect/decal/sand_overlay/sand2{
dir = 8
@@ -4970,14 +5004,14 @@
/area/desert_dam/interior/dam_interior/north_tunnel_entrance)
"avU" = (
/turf/open/floor/darkyellow2,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"avV" = (
/turf/open/floor/darkyellow2/southeast,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"avW" = (
/obj/structure/machinery/power/port_gen/pacman,
/turf/open/floor/plating/warnplate/west,
-/area/desert_dam/building/substation/northeast)
+/area/desert_dam/interior/lab_northeast/east_lab_east_hallway)
"avX" = (
/obj/effect/decal/sand_overlay/sand2,
/turf/open/floor/prison/whitepurple,
@@ -4991,13 +5025,13 @@
"avZ" = (
/obj/effect/decal/sand_overlay/sand2,
/turf/open/asphalt/tile,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"awa" = (
/obj/effect/decal/sand_overlay/sand2/corner2{
dir = 8
},
/turf/open/asphalt/cement/cement13,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"awb" = (
/obj/structure/machinery/power/apc/no_power/north,
/turf/open/floor/prison/whitepurple/north,
@@ -5050,11 +5084,7 @@
"awp" = (
/obj/structure/flora/grass/desert/lightgrass_8,
/turf/open/desert/rock/deep/rock3,
-/area/desert_dam/interior/dam_interior/west_tunnel)
-"awq" = (
-/obj/structure/machinery/colony_floodlight,
-/turf/open/desert/rock/deep/rock3,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"awr" = (
/obj/structure/surface/table/reinforced,
/obj/effect/spawner/random/tool,
@@ -5549,7 +5579,7 @@
"ayB" = (
/obj/structure/machinery/computer/aifixer,
/turf/open/floor/prison/blue/northwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayC" = (
/turf/open/desert/rock/deep/transition/northwest,
/area/desert_dam/interior/caves/temple)
@@ -5560,18 +5590,18 @@
/obj/structure/closet/secure_closet/RD,
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/prison/blue/north,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayF" = (
/obj/structure/surface/table,
/obj/structure/machinery/computer/communications,
/turf/open/floor/prison/blue/north,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayG" = (
/obj/structure/surface/table,
/obj/effect/spawner/random/tech_supply,
/obj/item/phone,
/turf/open/floor/prison/blue/north,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayH" = (
/turf/open/desert/rock/deep/rock3,
/area/desert_dam/interior/caves/temple)
@@ -5580,12 +5610,12 @@
dir = 8
},
/turf/open/floor/prison/blue/north,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayJ" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk,
/turf/open/floor/prison/blue/northeast,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayK" = (
/turf/open/floor/prison/whitepurple/north,
/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
@@ -5618,13 +5648,13 @@
dir = 4
},
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayV" = (
/obj/structure/surface/table,
/obj/item/paper_bin,
/obj/item/disk/nuclear,
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"ayX" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -5657,13 +5687,13 @@
/obj/structure/surface/table,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"azh" = (
/obj/structure/bed/chair/office/light{
dir = 8
},
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"azk" = (
/obj/effect/landmark/xeno_spawn,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -5678,10 +5708,10 @@
"azm" = (
/obj/structure/lamarr,
/turf/open/floor/prison/blue/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"azo" = (
/turf/open/floor/prison/blue,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"azp" = (
/turf/open/floor/prison/whitepurple,
/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
@@ -6271,7 +6301,7 @@
"aBT" = (
/obj/structure/disposalpipe/segment,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached2,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"aBU" = (
/turf/open/desert/rock/deep,
/area/desert_dam/interior/caves/temple)
@@ -6331,17 +6361,17 @@
dir = 9
},
/turf/open/asphalt/cement_sunbleached/cement_sunbleached2,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"aCi" = (
/obj/effect/decal/sand_overlay/sand1/corner1{
dir = 1
},
/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"aCj" = (
/obj/structure/disposalpipe/segment,
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"aCk" = (
/turf/open/floor/sandstone/runed,
/area/desert_dam/interior/caves/temple)
@@ -6480,7 +6510,7 @@
/area/desert_dam/exterior/valley/valley_wilderness)
"aCR" = (
/turf/open/asphalt/cement/cement14,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"aCS" = (
/obj/structure/window/framed/colony/reinforced,
/turf/open/floor/plating,
@@ -7316,17 +7346,6 @@
},
/turf/open/asphalt/cement_sunbleached,
/area/desert_dam/exterior/valley/valley_crashsite)
-"aFZ" = (
-/obj/structure/flora/grass/desert/heavygrass_4,
-/turf/open/desert/dirt,
-/area/desert_dam/interior/dam_interior/south_tunnel_entrance)
-"aGa" = (
-/obj/structure/desertdam/decals/road_edge,
-/obj/effect/decal/sand_overlay/sand1{
- dir = 4
- },
-/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/south_tunnel_entrance)
"aGb" = (
/obj/structure/flora/grass/desert/lightgrass_7,
/turf/open/desert/dirt,
@@ -7340,12 +7359,6 @@
},
/turf/open/asphalt/cement_sunbleached,
/area/desert_dam/exterior/valley/valley_crashsite)
-"aGe" = (
-/obj/structure/desertdam/decals/road_edge{
- icon_state = "road_edge_decal5"
- },
-/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/south_tunnel_entrance)
"aGf" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 8
@@ -7903,9 +7916,6 @@
"aIv" = (
/turf/open/gm/river/desert/shallow,
/area/desert_dam/exterior/valley/valley_crashsite)
-"aIw" = (
-/turf/closed/wall/r_wall/chigusa,
-/area/desert_dam/building/substation/northeast)
"aIx" = (
/turf/open/desert/desert_shore/desert_shore1/east,
/area/desert_dam/exterior/valley/valley_crashsite)
@@ -8152,7 +8162,7 @@
"aJU" = (
/obj/structure/prop/dam/large_boulder/boulder2,
/turf/open/desert/dirt/desert_transition_edge1/east,
-/area/desert_dam/interior/caves/central_caves)
+/area/desert_dam/exterior/valley/valley_wilderness)
"aJV" = (
/turf/open/desert/dirt/desert_transition_edge1/east,
/area/desert_dam/exterior/valley/valley_crashsite)
@@ -8429,7 +8439,7 @@
"aLH" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"aLI" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/desert/dirt,
@@ -9056,10 +9066,10 @@
dir = 4
},
/turf/open/asphalt/tile,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"aOj" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached2,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"aOk" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
/area/desert_dam/exterior/valley/valley_wilderness)
@@ -9209,9 +9219,6 @@
"aOT" = (
/turf/open/desert/dirt/rock1,
/area/desert_dam/exterior/valley/valley_wilderness)
-"aOU" = (
-/turf/open/desert/dirt/desert_transition_edge1,
-/area/desert_dam/exterior/valley/valley_wilderness)
"aOV" = (
/obj/structure/floodgate,
/obj/effect/blocker/toxic_water,
@@ -9642,18 +9649,12 @@
/obj/structure/filtration/machine_96x96/filtration,
/turf/open/floor/coagulation/icon4_8,
/area/desert_dam/building/water_treatment_two/purification)
-"aRj" = (
-/obj/effect/decal/sand_overlay/sand1/corner1{
- dir = 4
- },
-/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
-/area/desert_dam/exterior/valley/valley_wilderness)
"aRk" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 1
},
/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"aRl" = (
/obj/structure/machinery/light{
dir = 1
@@ -10282,10 +10283,6 @@
"aUp" = (
/turf/open/desert/rock/deep/transition/west,
/area/desert_dam/exterior/telecomm/lz1_south)
-"aUq" = (
-/obj/structure/prop/dam/wide_boulder/boulder1,
-/turf/open/desert/dirt,
-/area/desert_dam/exterior/valley/valley_wilderness)
"aUr" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Courtroom"
@@ -10998,9 +10995,6 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/interior/wood,
/area/desert_dam/building/security/marshals_office)
-"aXY" = (
-/turf/open/desert/dirt/desert_transition_corner1,
-/area/desert_dam/exterior/valley/valley_wilderness)
"aXZ" = (
/obj/structure/filingcabinet/security,
/obj/effect/landmark/objective_landmark/close,
@@ -14771,10 +14765,6 @@
/obj/structure/window/framed/colony/reinforced,
/turf/open/floor/plating,
/area/desert_dam/building/warehouse/breakroom)
-"bqa" = (
-/obj/effect/decal/sand_overlay/sand2,
-/turf/open/asphalt/cement_sunbleached/cement_sunbleached12,
-/area/desert_dam/interior/caves/central_caves)
"bqc" = (
/turf/open/desert/dirt/desert_transition_edge1/northwest,
/area/desert_dam/exterior/valley/bar_valley_dam)
@@ -18118,7 +18108,7 @@
"bHs" = (
/obj/structure/prop/dam/boulder/boulder3,
/turf/open/desert/rock,
-/area/desert_dam/interior/caves/central_caves)
+/area/desert_dam/exterior/valley/valley_wilderness)
"bHu" = (
/obj/effect/landmark/survivor_spawner,
/turf/open/floor/prison,
@@ -18162,12 +18152,6 @@
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/prison/green/east,
/area/desert_dam/interior/dam_interior/atmos_storage)
-"bHD" = (
-/obj/effect/decal/sand_overlay/sand2{
- dir = 1
- },
-/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
-/area/desert_dam/interior/caves/central_caves)
"bHE" = (
/turf/open/desert/rock/deep/transition/northwest,
/area/desert_dam/interior/caves/east_caves)
@@ -19187,12 +19171,6 @@
/obj/structure/machinery/light,
/turf/open/floor/prison/floor_plate/southwest,
/area/desert_dam/interior/dam_interior/north_tunnel_entrance)
-"bMH" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "N"
- },
-/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/north_tunnel)
"bMI" = (
/turf/open/asphalt,
/area/desert_dam/interior/dam_interior/central_tunnel)
@@ -19309,24 +19287,18 @@
"bNi" = (
/turf/open/floor/prison,
/area/desert_dam/building/security/warden)
-"bNj" = (
-/obj/structure/desertdam/decals/road_edge{
- icon_state = "road_edge_decal3"
- },
-/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/north_tunnel)
"bNk" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal6"
},
/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/north_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"bNl" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal5"
},
/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/north_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"bNm" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal3"
@@ -19613,7 +19585,7 @@
"bOU" = (
/obj/structure/desertdam/decals/road_edge,
/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"bOV" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal2"
@@ -20093,7 +20065,7 @@
icon_state = "E"
},
/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"bRf" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -20667,19 +20639,16 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement,
/area/desert_dam/interior/dam_interior/northwestern_tunnel)
-"bTG" = (
-/turf/open/floor/prison/sterile_white,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"bTH" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/disposalpipe/segment,
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"bTI" = (
/turf/closed/wall/hangar{
name = "reinforced metal wall"
},
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"bTJ" = (
/obj/structure/disposalpipe/segment,
/turf/open/asphalt/cement/cement9,
@@ -20790,7 +20759,7 @@
dir = 4
},
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"bUq" = (
/obj/effect/decal/sand_overlay/sand2{
dir = 8
@@ -20798,9 +20767,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/sterile_white,
/area/desert_dam/interior/dam_interior/north_tunnel)
-"bUr" = (
-/turf/open/asphalt/cement/cement1,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"bUs" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Tool Storage"
@@ -21122,12 +21088,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement/cement4,
/area/desert_dam/interior/dam_interior/workshop)
-"bVU" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/delivery,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"bVV" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21315,19 +21275,10 @@
},
/turf/open/floor/prison/sterile_white,
/area/desert_dam/interior/dam_interior/workshop)
-"bWR" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor/prison/sterile_white,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"bWS" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/darkbrown3/east,
/area/desert_dam/interior/dam_interior/hangar_storage)
-"bWV" = (
-/turf/open/floor/delivery,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"bWY" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
@@ -21476,10 +21427,6 @@
name = "reinforced metal wall"
},
/area/desert_dam/interior/dam_interior/disposals)
-"bXT" = (
-/obj/structure/machinery/power/apc/no_power/west,
-/turf/open/floor/prison/sterile_white,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"bXU" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21648,12 +21595,6 @@
/obj/item/device/flashlight/flare,
/turf/open/floor/prison/darkbrown3/north,
/area/desert_dam/interior/dam_interior/disposals)
-"bYC" = (
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor/prison/sterile_white,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"bYD" = (
/obj/effect/decal/sand_overlay/sand2{
dir = 8
@@ -22140,9 +22081,6 @@
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/whitegreen/north,
/area/desert_dam/building/medical/virology_isolation)
-"caB" = (
-/turf/open/asphalt/cement/cement3,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"caC" = (
/turf/open/floor/freezerfloor,
/area/desert_dam/interior/dam_interior/break_room)
@@ -22519,9 +22457,6 @@
/obj/effect/blocker/toxic_water/Group_2,
/turf/open/floor/warning/north,
/area/desert_dam/interior/dam_interior/engine_room)
-"cco" = (
-/turf/open/desert/rock/deep/transition/west,
-/area/desert_dam/interior/caves/central_caves)
"ccp" = (
/obj/effect/blocker/toxic_water/Group_1,
/turf/open/floor/greengrid,
@@ -22950,7 +22885,7 @@
dir = 4
},
/turf/open/asphalt/cement/cement4,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"ceJ" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk,
@@ -23074,15 +23009,6 @@
},
/turf/open/asphalt,
/area/desert_dam/interior/dam_interior/south_tunnel)
-"cfl" = (
-/obj/structure/desertdam/decals/road_edge{
- icon_state = "road_edge_decal4"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"cfm" = (
/obj/structure/machinery/computer/atmos_alert,
/obj/structure/surface/table,
@@ -24848,7 +24774,7 @@
"coX" = (
/obj/effect/decal/sand_overlay/sand1,
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"coY" = (
/obj/structure/cargo_container/grant/right,
/turf/open/floor/prison,
@@ -25233,7 +25159,7 @@
dir = 8
},
/turf/open/asphalt/cement_sunbleached/cement_sunbleached12,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"cqT" = (
/obj/structure/flora/grass/desert/lightgrass_2,
/turf/open/desert/dirt,
@@ -25684,10 +25610,6 @@
/obj/effect/decal/sand_overlay/sand1,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached18,
/area/desert_dam/exterior/valley/valley_civilian)
-"ctb" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement/cement12,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"ctc" = (
/obj/structure/disposalpipe/segment{
dir = 1;
@@ -25696,7 +25618,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement/cement14,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"ctd" = (
/obj/effect/decal/sand_overlay/sand1/corner1{
dir = 8
@@ -25707,15 +25629,9 @@
/obj/structure/machinery/computer/telecomms/server,
/turf/open/floor/prison/darkyellow2/north,
/area/desert_dam/building/substation/west)
-"ctf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/asphalt/cement/cement4,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"ctg" = (
/turf/open/asphalt/cement/cement2,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"cth" = (
/obj/structure/machinery/computer/telecomms/monitor,
/turf/open/floor/prison/darkyellow2/north,
@@ -25723,7 +25639,7 @@
"cti" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement/cement14,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"ctj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -26391,7 +26307,7 @@
dir = 4
},
/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"cwr" = (
/obj/structure/machinery/door/poddoor/almayer/locked{
dir = 2;
@@ -26400,12 +26316,6 @@
},
/turf/open/floor/prison/bright_clean/southwest,
/area/desert_dam/interior/dam_interior/hanger)
-"cws" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/asphalt,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"cwu" = (
/turf/open/desert/dirt/desert_transition_corner1/west,
/area/desert_dam/exterior/valley/valley_civilian)
@@ -28188,10 +28098,6 @@
},
/turf/open/floor/prison/whitegreencorner/east,
/area/desert_dam/building/medical/east_wing_hallway)
-"cEI" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/turf/open/floor/prison/whitegreen/north,
-/area/desert_dam/building/medical/east_wing_hallway)
"cEJ" = (
/turf/open/floor/prison/whitegreencorner/east,
/area/desert_dam/building/medical/east_wing_hallway)
@@ -28948,7 +28854,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"cHH" = (
/obj/effect/decal/medical_decals{
icon_state = "triagedecaltopright"
@@ -29851,10 +29757,6 @@
/obj/item/storage/box/syringes,
/turf/open/floor/prison/whitegreenfull/southwest,
/area/desert_dam/building/medical/treatment_room)
-"cLX" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement/cement1,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"cLY" = (
/turf/open/floor/prison/whitegreen/east,
/area/desert_dam/building/medical/virology_isolation)
@@ -30356,20 +30258,6 @@
},
/turf/open/floor/chapel/west,
/area/desert_dam/building/church)
-"cOo" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
-"cOp" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
-"cOq" = (
-/obj/structure/pipes/standard/simple/hidden/green,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"cOr" = (
/obj/effect/decal/sand_overlay/sand2{
dir = 1
@@ -31564,10 +31452,6 @@
"cTD" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached4,
/area/desert_dam/exterior/valley/valley_cargo)
-"cTE" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/desert/dirt,
-/area/desert_dam/exterior/valley/valley_wilderness)
"cTF" = (
/obj/effect/decal/sand_overlay/sand1/corner1{
dir = 1
@@ -31715,7 +31599,7 @@
"cUw" = (
/obj/structure/platform_decoration/metal/almayer,
/turf/open/asphalt/cement/cement2,
-/area/desert_dam/interior/dam_interior/north_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"cUy" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal6"
@@ -31812,14 +31696,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
-"cUX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"cUY" = (
/turf/open/floor/prison/cell_stripe/north,
/area/desert_dam/building/warehouse/warehouse)
@@ -32010,7 +31887,7 @@
/obj/effect/decal/sand_overlay/sand1,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/interior/caves/central_caves)
"cWr" = (
/obj/effect/decal/sand_overlay/sand1/corner1{
dir = 8
@@ -32219,7 +32096,7 @@
},
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"cYv" = (
/obj/effect/decal/sand_overlay/sand1/corner1,
/obj/structure/disposalpipe/segment{
@@ -32414,21 +32291,21 @@
icon_state = "pipe-c"
},
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"cZo" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 4
},
/obj/structure/disposalpipe/segment,
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"cZp" = (
/obj/effect/decal/sand_overlay/sand1/corner1{
dir = 1
},
/obj/structure/disposalpipe/segment,
/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"cZq" = (
/obj/structure/machinery/door/poddoor/almayer/locked{
dir = 2;
@@ -32779,12 +32656,6 @@
/obj/structure/machinery/chem_master/condimaster,
/turf/open/floor/prison/sterile_white,
/area/desert_dam/building/cafeteria/cafeteria)
-"dbF" = (
-/obj/structure/machinery/power/apc/no_power/north,
-/obj/structure/machinery/microwave,
-/obj/structure/surface/table/reinforced,
-/turf/open/floor/prison/sterile_white,
-/area/desert_dam/building/cafeteria/cafeteria)
"dbG" = (
/obj/structure/machinery/microwave,
/obj/structure/surface/table/reinforced,
@@ -33228,10 +33099,6 @@
},
/turf/open/floor/prison/bright_clean/southwest,
/area/desert_dam/building/hydroponics/hydroponics)
-"ddP" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/prison/sterile_white,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"ddQ" = (
/obj/structure/machinery/disposal,
/obj/structure/disposalpipe/trunk{
@@ -33388,7 +33255,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement/cement3,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"deu" = (
/turf/open/floor/prison/yellow,
/area/desert_dam/building/hydroponics/hydroponics)
@@ -33603,7 +33470,7 @@
"dfr" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/desert/dirt/desert_transition_edge1/north,
-/area/desert_dam/exterior/valley/valley_wilderness)
+/area/desert_dam/exterior/valley/valley_crashsite)
"dfs" = (
/obj/structure/machinery/light{
dir = 4
@@ -34767,11 +34634,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/sterile_white,
/area/desert_dam/building/cafeteria/cafeteria)
-"dqu" = (
-/obj/structure/machinery/power/apc/no_power/west,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/prison/sterile_white,
-/area/desert_dam/building/cafeteria/cafeteria)
"dqJ" = (
/obj/effect/blocker/toxic_water/Group_1,
/obj/structure/barricade/wooden{
@@ -35296,12 +35158,6 @@
"dwF" = (
/turf/open/floor/wood,
/area/desert_dam/building/dorms/hallway_northwing)
-"dwG" = (
-/obj/effect/decal/sand_overlay/sand1{
- dir = 6
- },
-/turf/open/asphalt/cement_sunbleached,
-/area/desert_dam/exterior/valley/valley_wilderness)
"dwH" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Dormitories"
@@ -36072,7 +35928,7 @@
},
/obj/effect/decal/cleanable/dirt,
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"dCB" = (
/obj/structure/surface/table/woodentable/fancy,
/turf/open/floor/wood,
@@ -37031,17 +36887,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/darkbrown3/west,
/area/desert_dam/interior/dam_interior/disposals)
-"dKx" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/asphalt/cement/cement3,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"dKz" = (
/obj/structure/machinery/light{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/sterile_white,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"dKA" = (
/obj/effect/blocker/toxic_water/Group_2,
/turf/open/desert/desert_shore/shore_corner2/west,
@@ -41132,7 +40984,7 @@
dir = 4
},
/turf/open/asphalt/cement/cement12,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"ejR" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 8
@@ -41261,7 +41113,7 @@
/obj/effect/landmark/corpsespawner/administrator,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/blue/west,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"eyp" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 6
@@ -41839,7 +41691,7 @@
},
/obj/structure/platform/metal/stair_cut/platform_left,
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"fGL" = (
/obj/structure/platform_decoration/metal/almayer/north,
/turf/open/desert/dirt/dirt2,
@@ -42304,7 +42156,7 @@
/obj/item/stack/rods,
/obj/item/stack/cable_coil,
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"gEj" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -42520,7 +42372,7 @@
"gYn" = (
/obj/structure/platform_decoration/metal/almayer/north,
/turf/open/asphalt/cement/cement9,
-/area/desert_dam/interior/dam_interior/north_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"gYB" = (
/obj/structure/platform/metal/almayer/north,
/turf/open/desert/dirt/dirt2,
@@ -43495,7 +43347,7 @@
},
/obj/effect/spawner/gibspawner/xeno,
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"jcK" = (
/obj/effect/decal/sand_overlay/sand1/corner1,
/turf/open/asphalt/cement_sunbleached,
@@ -43540,7 +43392,7 @@
},
/obj/structure/platform/metal/almayer,
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"jlI" = (
/turf/open/asphalt/cement_sunbleached/cement_sunbleached2,
/area/desert_dam/exterior/valley/valley_security)
@@ -44085,6 +43937,7 @@
},
/obj/item/reagent_container/food/snacks/stew,
/obj/item/tool/kitchen/utensil/spoon,
+/obj/structure/machinery/power/apc/fully_broken/no_cell/north,
/turf/open/desert/rock/deep/rock4,
/area/desert_dam/interior/caves/temple)
"kAV" = (
@@ -44324,7 +44177,7 @@
"leq" = (
/obj/structure/platform/metal/almayer/north,
/turf/open/desert/rock/deep/transition/west,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"leH" = (
/obj/structure/desertdam/decals/road_stop{
dir = 4;
@@ -44467,7 +44320,7 @@
pixel_x = -32
},
/turf/open/desert/rock/deep/transition/southwest,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/exterior/valley/valley_wilderness)
"lxq" = (
/obj/structure/surface/table,
/obj/effect/landmark/crap_item,
@@ -44844,7 +44697,7 @@
icon_state = "xgib1"
},
/turf/open/floor/prison/blue,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"mjR" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal6"
@@ -45407,7 +45260,7 @@
"nxS" = (
/obj/structure/platform/metal/almayer/north,
/turf/open/asphalt/cement/cement12,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"nyc" = (
/obj/structure/platform/metal/almayer,
/obj/effect/blocker/toxic_water/Group_2,
@@ -46796,10 +46649,6 @@
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/asphalt/cement_sunbleached/cement_sunbleached12,
/area/desert_dam/exterior/valley/valley_civilian)
-"qlC" = (
-/obj/structure/platform_decoration/metal/almayer/north,
-/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"qlG" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/desert/dirt,
@@ -47013,7 +46862,7 @@
/obj/structure/disposalpipe/segment,
/obj/item/weapon/gun/rifle/m41a/corporate/no_lock,
/turf/open/floor/prison/bluecorner/north,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"qKN" = (
/obj/effect/decal/sand_overlay/sand1{
dir = 1
@@ -47226,7 +47075,7 @@
dir = 4
},
/turf/open/asphalt/cement,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"rfm" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/remains/human,
@@ -48655,7 +48504,7 @@
/obj/effect/landmark/corpsespawner/wygoon/lead,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/blue,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"tQR" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/r_wall/bunker,
@@ -49103,11 +48952,6 @@
/obj/structure/flora/grass/desert/lightgrass_2,
/turf/open/desert/dirt,
/area/desert_dam/exterior/landing_pad_two)
-"uMJ" = (
-/obj/structure/stairs,
-/obj/structure/platform/metal/almayer/west,
-/turf/open/asphalt/cement/cement3,
-/area/desert_dam/interior/dam_interior/west_tunnel)
"uMM" = (
/obj/structure/platform_decoration/metal/almayer/west,
/turf/open/desert/dirt/dirt2,
@@ -49610,13 +49454,12 @@
/turf/open/desert/dirt/desert_transition_edge1/southeast,
/area/desert_dam/exterior/landing_pad_two)
"vTE" = (
-/obj/structure/machinery/power/apc/no_power/west,
/obj/effect/decal/cleanable/blood{
icon_state = "gib6";
pixel_y = 12
},
/turf/open/floor/prison/blue/west,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"vTR" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal4"
@@ -49741,11 +49584,11 @@
dir = 8
},
/turf/open/asphalt/cement/cement1,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"wfL" = (
/obj/structure/platform/metal/almayer/west,
/turf/open/asphalt/cement/cement1,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"wgi" = (
/obj/structure/desertdam/decals/road_edge,
/turf/open/asphalt,
@@ -49832,7 +49675,7 @@
"wrz" = (
/obj/structure/platform_decoration/metal/almayer/west,
/turf/open/asphalt/cement/cement12,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"wrG" = (
/turf/open/desert/dirt/desert_transition_edge1/east,
/area/desert_dam/exterior/valley/valley_security)
@@ -49999,7 +49842,7 @@
"wHR" = (
/obj/structure/platform_decoration/metal/almayer/east,
/turf/open/asphalt/cement/cement15,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"wIi" = (
/obj/structure/prop/dam/boulder/boulder2,
/turf/open/desert/dirt,
@@ -50301,7 +50144,7 @@
/obj/structure/platform/metal/almayer/east,
/obj/structure/stairs,
/turf/open/asphalt/cement/cement1,
-/area/desert_dam/interior/dam_interior/west_tunnel)
+/area/desert_dam/interior/dam_interior/central_tunnel)
"xlE" = (
/obj/structure/machinery/door/poddoor/almayer/locked{
dir = 4;
@@ -50641,7 +50484,7 @@
/obj/effect/landmark/corpsespawner/wygoon,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/southwest,
-/area/desert_dam/interior/lab_northeast/east_lab_RND)
+/area/desert_dam/interior/lab_northeast/east_lab_west_hallway)
"xUC" = (
/obj/item/tool/weldingtool,
/turf/open/floor/neutral,
@@ -60046,11 +59889,11 @@ bPT
bQZ
bRU
bOR
-bTG
+bOY
ceI
-ctb
-bTG
-bWR
+cuq
+bOY
+bZp
bXS
bXS
bZb
@@ -60280,23 +60123,23 @@ bPU
bRX
bRV
bRk
-caB
+bWh
bUp
-cOp
+dgU
ctc
-ddP
-bXT
-bWR
+cOP
+bOY
+bZp
ctg
cti
-bTG
-ddP
-bTG
-bTG
-bWR
-bTG
+bOY
+cOP
+bOY
+bOY
+bZp
+bOY
leq
-cfl
+cxc
gpC
uRT
glL
@@ -60516,22 +60359,22 @@ bRW
bSW
bTH
cHG
-cOq
+dgM
cUW
det
det
det
-cOq
+dgM
dCz
-caB
-dKx
-dKx
-dKx
-caB
-uMJ
+bWh
+cGr
+cGr
+cGr
+bWh
+oJM
ejK
-cfl
-bkk
+cxc
+cfP
gsO
glL
wmo
@@ -60748,24 +60591,24 @@ cfm
bRc
bRX
bRk
-bUr
-cLX
-cLX
-cUX
-cOo
-cLX
-cLX
-cLX
-cLX
-cLX
-cLX
-cLX
-cLX
-cLX
+bXa
+cCT
+cCT
+dam
+deJ
+cCT
+cCT
+cCT
+cCT
+cCT
+cCT
+cCT
+cCT
+cCT
xlt
wrz
-cfl
-bkj
+cxc
+bMI
gpC
glL
wmo
@@ -60891,7 +60734,7 @@ dTs
dTs
aOc
aOc
-aPD
+adE
byX
iqK
aOc
@@ -60982,24 +60825,24 @@ bPX
tdf
bRY
bOR
-bTG
-bTG
-bTG
-ctf
-bZc
-bTG
-bYC
-bTG
-ddP
-ddP
+bOY
+bOY
+bOY
+bVp
+cuo
+bOY
+bQc
+bOY
+cOP
+cOP
dKz
-bTG
-ddP
-bTG
-bYC
+bOY
+cOP
+bOY
+bQc
nxS
-cfl
-bkj
+cxc
+bMI
gpC
glL
wmo
@@ -61218,22 +61061,22 @@ bRk
bOR
bTI
bTI
-bTG
+bOY
fGF
jli
-bTG
+bOY
bTI
-bTG
-bTG
-bTG
+bOY
+bOY
+bOY
bTI
-bTG
-bTG
-bTG
+bOY
+bOY
+bOY
bTI
nxS
-cfl
-bkk
+cxc
+cfP
gsO
glL
wmo
@@ -61442,8 +61285,8 @@ bpK
bpK
bLh
bsC
-bMH
-bNj
+bMJ
+bNm
gYn
wfA
wfL
@@ -61454,7 +61297,7 @@ wfA
wfL
wfL
reE
-qlC
+ujV
wfL
wfA
wfL
@@ -61466,8 +61309,8 @@ wfL
wfL
wfA
wHR
-cfl
-bkj
+cxc
+bMI
gpC
glL
wmo
@@ -61676,9 +61519,8 @@ tjR
rcu
brQ
bpJ
-bpJ
+bMI
bNk
-bpI
bOU
bOU
bOU
@@ -61687,8 +61529,9 @@ bOU
bOU
bOU
bOU
-bVU
-bWV
+bOU
+bVV
+bML
bOU
bOU
bOU
@@ -61701,7 +61544,7 @@ bOU
bOU
bOU
cwq
-bkj
+bMI
gpC
glL
wmo
@@ -61910,32 +61753,32 @@ bJh
iVX
brQ
bpJ
-bpJ
-bpJ
-brS
-bkj
-bkj
+bMI
+bMI
bRe
-bkj
-bkj
+bMI
+bMI
bRe
-bkj
-bkj
-bVU
-bWV
-bkj
+bMI
+bMI
bRe
-bkj
-bkj
+bMI
+bMI
+bVV
+bML
+bMI
bRe
-bkj
-bkj
+bMI
+bMI
bRe
-bkj
-bkj
+bMI
+bMI
bRe
-cws
-bkj
+bMI
+bMI
+bRe
+cfR
+bMI
gpC
glL
wmo
@@ -62144,9 +61987,9 @@ bAt
iVX
brQ
bpJ
-bpJ
-bpJ
-bAr
+bMI
+bMI
+bRf
bMI
bMI
bRf
@@ -62378,9 +62221,9 @@ bAt
iVX
brQ
bpJ
-bpJ
+bMI
bNl
-bpK
+bOV
bOV
bOV
bOV
@@ -62612,8 +62455,8 @@ bAt
iVX
brQ
bsC
-bMH
-bNj
+bMJ
+bNm
cUw
sHm
sHm
@@ -65430,7 +65273,7 @@ bRy
bRy
bPb
bPb
-bVn
+bOY
cuj
dgM
cus
@@ -66834,7 +66677,7 @@ cFw
cbg
bPb
bPb
-bOY
+bVn
cum
deJ
bOY
@@ -69925,7 +69768,7 @@ cAc
mAr
rUK
lNu
-aFQ
+lNu
aHh
dTs
dTs
@@ -70159,7 +70002,7 @@ eJh
faE
kWh
lNu
-aFZ
+kWh
aFQ
dTs
dTs
@@ -70393,7 +70236,7 @@ eJh
faE
lNu
lNu
-aFQ
+lNu
aFQ
cqn
dTs
@@ -70627,7 +70470,7 @@ dud
lKW
lNu
nvr
-aFQ
+lNu
aHi
cqn
cqn
@@ -70861,7 +70704,7 @@ kWh
lNu
lNu
lNu
-aFQ
+lNu
aHj
cqn
cQE
@@ -71095,7 +70938,7 @@ tUF
sYp
qbW
qbW
-aGa
+qbW
aHu
csz
cQF
@@ -71329,7 +71172,7 @@ qlU
igf
vqt
eft
-cSb
+ctF
cSb
cyf
cQP
@@ -71563,7 +71406,7 @@ qlU
igf
eft
foq
-cSc
+cWw
cSc
cMB
cRd
@@ -71797,7 +71640,7 @@ pij
igf
eft
jmd
-aGe
+jHR
cRJ
cNz
cRJ
@@ -83615,12 +83458,12 @@ axL
axL
ayt
avG
-aCr
-aCr
-aCr
-aCr
-aCr
-aCr
+avG
+avG
+avG
+avG
+avG
+avG
dTs
dTs
dTs
@@ -83849,12 +83692,12 @@ axL
axL
axL
ayx
-aCr
+avG
ayB
exp
vTE
azm
-aCr
+avG
dTs
dTs
dTs
@@ -84083,12 +83926,12 @@ axN
ayh
axL
ayx
-aCr
+avG
ayE
-auq
-auq
+acl
+acl
tPQ
-aCr
+avG
dTs
dTs
dTs
@@ -84317,12 +84160,12 @@ avG
avG
avG
avG
-aCr
+avG
ayF
ayU
aLH
azo
-aCr
+avG
dTs
dTs
dTs
@@ -84551,12 +84394,12 @@ dTs
dTs
dTs
dTs
-aCr
+avG
ayG
ayV
azg
azo
-aCr
+avG
dTs
dTs
dTs
@@ -84785,12 +84628,12 @@ dTs
dTs
dTs
dTs
-aCr
+avG
ayI
xTM
azh
azo
-aCr
+avG
dTs
dTs
aam
@@ -85019,12 +84862,12 @@ avG
dTs
dTs
dTs
-aCr
+avG
ayJ
qKF
jcx
miV
-aCr
+avG
dTs
dTs
azA
@@ -85253,12 +85096,12 @@ avG
avG
avG
avG
-aCr
-aug
-aug
+avG
+avH
+avH
gCC
-aug
-aCr
+avH
+avG
dTs
dTs
aeE
@@ -85749,15 +85592,15 @@ aXW
aVZ
aVZ
aZk
-atH
+bAN
auu
lwh
-avb
+aam
avk
-ctg
+aAb
aCR
avZ
-avb
+aam
awp
aam
aam
@@ -85983,16 +85826,16 @@ aXW
aWa
aWB
aZk
-atH
-auG
-aut
-avc
+bAN
+aeE
+bgH
+axP
avk
-aCP
-bZc
+bij
+bgr
avZ
-avc
-awq
+axP
+azz
axP
azA
aeE
@@ -86218,15 +86061,15 @@ aVZ
aVZ
aZk
atI
-auH
-auH
-auH
+azR
+azR
+azR
avm
-bUr
-bUr
+bzV
+bzV
awa
-auH
-auH
+azR
+azR
azR
azR
azR
@@ -88793,11 +88636,11 @@ aeE
aBc
aBv
bHs
-aeT
-aeT
-aeT
-cad
-cco
+aeE
+aeE
+aeE
+bgH
+axP
dTs
dTs
dTs
@@ -88812,9 +88655,9 @@ aeE
aeE
bgH
axP
-cco
-cco
-cco
+axP
+axP
+axP
dTs
dTs
dTs
@@ -89023,15 +88866,15 @@ aam
aam
dTs
dTs
-aeT
-bHD
-bqa
-aeT
-aeT
-aeT
-aeT
-aeT
-aeT
+aeE
+aBc
+aBv
+aeE
+aeE
+aeE
+aeE
+aeE
+aeE
dTs
dTs
dTs
@@ -89045,11 +88888,11 @@ dTs
aeE
aeE
aeE
-aeT
-aGQ
+aeE
+aOf
aJU
-aGX
-aGX
+aYz
+aYz
dTs
dTs
dTs
@@ -89257,14 +89100,14 @@ dTs
dTs
dTs
dTs
-aeT
-bHD
-bqa
-aeT
-aeT
-aeT
-aeT
-aeT
+aeE
+aBc
+aBv
+aeE
+aeE
+aeE
+aeE
+aeE
dTs
dTs
dTs
@@ -89278,12 +89121,12 @@ dTs
dTs
dTs
aYz
-aGX
-aGX
-aGR
-bfh
-beB
-beM
+aYz
+aYz
+aOg
+aRM
+aSk
+aPg
dTs
dTs
dTs
@@ -91448,7 +91291,7 @@ czf
czf
czf
czf
-cEI
+cEM
dRy
dRT
cGB
@@ -95075,12 +94918,12 @@ amx
are
amz
anD
-aIw
-aIw
-aIw
-aIw
-aIw
-aIw
+apW
+apW
+apW
+apW
+apW
+apW
dTs
dTs
dTs
@@ -95309,12 +95152,12 @@ amx
are
amz
aiH
-aIw
+apW
+asM
asM
-atG
asM
avQ
-aIw
+apW
dTs
dTs
dTs
@@ -95548,7 +95391,7 @@ atV
atV
atV
avU
-aIw
+apW
dTs
dTs
dTs
@@ -95556,8 +95399,8 @@ dTs
dTs
dTs
dTs
-cov
-cYx
+aGd
+abC
adA
aDz
adr
@@ -95782,16 +95625,16 @@ atV
atV
atV
avU
-aIw
+apW
dTs
dTs
dTs
dTs
dTs
dTs
-aOh
-cov
-cYx
+adA
+aGd
+abC
adA
adA
adA
@@ -95928,13 +95771,13 @@ cxm
daO
dby
dcw
-dqu
+dqt
dvf
dqt
ddi
dzD
dCe
-dDK
+abt
dgY
dDK
dJi
@@ -96011,20 +95854,20 @@ amx
are
ant
anv
-aIw
+apW
asW
atV
atV
avU
-aIw
+apW
dTs
dTs
dTs
dTs
dTs
-aPg
-aOh
-cov
+agC
+adA
+aGd
aiJ
ajh
adA
@@ -96245,21 +96088,21 @@ amx
are
amz
apj
-aIw
+apW
asX
aua
atV
avU
-aIw
+apW
dTs
dTs
dTs
dTs
-aOf
-aOg
-aUq
-cov
-cYx
+aEU
+aEV
+aJi
+aGd
+abC
adA
adA
aFN
@@ -96479,21 +96322,21 @@ amx
are
amz
apj
-aIw
+apW
asY
aub
aub
avV
-aIw
+apW
dTs
dTs
dTs
dTs
-aOU
-aOh
-aOh
-cov
-cYx
+agD
+adA
+adA
+aGd
+abC
adA
ajC
adA
@@ -96713,21 +96556,21 @@ amx
are
amz
apj
-aIw
-atm
-auc
-auc
+apW
+acX
+acv
+acv
avW
-aIw
+apW
dTs
dTs
dTs
dTs
-aOg
-aOh
-aOh
-cov
-cYx
+aEV
+adA
+adA
+aGd
+abC
adA
adA
adA
@@ -96947,16 +96790,16 @@ amx
are
amz
anD
-aIw
-aIw
-auA
-auA
-auA
-aIw
+apW
+apW
+aco
+aco
+aco
+apW
dTs
dTs
dTs
-aOg
+aEV
aCh
cYu
cZo
@@ -97190,12 +97033,12 @@ aJd
aJd
aJd
gab
-aOh
-aRk
-cYv
-cgR
-cgR
-dwG
+adA
+aEZ
+abP
+aGf
+aGf
+aGo
adA
adA
dZl
@@ -97424,11 +97267,11 @@ awP
awt
auB
oUN
-aOi
-aCi
-cYx
-aOh
-aOh
+akr
+aIA
+abC
+adA
+adA
adA
adA
adA
@@ -97564,7 +97407,7 @@ wQZ
dOw
cmH
daO
-dbF
+dbG
dqs
drY
dUe
@@ -97662,7 +97505,7 @@ aBT
aCj
cZn
aij
-aOh
+adA
adA
adA
aeo
@@ -97892,11 +97735,11 @@ awX
auT
auT
xEP
-ath
-aOY
-coX
+aGU
+aGc
+aGn
aik
-aRM
+aCG
agK
agC
adA
@@ -98126,10 +97969,10 @@ aww
awX
axa
oUN
-aSi
-aRj
-coX
-aOh
+azO
+aHe
+aGn
+adA
dfr
dTs
aDY
@@ -98360,11 +98203,11 @@ aww
lHW
axb
gab
-aOh
-aRk
-cqS
+adA
+aEZ
+aIQ
dTs
-aRN
+aCM
dTs
akq
agC
@@ -98594,9 +98437,9 @@ aww
aww
axc
oUN
-aOh
-aRk
-afl
+adA
+aEZ
+aHA
dTs
dTs
dTs
@@ -98813,7 +98656,7 @@ aoQ
apn
apn
apn
-aqe
+apn
apn
aqQ
ark
@@ -98828,7 +98671,7 @@ aww
aww
axc
oUN
-cTE
+vte
aRk
afl
dTs
@@ -99062,7 +98905,7 @@ aww
awx
axc
oUN
-aOh
+aFz
aRk
afl
dTs
@@ -99296,7 +99139,7 @@ aww
awx
axc
oUN
-aOh
+aFz
aRk
afm
dTs
@@ -99518,7 +99361,7 @@ apH
aqd
aqd
anP
-arl
+aqu
kmj
aoT
asJ
@@ -99530,10 +99373,10 @@ aww
aww
axc
oUN
-aOh
+aFz
aRk
coX
-aOh
+aFz
dTs
dTs
dTs
@@ -99764,10 +99607,10 @@ aww
aww
axc
oUN
-aOh
+aFz
aRk
coX
-aOh
+aFz
dTs
dTs
dTs
@@ -99998,10 +99841,10 @@ awS
aww
axb
gab
-aOh
+aFz
aRk
cWq
-bzS
+abG
dTs
dTs
dTs
@@ -100235,7 +100078,7 @@ oUN
aOi
aCi
coX
-aOh
+aFz
dTs
beB
beM
@@ -100467,7 +100310,7 @@ auT
auT
axv
aOj
-aOY
+ace
cqS
dTs
dTs
@@ -100737,7 +100580,7 @@ aFz
aGg
aGs
aeT
-azT
+aeT
dTs
dTs
dTs
@@ -100934,8 +100777,8 @@ auT
auT
axa
oUN
-aSi
-aSi
+aci
+aci
dTs
dTs
dTs
@@ -100971,8 +100814,8 @@ aFz
aFz
aGI
aeT
-azT
-azT
+aeT
+aeT
dTs
awR
aIv
@@ -101168,11 +101011,11 @@ awT
auT
axb
gab
-aOh
-aRM
+aFz
+bfh
dTs
dTs
-aam
+abE
aiL
aFU
aFz
@@ -101205,9 +101048,9 @@ aFz
bfh
bfi
aeT
-azT
-azT
-azT
+aeT
+aeT
+aeT
awW
aIx
aIG
@@ -101402,11 +101245,11 @@ aJd
awZ
aJd
gab
-aOh
-aWz
-bgH
-aam
-azA
+aFz
+aGI
+cad
+abE
+aiL
aeT
aFU
aFz
@@ -101439,10 +101282,10 @@ aFz
aGI
lMc
aeT
-azT
-azT
-azT
-azT
+aeT
+aeT
+aeT
+aeT
tKQ
tKQ
tKQ
@@ -101636,11 +101479,11 @@ awO
awO
awO
gab
-aOh
-aWA
-aXY
-aeE
-aeE
+aFz
+aGg
+aGs
+aeT
+aeT
aGQ
dUz
aFz
@@ -101673,10 +101516,10 @@ aFz
aGI
aeT
aeT
-azT
-azT
-azT
-tKQ
+aeT
+aeT
+aeT
+abB
tKQ
tKQ
tKQ
@@ -101870,11 +101713,11 @@ aKc
awO
awO
gab
-aPg
-cTE
-aWz
-aeE
-aeE
+beM
+vte
+aGI
+aeT
+aeT
aFU
aFz
aFz
@@ -101907,11 +101750,11 @@ bfh
bfi
aeT
aeT
-azT
-azT
-tKQ
-tKQ
-tKQ
+aeT
+aeT
+abB
+abB
+abB
tKQ
tKQ
aBk
@@ -102104,11 +101947,11 @@ awV
awV
axf
gab
-aPi
-aSk
-aRN
+bel
+beB
+bfi
ail
-aeE
+aeT
aFU
aFz
aFz
@@ -102141,12 +101984,12 @@ aGI
aeT
dTs
dTs
-azT
-azT
-tKQ
-tKQ
-tKQ
-tKQ
+aeT
+aeT
+abB
+abB
+abB
+abB
dTs
tKQ
tKQ
@@ -102338,11 +102181,11 @@ aJd
aJd
aJd
gab
-aan
-ady
-aeE
-aeE
-aeE
+acm
+abY
+aeT
+aeT
+aeT
bel
beM
aFz
@@ -102572,11 +102415,11 @@ dTs
dTs
dTs
dTs
-aam
-aam
-ady
-aeE
-aeE
+abE
+abE
+abY
+aeT
+aeT
dTs
bel
beM
@@ -102805,12 +102648,12 @@ dTs
dTs
dTs
dTs
-aam
-aam
-aam
-azA
-aeE
-aeE
+abE
+abE
+abE
+aiL
+aeT
+aeT
dTs
dTs
aFU
diff --git a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm
index 882e0e1a608c..64365bb1aefb 100644
--- a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm
+++ b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm
@@ -609,6 +609,7 @@
},
/obj/item/reagent_container/food/snacks/stew,
/obj/item/tool/kitchen/utensil/spoon,
+/obj/structure/machinery/power/apc/fully_broken/no_cell/north,
/turf/open/floor/corsat/squareswood/north,
/area/desert_dam/interior/caves/temple)
"NL" = (
diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
index de1b7f82853b..736636b06d0d 100644
--- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
+++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm
@@ -947,6 +947,10 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/prison/cell_stripe/west,
/area/prison/research/secret/bioengineering)
+"acU" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/prison/darkred2/west,
+/area/prison/security/checkpoint/highsec_medsec)
"acV" = (
/turf/open/floor/prison/sterile_white/southwest,
/area/prison/research/secret/bioengineering)
@@ -1540,6 +1544,12 @@
},
/turf/open/floor/prison/whitepurplefull,
/area/prison/research/secret/containment)
+"aeJ" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/prison/bright_clean/southwest,
+/area/prison/holding/holding2)
"aeK" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -1593,6 +1603,10 @@
},
/turf/open/floor/prison/cell_stripe/east,
/area/prison/cellblock/maxsec/north)
+"aeS" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/prison/bright_clean2/southwest,
+/area/prison/hallway/central/south)
"aeT" = (
/obj/structure/machinery/light{
dir = 1
@@ -1774,6 +1788,10 @@
/obj/structure/pipes/standard/manifold/fourway/hidden/supply,
/turf/open/floor/prison/sterile_white/southwest,
/area/prison/research/secret/bioengineering)
+"afz" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/prison/redfull,
+/area/prison/hallway/central/west)
"afA" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -1833,6 +1851,10 @@
},
/turf/open/floor/prison/whitepurple/west,
/area/prison/research/secret/bioengineering)
+"afK" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/prison/bright_clean2/southwest,
+/area/prison/holding/holding1)
"afL" = (
/turf/open/floor/prison/whitepurplecorner,
/area/prison/research/secret/bioengineering)
@@ -1889,6 +1911,10 @@
/obj/effect/landmark/corpsespawner/prisoner,
/turf/open/floor/prison,
/area/prison/research/secret/containment)
+"afX" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/prison/bright_clean2/southwest,
+/area/prison/hallway/central/north)
"afY" = (
/turf/open/floor/plating,
/area/prison/research/secret/containment)
@@ -19379,12 +19405,6 @@
/obj/structure/toilet,
/turf/open/floor/prison/sterile_white/southwest,
/area/prison/holding/holding1)
-"bwv" = (
-/obj/structure/machinery/power/apc/no_power/east,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/prison/bright_clean2/southwest,
-/area/prison/holding/holding1)
"bww" = (
/obj/structure/pipes/vents/scrubber,
/turf/open/floor/prison/bright_clean/southwest,
@@ -19981,7 +20001,6 @@
"bzw" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
-/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/prison/rampbottom/north,
/area/prison/holding/holding1)
"bzx" = (
@@ -21295,10 +21314,6 @@
},
/turf/open/floor/prison,
/area/prison/quarters/security)
-"bEF" = (
-/obj/structure/machinery/power/apc/no_power/west,
-/turf/open/floor/plating,
-/area/prison/maintenance/hangar_barracks)
"bEG" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -22087,12 +22102,6 @@
"bHJ" = (
/turf/closed/wall/prison,
/area/prison/holding/holding2)
-"bHK" = (
-/obj/structure/machinery/power/apc/no_power/east,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/prison/bright_clean/southwest,
-/area/prison/holding/holding2)
"bHL" = (
/obj/structure/machinery/light{
dir = 8
@@ -22671,6 +22680,7 @@
dir = 1;
icon_state = "pipe-c"
},
+/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/prison/darkredfull2/southwest,
/area/prison/security/checkpoint/highsec/s)
"bKf" = (
@@ -23250,10 +23260,6 @@
},
/turf/open/floor/prison,
/area/prison/telecomms)
-"bMB" = (
-/obj/structure/machinery/power/apc/no_power/east,
-/turf/open/floor/prison,
-/area/prison/telecomms)
"bMC" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -29162,7 +29168,6 @@
/obj/structure/machinery/computer/cameras{
network = list("PRISON")
},
-/obj/structure/machinery/power/apc/no_power/north,
/turf/open/floor/prison/darkredfull2/southwest,
/area/prison/security/checkpoint/highsec_medsec)
"ckD" = (
@@ -29798,7 +29803,6 @@
/turf/open/floor/prison/darkred2,
/area/prison/security/checkpoint/highsec_medsec)
"cnn" = (
-/obj/structure/machinery/power/apc/no_power/south,
/turf/open/floor/prison/darkred2,
/area/prison/security/checkpoint/highsec_medsec)
"cnp" = (
@@ -58082,7 +58086,7 @@ bZS
cjB
lME
vKV
-gbI
+acU
gbI
upJ
cjB
@@ -59956,7 +59960,7 @@ bBF
bDf
bBF
bBF
-bDf
+afz
bBF
bBF
bDf
@@ -67594,7 +67598,7 @@ bBS
bFm
bql
cWx
-cWx
+aeS
cWx
cWx
cWx
@@ -67969,7 +67973,7 @@ aEg
aFK
aGT
aCT
-aKN
+afX
aJc
aJJ
aJJ
@@ -76913,7 +76917,7 @@ bua
bua
bua
bur
-bua
+afK
bua
bAi
bzu
@@ -77126,7 +77130,7 @@ bso
bso
buu
bvo
-bwv
+bvo
bxW
bzw
byn
@@ -77135,8 +77139,8 @@ bDP
byn
bFE
bGN
-bHK
bIx
+aeJ
bIV
bJI
bJI
@@ -79261,7 +79265,7 @@ eMW
pft
bKE
hdw
-bMB
+bKD
bQj
bQd
bQd
@@ -85400,7 +85404,7 @@ byu
bAT
bCO
bEd
-bEF
+bDa
bDa
bzJ
byu
diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
index 7a5f5abc8f5b..8d0f57b32c53 100644
--- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
+++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm
@@ -19,6 +19,22 @@
},
/turf/open/floor/prison/sterile_white/southwest,
/area/fiorina/tumor/ice_lab)
+"aad" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/bluefull,
+/area/fiorina/station/power_ring)
+"aae" = (
+/obj/structure/machinery/power/apc/power/south,
+/turf/open/floor/prison/floor_plate,
+/area/fiorina/station/civres_blue)
+"aaf" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/prison/darkpurple2/north,
+/area/fiorina/tumor/servers)
+"aag" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/whitegreenfull/southwest,
+/area/fiorina/tumor/ice_lab)
"aak" = (
/obj/effect/decal/hefa_cult_decals/d32{
icon_state = "4"
@@ -47535,7 +47551,7 @@ rqG
pQs
pQs
pQs
-bNE
+aae
rja
lMq
jYK
@@ -49622,7 +49638,7 @@ kPf
kPf
kPf
jXz
-jnU
+aaf
jHz
oiV
eSH
@@ -61059,7 +61075,7 @@ jFP
phz
sWb
xLi
-mvp
+aag
cer
kpq
azZ
@@ -70427,7 +70443,7 @@ cIa
mVE
sEK
cIa
-nVK
+urw
jii
apg
cIa
@@ -72110,7 +72126,7 @@ cIa
fna
moQ
cIa
-urw
+nVK
jii
vwX
cIa
@@ -76847,7 +76863,7 @@ brR
vDO
tUs
mxQ
-pYB
+aad
tOM
gbf
tOM
diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
index 469aec8e363b..a85e94d5214e 100644
--- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
+++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -1128,6 +1128,10 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/darkyellow2/northeast,
/area/ice_colony/surface/engineering/generator)
+"aex" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/dark2,
+/area/ice_colony/underground/maintenance/central/construction)
"aey" = (
/obj/item/lightstick/planted,
/turf/open/auto_turf/snow/layer1,
@@ -1147,6 +1151,10 @@
},
/turf/open/ice,
/area/ice_colony/exterior/surface/valley/northeast)
+"aeC" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/plating/icefloor/warnplate/north,
+/area/ice_colony/exterior/surface/landing_pad)
"aeD" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -1673,6 +1681,9 @@
},
/turf/open/floor/darkyellow2/east,
/area/ice_colony/surface/engineering/generator)
+"ags" = (
+/turf/open/floor/darkbrown2/west,
+/area/ice_colony/surface/hangar/hallway)
"agt" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -1829,6 +1840,9 @@
},
/turf/open/auto_turf/snow/layer1,
/area/ice_colony/exterior/surface/valley/northwest)
+"agU" = (
+/turf/open/floor/darkbrown2/east,
+/area/ice_colony/surface/hangar/hallway)
"agV" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 9
@@ -2014,6 +2028,15 @@
/obj/structure/barricade/metal,
/turf/open/floor/plating/icefloor/warnplate/southwest,
/area/ice_colony/surface/requesitions)
+"ahF" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/green{
+ dir = 4
+ },
+/turf/open/floor/dark2,
+/area/ice_colony/surface/hangar/hallway)
"ahG" = (
/turf/closed/wall/r_wall,
/area/ice_colony/exterior/surface/valley/northwest)
@@ -2021,6 +2044,12 @@
/obj/structure/window/framed/colony/reinforced,
/turf/open/floor/plating,
/area/ice_colony/surface/hydroponics/north)
+"ahI" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/darkbrown2/east,
+/area/ice_colony/surface/hangar/hallway)
"ahJ" = (
/obj/item/lightstick/red/planted,
/turf/open/auto_turf/snow/layer2,
@@ -2426,6 +2455,9 @@
"aiX" = (
/turf/open/ice,
/area/ice_colony/exterior/surface/clearing/north)
+"aiY" = (
+/turf/open/floor/darkbrown2/northwest,
+/area/ice_colony/surface/hangar/hallway)
"aiZ" = (
/obj/structure/surface/rack,
/obj/item/cell/high/empty,
@@ -10942,11 +10974,11 @@
name = "\improper Security Checkpoint"
},
/turf/open/floor/darkbrown2/northwest,
-/area/ice_colony/surface/hangar/checkpoint)
+/area/ice_colony/surface/hangar/hallway)
"aOi" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/darkbrown2/northeast,
-/area/ice_colony/surface/hangar/checkpoint)
+/area/ice_colony/surface/hangar/hallway)
"aOj" = (
/turf/closed/wall/r_wall,
/area/ice_colony/surface/hangar/beta)
@@ -11119,11 +11151,11 @@
/turf/open/floor/dark2,
/area/ice_colony/surface/hangar/beta)
"aOQ" = (
-/obj/structure/machinery/power/apc/no_power/north,
/obj/structure/machinery/firealarm{
dir = 4;
pixel_x = 24
},
+/obj/structure/machinery/power/apc/no_power/north,
/turf/open/floor/darkbrown2/northeast,
/area/ice_colony/surface/hangar/alpha)
"aOR" = (
@@ -18741,10 +18773,6 @@
"bvw" = (
/turf/open/floor/dark2,
/area/ice_colony/underground/maintenance/central/construction)
-"bvx" = (
-/obj/item/frame/apc,
-/turf/open/floor/plating,
-/area/ice_colony/underground/maintenance/central/construction)
"bvy" = (
/turf/open/floor/plating,
/area/ice_colony/underground/maintenance/central/construction)
@@ -26560,7 +26588,7 @@
"gxg" = (
/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/darkbrown2/west,
-/area/ice_colony/surface/hangar/alpha)
+/area/ice_colony/surface/hangar/hallway)
"gDb" = (
/obj/structure/surface/table,
/turf/open/floor/darkred2/north,
@@ -26791,7 +26819,7 @@
/area/ice_colony/underground/maintenance/south)
"mHc" = (
/turf/open/floor/darkbrown2/northeast,
-/area/ice_colony/surface/hangar/beta)
+/area/ice_colony/surface/hangar/hallway)
"mLJ" = (
/obj/structure/shuttle/diagonal{
icon_state = "swall_f5"
@@ -26814,7 +26842,7 @@
"oHs" = (
/obj/structure/window/framed/colony/reinforced,
/turf/open/floor/plating/icefloor,
-/area/ice_colony/surface/hangar/alpha)
+/area/ice_colony/surface/hangar/hallway)
"oHE" = (
/obj/effect/landmark/static_comms/net_one,
/turf/open/floor/plating/icefloor,
@@ -26845,11 +26873,7 @@
pixel_x = -24
},
/turf/open/floor/darkbrown2/southwest,
-/area/ice_colony/surface/hangar/alpha)
-"paK" = (
-/obj/structure/window/framed/colony/reinforced,
-/turf/open/floor/plating/icefloor,
-/area/ice_colony/surface/hangar/beta)
+/area/ice_colony/surface/hangar/hallway)
"pjQ" = (
/obj/structure/surface/table/gamblingtable,
/obj/structure/pipes/standard/manifold/hidden/green{
@@ -26963,7 +26987,7 @@
pixel_x = -24
},
/turf/open/floor/darkbrown2/west,
-/area/ice_colony/surface/hangar/alpha)
+/area/ice_colony/surface/hangar/hallway)
"sto" = (
/obj/docking_port/stationary/marine_dropship/lz1{
name = "LZ1: Hangar Landing Zone"
@@ -27001,7 +27025,7 @@
dir = 8
},
/turf/open/floor/darkbrown2/west,
-/area/ice_colony/surface/hangar/alpha)
+/area/ice_colony/surface/hangar/hallway)
"tue" = (
/obj/structure/machinery/light,
/turf/open/floor/darkblue2,
@@ -27063,7 +27087,7 @@
/area/ice_colony/exterior/surface/cliff)
"uPr" = (
/turf/open/floor/darkbrown2/southeast,
-/area/ice_colony/surface/hangar/beta)
+/area/ice_colony/surface/hangar/hallway)
"uUv" = (
/obj/effect/alien/weeds/node,
/obj/effect/landmark/xeno_hive_spawn,
@@ -49361,7 +49385,7 @@ bto
btS
brM
bvw
-bvw
+aex
bvy
bvv
bxv
@@ -49924,7 +49948,7 @@ bsC
btq
btU
brM
-bvx
+bvy
bvy
bvw
bwU
@@ -72685,20 +72709,20 @@ aMn
aMV
aNN
oHs
-aOH
-aPD
-aQG
+aiY
+ags
+ahF
tly
-aPD
-aPD
-aPD
-aPD
-aPD
+ags
+ags
+ags
+ags
+ags
gxg
rNB
-aPD
-aPD
-aPD
+ags
+ags
+ags
oZq
oHs
aYC
@@ -73530,23 +73554,23 @@ aKj
aMq
aKj
aNO
-paK
+oHs
mHc
-aTb
-aTb
-aTb
-aTb
-aTb
-aTb
-aTb
-ecS
-mog
-aTb
-aTb
-aTb
-aTb
+agU
+agU
+agU
+agU
+agU
+agU
+agU
+ahI
+ahF
+agU
+agU
+agU
+agU
uPr
-paK
+oHs
aYC
aYH
aYC
@@ -74112,7 +74136,7 @@ aWL
aXr
aXT
aOj
-aYB
+aeC
aYC
aYC
aYC
diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
index 18dc6cf7c8a6..a4c5f75b811c 100644
--- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
+++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm
@@ -17,6 +17,10 @@
/obj/structure/girder,
/turf/open/auto_turf/ice/layer1,
/area/shiva/interior/colony/medseceng)
+"aaf" = (
+/obj/structure/machinery/space_heater,
+/turf/open/floor/shiva/north,
+/area/shiva/interior/telecomm/lz1_biceps)
"aag" = (
/obj/structure/bed/chair{
dir = 4
@@ -51,6 +55,16 @@
},
/turf/open/auto_turf/ice/layer1,
/area/shiva/interior/caves/medseceng_caves)
+"aam" = (
+/obj/structure/barricade/metal{
+ dir = 4
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E-corner"
+ },
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/plating,
+/area/shiva/exterior/lz1_valley)
"aan" = (
/obj/structure/prop/ice_colony/dense/planter_box{
dir = 8
@@ -72,10 +86,20 @@
},
/turf/open/auto_turf/ice/layer1,
/area/shiva/exterior/cp_lz2)
+"aap" = (
+/obj/item/lightstick/red/planted,
+/turf/open/auto_turf/snow/layer2,
+/area/shiva/interior/valley_huts)
+"aaq" = (
+/turf/open/auto_turf/snow/layer2,
+/area/shiva/interior/valley_huts)
"aar" = (
/obj/structure/machinery/camera/autoname/lz_camera,
/turf/open/floor/shiva/north,
/area/shiva/exterior/lz2_fortress)
+"aas" = (
+/turf/open/auto_turf/snow/layer2,
+/area/shiva/interior/valley_huts/no2)
"aat" = (
/obj/item/tool/shovel/snow{
pixel_y = 8
@@ -91,6 +115,13 @@
"aav" = (
/turf/open/auto_turf/ice/layer1,
/area/shiva/exterior/telecomm/lz1_north)
+"aaw" = (
+/turf/open/auto_turf/snow/layer0,
+/area/shiva/interior/valley_huts/no2)
+"aax" = (
+/obj/structure/machinery/space_heater,
+/turf/open/floor/shiva/wredfull,
+/area/shiva/interior/colony/medseceng)
"aay" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/auto_turf/ice/layer0,
@@ -111,11 +142,6 @@
/obj/structure/surface/rack,
/turf/open/auto_turf/ice/layer1,
/area/shiva/exterior/cp_colony_grounds)
-"aaC" = (
-/obj/effect/spider/stickyweb,
-/obj/structure/machinery/space_heater,
-/turf/open/auto_turf/ice/layer1,
-/area/shiva/interior/caves/right_spiders)
"aaD" = (
/obj/effect/spider/cocoon{
icon_state = "cocoon_large1"
@@ -3785,7 +3811,7 @@
specialfunctions = 4
},
/turf/open/auto_turf/snow/layer2,
-/area/shiva/exterior/valley)
+/area/shiva/interior/valley_huts/no2)
"aDI" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/auto_turf/snow/layer1,
@@ -3857,7 +3883,7 @@
specialfunctions = 4
},
/turf/open/auto_turf/snow/layer2,
-/area/shiva/exterior/valley)
+/area/shiva/interior/valley_huts)
"aEH" = (
/obj/structure/flora/grass/tallgrass/ice/corner{
dir = 9
@@ -4172,7 +4198,8 @@
/area/shiva/exterior/valley)
"aKn" = (
/obj/structure/machinery/portable_atmospherics/powered/scrubber{
- icon_state = "psiphon:1"
+ icon_state = "psiphon:1";
+ needs_power = 0
},
/turf/open/auto_turf/snow/layer1,
/area/shiva/exterior/valley)
@@ -4807,7 +4834,7 @@
name = "\improper Anti-Freeze Lounge"
},
/turf/open/floor/plating,
-/area/shiva/exterior/cp_s_research)
+/area/shiva/interior/bar)
"aSX" = (
/obj/structure/largecrate/random/mini/ammo,
/turf/open/floor/plating,
@@ -7061,6 +7088,7 @@
"cYC" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/device/multitool,
+/obj/structure/machinery/cell_charger,
/turf/open/floor/shiva,
/area/shiva/interior/colony/research_hab)
"cYR" = (
@@ -8866,10 +8894,6 @@
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/shiva/greenfull,
/area/shiva/interior/colony/n_admin)
-"fBA" = (
-/obj/structure/machinery/space_heater,
-/turf/open/auto_turf/ice/layer1,
-/area/shiva/exterior/cp_s_research)
"fBJ" = (
/obj/structure/surface/table/woodentable,
/obj/item/paper_bin,
@@ -13900,10 +13924,6 @@
/obj/item/storage/belt/utility/full,
/turf/open/auto_turf/snow/layer3,
/area/shiva/exterior/cp_s_research)
-"luD" = (
-/obj/structure/machinery/space_heater,
-/turf/open/auto_turf/snow/layer1,
-/area/shiva/exterior/junkyard/fortbiceps)
"luR" = (
/obj/structure/machinery/landinglight/ds2/delaytwo{
dir = 4
@@ -15050,7 +15070,7 @@
/turf/open/floor/shiva/floor3,
/area/shiva/interior/aerodrome)
"mKD" = (
-/obj/structure/machinery/cell_charger,
+/obj/item/circuitboard,
/turf/open/auto_turf/snow/layer0,
/area/shiva/exterior/cp_s_research)
"mKF" = (
@@ -16647,9 +16667,6 @@
"oQl" = (
/turf/closed/wall/shiva/ice,
/area/shiva/exterior/valley)
-"oQo" = (
-/turf/closed/wall/shiva/prefabricated,
-/area/shiva/exterior/cp_s_research)
"oRc" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/auto_turf/snow/layer0,
@@ -19048,9 +19065,6 @@
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/plating,
/area/shiva/interior/colony/research_hab)
-"rRZ" = (
-/turf/closed/wall/shiva/prefabricated/reinforced,
-/area/shiva/exterior/cp_s_research)
"rSr" = (
/obj/structure/bed/chair/office/light,
/turf/open/floor/shiva/multi_tiles/southeast,
@@ -30388,7 +30402,7 @@ uji
uji
uji
uji
-qhm
+aam
qhm
kXs
mcH
@@ -44182,7 +44196,7 @@ sod
rKk
uYC
pOM
-blI
+aaf
blI
jLn
hcJ
@@ -45957,7 +45971,7 @@ fnG
rEV
jrg
jrg
-luD
+sod
jrg
jrg
sod
@@ -46409,11 +46423,11 @@ iXm
daD
dKL
aPk
-rRZ
-oQo
+hcH
+tnu
aSQ
-oQo
-rRZ
+tnu
+hcH
rWW
kVd
uzu
@@ -50164,7 +50178,7 @@ rAH
xgc
boW
vkr
-nij
+kVd
ukp
jrg
jrg
@@ -51948,7 +51962,7 @@ asz
pLf
ukp
uzu
-fBA
+ukp
xgc
ukp
ukp
@@ -52435,7 +52449,7 @@ fXX
bJj
bJj
bJj
-bJj
+xuz
bJj
bJj
bJj
@@ -52838,7 +52852,7 @@ ecj
ecj
ecj
ecj
-aaC
+imk
imk
gkv
kng
@@ -54489,8 +54503,8 @@ iMb
iMb
iMb
aDH
-pqj
-iMb
+aaw
+aas
iMb
iMb
fQX
@@ -55141,7 +55155,7 @@ pqj
iMb
iMb
iMb
-kri
+aap
pQE
eiT
qVq
@@ -55303,7 +55317,7 @@ iMb
iMb
iMb
iMb
-iMb
+aaq
aEW
qVq
qVq
@@ -57364,7 +57378,7 @@ akt
akI
alx
amP
-amP
+aax
acT
jLT
kqO
diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm
index 29f5f428ca06..6b714900192a 100644
--- a/maps/map_files/Kutjevo/Kutjevo.dmm
+++ b/maps/map_files/Kutjevo/Kutjevo.dmm
@@ -1,16 +1,146 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aaa" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/kutjevo/multi_tiles/north,
+/area/kutjevo/exterior/runoff_bridge)
+"aab" = (
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/kutjevo/multi_tiles,
+/area/kutjevo/interior/colony_central/mine_elevator)
+"aac" = (
+/turf/closed/wall/kutjevo/colony/reinforced,
+/area/kutjevo/interior/construction/east)
+"aad" = (
+/obj/structure/girder,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/interior/construction/east)
+"aae" = (
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/signal_tower)
+"aaf" = (
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/interior/construction/signal_tower)
+"aag" = (
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/east)
+"aah" = (
+/turf/open/floor/kutjevo/grey/plate,
+/area/kutjevo/interior/construction/east)
+"aai" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/east)
+"aaj" = (
+/obj/structure/girder,
+/turf/open/floor/kutjevo/grey/plate,
+/area/kutjevo/interior/construction/east)
+"aak" = (
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/interior/complex/med)
+"aal" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/exterior/construction)
+"aam" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/kutjevo/tan/grey_edge/north,
+/area/kutjevo/interior/construction/east)
+"aan" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/exterior/construction)
+"aao" = (
+/obj/structure/window/framed/kutjevo/reinforced,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/exterior/complex_border/med_rec)
+"aap" = (
+/turf/closed/wall/kutjevo/colony/reinforced,
+/area/kutjevo/interior/construction/north)
+"aaq" = (
+/obj/structure/girder,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/north)
+"aar" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/exterior/complex_border/med_rec)
+"aas" = (
+/turf/open/floor/kutjevo/tan,
+/area/kutjevo/interior/construction/north)
"aat" = (
/obj/structure/flora/grass/tallgrass/desert/corner{
dir = 10
},
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/exterior/construction)
+"aau" = (
+/turf/closed/wall/kutjevo/colony,
+/area/kutjevo/interior/construction/north)
+"aav" = (
+/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
+ req_one_access = null
+ },
+/turf/open/floor/kutjevo/multi_tiles,
+/area/kutjevo/interior/construction/north)
+"aaw" = (
+/obj/structure/window_frame/kutjevo/reinforced,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/north)
"aax" = (
/obj/structure/platform/stone/kutjevo/north,
/obj/structure/platform/stone/kutjevo/east,
/obj/structure/platform/stone/kutjevo,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/interior/colony_north)
+"aay" = (
+/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
+ dir = 1;
+ req_one_access = null
+ },
+/turf/open/floor/kutjevo/multi_tiles,
+/area/kutjevo/interior/construction/north)
+"aaz" = (
+/turf/open/auto_turf/sand/layer1,
+/area/kutjevo/interior/construction/north)
+"aaA" = (
+/turf/open/floor/kutjevo/grey/plate,
+/area/kutjevo/interior/construction/north)
+"aaB" = (
+/obj/effect/landmark/corpsespawner/colonist/kutjevo,
+/turf/open/floor/kutjevo/grey/plate,
+/area/kutjevo/interior/construction/north)
+"aaC" = (
+/turf/open/auto_turf/sand/layer2,
+/area/kutjevo/interior/construction/north)
+"aaD" = (
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/north)
+"aaE" = (
+/turf/open/auto_turf/sand/layer0,
+/area/kutjevo/interior/construction/north)
+"aaF" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/north)
+"aaG" = (
+/obj/structure/girder,
+/turf/open/floor/kutjevo/grey/plate,
+/area/kutjevo/interior/construction/north)
+"aaH" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/construction/north)
+"aaI" = (
+/obj/effect/spawner/random/tool,
+/turf/open/floor/kutjevo/grey/plate,
+/area/kutjevo/interior/construction/north)
+"aaJ" = (
+/turf/open/floor/plating/kutjevo,
+/area/kutjevo/interior/complex/med/auto_doc)
+"aaK" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/floor/kutjevo/grey/plate,
+/area/kutjevo/interior/construction/north)
"aaT" = (
/obj/structure/flora/grass/tallgrass/desert/corner{
dir = 6
@@ -140,7 +270,7 @@
pixel_y = 3
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"alG" = (
/obj/structure/platform_decoration/metal/kutjevo,
/turf/open/auto_turf/sand/layer2,
@@ -222,7 +352,7 @@
dir = 8
},
/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/botany)
"arh" = (
/obj/item/prop/alien/hugger,
/turf/open/auto_turf/sand/layer1,
@@ -244,7 +374,7 @@
/obj/effect/spawner/random/toolbox,
/obj/structure/surface/table/almayer,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"arU" = (
/obj/item/ammo_magazine/rifle/m16,
/obj/effect/decal/cleanable/blood/xeno{
@@ -256,10 +386,6 @@
/obj/structure/machinery/colony_floodlight,
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/exterior/lz_dunes)
-"ast" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/exterior/construction)
"asQ" = (
/obj/structure/pipes/standard/manifold/visible,
/turf/open/floor/kutjevo/colors/cyan,
@@ -277,7 +403,7 @@
"atC" = (
/obj/item/stack/rods,
/turf/open/floor/kutjevo/colors/purple/edge/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"atL" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/flora/bush/ausbushes/reedbush,
@@ -285,7 +411,7 @@
/obj/structure/platform/metal/kutjevo/west,
/obj/structure/platform/metal/kutjevo/east,
/turf/open/gm/river/desert/shallow,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"atQ" = (
/obj/item/tank/emergency_oxygen/engi,
/turf/open/floor/kutjevo/colors/orange,
@@ -303,7 +429,7 @@
"avT" = (
/obj/item/stack/sandbags/large_stack,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"avX" = (
/obj/effect/decal/cleanable/blood/oil/streak,
/turf/open/floor/kutjevo/multi_tiles,
@@ -341,7 +467,7 @@
icon_state = "p_stair_full"
},
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/construction/east)
"axN" = (
/obj/structure/bed/chair{
dir = 8
@@ -368,7 +494,7 @@
icon_state = "dispenser"
},
/turf/open/floor/kutjevo/tan/multi_tiles,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"azo" = (
/obj/structure/largecrate/random/case/small,
/obj/structure/sign/nosmoking_1{
@@ -474,7 +600,7 @@
"aFL" = (
/obj/structure/blocker/invisible_wall,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"aGR" = (
/obj/structure/bed/sofa/vert/grey/bot{
pixel_y = 4
@@ -578,7 +704,7 @@
pixel_y = -4
},
/turf/closed/wall/kutjevo/colony,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"aOh" = (
/obj/structure/largecrate/random/case/small,
/turf/open/floor/kutjevo/colors/cyan,
@@ -808,7 +934,7 @@
dir = 4
},
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/med)
"bkn" = (
/obj/structure/machinery/power/reactor/colony,
/turf/open/floor/kutjevo/colors/orange,
@@ -911,7 +1037,7 @@
"bsm" = (
/obj/structure/surface/rack,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"bsq" = (
/obj/structure/tunnel,
/turf/open/auto_turf/sand/layer0,
@@ -978,7 +1104,7 @@
"bzj" = (
/obj/structure/machinery/space_heater,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/exterior/construction)
"bzl" = (
/obj/structure/flora/bush/ausbushes/ausbush{
icon_state = "pointybush_1"
@@ -1047,7 +1173,7 @@
"bDX" = (
/obj/structure/machinery/sensortower,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"bEg" = (
/obj/structure/window/framed/kutjevo,
/turf/open/floor/plating/kutjevo,
@@ -1165,7 +1291,7 @@
/obj/structure/bed/chair,
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"bKH" = (
/turf/open/auto_turf/sand/layer0,
/area/kutjevo/exterior/construction)
@@ -1265,7 +1391,7 @@
dir = 4
},
/turf/open/floor/kutjevo/colors/purple/edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"bTN" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null;
@@ -1291,7 +1417,7 @@
/obj/structure/surface/table/gamblingtable,
/obj/item/storage/box/stompers,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"bVK" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 9;
@@ -1359,7 +1485,7 @@
"cal" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/kutjevo/colors/purple/edge/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"cau" = (
/obj/item/bodybag/tarp/reactive,
/obj/item/bodybag/tarp/reactive,
@@ -1371,7 +1497,7 @@
/obj/structure/closet/firecloset/full,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"cbg" = (
/turf/open/floor/kutjevo/colors/cyan,
/area/kutjevo/interior/complex/med/operating)
@@ -1406,7 +1532,7 @@
dir = 4
},
/turf/open/floor/kutjevo/colors/purple/inner_corner/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"cen" = (
/turf/open/desert/desert_shore/shore_edge1/east,
/area/kutjevo/exterior/scrubland/south)
@@ -1619,7 +1745,7 @@
"csE" = (
/obj/structure/girder,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"ctA" = (
/obj/structure/largecrate,
/turf/open/floor/almayer/research/containment/floor2,
@@ -1629,7 +1755,7 @@
icon_state = "pottedplant_30"
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"ctG" = (
/obj/structure/bed/chair,
/turf/open/floor/kutjevo/tan,
@@ -1712,7 +1838,7 @@
"cBd" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor/kutjevo/colors/purple/inner_corner/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"cBq" = (
/obj/structure/flora/bush/ausbushes/ausbush{
icon_state = "pointybush_2";
@@ -1801,7 +1927,7 @@
icon_state = "solo_tank_empty"
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/exterior/construction)
"cIj" = (
/obj/structure/platform_decoration/metal/kutjevo/north,
/turf/open/auto_turf/sand/layer0,
@@ -1889,7 +2015,7 @@
/area/kutjevo/interior/complex/botany)
"cPv" = (
/turf/open/floor/kutjevo/colors/purple/inner_corner,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"cPR" = (
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
name = "\improper Medical Stormlock Shutters"
@@ -1978,8 +2104,9 @@
/turf/open/floor/kutjevo/multi_tiles/southwest,
/area/kutjevo/interior/colony_South/power2)
"cUm" = (
+/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"cUo" = (
/obj/structure/platform_decoration/metal/kutjevo/east,
/turf/open/auto_turf/sand/layer0,
@@ -1990,7 +2117,7 @@
},
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"cVD" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/kutjevo/tan,
@@ -2007,7 +2134,7 @@
pixel_y = 28
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"cWL" = (
/obj/effect/decal/cleanable/blood/xeno{
icon_state = "xgib2"
@@ -2307,7 +2434,7 @@
pixel_y = 20
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"dte" = (
/turf/open/gm/river/desert/shallow_edge/west,
/area/kutjevo/exterior/runoff_river)
@@ -2581,7 +2708,7 @@
dir = 4
},
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"dLR" = (
/turf/open/gm/river/desert/shallow_edge,
/area/kutjevo/exterior/runoff_bridge)
@@ -2604,7 +2731,7 @@
"dOJ" = (
/obj/structure/barricade/deployable,
/turf/open/floor/kutjevo/colors/purple/edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"dOS" = (
/obj/structure/platform/stone/kutjevo/north,
/obj/structure/platform/stone/kutjevo/west,
@@ -2803,7 +2930,7 @@
dir = 8
},
/turf/open/floor/kutjevo/colors/purple/edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"efS" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
@@ -2877,7 +3004,7 @@
dir = 8
},
/turf/open/floor/kutjevo/colors/purple/inner_corner,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"eiG" = (
/turf/open/floor/kutjevo/multi_tiles/east,
/area/kutjevo/interior/power/comms)
@@ -2932,7 +3059,7 @@
icon_state = "p_stair_full"
},
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/construction/east)
"emn" = (
/obj/item/weapon/gun/revolver/cmb,
/turf/open/floor/kutjevo/tan/multi_tiles,
@@ -2962,14 +3089,14 @@
/obj/structure/lattice,
/obj/effect/landmark/yautja_teleport,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/exterior/construction)
"epG" = (
/turf/open/gm/dirtgrassborder2/wall2,
/area/kutjevo/exterior/complex_border/med_park)
"epQ" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"epR" = (
/turf/open/floor/kutjevo/colors/orange/edge,
/area/kutjevo/interior/power_pt2_electric_boogaloo)
@@ -2996,7 +3123,7 @@
/obj/structure/closet/crate/freezer/rations,
/obj/item/defenses/handheld/tesla_coil,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"erX" = (
/obj/structure/prop/dam/boulder/boulder1,
/turf/open/auto_turf/sand/layer0,
@@ -3035,7 +3162,7 @@
/area/kutjevo/interior/colony_South)
"euj" = (
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"eur" = (
/obj/structure/barricade/wooden{
dir = 1;
@@ -3048,7 +3175,7 @@
/obj/structure/platform/metal/kutjevo/north,
/obj/structure/platform/metal/kutjevo/west,
/turf/open/floor/coagulation/icon0_8,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"euI" = (
/obj/item/clipboard,
/turf/open/floor/kutjevo/multi_tiles/southwest,
@@ -3136,7 +3263,7 @@
pixel_y = 7
},
/turf/open/floor/kutjevo/colors/purple/inner_corner/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"ezm" = (
/obj/structure/largecrate/random/case/double,
/turf/open/auto_turf/sand/layer0,
@@ -3179,7 +3306,7 @@
dir = 1
},
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"eCE" = (
/obj/item/clipboard{
pixel_x = -4;
@@ -3252,7 +3379,7 @@
"eIZ" = (
/obj/item/stack/rods,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"eJi" = (
/obj/structure/blocker/invisible_wall,
/turf/open/gm/river/desert/deep/toxic,
@@ -3271,9 +3398,6 @@
},
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/exterior/scrubland)
-"eMC" = (
-/turf/closed/wall/kutjevo/colony/reinforced,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
"eMO" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/kutjevo/colors/cyan,
@@ -3288,7 +3412,7 @@
"eNl" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"eOc" = (
/turf/open/floor/kutjevo/colors/orange/edge/northwest,
/area/kutjevo/interior/power_pt2_electric_boogaloo)
@@ -3340,7 +3464,7 @@
"eQQ" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"eQW" = (
/obj/structure/bed/chair{
dir = 4;
@@ -3388,14 +3512,14 @@
pixel_y = 20
},
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"eTT" = (
/obj/structure/girder,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"eUA" = (
/turf/open/floor/kutjevo/tan/grey_edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"eUJ" = (
/obj/structure/closet/crate,
/obj/effect/landmark/objective_landmark/medium,
@@ -3446,11 +3570,11 @@
"eZP" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"eZT" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"fbG" = (
/obj/structure/barricade/wooden{
dir = 4;
@@ -3507,11 +3631,11 @@
"feY" = (
/obj/structure/window_frame/kutjevo/reinforced,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/exterior/complex_border/med_rec)
"ffa" = (
/obj/item/stack/rods,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"ffv" = (
/obj/structure/surface/table/almayer,
/obj/item/device/defibrillator,
@@ -3612,7 +3736,7 @@
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/drinks/bottle/vodka,
/turf/open/floor/kutjevo/colors/purple/inner_corner/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"fne" = (
/obj/item/trash/barcardine,
/turf/open/auto_turf/sand/layer1,
@@ -3640,7 +3764,7 @@
"fpj" = (
/obj/item/trash/hotdog,
/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"fpJ" = (
/turf/open/floor/kutjevo/multi_tiles/west,
/area/kutjevo/interior/complex/med/locks)
@@ -3708,7 +3832,7 @@
/area/kutjevo/exterior/runoff_bridge)
"fyF" = (
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"fyT" = (
/turf/open/floor/kutjevo/colors/orange,
/area/kutjevo/exterior/complex_border/med_rec)
@@ -3763,7 +3887,7 @@
dir = 4
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"fFH" = (
/obj/structure/sign/safety/hazard{
pixel_x = -32
@@ -3843,7 +3967,7 @@
"fMd" = (
/obj/effect/landmark/corpsespawner/security/marshal,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"fMB" = (
/obj/structure/flora/grass/tallgrass/desert/corner{
dir = 5
@@ -4090,7 +4214,7 @@
"gew" = (
/obj/structure/surface/table/gamblingtable,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"geQ" = (
/obj/structure/platform/metal/kutjevo/west,
/obj/structure/blocker/invisible_wall,
@@ -4198,7 +4322,7 @@
dir = 4
},
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/botany)
"gpm" = (
/obj/structure/bed/roller,
/obj/effect/landmark/objective_landmark/close,
@@ -4475,13 +4599,13 @@
icon_state = "p_stair_full"
},
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/colony_central/mine_elevator)
"gKa" = (
/obj/structure/lattice,
/obj/item/stack/rods,
/obj/structure/surface/table/almayer,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"gKG" = (
/obj/structure/flora/bush/ausbushes/ausbush{
icon_state = "pointybush_4"
@@ -4696,7 +4820,7 @@
pixel_x = -28
},
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"hbK" = (
/turf/open/auto_turf/sand/layer2,
/area/kutjevo/interior/power)
@@ -4759,7 +4883,7 @@
"hkq" = (
/obj/effect/landmark/corpsespawner/wygoon/kutjevo,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"hkO" = (
/turf/closed/wall/kutjevo/rock,
/area/kutjevo/interior/complex/botany)
@@ -4774,14 +4898,14 @@
"hma" = (
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"hmR" = (
/turf/open/floor/kutjevo/colors/orange/edge/northwest,
/area/kutjevo/interior/foremans_office)
"hnm" = (
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"hnq" = (
/obj/structure/machinery/landinglight/ds2/delaythree{
dir = 4
@@ -4855,7 +4979,7 @@
"hrR" = (
/obj/structure/surface/rack,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"hsi" = (
/obj/structure/closet,
/obj/item/clothing/under/kutjevo,
@@ -4892,7 +5016,7 @@
dir = 8
},
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/med)
"htT" = (
/obj/structure/machinery/computer3/server/rack,
/turf/open/floor/kutjevo/grey/plate,
@@ -4924,14 +5048,14 @@
"hvN" = (
/obj/structure/platform/metal/kutjevo/west,
/turf/open/floor/coagulation/icon0_5,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"hwb" = (
/obj/structure/platform/metal/kutjevo_smooth/east,
/turf/open/gm/river/desert/shallow_edge/southeast,
/area/kutjevo/exterior/runoff_bridge)
"hwf" = (
/turf/open/floor/kutjevo/multi_tiles,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"hwA" = (
/turf/open/floor/plating/kutjevo/platingdmg3,
/area/kutjevo/interior/complex/botany/east_tech)
@@ -5050,12 +5174,12 @@
/obj/item/device/multitool,
/obj/structure/surface/table/almayer,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"hDW" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/landmark/objective_landmark/close,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"hEC" = (
/obj/structure/window_frame/kutjevo,
/turf/open/floor/plating/kutjevo,
@@ -5070,7 +5194,7 @@
icon_state = "p_stair_full"
},
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/construction/east)
"hET" = (
/turf/open/gm/river/desert/shallow_edge/southwest,
/area/kutjevo/exterior/spring)
@@ -5136,7 +5260,7 @@
/obj/structure/surface/table/almayer,
/obj/item/storage/box/m94,
/turf/open/floor/kutjevo/colors/purple/inner_corner/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"hOB" = (
/obj/structure/bed/chair{
dir = 8;
@@ -5201,7 +5325,7 @@
"hTF" = (
/obj/structure/platform_decoration/metal/kutjevo,
/turf/open/floor/kutjevo/colors/purple/edge/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"hUk" = (
/turf/closed/wall/kutjevo/rock,
/area/kutjevo/interior/colony_north)
@@ -5234,7 +5358,7 @@
/obj/structure/lattice,
/obj/structure/surface/table/almayer,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"hWX" = (
/obj/structure/bed/sofa/vert/grey/top,
/obj/structure/barricade/handrail/strata{
@@ -5306,10 +5430,6 @@
"ify" = (
/turf/closed/wall/kutjevo/colony,
/area/kutjevo/interior/complex/med/pano)
-"ifE" = (
-/obj/structure/machinery/power/apc/no_power/west,
-/turf/open/floor/kutjevo/tan/grey_edge/west,
-/area/kutjevo/interior/construction)
"ifT" = (
/obj/structure/largecrate/random,
/obj/structure/machinery/light,
@@ -5346,7 +5466,7 @@
/area/kutjevo/exterior/scrubland)
"ikW" = (
/turf/open/floor/kutjevo/colors/purple/edge/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"ikZ" = (
/obj/structure/platform/metal/kutjevo_smooth/north,
/obj/structure/platform/metal/kutjevo_smooth/west,
@@ -5434,11 +5554,11 @@
pixel_y = 20
},
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"isV" = (
/obj/structure/surface/rack,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"itr" = (
/obj/structure/platform/metal/kutjevo/north,
/obj/structure/machinery/portable_atmospherics/powered/scrubber,
@@ -5455,7 +5575,7 @@
/obj/structure/machinery/vending/coffee,
/obj/structure/machinery/light,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"ivh" = (
/obj/structure/barricade/wooden,
/turf/open/floor/kutjevo/tan/multi_tiles,
@@ -5478,7 +5598,7 @@
},
/obj/item/trash/cigbutt,
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"ixP" = (
/turf/open/gm/river/desert/deep,
/area/kutjevo/exterior/runoff_river)
@@ -5521,7 +5641,7 @@
dir = 8
},
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/med)
"iCw" = (
/obj/structure/surface/table/almayer,
/obj/effect/landmark/objective_landmark/close,
@@ -5584,7 +5704,7 @@
pixel_y = 32
},
/turf/open/floor/kutjevo/colors/purple/inner_corner/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"iMA" = (
/obj/structure/barricade/handrail/kutjevo{
dir = 4
@@ -5601,7 +5721,7 @@
/obj/structure/surface/table/reinforced/prison,
/obj/item/tool/kitchen/rollingpin,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"iNF" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/box/trackimp,
@@ -5895,7 +6015,7 @@
dir = 4
},
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"jkJ" = (
/obj/structure/closet/secure_closet/hydroponics,
/obj/item/reagent_container/glass/watertank,
@@ -5909,7 +6029,7 @@
pixel_y = 10
},
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"jlK" = (
/obj/item/device/flashlight/lamp/tripod/grey,
/turf/open/auto_turf/sand/layer1,
@@ -5975,7 +6095,7 @@
},
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"jpl" = (
/obj/structure/flora/bush/ausbushes/ausbush{
icon_state = "pointybush_3"
@@ -5989,7 +6109,7 @@
pixel_y = 13
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"jqd" = (
/turf/closed/wall/kutjevo/colony/reinforced,
/area/kutjevo/exterior/telecomm/lz1_south)
@@ -6036,7 +6156,7 @@
/obj/structure/filingcabinet,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"jtJ" = (
/obj/structure/flora/bush/desert{
icon_state = "tree_4"
@@ -6050,7 +6170,7 @@
/obj/item/ammo_magazine/smg/nailgun,
/obj/item/ammo_magazine/smg/nailgun,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"juC" = (
/obj/structure/largecrate/random/secure,
/turf/open/floor/kutjevo/colors/orange,
@@ -6156,7 +6276,7 @@
/obj/structure/closet/firecloset/full,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"jBj" = (
/obj/structure/platform/metal/kutjevo,
/turf/open/floor/kutjevo/tan,
@@ -6303,7 +6423,7 @@
dir = 4
},
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/med)
"jPD" = (
/turf/open/floor/kutjevo/tan/grey_edge,
/area/kutjevo/interior/complex/Northwest_Dorms)
@@ -6388,7 +6508,7 @@
"jZL" = (
/obj/structure/platform_decoration/metal/kutjevo/west,
/turf/open/floor/kutjevo/colors/purple/edge/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"jZT" = (
/turf/open/floor/kutjevo/colors/cyan/edge/west,
/area/kutjevo/interior/complex/med/triage)
@@ -6418,7 +6538,7 @@
"kcd" = (
/obj/structure/machinery/vending/snack,
/turf/open/floor/kutjevo/tan/grey_edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"kct" = (
/obj/effect/decal/cleanable/blood/xeno{
icon_state = "xgib4"
@@ -6440,7 +6560,7 @@
dir = 8
},
/turf/open/floor/kutjevo/colors/purple/edge/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"keX" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 4;
@@ -6559,7 +6679,7 @@
pixel_x = -28
},
/turf/open/floor/kutjevo/colors/purple/edge/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"kne" = (
/obj/structure/flora/grass/desert/lightgrass_1,
/turf/open/auto_turf/sand/layer1,
@@ -6663,7 +6783,7 @@
"kuL" = (
/obj/effect/landmark/corpsespawner/wygoon/kutjevo,
/turf/open/floor/kutjevo/colors/purple/edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"kuM" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -6719,7 +6839,7 @@
dir = 4
},
/turf/open/floor/kutjevo/colors/purple/edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"kxW" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -6760,7 +6880,7 @@
"kAr" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/kutjevo/colony/reinforced,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"kAE" = (
/obj/structure/platform_decoration/metal/kutjevo/east,
/turf/open/auto_turf/sand/layer1,
@@ -6851,7 +6971,7 @@
},
/obj/structure/machinery/light,
/turf/open/floor/kutjevo/colors/purple/edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"kFi" = (
/obj/structure/platform/metal/kutjevo/west,
/turf/open/floor/coagulation/icon0_5,
@@ -6876,7 +6996,7 @@
req_one_access = null
},
/turf/open/floor/kutjevo/multi_tiles,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"kGb" = (
/obj/structure/machinery/vending/dinnerware{
pixel_x = 2;
@@ -6935,7 +7055,7 @@
},
/obj/effect/decal/cleanable/blood/gibs/core,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"kKq" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{
dir = 1
@@ -7038,7 +7158,7 @@
"kQo" = (
/obj/structure/girder,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"kQD" = (
/turf/open/desert/desert_shore/desert_shore1/west,
/area/kutjevo/exterior/spring)
@@ -7304,7 +7424,7 @@
dir = 8
},
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"lpm" = (
/obj/structure/platform/metal/kutjevo/north,
/turf/open/floor/kutjevo/tan/alt_edge/west,
@@ -7378,7 +7498,7 @@
/obj/structure/surface/table/almayer,
/obj/item/card/id/pizza,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"lvR" = (
/turf/open/floor/kutjevo/colors/red/tile,
/area/kutjevo/exterior/Northwest_Colony)
@@ -7387,7 +7507,7 @@
/area/kutjevo/exterior/complex_border/med_park)
"lxc" = (
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"lxd" = (
/obj/structure/machinery/light{
dir = 4
@@ -7441,7 +7561,7 @@
icon_state = "p_stair_sn_full_cap"
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"lAn" = (
/obj/structure/machinery/light{
dir = 4
@@ -7476,7 +7596,7 @@
"lCE" = (
/obj/effect/landmark/yautja_teleport,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"lDi" = (
/obj/item/stack/sheet/wood,
/turf/open/floor/kutjevo/colors/purple,
@@ -7561,7 +7681,7 @@
dir = 4
},
/turf/open/floor/kutjevo/colors/purple/edge/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"lLS" = (
/obj/structure/platform/metal/kutjevo_smooth/north,
/obj/structure/platform/metal/kutjevo_smooth/east,
@@ -7776,7 +7896,7 @@
"mbR" = (
/obj/structure/closet/crate/trashcart,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"mbS" = (
/turf/closed/wall/kutjevo/colony,
/area/kutjevo/interior/complex/botany)
@@ -7825,7 +7945,7 @@
icon_state = "distribution"
},
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"meY" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 1;
@@ -7975,7 +8095,7 @@
dir = 4
},
/turf/open/floor/kutjevo/colors/purple/inner_corner/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mrY" = (
/obj/structure/platform/metal/kutjevo/north,
/turf/open/auto_turf/sand/layer0,
@@ -8001,7 +8121,7 @@
pixel_y = 20
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mtG" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/kutjevo/tan,
@@ -8130,11 +8250,11 @@
/obj/item/weapon/gun/smg/nailgun,
/obj/effect/decal/cleanable/blood/gibs/down,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mDm" = (
/obj/structure/window/framed/kutjevo,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mDz" = (
/obj/structure/sign/poster{
pixel_y = 32
@@ -8143,7 +8263,7 @@
dir = 1
},
/turf/open/floor/kutjevo/colors/purple/edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mDA" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -8203,7 +8323,7 @@
"mIq" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/kutjevo/colony,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"mIs" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
@@ -8235,7 +8355,7 @@
"mJY" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mLe" = (
/obj/structure/machinery/light,
/turf/open/floor/kutjevo/tan/grey_edge,
@@ -8332,7 +8452,7 @@
/area/kutjevo/interior/complex/botany/east_tech)
"mRP" = (
/turf/open/floor/kutjevo/colors/purple/inner_corner/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mSm" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/auto_turf/sand/layer0,
@@ -8382,7 +8502,7 @@
"mYM" = (
/obj/structure/window/framed/kutjevo/reinforced,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"mZo" = (
/obj/structure/platform/metal/kutjevo/east,
/obj/structure/blocker/invisible_wall,
@@ -8565,7 +8685,7 @@
"nrt" = (
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"nsa" = (
/obj/structure/machinery/cm_vending/sorted/tech/comp_storage,
/turf/open/floor/kutjevo/colors/orange,
@@ -8673,7 +8793,7 @@
"nyA" = (
/obj/structure/platform/metal/kutjevo/east,
/turf/open/floor/coagulation/icon8_3,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"nyF" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/platform/metal/kutjevo/north,
@@ -8846,7 +8966,7 @@
"nJa" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"nJj" = (
/obj/structure/machinery/cm_vending/sorted/boozeomat,
/turf/open/auto_turf/sand/layer0,
@@ -9021,7 +9141,7 @@
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/snacks/bigbiteburger,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"nSQ" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/surface/table/reinforced/prison,
@@ -9065,9 +9185,6 @@
/obj/structure/platform_decoration/metal/kutjevo,
/turf/open/floor/plating/kutjevo,
/area/kutjevo/exterior/runoff_dunes)
-"nXr" = (
-/turf/open/gm/river/desert/deep/covered,
-/area/kutjevo/interior/construction)
"nXX" = (
/obj/structure/machinery/power/terminal{
dir = 8
@@ -9077,7 +9194,7 @@
"nYb" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/exterior/construction)
"nYz" = (
/turf/open/floor/kutjevo/colors/orange,
/area/kutjevo/exterior/construction)
@@ -9151,7 +9268,7 @@
"ocn" = (
/obj/structure/machinery/light,
/turf/open/asphalt/cement_sunbleached,
-/area/kutjevo/exterior/scrubland)
+/area/kutjevo/interior/complex/med/auto_doc)
"oeb" = (
/turf/open/floor/kutjevo/multi_tiles/north,
/area/kutjevo/exterior/runoff_bridge)
@@ -9223,7 +9340,7 @@
icon_state = "p_stair_ew_half_cap"
},
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/colony_central/mine_elevator)
"oiJ" = (
/turf/open/floor/kutjevo/tiles,
/area/kutjevo/exterior/Northwest_Colony)
@@ -9384,7 +9501,7 @@
"orL" = (
/obj/structure/largecrate/supply/supplies/water,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/med)
"orY" = (
/obj/structure/surface/rack,
/turf/open/floor/kutjevo/multi_tiles,
@@ -9415,7 +9532,7 @@
/obj/item/stack/sheet/metal/medium_stack,
/obj/item/stack/sheet/metal/medium_stack,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"ovv" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/machinery/light{
@@ -9548,7 +9665,7 @@
"oIq" = (
/obj/effect/spawner/random/tool,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"oIv" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2"
@@ -9586,7 +9703,7 @@
dir = 1
},
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/scrubland)
+/area/kutjevo/interior/complex/med/operating)
"oKn" = (
/obj/structure/platform/metal/kutjevo_smooth/east,
/obj/structure/platform/metal/kutjevo_smooth,
@@ -9628,7 +9745,7 @@
"oMW" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/colors/purple/edge/northeast,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"oMZ" = (
/turf/closed/wall/kutjevo/colony,
/area/kutjevo/interior/foremans_office)
@@ -9692,7 +9809,7 @@
/area/kutjevo/interior/complex/botany)
"oQL" = (
/turf/open/floor/kutjevo/tan/grey_edge/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"oQQ" = (
/obj/structure/window/framed/kutjevo/reinforced,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -9711,13 +9828,13 @@
"oSK" = (
/obj/structure/machinery/vending/snack,
/turf/open/floor/kutjevo/tan/grey_edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"oSP" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
explo_proof = 1
},
/turf/open/floor/kutjevo/tiles,
-/area/kutjevo/exterior/Northwest_Colony)
+/area/kutjevo/interior/oob/dev_room)
"oSQ" = (
/turf/open/floor/kutjevo/colors/orange,
/area/kutjevo/exterior/scrubland/south)
@@ -9739,7 +9856,7 @@
/area/kutjevo/interior/complex/med/auto_doc)
"oUP" = (
/turf/closed/wall/kutjevo/colony,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"oVt" = (
/obj/structure/platform/metal/kutjevo_smooth/west,
/turf/open/floor/kutjevo/colors/cyan/inner_corner/east,
@@ -9753,7 +9870,7 @@
icon_state = "p_stair_full"
},
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/construction/east)
"oVX" = (
/turf/open/floor/kutjevo/tan,
/area/kutjevo/interior/complex/med)
@@ -9911,7 +10028,7 @@
"pih" = (
/obj/structure/window/framed/kutjevo,
/turf/open/floor/kutjevo/multi_tiles,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"pio" = (
/turf/open/floor/kutjevo/tan/alt_inner_edge/west,
/area/kutjevo/interior/complex/Northwest_Flight_Control)
@@ -10001,7 +10118,7 @@
"pmR" = (
/obj/structure/largecrate/supply/supplies/flares,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/med)
"pnn" = (
/obj/structure/bed/chair{
dir = 4
@@ -10026,7 +10143,7 @@
},
/obj/item/trash/cigbutt/cigarbutt,
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"ppn" = (
/turf/open/desert/desert_shore/desert_shore1/north,
/area/kutjevo/exterior/runoff_bridge)
@@ -10126,7 +10243,7 @@
},
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/kutjevo/multi_tiles,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"pxb" = (
/turf/open/floor/kutjevo/colors/orange/edge/southeast,
/area/kutjevo/interior/power_pt2_electric_boogaloo)
@@ -10200,7 +10317,7 @@
"pCJ" = (
/obj/structure/machinery/vending/snack,
/turf/open/floor/kutjevo/colors/purple/inner_corner/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"pCP" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 8;
@@ -10221,7 +10338,7 @@
/area/kutjevo/exterior/runoff_dunes)
"pDk" = (
/turf/open/floor/kutjevo/tan/grey_inner_edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"pDs" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/stairs/perspective/kutjevo{
@@ -10302,7 +10419,7 @@
dir = 8
},
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"pJL" = (
/obj/structure/cable/heavyduty{
icon_state = "1-2-4"
@@ -10334,7 +10451,7 @@
/obj/structure/largecrate/supply/supplies/mre,
/obj/item/clothing/suit/armor/vest/security,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/med)
"pLI" = (
/obj/structure/platform_decoration/stone/kutjevo,
/turf/open/auto_turf/sand/layer0,
@@ -10499,7 +10616,7 @@
/area/kutjevo/interior/colony_South)
"qaI" = (
/turf/closed/wall/kutjevo/colony/reinforced,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"qaS" = (
/obj/structure/machinery/photocopier,
/turf/open/floor/kutjevo/tan/multi_tiles/east,
@@ -10525,7 +10642,7 @@
"qev" = (
/obj/item/trash/chunk,
/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"qfw" = (
/obj/structure/barricade/wooden{
dir = 1;
@@ -10605,7 +10722,7 @@
icon_state = "p_stair_sn_full_cap"
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"qmR" = (
/turf/open/floor/kutjevo/tan/multi_tiles,
/area/kutjevo/interior/colony_South)
@@ -10623,7 +10740,7 @@
/area/kutjevo/exterior/lz_dunes)
"qoL" = (
/turf/closed/wall/kutjevo/colony/reinforced/hull,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"qoQ" = (
/obj/structure/stairs/perspective/kutjevo{
icon_state = "p_stair_ew_full_cap_butt"
@@ -10708,7 +10825,7 @@
/obj/structure/surface/table/almayer,
/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"qtN" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/kutjevo/tan,
@@ -10787,10 +10904,10 @@
req_one_access = null
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"qCi" = (
/turf/open/floor/kutjevo/colors/purple/edge/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"qCy" = (
/obj/structure/barricade/handrail/kutjevo{
dir = 4
@@ -10804,7 +10921,7 @@
"qDu" = (
/obj/item/trash/kepler,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"qDH" = (
/turf/open/floor/kutjevo/tan/alt_edge/east,
/area/kutjevo/exterior/lz_pad)
@@ -10874,7 +10991,7 @@
/obj/structure/surface/table/gamblingtable,
/obj/effect/spawner/random/tool,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"qIN" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/toy/deck,
@@ -10921,7 +11038,7 @@
"qOM" = (
/obj/effect/decal/cleanable/blood/gibs/limb,
/turf/open/floor/kutjevo/colors/purple/edge/northeast,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"qOP" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/auto_turf/sand/layer0,
@@ -10934,7 +11051,7 @@
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/food/snacks/meatballspagetti,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"qPz" = (
/turf/open/gm/river/desert/shallow_edge/southwest,
/area/kutjevo/exterior/runoff_river)
@@ -11034,7 +11151,7 @@
/obj/structure/platform/metal/kutjevo/west,
/obj/structure/platform/metal/kutjevo,
/turf/open/floor/coagulation/icon0_0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"qZO" = (
/obj/structure/flora/grass/desert/lightgrass_3,
/turf/open/auto_turf/sand/layer1,
@@ -11201,7 +11318,7 @@
/area/kutjevo/exterior/stonyfields)
"rob" = (
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"roO" = (
/obj/structure/platform/metal/kutjevo,
/turf/open/auto_turf/sand/layer1,
@@ -11228,7 +11345,7 @@
dir = 1
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"rqL" = (
/obj/structure/stairs/perspective/kutjevo{
icon_state = "p_stair_ew_full_cap_butt"
@@ -11333,7 +11450,7 @@
"ryY" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"rzc" = (
/turf/open/gm/river/desert/deep,
/area/kutjevo/exterior/runoff_dunes)
@@ -11399,7 +11516,7 @@
"rGm" = (
/obj/structure/machinery/space_heater,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"rHg" = (
/obj/structure/prop/dam/truck/cargo,
/turf/open/asphalt/cement_sunbleached,
@@ -11548,7 +11665,7 @@
/area/kutjevo/exterior/lz_pad)
"rTF" = (
/turf/open/floor/kutjevo/tan/grey_edge/southwest,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"rTL" = (
/obj/structure/window{
dir = 1
@@ -11572,7 +11689,7 @@
dir = 8
},
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/botany)
"rUv" = (
/obj/structure/platform_decoration/metal/kutjevo/west,
/turf/open/desert/desert_shore/shore_corner2,
@@ -11631,7 +11748,7 @@
/obj/structure/surface/table/almayer,
/obj/item/storage/box/pizza,
/turf/open/floor/kutjevo/colors/purple/inner_corner/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"rXS" = (
/obj/structure/platform/metal/kutjevo/west,
/obj/structure/machinery/colony_floodlight,
@@ -11678,11 +11795,11 @@
icon_state = "p_stair_ew_full_cap"
},
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/colony_central/mine_elevator)
"sbz" = (
/obj/structure/machinery/light/small,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"sbI" = (
/obj/structure/platform/metal/kutjevo/east,
/obj/structure/flora/bush/ausbushes/grassybush{
@@ -11715,7 +11832,7 @@
icon_state = "p_stair_full"
},
/turf/open/floor/kutjevo/multi_tiles,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/construction/east)
"sdX" = (
/obj/structure/bed/chair{
dir = 4
@@ -11766,7 +11883,7 @@
/obj/item/clothing/head/welding,
/obj/effect/spawner/random/tool,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"skx" = (
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/exterior/spring)
@@ -11775,7 +11892,7 @@
dir = 4
},
/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/exterior/complex_border/botany_medical_cave)
+/area/kutjevo/interior/complex/botany)
"slx" = (
/turf/open/floor/kutjevo/tan/multi_tiles/southeast,
/area/kutjevo/interior/colony_South/power2)
@@ -11827,7 +11944,7 @@
"snz" = (
/obj/structure/platform/metal/kutjevo/east,
/turf/open/floor/kutjevo/colors/purple/edge/east,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"snP" = (
/obj/structure/flora/bush/ausbushes/grassybush{
pixel_x = 5;
@@ -11856,7 +11973,7 @@
/obj/structure/surface/table/almayer,
/obj/item/storage/fancy/cigarettes/lady_finger,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"spd" = (
/obj/structure/surface/rack,
/obj/effect/landmark/objective_landmark/close,
@@ -11885,7 +12002,7 @@
"ssj" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"ssV" = (
/obj/structure/surface/rack,
/obj/item/tool/wirecutters/clippers,
@@ -11969,10 +12086,10 @@
pixel_y = 8
},
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"sBk" = (
/turf/open/floor/kutjevo/tan/grey_edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"sBm" = (
/obj/structure/window/framed/kutjevo,
/turf/open/floor/kutjevo/multi_tiles,
@@ -11998,7 +12115,7 @@
/area/kutjevo/exterior/lz_river)
"sCG" = (
/turf/open/floor/kutjevo/colors/purple/edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"sDe" = (
/obj/structure/platform/metal/kutjevo_smooth/north,
/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{
@@ -12221,7 +12338,7 @@
"sTU" = (
/obj/structure/lattice,
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"sUs" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/gm/river/desert/deep/covered,
@@ -12279,14 +12396,10 @@
pixel_y = 5
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"sXo" = (
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/interior/oob/dev_room)
-"sXR" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/exterior/construction)
"sYd" = (
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/exterior/scrubland)
@@ -12388,7 +12501,7 @@
/obj/structure/platform/metal/kutjevo/east,
/obj/structure/platform/metal/kutjevo,
/turf/open/floor/coagulation/icon8_0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"tgl" = (
/obj/item/weapon/gun/revolver/cmb,
/turf/open/floor/kutjevo/tan,
@@ -12406,7 +12519,7 @@
/obj/structure/surface/table/almayer,
/obj/item/weapon/gun/revolver/cmb,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"tha" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 4;
@@ -12510,7 +12623,7 @@
icon_state = "pottedplant_29"
},
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"toV" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 1;
@@ -12598,7 +12711,7 @@
req_one_access = null
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"twq" = (
/turf/open/desert/desert_shore/desert_shore1/east,
/area/kutjevo/exterior/runoff_dunes)
@@ -12609,7 +12722,7 @@
"txH" = (
/obj/structure/machinery/light,
/turf/open/floor/kutjevo/colors/purple/edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"txS" = (
/obj/effect/sentry_landmark/lz_1/bottom_left,
/turf/open/auto_turf/sand/layer1,
@@ -12655,11 +12768,11 @@
/obj/structure/closet/firecloset/full,
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"tAX" = (
/obj/item/ammo_magazine/smg/nailgun,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"tBB" = (
/obj/item/ammo_magazine/revolver/cmb{
pixel_x = 7;
@@ -12749,7 +12862,7 @@
"tFN" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/exterior/construction)
+/area/kutjevo/interior/colony_north)
"tGi" = (
/turf/open/floor/coagulation/icon8_6,
/area/kutjevo/exterior/runoff_river)
@@ -12866,7 +12979,7 @@
"tOw" = (
/obj/effect/spawner/random/tool,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"tPh" = (
/obj/structure/surface/rack,
/obj/item/stack/sheet/metal/med_small_stack,
@@ -12985,7 +13098,7 @@
dir = 8
},
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"ubp" = (
/obj/structure/flora/grass/tallgrass/desert/corner{
dir = 5
@@ -13049,7 +13162,7 @@
/area/kutjevo/exterior/runoff_bridge)
"uhD" = (
/turf/open/floor/kutjevo/tan/grey_edge/west,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"uhM" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/extinguisher_cabinet,
@@ -13077,7 +13190,7 @@
dir = 8
},
/turf/open/floor/plating/kutjevo,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"uiC" = (
/obj/structure/flora/grass/tallgrass/desert/corner,
/turf/open/auto_turf/sand/layer0,
@@ -13258,7 +13371,7 @@
/obj/structure/platform/metal/kutjevo/north,
/obj/structure/platform/metal/kutjevo/east,
/turf/open/floor/coagulation/icon8_8,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"uwD" = (
/obj/item/clothing/mask/cigarette/pipe/cobpipe,
/turf/open/floor/kutjevo/multi_tiles/southeast,
@@ -13270,7 +13383,7 @@
"uxf" = (
/obj/structure/platform/metal/kutjevo/north,
/turf/open/floor/coagulation/icon7_8_2,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"uxA" = (
/obj/structure/prop/dam/truck,
/turf/open/asphalt/cement_sunbleached,
@@ -13329,7 +13442,7 @@
/obj/structure/surface/table/gamblingtable,
/obj/effect/landmark/objective_landmark/science,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"uDP" = (
/obj/structure/blocker/invisible_wall,
/turf/open/desert/desert_shore/desert_shore1,
@@ -13477,13 +13590,13 @@
explo_proof = 1
},
/turf/open/floor/kutjevo/colors/red/tile,
-/area/kutjevo/exterior/Northwest_Colony)
+/area/kutjevo/interior/oob/dev_room)
"uOk" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
},
/turf/open/floor/kutjevo/multi_tiles,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"uPt" = (
/obj/item/fuel_cell,
/obj/structure/surface/rack,
@@ -13513,7 +13626,7 @@
},
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"uQf" = (
/obj/item/reagent_container/glass/bucket,
/obj/structure/surface/table/almayer,
@@ -13651,7 +13764,7 @@
},
/obj/item/ammo_magazine/revolver/cmb,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"vbl" = (
/obj/structure/prop/dam/wide_boulder/boulder1,
/turf/open/auto_turf/sand/layer1,
@@ -13755,7 +13868,7 @@
/area/kutjevo/exterior/Northwest_Colony)
"vfr" = (
/turf/open/floor/kutjevo/colors/purple/edge/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"vgw" = (
/turf/open/floor/kutjevo/colors/cyan/edge/east,
/area/kutjevo/interior/complex/med)
@@ -13979,7 +14092,7 @@
dir = 8
},
/turf/open/floor/kutjevo/colors/purple/edge,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"vEz" = (
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
dir = 4;
@@ -14019,7 +14132,7 @@
pixel_y = 3
},
/turf/open/floor/kutjevo/colors/purple/inner_corner,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"vHh" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/kutjevo/tan/multi_tiles/east,
@@ -14109,11 +14222,11 @@
"vMf" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"vMk" = (
/obj/structure/fence,
/turf/open/auto_turf/sand/layer1,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"vMP" = (
/obj/structure/platform/metal/kutjevo_smooth,
/turf/open/floor/kutjevo/colors/orange,
@@ -14160,7 +14273,7 @@
dir = 8
},
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"vQJ" = (
/obj/structure/largecrate/random/case/double,
/turf/open/floor/kutjevo/colors/cyan,
@@ -14176,7 +14289,7 @@
"vSH" = (
/obj/structure/machinery/autolathe/full,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"vTc" = (
/obj/structure/prop/dam/boulder/boulder1,
/turf/open/auto_turf/sand/layer1,
@@ -14270,7 +14383,7 @@
/obj/structure/surface/rack,
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"wbH" = (
/obj/structure/platform/metal/kutjevo_smooth/east,
/turf/closed/wall/kutjevo/rock,
@@ -14341,7 +14454,7 @@
"wiC" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/colony_central)
+/area/kutjevo/interior/colony_central/mine_elevator)
"wiH" = (
/obj/item/ammo_magazine/rifle/mar40,
/obj/item/stack/sheet/wood,
@@ -14512,7 +14625,7 @@
"wuL" = (
/obj/item/stack/rods,
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"wvg" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/almayer/research/containment/floor1,
@@ -14610,10 +14723,10 @@
/obj/structure/surface/table/gamblingtable,
/obj/item/toy/deck/uno,
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"wAp" = (
/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"wBt" = (
/obj/structure/machinery/colony_floodlight{
pixel_y = 10
@@ -14711,7 +14824,7 @@
"wLt" = (
/obj/effect/landmark/corpsespawner/colonist/kutjevo,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"wLH" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 10;
@@ -14749,7 +14862,7 @@
dir = 4
},
/turf/open/floor/kutjevo/colors/purple/inner_corner/north,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"wOU" = (
/obj/structure/flora/bush/ausbushes/ausbush{
icon_state = "pointybush_2";
@@ -14764,7 +14877,7 @@
/obj/structure/surface/rack,
/obj/effect/landmark/objective_landmark/medium,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"wQg" = (
/obj/structure/platform/metal/kutjevo/north,
/obj/structure/platform/metal/kutjevo/west,
@@ -14793,7 +14906,7 @@
dir = 4
},
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"wTk" = (
/obj/structure/platform/metal/kutjevo,
/obj/structure/blocker/invisible_wall,
@@ -15049,10 +15162,6 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/auto_turf/sand/layer1,
/area/kutjevo/interior/colony_South)
-"xof" = (
-/obj/structure/machinery/power/apc/no_power/east,
-/turf/open/floor/kutjevo/tan/multi_tiles,
-/area/kutjevo/interior/complex/botany)
"xoq" = (
/obj/structure/bed/chair/office/light{
dir = 8
@@ -15129,7 +15238,7 @@
"xrv" = (
/obj/structure/girder,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/signal_tower)
"xrx" = (
/obj/structure/stairs/perspective/kutjevo{
dir = 8;
@@ -15142,7 +15251,7 @@
pixel_y = 8
},
/turf/open/floor/kutjevo/tan,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"xrT" = (
/obj/structure/flora/grass/desert/lightgrass_8,
/turf/open/auto_turf/sand/layer1,
@@ -15176,7 +15285,7 @@
pixel_y = 8
},
/turf/open/floor/kutjevo/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"xvn" = (
/obj/structure/window/framed/kutjevo/reinforced,
/turf/open/floor/plating/kutjevo,
@@ -15207,7 +15316,7 @@
"xyF" = (
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/kutjevo/grey/plate,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"xyY" = (
/obj/structure/machinery/light/small,
/turf/open/floor/kutjevo/multi_tiles/east,
@@ -15313,14 +15422,14 @@
"xMm" = (
/obj/structure/largecrate/machine/autodoc,
/turf/open/auto_turf/sand/layer2,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"xMV" = (
/obj/structure/flora/grass/tallgrass/desert,
/turf/open/auto_turf/sand/layer2,
/area/kutjevo/exterior/Northwest_Colony)
"xNf" = (
/turf/open/floor/kutjevo/colors/purple,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/north)
"xNF" = (
/obj/structure/bed/chair{
dir = 1
@@ -15487,7 +15596,7 @@
"xZT" = (
/obj/effect/spawner/random/tool,
/turf/open/auto_turf/sand/layer0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/construction/east)
"yah" = (
/turf/open/floor/kutjevo/colors/orange,
/area/kutjevo/interior/complex/botany/east_tech)
@@ -15559,7 +15668,7 @@
"yfH" = (
/obj/structure/platform/metal/kutjevo,
/turf/open/floor/coagulation/icon7_0,
-/area/kutjevo/interior/construction)
+/area/kutjevo/interior/colony_central)
"ygh" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/pipes/standard/simple/visible{
@@ -19366,7 +19475,7 @@ ppX
ppX
ppX
ppX
-ppX
+aaJ
ppX
ppX
ppX
@@ -28936,7 +29045,7 @@ bXl
bEp
bEp
bEp
-sYd
+dic
sbX
dic
dic
@@ -29101,9 +29210,9 @@ sYd
sYd
sYd
kIn
-sYd
-sYd
-bXl
+dic
+dic
+tKY
dKu
lKV
lKV
@@ -29269,7 +29378,7 @@ tKY
dic
dic
dic
-bXl
+tKY
dKu
qny
sxy
@@ -31423,9 +31532,9 @@ oVX
snr
jzl
dxF
-fpO
+aak
bjj
-fpO
+aak
orL
dxF
dxF
@@ -31595,7 +31704,7 @@ jzl
lcs
jzl
jzl
-eMC
+jzl
hVt
fpO
nnf
@@ -33115,7 +33224,7 @@ qgW
uLa
sef
qgW
-xof
+qgW
cht
vPE
vgX
@@ -34141,7 +34250,7 @@ xvn
dJT
mNM
mNM
-oeb
+aaa
fyD
oeb
wRj
@@ -34475,7 +34584,7 @@ fiE
fyD
jiz
cqX
-fyD
+nOH
fyD
oeb
wRj
@@ -34580,7 +34689,7 @@ msK
hpy
aEl
jar
-msK
+aar
msK
msK
msK
@@ -34730,11 +34839,11 @@ dxF
dxF
dxF
dxF
-qaI
-qaI
-qaI
-qaI
-qaI
+aap
+aap
+aap
+aap
+aap
dxF
dxF
kGU
@@ -34897,13 +35006,13 @@ dxF
dxF
dxF
dxF
-qaI
-fyF
+aap
+aaA
uiz
gKa
-qaI
-qaI
-qaI
+aap
+aap
+aap
kGU
gXF
gXF
@@ -35064,13 +35173,13 @@ dxF
dxF
dxF
dxF
-qaI
-fyF
-fyF
-fyF
-rob
-lxc
-rob
+aap
+aaA
+aaA
+aaA
+aaE
+aaz
+aaE
gld
rgQ
wzC
@@ -35231,12 +35340,12 @@ dxF
dxF
dxF
dxF
-qaI
-fyF
-cUm
-fyF
+aap
+aaA
+aaD
+aaA
ffa
-fyF
+aaA
tOw
gld
gld
@@ -35398,13 +35507,13 @@ dxF
dxF
dxF
dxF
-qaI
-cUm
-fyF
-cUm
-sTU
-fyF
-lxc
+aap
+aaD
+aaA
+aaD
+aaF
+aaA
+aaz
gld
msK
msK
@@ -35565,23 +35674,23 @@ dxF
dxF
dxF
dxF
-qaI
+aap
eTP
-eTT
-sTU
-sTU
-sTU
-fyF
-lxc
-lxc
-lxc
-qaI
-qaI
-feY
-feY
+aaq
+aaF
+aaF
+aaF
+aaA
+aaz
+aaz
+aaz
+aap
+aap
+aaw
+aaw
mYM
-qaI
-qaI
+aap
+aap
aCY
aCY
aCY
@@ -35732,17 +35841,17 @@ dxF
dxF
dxF
dxF
-qaI
-fyF
+aap
+aaA
sXj
-cUm
-sTU
-cUm
-cUm
+aaD
+aaF
+aaD
+aaD
ffa
tAX
eIZ
-oUP
+aau
eiz
atC
keM
@@ -35899,13 +36008,13 @@ dxF
dxF
dxF
dxF
-qaI
-fyF
-cUm
-wAp
-fyF
-fyF
-cUm
+aap
+aaA
+aaD
+aaC
+aaA
+aaA
+aaD
tAX
mCL
tAX
@@ -36066,17 +36175,17 @@ dxF
dxF
dxF
dxF
-qaI
-sTU
-cUm
-lxc
+aap
+aaF
+aaD
+aaz
ryY
-xrv
-oUP
-eTT
+aaG
+aau
+aaq
kKc
-eTT
-oUP
+aaq
+aau
vfr
qIi
gew
@@ -36233,17 +36342,17 @@ dxF
dxF
dxF
dxF
-qaI
+aap
dsP
-lxc
-cUm
-fyF
-cUm
-oUP
+aaz
+aaD
+aaA
+aaD
+aau
mtt
wuL
juz
-oUP
+aau
vfr
bVI
wAo
@@ -36400,17 +36509,17 @@ dxF
dxF
dxF
dxF
-qaI
+aap
hWD
-lxc
-cUm
-fyF
+aaz
+aaD
+aaA
sbz
-oUP
+aau
rqD
xNf
xNf
-kFF
+aay
vfr
xrF
xrF
@@ -36567,17 +36676,17 @@ dxF
dxF
dxF
dxF
-qaI
-fyF
-lxc
-lxc
-fyF
-fyF
-oUP
+aap
+aaA
+aaz
+aaz
+aaA
+aaA
+aau
era
xNf
rGm
-oUP
+aau
wOI
ikW
ikW
@@ -36734,26 +36843,26 @@ dxF
dxF
dxF
dxF
-qaI
+aap
eIZ
-lxc
-cUm
-fyF
-xrv
-qaI
-oUP
+aaz
+aaD
+aaA
+aaG
+aap
+aau
qCd
-oUP
-qaI
-oUP
-oUP
-uOk
-uOk
-oUP
-oUP
-eTT
-eTT
-qaI
+aau
+aap
+aau
+aau
+aav
+aav
+aau
+aau
+aaq
+aaq
+aap
ibV
msK
gld
@@ -36901,16 +37010,16 @@ dxF
dxF
dxF
dxF
-qaI
+aap
irK
-wAp
-fyF
-lxc
-wAp
-oUP
+aaC
+aaA
+aaz
+aaC
+aau
uQa
-fyF
-fyF
+aaA
+aaA
alo
cPv
qCi
@@ -37068,24 +37177,24 @@ dxF
dxF
dxF
dxF
-eTT
-lxc
-cUm
-lxc
-fyF
+aaq
+aaz
+aaD
+aaz
+aaA
sbz
-oUP
+aau
sBh
xyF
-wLt
+aaB
alo
vfr
hkq
dKO
-euj
-euj
-euj
-euj
+aas
+aas
+aas
+aas
sCG
mYM
iWU
@@ -37235,13 +37344,13 @@ dxF
dxF
dxF
mSm
-fyF
-fyF
-sTU
-sTU
-fyF
-cUm
-oUP
+aaA
+aaA
+aaF
+aaF
+aaA
+aaD
+aau
cWo
iNt
nSP
@@ -37252,9 +37361,9 @@ tgZ
vaG
soQ
jpS
-euj
+aas
kEG
-qaI
+aap
eQQ
ibV
msK
@@ -37402,24 +37511,24 @@ wTt
bEH
bEH
wUa
-cUm
-lxc
-fyF
-lxc
-fyF
-cUm
-oUP
+aaD
+aaz
+aaA
+aaz
+aaA
+aaD
+aau
mDm
mDm
mDm
-qaI
+aap
mDz
-euj
-euj
+aas
+aas
hma
-euj
-euj
-euj
+aas
+aas
+aas
sCG
twn
kLO
@@ -37570,23 +37679,23 @@ bkR
bkR
wUa
ryY
-lxc
-lxc
-lxc
-cUm
-cUm
-fyF
-fyF
-fyF
-lxc
-kFF
+aaz
+aaz
+aaz
+aaD
+aaD
+aaA
+aaA
+aaA
+aaz
+aay
kuL
-euj
+aas
fMd
ssj
-euj
-euj
-euj
+aas
+aas
+aas
dOJ
twn
nZp
@@ -37736,26 +37845,26 @@ bkR
bkR
jIN
wUa
-cUm
-lxc
-lxc
-cUm
-lxc
-lxc
-lxc
-wAp
-fyF
-fyF
-qaI
+aaD
+aaz
+aaz
+aaD
+aaz
+aaz
+aaz
+aaC
+aaA
+aaA
+aap
iLU
oMW
-euj
+aas
bKm
vMf
fEz
-euj
+aas
txH
-qaI
+aap
eQQ
itr
msK
@@ -37903,24 +38012,24 @@ bkR
bkR
bkR
mSm
-eTT
-lxc
-lxc
-cUm
-lxc
-fyF
-lxc
-lxc
+aaq
+aaz
+aaz
+aaD
+aaz
+aaA
+aaz
+aaz
ouW
ouW
-qaI
-qaI
+aap
+aap
pCJ
qOM
-euj
+aas
vQg
vQg
-euj
+aas
sCG
mYM
avT
@@ -38070,19 +38179,19 @@ bkR
bEH
hUk
hUk
-qaI
-fyF
-sTU
-sTU
-sTU
-wAp
-fyF
-cUm
+aap
+aaA
+aaF
+aaF
+aaF
+aaC
+aaA
+aaD
hUk
hUk
hUk
-qaI
-qaI
+aap
+aap
cBd
hTF
snz
@@ -38237,12 +38346,12 @@ hUk
hUk
hUk
sMg
-qaI
+aap
irK
-nYb
-fyF
-fyF
-lxc
+aaI
+aaA
+aaA
+aaz
hUk
hUk
hUk
@@ -38281,7 +38390,7 @@ xWK
xWK
bKH
xWK
-cUm
+aae
fyF
cUm
qaI
@@ -38404,11 +38513,11 @@ hUk
hUk
hUk
sMg
-eZP
+aaK
mJY
-nJa
-nJa
-nJa
+aaH
+aaH
+aaH
hUk
hUk
hUk
@@ -38433,7 +38542,7 @@ ibc
fyT
qnB
nRY
-lPR
+pmv
bKH
xWK
xWK
@@ -38600,7 +38709,7 @@ ibc
fyT
qnB
lpD
-hPf
+aao
xWK
xWK
xWK
@@ -38768,10 +38877,10 @@ fyT
qnB
kSH
feY
-fyF
-fyF
+hpB
+hpB
nYb
-eTT
+dQv
tMR
xWK
xWK
@@ -38934,11 +39043,11 @@ ibc
fyT
qnB
kSH
-qaI
+pmv
bzj
epe
-sTU
-eTT
+aan
+dQv
eXy
xWK
xWK
@@ -38949,7 +39058,7 @@ bKH
xWK
xWK
viU
-lxc
+aaf
kQo
qaI
qaI
@@ -39101,7 +39210,7 @@ mpW
mpW
pmv
pmv
-lPR
+pmv
hPf
hPf
hPf
@@ -39246,9 +39355,9 @@ hUk
hUk
hUk
hUk
-xWK
-xWK
-jhx
+bkR
+bkR
+bEH
tFN
bKH
bKH
@@ -39274,8 +39383,8 @@ uah
ecO
lPR
lPR
-xrv
-eTT
+rvA
+dQv
xWK
bKH
bKH
@@ -39412,11 +39521,11 @@ xzS
hUk
hUk
hUk
-xWK
-xWK
-xWK
-bKH
-ast
+bkR
+bkR
+bkR
+wTt
+mSm
bKH
bKH
xWK
@@ -39442,7 +39551,7 @@ uah
aWR
hPf
cHb
-fyF
+hpB
xWK
bKH
bKH
@@ -39578,12 +39687,12 @@ gQI
hUk
hUk
hUk
-xWK
-bKH
-bKH
-jhx
-jhx
-sXR
+bkR
+wTt
+wTt
+bEH
+bEH
+wUa
xWK
bKH
xWK
@@ -39608,8 +39717,8 @@ lPR
lPR
uah
hPf
-fyF
-lxc
+hpB
+xWK
xWK
bKH
bKH
@@ -39745,9 +39854,9 @@ hUk
hUk
hUk
hUk
-bKH
-bKH
-bKH
+wTt
+wTt
+wTt
hUk
hUk
tFN
@@ -39775,8 +39884,8 @@ lPR
uah
epV
hPf
-cUm
-cUm
+viU
+viU
xWK
bKH
bKH
@@ -39942,8 +40051,8 @@ uah
ecO
lPR
lPR
-cUm
-eTT
+aal
+dQv
hpB
bKH
bKH
@@ -40281,9 +40390,9 @@ bKH
bKH
bKH
xWK
-xrv
-cUm
-fyF
+aaj
+aag
+aah
wAp
lxc
wAp
@@ -40448,10 +40557,10 @@ bKH
bKH
xWK
xWK
-qaI
-cUm
-oIq
-cUm
+aac
+aag
+aai
+aag
hnm
wAp
xWK
@@ -40615,10 +40724,10 @@ xWK
rvA
dQv
xWK
-qaI
+aac
nrt
wLt
-cUm
+aag
lxc
eTT
jhx
@@ -40929,7 +41038,7 @@ hUk
hUk
hUk
hUk
-fQx
+lEA
xWK
nlA
xWK
@@ -40949,10 +41058,10 @@ jhx
rvA
lPR
oNG
-qaI
+aac
wbE
-fyF
-fyF
+aah
+aah
lCE
kAr
feg
@@ -41096,7 +41205,7 @@ hUk
hUk
hUk
hUk
-sMg
+kvI
hGP
sZY
sUs
@@ -41116,12 +41225,12 @@ mIq
oNG
oNG
oNG
-qaI
+aac
wOX
-fyF
-fyF
+aah
+aah
joL
-qaI
+aac
feg
feg
rdm
@@ -41263,7 +41372,7 @@ hUk
hUk
hUk
hUk
-fQx
+lEA
dYB
fwF
nbR
@@ -41275,7 +41384,7 @@ feg
feg
feg
feg
-qaI
+aac
vSH
uhD
loO
@@ -41288,7 +41397,7 @@ oUP
uOk
oUP
oUP
-qaI
+aac
feg
feg
rdm
@@ -41430,7 +41539,7 @@ hUk
hUk
hUk
hUk
-fQx
+lEA
dYB
fwF
nbR
@@ -41442,20 +41551,20 @@ feg
feg
feg
feg
-qaI
+aac
eUA
euj
sBk
tAQ
pih
jBe
-cUm
-fyF
-fyF
-cUm
-cUm
-cUm
-kQo
+aag
+aah
+aah
+aag
+aag
+aag
+aad
feg
feg
rdm
@@ -41609,7 +41718,7 @@ feg
feg
feg
feg
-qaI
+aac
eUA
euj
sBk
@@ -41617,10 +41726,10 @@ cbf
pih
cUq
wSU
-fyF
-cUm
+aah
+aag
lxc
-cUm
+aag
lxc
lxc
feg
@@ -41776,15 +41885,15 @@ feg
mbR
xMm
feg
-qaI
+aac
wSU
oQL
hrR
-qaI
-qaI
-qaI
-qaI
-qaI
+aac
+aac
+aac
+aac
+aac
csE
oUP
csE
@@ -41943,11 +42052,11 @@ qDu
lxc
lxc
wAp
-qaI
+aac
oUP
uOk
oUP
-qaI
+aac
feg
feg
feg
@@ -42114,7 +42223,7 @@ kFF
ubm
uhD
haK
-qaI
+aac
feg
feg
feg
@@ -42270,21 +42379,21 @@ mnT
uiK
mnT
nlv
-qaI
-qaI
-qaI
-qaI
+aac
+aac
+aac
+aac
oUP
uOk
oUP
oUP
-eUA
+aam
euj
sBk
-qaI
+aac
qoL
-qaI
-qaI
+aac
+aac
feg
rob
rob
@@ -42449,7 +42558,7 @@ eUA
euj
rTF
uhD
-ifE
+uhD
ubm
pih
hDW
@@ -42784,7 +42893,7 @@ oQL
oQL
oQL
oQL
-fyF
+aah
pih
lxc
wAp
@@ -43603,7 +43712,7 @@ uiK
mnT
cJP
uxf
-nXr
+nbR
yfH
soz
mnT
@@ -44605,7 +44714,7 @@ mnT
mnT
cJP
uxf
-nXr
+nbR
yfH
soz
uiK
@@ -49976,7 +50085,7 @@ cyc
tlq
nHd
tlq
-pGc
+aab
ygL
oIv
quW
diff --git a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
index be6e937531c1..e9ff2e3d0680 100644
--- a/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
+++ b/maps/map_files/Kutjevo/sprinkles/35.communications.dmm
@@ -3,30 +3,30 @@
/obj/structure/girder/displaced,
/obj/effect/decal/cleanable/blood/oil,
/turf/open/auto_turf/sand/layer0,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"cm" = (
/turf/open/floor/kutjevo/tan/grey_edge/west,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"cL" = (
/obj/item/clothing/suit/storage/hazardvest/yellow,
/turf/open/floor/kutjevo/tan,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"cW" = (
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"di" = (
/turf/open/floor/kutjevo/tan/grey_edge/north,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"dl" = (
/obj/structure/girder/displaced,
/obj/item/stack/sheet/metal,
/turf/open/auto_turf/sand/layer0,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"gD" = (
/obj/item/stack/rods,
/obj/item/tool/warning_cone,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"ix" = (
/obj/item/tool/warning_cone,
/obj/item/paper/crumpled{
@@ -38,14 +38,14 @@
pixel_y = 14
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"lD" = (
/obj/structure/machinery/door_display{
desc = "A work schedule monitor. It appears to be broken.";
name = "Schedule Monitor"
},
/turf/closed/wall/kutjevo/colony,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"lZ" = (
/obj/structure/bed/chair{
dir = 4;
@@ -53,15 +53,15 @@
pixel_y = 5
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"mv" = (
/obj/structure/girder,
/turf/open/floor/plating/kutjevo,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"nn" = (
/obj/structure/machinery/constructable_frame,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"oB" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/prop/almayer/computer/PC{
@@ -69,16 +69,16 @@
layer = 2.8
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"oK" = (
/obj/structure/machinery/photocopier,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"oU" = (
/obj/structure/machinery/light,
/obj/structure/machinery/message_server,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"pP" = (
/obj/structure/largecrate/random{
pixel_y = 19;
@@ -95,41 +95,41 @@
dir = 4
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"qp" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
},
/turf/open/floor/kutjevo/tan/grey_edge/north,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"qM" = (
/obj/structure/machinery/light,
/obj/effect/decal/cleanable/blood/oil,
/obj/item/tool/warning_cone,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"rm" = (
/obj/structure/surface/rack,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"ry" = (
/obj/item/stack/rods,
/obj/structure/fence,
/turf/open/auto_turf/sand/layer1,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"rG" = (
/obj/item/stack/rods,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"rP" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"sQ" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/kutjevo/tan/grey_edge/north,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"uS" = (
/obj/structure/surface/table/almayer,
/obj/item/device/flashlight/lamp/on{
@@ -154,16 +154,16 @@
name = "I should have gone on holiday"
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"wh" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/auto_turf/sand/layer0,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"wC" = (
/obj/structure/surface/rack,
/obj/item/notepad/blue,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"wO" = (
/obj/structure/filingcabinet{
density = 0;
@@ -193,51 +193,48 @@
layer = 3.3
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"yQ" = (
/obj/structure/machinery/light{
dir = 1
},
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
/obj/structure/surface/rack,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"zb" = (
/turf/open/floor/kutjevo/tan/grey_edge,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"zh" = (
/obj/structure/surface/table/almayer,
/obj/effect/spawner/random/tool,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Af" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/tan/grey_edge/east,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Ca" = (
/obj/structure/window/framed/kutjevo,
/obj/structure/barricade/handrail/kutjevo{
layer = 3.1
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Ci" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/tan/grey_edge/north,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"DY" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
dir = 1;
req_one_access = null
},
/turf/open/floor/kutjevo/tan/grey_edge/east,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"EK" = (
/obj/structure/window/framed/kutjevo,
/turf/open/floor/plating/kutjevo,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"GH" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/paper/crumpled{
@@ -245,25 +242,25 @@
pixel_y = 14
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"IR" = (
/obj/item/paper/crumpled,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Jg" = (
/obj/effect/spawner/random/toolbox,
/turf/open/floor/kutjevo/tan/grey_edge/east,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Jz" = (
/obj/item/stack/sheet/metal,
/obj/item/stack/rods,
/turf/open/floor/kutjevo/tan/grey_edge/east,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Ks" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"KC" = (
/obj/structure/bed/chair/comfy{
dir = 1;
@@ -282,28 +279,28 @@
pixel_y = -8
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"KD" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
dir = 1;
req_one_access = null
},
/turf/open/floor/plating/kutjevo,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"LG" = (
/obj/structure/fence,
/turf/open/auto_turf/sand/layer0,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"LO" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/item/prop/alien/hugger,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"LR" = (
/obj/structure/prop/almayer/computers/sensor_computer2,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"MV" = (
/obj/structure/largecrate/random{
pixel_y = 1
@@ -323,87 +320,87 @@
dir = 8
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Nr" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Or" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Pp" = (
/obj/structure/prop/almayer/computers/sensor_computer1,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Re" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/tool/warning_cone,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Rj" = (
/obj/item/stack/rods,
/obj/effect/decal/cleanable/blood/oil,
/obj/item/tool/warning_cone,
/turf/open/auto_turf/sand/layer0,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"RK" = (
/turf/closed/wall/kutjevo/colony,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"SZ" = (
/turf/closed/wall/kutjevo/colony/reinforced,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Ul" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
req_one_access = null
},
/turf/open/floor/kutjevo/tan/grey_edge,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Um" = (
/turf/open/floor/kutjevo/tan/grey_edge/east,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Vc" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/tool/warning_cone,
/turf/open/auto_turf/sand/layer0,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Xi" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/tan/grey_edge,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Xq" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/tan/grey_edge/west,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"XS" = (
/obj/structure/fence{
desc = "A large metal mesh strewn between two poles. A 'Keep Out! Under Construction' sign dangles from one of the fence posts."
},
/turf/open/auto_turf/sand/layer1,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Yo" = (
/obj/item/clothing/head/hardhat/orange,
/turf/open/floor/kutjevo/tan/grey_edge/north,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"YG" = (
/obj/structure/machinery/power/port_gen/pacman,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"YO" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{
dir = 1;
req_one_access = null
},
/turf/open/floor/kutjevo/tan/grey_edge/west,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
"Zf" = (
/obj/structure/window/framed/kutjevo,
/obj/structure/barricade/handrail/kutjevo{
layer = 3
},
/turf/open/floor/kutjevo/grey/plate,
-/area/template_noop)
+/area/kutjevo/interior/construction/signal_tower)
(1,1,1) = {"
SZ
diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
index 1bd78cb56fea..4bdde6fb819b 100644
--- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
+++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm
@@ -593,12 +593,26 @@
/obj/effect/alien/resin/sticky,
/turf/open/floor/plating/plating_catwalk/prison,
/area/lv522/atmos/cargo_intake)
+"acm" = (
+/obj/structure/machinery/power/apc/power/north{
+ start_charge = 20
+ },
+/turf/open/floor/plating,
+/area/lv522/landing_zone_1/tunnel/far)
"acn" = (
/obj/structure/pipes/standard/manifold/hidden/green{
dir = 8
},
/turf/open/floor/corsat/squares,
/area/lv522/atmos/east_reactor/south)
+"aco" = (
+/obj/structure/stairs/perspective{
+ dir = 8;
+ icon_state = "p_stair_full"
+ },
+/obj/structure/machinery/power/apc/power/east,
+/turf/open/asphalt/cement/cement3,
+/area/lv522/outdoors/colony_streets/south_west_street)
"acp" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison,
@@ -607,14 +621,73 @@
/obj/effect/acid_hole,
/turf/closed/wall/strata_ice/dirty,
/area/lv522/oob)
+"acr" = (
+/turf/open/floor/prison/darkbrownfull2,
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
+"acs" = (
+/turf/closed/wall/shiva/prefabricated/reinforced,
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
+"act" = (
+/obj/effect/landmark/lv624/fog_blocker/short,
+/obj/structure/machinery/power/apc/power/east,
+/turf/open/asphalt/cement/cement3,
+/area/lv522/landing_zone_1)
+"acu" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/turf/open/auto_turf/sand_white/layer0,
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"acv" = (
/obj/structure/cargo_container/ferret/left,
/turf/open/auto_turf/sand_white/layer0,
/area/lv522/outdoors/colony_streets/containers)
+"acw" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/floor_plate,
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
+"acx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/power/apc/power/north{
+ start_charge = 20
+ },
+/turf/open/floor/prison/greenfull/east,
+/area/lv522/indoors/b_block/hydro/glass)
+"acy" = (
+/turf/closed/wall/strata_outpost,
+/area/lv522/indoors/b_block/hydro/glass)
+"acz" = (
+/obj/structure/machinery/power/apc/power/east,
+/turf/open/asphalt/cement,
+/area/lv522/outdoors/colony_streets/central_streets)
+"acA" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/asphalt/cement/cement12,
+/area/lv522/outdoors/colony_streets/north_west_street)
+"acB" = (
+/turf/closed/wall/shiva/prefabricated/reinforced,
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
+"acC" = (
+/turf/open/floor/prison,
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
+"acD" = (
+/turf/open/floor/prison/floor_plate,
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"acE" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/plating_catwalk/prison,
/area/lv522/indoors/c_block/bridge)
+"acF" = (
+/obj/structure/machinery/power/apc/power/south,
+/turf/open/asphalt/cement/cement4,
+/area/lv522/outdoors/colony_streets/north_east_street)
+"acG" = (
+/turf/open/asphalt/cement/cement1,
+/area/lv522/atmos/filt)
+"acH" = (
+/obj/structure/machinery/power/apc/power/north,
+/turf/open/floor/prison/floor_marked,
+/area/lv522/outdoors/nw_rockies)
"adk" = (
/obj/structure/surface/table/almayer,
/obj/item/trash/plate,
@@ -1182,7 +1255,7 @@
/obj/item/tool/pickaxe/silver,
/obj/item/tool/pickaxe/silver,
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"atV" = (
/obj/structure/largecrate/random,
/turf/open/floor/corsat,
@@ -2778,7 +2851,7 @@
/obj/item/ore/silver,
/obj/item/ore/silver,
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"bzv" = (
/obj/structure/largecrate,
/turf/open/floor/corsat/brown/north,
@@ -5079,7 +5152,7 @@
dir = 4
},
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"cOZ" = (
/obj/structure/prop/server_equipment/yutani_server/off,
/obj/structure/machinery/light{
@@ -5969,7 +6042,7 @@
"djm" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"djq" = (
/obj/structure/prop/invuln/overhead/flammable_pipe/fly{
pixel_y = 6
@@ -6873,7 +6946,7 @@
dir = 4
},
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"dGV" = (
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/corsat/browncorner/north,
@@ -7634,7 +7707,7 @@
"eaG" = (
/obj/structure/ore_box,
/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"ebe" = (
/obj/item/storage/pouch/autoinjector/full,
/turf/open/auto_turf/shale/layer2,
@@ -8408,14 +8481,6 @@
},
/turf/open/floor/prison/floor_plate,
/area/lv522/outdoors/colony_streets/containers)
-"evg" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/power/west{
- start_charge = 20
- },
-/obj/effect/landmark/lv624/fog_blocker/short,
-/turf/open/floor/prison/greenfull/east,
-/area/lv522/landing_zone_1/ceiling)
"evu" = (
/obj/structure/tunnel/maint_tunnel{
pixel_y = 6
@@ -9437,7 +9502,7 @@
dir = 8
},
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"fcv" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/prop/almayer/computer/PC{
@@ -10269,8 +10334,9 @@
/turf/open/asphalt/cement/cement4,
/area/lv522/outdoors/colony_streets/central_streets)
"fCW" = (
+/obj/structure/machinery/power/apc/power/north,
/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"fDg" = (
/turf/closed/shuttle/dropship3/tornado/typhoon{
icon_state = "30"
@@ -10655,7 +10721,7 @@
"fPc" = (
/obj/structure/largecrate/random/barrel/true_random,
/turf/open/asphalt/cement/cement1,
-/area/lv522/outdoors/colony_streets/containers)
+/area/lv522/atmos/filt)
"fPB" = (
/obj/structure/bed/chair,
/obj/effect/decal/cleanable/dirt,
@@ -10783,7 +10849,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid"
},
/obj/structure/pipes/standard/simple/hidden/green,
@@ -11114,7 +11179,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid";
pixel_x = -2;
pixel_y = 16
@@ -11323,19 +11387,12 @@
/obj/structure/pipes/vents/pump,
/turf/open/floor/wood,
/area/lv522/indoors/b_block/bar)
-"ghw" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
-/turf/open/floor/prison/darkpurplefull2,
-/area/lv522/indoors/a_block/dorms/glass)
"ghY" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
},
/turf/open/shuttle/dropship/can_surgery/light_grey_top_right,
-/area/lv522/outdoors/nw_rockies)
+/area/lv522/landing_zone_forecon/UD6_Typhoon)
"gib" = (
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
@@ -11922,7 +11979,7 @@
req_access = null
},
/turf/open/asphalt/cement/cement1,
-/area/lv522/outdoors/colony_streets/containers)
+/area/lv522/atmos/filt)
"gzS" = (
/obj/structure/pipes/unary/freezer{
dir = 1;
@@ -13484,7 +13541,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid"
},
/turf/open/floor/platingdmg1,
@@ -14048,7 +14104,7 @@
/obj/item/explosive/plastic,
/obj/item/explosive/plastic,
/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"hJZ" = (
/turf/open/auto_turf/sand_white/layer0,
/area/lv522/outdoors/colony_streets/north_west_street)
@@ -14133,7 +14189,7 @@
/obj/vehicle/train/cargo/trolley,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"hLm" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison/darkredfull2,
@@ -14584,7 +14640,7 @@
/area/lv522/indoors/a_block/hallway)
"hYf" = (
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"hYg" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/light{
@@ -14723,7 +14779,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"icT" = (
/obj/structure/machinery/light{
dir = 1
@@ -14798,7 +14854,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid";
pixel_x = -10;
pixel_y = 4
@@ -16054,7 +16109,7 @@
id = "A-Block_Warehouse"
},
/turf/open/floor/corsat/marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"iPO" = (
/obj/structure/surface/table/almayer,
/obj/effect/landmark/objective_landmark/close,
@@ -16222,7 +16277,7 @@
/obj/structure/surface/rack,
/obj/item/clothing/suit/storage/hazardvest,
/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"iUg" = (
/obj/effect/landmark/objective_landmark/close,
/obj/structure/bed/roller,
@@ -16300,7 +16355,9 @@
/turf/open/floor/strata/blue1,
/area/lv522/outdoors/colony_streets/windbreaker/observation)
"iWh" = (
-/obj/structure/machinery/portable_atmospherics/canister/empty/oxygen,
+/obj/structure/machinery/portable_atmospherics/canister/empty/oxygen{
+ needs_power = 0
+ },
/turf/open/asphalt/cement/cement4,
/area/lv522/outdoors/colony_streets/south_street)
"iWo" = (
@@ -16999,16 +17056,6 @@
/obj/effect/spawner/gibspawner/xeno,
/turf/open/floor/prison,
/area/lv522/indoors/a_block/security/glass)
-"jpm" = (
-/obj/structure/desertdam/decals/road_edge{
- icon_state = "road_edge_decal3";
- pixel_y = 16
- },
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
-/turf/open/floor/wood,
-/area/lv522/indoors/a_block/fitness/glass)
"jpx" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -18020,7 +18067,7 @@
"jOF" = (
/obj/effect/acid_hole,
/turf/closed/wall/shiva/prefabricated/reinforced,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"jOG" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -18191,7 +18238,7 @@
dir = 4
},
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"jUn" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/effect/decal/cleanable/dirt,
@@ -19443,12 +19490,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison,
/area/lv522/indoors/c_block/garage)
-"kxz" = (
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
-/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/c_block/mining)
"kxH" = (
/obj/item/prop/colony/used_flare,
/turf/open/asphalt/cement/cement12,
@@ -19745,7 +19786,9 @@
name = "\improper M577 armored personnel carrier";
pixel_y = -21;
unacidable = 1;
- unslashable = 1
+ unslashable = 1;
+ use_power = 0;
+ needs_power = 0
},
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -20021,6 +20064,9 @@
"kLs" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/mouse,
+/obj/structure/machinery/power/apc/power/north{
+ start_charge = 20
+ },
/turf/open/floor/prison/floor_plate,
/area/lv522/indoors/a_block/corpo)
"kLO" = (
@@ -20256,7 +20302,7 @@
icon_state = "W"
},
/turf/open/auto_turf/sand_white/layer0,
-/area/lv522/outdoors/colony_streets/south_east_street)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"kSs" = (
/obj/structure/filingcabinet/chestdrawer{
density = 0;
@@ -20544,7 +20590,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid";
pixel_x = 23;
pixel_y = 21
@@ -22473,7 +22518,8 @@
/obj/structure/machinery/portable_atmospherics/canister/empty/oxygen{
layer = 4.4;
pixel_x = 13;
- pixel_y = 19
+ pixel_y = 19;
+ needs_power = 0
},
/turf/open/asphalt/cement/cement14,
/area/lv522/outdoors/colony_streets/south_street)
@@ -24914,7 +24960,7 @@
unacidable = 1
},
/turf/open/floor/corsat/marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"nnW" = (
/obj/item/weapon/twohanded/folded_metal_chair,
/obj/item/prop/alien/hugger,
@@ -25056,7 +25102,7 @@
"nqw" = (
/obj/structure/girder,
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"nqy" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -25102,7 +25148,7 @@
/obj/structure/surface/rack,
/obj/item/stack/sheet/metal/medium_stack,
/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"nrJ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/firstaid/regular{
@@ -26310,7 +26356,7 @@
"nXO" = (
/obj/item/ammo_box/magazine/misc/flares,
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"nXV" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/chem_dispenser/soda{
@@ -26762,7 +26808,7 @@
dir = 4
},
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"oiW" = (
/turf/open/floor/corsat/squares,
/area/lv522/atmos/east_reactor/south)
@@ -27174,9 +27220,6 @@
current_rounds = 0
},
/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
/turf/open/floor/prison,
/area/lv522/indoors/a_block/kitchen)
"ouO" = (
@@ -27725,7 +27768,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid";
pixel_x = -2;
pixel_y = 27
@@ -27851,7 +27893,7 @@
id = "A-Block_Warehouse"
},
/turf/open/floor/corsat/marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"oOD" = (
/obj/structure/prop/invuln/ice_prefab{
dir = 1;
@@ -29083,7 +29125,7 @@
/obj/structure/cargo_container/watatsumi/leftmid,
/obj/structure/pipes/standard/simple/hidden/green,
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"pCq" = (
/obj/structure/stairs/perspective{
dir = 5;
@@ -29400,7 +29442,7 @@
dir = 4
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"pLu" = (
/obj/item/lightstick/red/spoke/planted{
layer = 3.1;
@@ -29775,7 +29817,7 @@
/area/lv522/indoors/c_block/casino)
"pUc" = (
/turf/open/floor/plating,
-/area/lv522/outdoors/nw_rockies)
+/area/lv522/landing_zone_forecon/UD6_Typhoon)
"pUd" = (
/obj/structure/machinery/light,
/obj/effect/decal/cleanable/dirt,
@@ -30008,7 +30050,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid"
},
/turf/open/auto_turf/sand_white/layer0,
@@ -30535,7 +30576,7 @@
/obj/structure/cargo_container/watatsumi/right,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"qpd" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 6
@@ -30591,7 +30632,7 @@
pixel_y = 1
},
/turf/open/auto_turf/shale/layer1,
-/area/lv522/outdoors/colony_streets/south_east_street)
+/area/lv522/indoors/toilet)
"qpE" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/floor_marked/southwest,
@@ -30685,7 +30726,7 @@
"qrj" = (
/obj/structure/machinery/optable,
/turf/open/floor/strata/white_cyan2,
-/area/lv522/outdoors/nw_rockies)
+/area/lv522/landing_zone_forecon/UD6_Typhoon)
"qrG" = (
/obj/structure/surface/table/almayer,
/obj/effect/landmark/map_item,
@@ -30713,7 +30754,7 @@
"qst" = (
/obj/structure/girder/displaced,
/turf/open/floor/plating,
-/area/lv522/outdoors/nw_rockies)
+/area/lv522/landing_zone_forecon/UD6_Typhoon)
"qsC" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/box/beakers,
@@ -31437,7 +31478,7 @@
dir = 5
},
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"qJN" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -31501,7 +31542,7 @@
},
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/strata/white_cyan2,
-/area/lv522/outdoors/nw_rockies)
+/area/lv522/landing_zone_forecon/UD6_Typhoon)
"qLk" = (
/obj/structure/closet/firecloset/full,
/turf/open/floor/plating,
@@ -32573,6 +32614,7 @@
/turf/open/floor/prison/floor_plate,
/area/lv522/landing_zone_2/ceiling)
"rex" = (
+/obj/structure/machinery/power/apc/power/west,
/turf/open/floor/strata/white_cyan1/east,
/area/lv522/indoors/a_block/medical/glass)
"reB" = (
@@ -33154,7 +33196,7 @@
"rus" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/cell_stripe/west,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"ruv" = (
/obj/item/stack/medical/bruise_pack,
/turf/open/auto_turf/shale/layer1,
@@ -34134,7 +34176,7 @@
/area/lv522/landing_zone_1/ceiling)
"rSs" = (
/turf/open/floor/prison/cell_stripe/east,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"rSz" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_full"
@@ -34352,7 +34394,7 @@
/area/lv522/oob)
"saQ" = (
/turf/open/floor/prison/cell_stripe/west,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"saS" = (
/obj/structure/filingcabinet{
density = 0;
@@ -34973,7 +35015,7 @@
layer = 2.9
},
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"spJ" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -35086,7 +35128,7 @@
"ssn" = (
/obj/structure/closet/crate,
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"ssU" = (
/turf/closed/shuttle/dropship3/tornado{
icon_state = "89"
@@ -35130,7 +35172,7 @@
"suS" = (
/obj/structure/cargo_container/watatsumi/rightmid,
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"suV" = (
/obj/structure/machinery/computer/cameras/wooden_tv{
desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW.";
@@ -35186,7 +35228,7 @@
id = "A-Block_Warehouse"
},
/turf/open/floor/corsat/marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"swj" = (
/obj/structure/platform_decoration/metal/almayer/east,
/obj/structure/stairs/perspective{
@@ -35252,7 +35294,7 @@
dir = 8
},
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"syl" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -35404,7 +35446,7 @@
id = "A-Block_Warehouse"
},
/turf/open/floor/corsat/marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sCi" = (
/obj/item/clothing/shoes/jackboots{
pixel_x = -5;
@@ -35439,7 +35481,7 @@
"sCP" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sDa" = (
/obj/structure/machinery/light/small{
dir = 8;
@@ -35454,7 +35496,7 @@
/area/lv522/indoors/lone_buildings/chunk)
"sDf" = (
/turf/open/floor/prison/cell_stripe,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sDq" = (
/obj/structure/barricade/wooden{
dir = 4
@@ -35496,7 +35538,7 @@
dir = 4
},
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"sES" = (
/obj/item/fuel_cell{
layer = 3.1;
@@ -35560,7 +35602,7 @@
/obj/item/tool/pickaxe/silver,
/obj/item/tool/pickaxe/silver,
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"sGv" = (
/obj/effect/landmark/corpsespawner/colonist/burst,
/turf/open/floor/corsat/plate,
@@ -35590,7 +35632,7 @@
/obj/structure/machinery/floodlight,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/cell_stripe/west,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sHS" = (
/obj/structure/stairs/perspective{
dir = 5;
@@ -35749,7 +35791,7 @@
"sKU" = (
/obj/structure/machinery/floodlight,
/turf/open/floor/prison/cell_stripe,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sLc" = (
/obj/effect/spawner/gibspawner/xeno,
/turf/open/floor/prison/cell_stripe/west,
@@ -35827,7 +35869,7 @@
dir = 4
},
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sMa" = (
/obj/structure/prop/ice_colony/ground_wire{
dir = 1
@@ -35879,7 +35921,7 @@
/obj/item/storage/pouch/medkit/full_advanced,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sNz" = (
/obj/effect/spawner/gibspawner/xeno,
/obj/structure/platform_decoration/metal/almayer/north,
@@ -35889,7 +35931,7 @@
/obj/structure/machinery/floodlight,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sNR" = (
/obj/structure/coatrack{
pixel_y = 24
@@ -35921,7 +35963,7 @@
"sOm" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/cell_stripe,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sOA" = (
/obj/item/clothing/head/welding{
pixel_y = 7
@@ -36014,7 +36056,7 @@
/obj/vehicle/train/cargo/engine,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sPS" = (
/obj/structure/surface/table/almayer,
/obj/effect/spawner/random/toolbox,
@@ -36107,7 +36149,7 @@
"sRx" = (
/obj/vehicle/train/cargo/trolley,
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"sRI" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/auto_turf/shale/layer1,
@@ -37109,7 +37151,7 @@
/obj/item/weapon/gun/smg/nailgun,
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"ttE" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "\improper Electronics Storage"
@@ -37753,7 +37795,7 @@
pixel_y = 1
},
/turf/open/auto_turf/shale/layer1,
-/area/lv522/outdoors/colony_streets/south_east_street)
+/area/lv522/indoors/toilet)
"tKF" = (
/obj/structure/surface/rack,
/turf/open/floor/plating,
@@ -38291,7 +38333,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid"
},
/turf/open/floor/platingdmg1,
@@ -38586,7 +38627,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid"
},
/obj/item/stack/sheet/metal,
@@ -39741,7 +39781,6 @@
/obj/effect/decal{
icon = 'icons/mob/xenos/effects.dmi';
icon_state = "acid_weak";
- layer = 2;
name = "weak acid"
},
/obj/effect/decal/cleanable/dirt,
@@ -40380,9 +40419,6 @@
dir = 8
},
/obj/item/ashtray/bronze,
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
/turf/open/floor/prison/darkpurplefull2,
/area/lv522/indoors/a_block/dorms/glass)
"uWa" = (
@@ -41070,9 +41106,6 @@
/turf/open/floor/strata/white_cyan3/west,
/area/lv522/indoors/a_block/medical/glass)
"vnq" = (
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
/turf/open/floor/prison/darkredfull2,
/area/lv522/indoors/a_block/bridges/op_centre)
"vnX" = (
@@ -41619,7 +41652,7 @@
dir = 8
},
/turf/open/floor/prison/floor_marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"vBN" = (
/obj/structure/bed/chair,
/turf/open/floor/prison,
@@ -42159,7 +42192,7 @@
},
/obj/item/ammo_box/magazine/misc/flares,
/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"vNi" = (
/obj/item/prop/alien/hugger,
/obj/effect/decal/cleanable/dirt,
@@ -42204,7 +42237,7 @@
name = "Blast Door Control"
},
/turf/closed/wall/shiva/prefabricated/reinforced,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"vOj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/warning_stripes{
@@ -43954,14 +43987,15 @@
/area/lv522/indoors/a_block/admin)
"wHi" = (
/obj/effect/decal/cleanable/dirt,
+/obj/structure/machinery/power/apc/power/north,
/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/north_west)
"wHj" = (
/obj/structure/surface/rack,
/obj/structure/machinery/light,
/obj/item/clothing/mask/gas,
/turf/open/floor/prison/darkbrownfull2,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"wHo" = (
/obj/structure/surface/table/almayer,
/obj/item/clothing/head/hardhat/white{
@@ -46636,7 +46670,7 @@
"ycb" = (
/obj/structure/machinery/door/airlock/almayer/generic,
/turf/open/floor/corsat/marked,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/east)
"ycc" = (
/obj/structure/largecrate/random/barrel,
/obj/effect/decal/cleanable/dirt,
@@ -46645,9 +46679,6 @@
"yct" = (
/obj/structure/surface/rack,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/machinery/power/apc/power/north{
- start_charge = 20
- },
/turf/open/floor/prison/darkpurplefull2,
/area/lv522/indoors/a_block/dorms/glass)
"ycv" = (
@@ -46768,7 +46799,7 @@
/area/lv522/indoors/c_block/cargo)
"yfu" = (
/turf/open/floor/prison,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"yfy" = (
/turf/open/asphalt/cement/cement2,
/area/lv522/outdoors/colony_streets/containers)
@@ -47098,7 +47129,7 @@
/area/lv522/atmos/command_centre)
"ylo" = (
/turf/closed/wall/shiva/prefabricated/reinforced,
-/area/lv522/indoors/lone_buildings/storage_blocks)
+/area/lv522/indoors/lone_buildings/storage_blocks/south)
"ylp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/chair{
@@ -50159,7 +50190,7 @@ cpy
tFx
tFx
wnP
-evg
+rzz
syM
rnT
aaa
@@ -51345,13 +51376,13 @@ hJZ
hJZ
clY
aTP
-ylo
-ylo
-ylo
-ylo
-ylo
-ylo
-ylo
+acB
+acB
+acB
+acB
+acB
+acB
+acB
sjY
clY
clY
@@ -51550,15 +51581,15 @@ wRz
wBA
wBA
kYm
-ylo
-ylo
+acB
+acB
vBM
ssn
sxU
hLl
fcd
-ylo
-ylo
+acB
+acB
clY
clY
ien
@@ -51756,15 +51787,15 @@ hJZ
hJZ
nlz
oRU
-ylo
+acB
wHi
rus
saQ
-yfu
+acC
saQ
sHy
sNk
-ylo
+acB
clY
clY
ien
@@ -51967,10 +51998,10 @@ icE
djm
pCn
qJK
-yfu
+acC
sDf
sNQ
-ylo
+acB
sjY
clY
ien
@@ -52169,14 +52200,14 @@ rsM
rGi
hJZ
iPD
-hYf
+acD
spI
suS
dGK
-yfu
+acC
sDf
sPH
-ylo
+acB
sjY
clY
ien
@@ -52374,15 +52405,15 @@ sIS
sIS
sIS
sIS
-ylo
-hYf
+acB
+acD
rSs
qpc
dGK
sCP
sKU
sRx
-ylo
+acB
clY
clY
ien
@@ -52580,15 +52611,15 @@ hJZ
hJZ
hJZ
hJZ
-ylo
-ylo
+acB
+acB
cOA
sOm
jUk
sDf
sLZ
-ylo
-ylo
+acB
+acB
sIS
sIS
ien
@@ -52787,13 +52818,13 @@ hJZ
hJZ
hJZ
hJZ
-ylo
-ylo
+acB
+acB
svW
sBH
svW
-ylo
-ylo
+acB
+acB
hJZ
hJZ
hJZ
@@ -53046,7 +53077,7 @@ max
osN
sSQ
vGo
-jZD
+act
jZD
jZD
jZD
@@ -54032,7 +54063,7 @@ xXP
tNa
luu
nLm
-rvI
+acA
hJZ
hJZ
hJZ
@@ -55414,7 +55445,7 @@ tiQ
tiQ
tiQ
vtc
-fFA
+acH
gat
gsZ
uWO
@@ -58652,7 +58683,7 @@ cpy
ygJ
ygJ
bPJ
-nZP
+acm
nZP
ixV
bPJ
@@ -59221,8 +59252,8 @@ dGB
fnA
fnA
tSL
-tSL
-tne
+acy
+acx
tne
yfR
tSL
@@ -59751,7 +59782,7 @@ jXT
wbt
pPm
xtb
-jpm
+xPA
bID
rSd
bNf
@@ -60611,7 +60642,7 @@ nti
syt
mVH
nwj
-ghw
+mVH
syt
qAF
rro
@@ -61311,7 +61342,7 @@ cbR
cbR
cbR
cbR
-cbR
+aco
cbR
cbR
cbR
@@ -64576,7 +64607,7 @@ rSX
six
ndK
jmG
-rMF
+acz
rMF
jmG
jmG
@@ -65222,7 +65253,7 @@ dyS
nax
glO
vOb
-fCW
+acr
yfu
yfu
eaG
@@ -66261,7 +66292,7 @@ mPr
mPr
iWh
jas
-kxz
+aRi
vpe
aAI
ozw
@@ -73232,11 +73263,11 @@ xvB
otS
hMz
qjO
-ylo
-ylo
-ylo
-ylo
-ylo
+acs
+acs
+acs
+acs
+acs
ivy
uwT
xRn
@@ -73438,11 +73469,11 @@ xvB
otS
hMz
qjO
-ylo
+acs
byR
atL
sGj
-ylo
+acs
yaf
uwT
fWG
@@ -73644,11 +73675,11 @@ xvl
otS
hMz
qjO
-ylo
+acs
sGj
ttC
byR
-ylo
+acs
mkm
uwT
fWG
@@ -73854,7 +73885,7 @@ jOF
oiR
pLs
sED
-ylo
+acs
mkm
uwT
oTD
@@ -74056,11 +74087,11 @@ xvB
otS
hMz
qjO
-ylo
-hYf
+acs
+acw
nqw
hYf
-ylo
+acs
syB
uwT
xbk
@@ -74262,11 +74293,11 @@ xvB
otS
hMz
qjO
-ylo
-ylo
+acs
+acs
ycb
-ylo
-ylo
+acs
+acs
syB
uwT
qTI
@@ -74470,7 +74501,7 @@ hMz
gBy
mUr
kSm
-mUr
+acu
kSm
mUr
fvV
@@ -76423,13 +76454,13 @@ cpy
cpy
cpy
cpy
-aRf
+acG
gzF
-aRf
-aRf
-aRf
-aRf
-aRf
+acG
+acG
+acG
+acG
+acG
fPc
ien
ien
@@ -76872,7 +76903,7 @@ vGp
cpy
cpy
pZo
-uRb
+acF
tDS
nLe
yke
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index f52755ca0228..255d9ef2c227 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -457,6 +457,10 @@
/obj/structure/window/framed/colony,
/turf/open/floor/plating/platebotc,
/area/lv624/lazarus/quartstorage)
+"acc" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/warning/west,
+/area/lv624/lazarus/landing_zones/lz1)
"acd" = (
/obj/structure/pipes/standard/manifold/hidden/cyan{
dir = 8
@@ -787,6 +791,15 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
+"adl" = (
+/obj/structure/machinery/power/apc/power/west,
+/turf/open/floor/plating/asteroidwarning/west,
+/area/lv624/lazarus/landing_zones/lz2)
+"adm" = (
+/obj/structure/foamed_metal,
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/shuttle/bright_red,
+/area/lv624/lazarus/crashed_ship_containers)
"adn" = (
/obj/structure/girder/displaced,
/turf/closed/shuttle{
@@ -1976,7 +1989,6 @@
/area/lv624/ground/river/east_river)
"akh" = (
/obj/item/trash/candy,
-/obj/structure/machinery/power/apc/power/north,
/obj/structure/machinery/door_control{
id = "secure_outer_blast";
name = "Secure Outer Doors";
@@ -9753,13 +9765,10 @@
/turf/open/floor/dark,
/area/lv624/lazarus/engineering)
"aZz" = (
-/obj/structure/filingcabinet/security{
- desc = "A large cabinet with hard copy security records.";
- name = "Security Records"
- },
/obj/structure/machinery/light/small{
dir = 4
},
+/obj/structure/filingcabinet,
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/redcorner/north,
/area/lv624/lazarus/security)
@@ -14235,7 +14244,7 @@
/obj/structure/pipes/standard/simple/hidden/cyan{
dir = 4
},
-/obj/structure/machinery/power/apc/no_power/north,
+/obj/structure/machinery/power/apc/power/north,
/turf/open/floor/grimy,
/area/lv624/lazarus/hop)
"jRm" = (
@@ -27793,7 +27802,7 @@ uzH
uzH
uzH
uzH
-uzH
+adl
aDV
aRG
tZD
@@ -48878,7 +48887,7 @@ acf
acf
acf
ecy
-acw
+adm
acU
acT
kRr
@@ -52422,7 +52431,7 @@ aOd
aNo
nIZ
aNo
-aDG
+acc
aGQ
aky
btF
diff --git a/maps/map_files/LV624/hydro/30.destroyed.dmm b/maps/map_files/LV624/hydro/30.destroyed.dmm
index 937d4af1d027..a56c0c68847d 100644
--- a/maps/map_files/LV624/hydro/30.destroyed.dmm
+++ b/maps/map_files/LV624/hydro/30.destroyed.dmm
@@ -1,4 +1,14 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/plating,
+/area/lv624/lazarus/hydroponics)
+"ab" = (
+/obj/effect/spawner/random/claymore/lowchance{
+ dir = 8
+ },
+/turf/open/floor/plating/platingdmg3,
+/area/lv624/lazarus/hydroponics)
"aO" = (
/obj/effect/landmark/crap_item,
/obj/item/reagent_container/glass/watertank,
@@ -38,11 +48,7 @@
/turf/open/floor/plating/panelscorched,
/area/lv624/lazarus/hydroponics)
"dZ" = (
-/obj/item/stack/sheet/metal,
-/obj/effect/spawner/random/claymore/lowchance{
- dir = 8
- },
-/turf/open/floor/platingdmg1,
+/turf/closed/wall/r_wall,
/area/lv624/lazarus/hydroponics)
"eU" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
@@ -612,7 +618,7 @@ Cq
Lu
TC
dZ
-Wg
+aa
ym
FJ
Xv
@@ -626,7 +632,7 @@ se
XA
qe
YV
-TC
+ab
FJ
Wg
YV
diff --git a/maps/map_files/LV624/standalone/corporatedome.dmm b/maps/map_files/LV624/standalone/corporatedome.dmm
index 843df8f5af35..a6167fcc4777 100644
--- a/maps/map_files/LV624/standalone/corporatedome.dmm
+++ b/maps/map_files/LV624/standalone/corporatedome.dmm
@@ -59,8 +59,8 @@
pixel_y = 20
},
/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/plating/asteroidfloor/north,
-/area/lv624/lazarus/landing_zones/lz2)
+/turf/template_noop,
+/area/template_noop)
"dq" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/folder/white{
@@ -92,9 +92,6 @@
/obj/item/shard,
/turf/open/floor/whiteyellow/east,
/area/lv624/lazarus/corporate_dome)
-"dY" = (
-/turf/open/floor/plating/asteroidwarning,
-/area/lv624/lazarus/landing_zones/lz2)
"ev" = (
/obj/structure/surface/table/reinforced/prison,
/obj/effect/landmark/objective_landmark/close,
@@ -223,8 +220,8 @@
},
/obj/effect/landmark/corpsespawner/colonist,
/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plating/asteroidwarning,
-/area/lv624/lazarus/landing_zones/lz2)
+/turf/template_noop,
+/area/template_noop)
"ln" = (
/obj/structure/machinery/light{
dir = 8
@@ -428,9 +425,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/white,
/area/lv624/lazarus/corporate_dome)
-"yc" = (
-/turf/open/floor/plating/asteroidwarning/north,
-/area/lv624/lazarus/landing_zones/lz2)
"yJ" = (
/turf/open/floor/plating/platingdmg2,
/area/lv624/lazarus/corporate_dome)
@@ -580,8 +574,8 @@
/area/lv624/lazarus/corporate_dome)
"Fk" = (
/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/plating/asteroidwarning/north,
-/area/lv624/lazarus/landing_zones/lz2)
+/turf/template_noop,
+/area/template_noop)
"Fl" = (
/turf/open/floor/whitebluecorner/north,
/area/lv624/lazarus/corporate_dome)
@@ -725,9 +719,6 @@
"LZ" = (
/turf/open/floor/plating/platingdmg3,
/area/lv624/lazarus/corporate_dome)
-"Me" = (
-/turf/open/floor/plating/asteroidfloor/north,
-/area/lv624/lazarus/landing_zones/lz2)
"Ml" = (
/obj/structure/machinery/atm{
name = "Weyland-Yutani Automatic Teller Machine";
@@ -944,8 +935,8 @@ Xt
Xt
Xt
Fk
-Me
-dY
+Xt
+Xt
Xt
Xt
Xt
@@ -965,9 +956,9 @@ Xt
Xt
Xt
Xt
-yc
+Xt
da
-dY
+Xt
Xt
Xt
Xt
@@ -987,8 +978,8 @@ Xt
Xt
Xt
Xt
-yc
-Me
+Xt
+Xt
kU
XG
XG
diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
index 6d9c4b320b2e..9361a6e6bd57 100644
--- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
+++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
@@ -489,14 +489,14 @@
icon_state = "NE-out"
},
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"abt" = (
/obj/effect/decal/hybrisa/lattice/full,
/obj/effect/decal/warning_stripes{
icon_state = "NE-out"
},
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"abu" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/prop/hybrisa/fakeplatforms/platform4/deco{
@@ -514,7 +514,7 @@
layer = 2.5
},
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"abw" = (
/obj/structure/largecrate/empty/case/double,
/obj/item/clothing/head/hardhat/dblue{
@@ -531,20 +531,12 @@
/obj/effect/decal/hybrisa/dirt,
/obj/structure/blocker/forcefield/vehicles,
/turf/closed/wall/hybrisa/colony/reinforced,
-/area/lv759/indoors/meridian/meridian_managersoffice)
-"abz" = (
-/obj/structure/blocker/forcefield/vehicles,
-/turf/closed/wall/hybrisa/colony/reinforced,
-/area/lv759/indoors/meridian/meridian_managersoffice)
-"abA" = (
-/obj/structure/blocker/forcefield/vehicles,
-/turf/closed/wall/hybrisa/colony/reinforced,
-/area/lv759/indoors/meridian/meridian_restroom)
+/area/lv759/indoors/meridian/meridian_maintenance)
"abB" = (
/obj/structure/blocker/forcefield/vehicles,
/obj/structure/blocker/forcefield/vehicles,
/turf/closed/wall/hybrisa/colony/reinforced,
-/area/lv759/indoors/meridian/meridian_restroom)
+/area/lv759/indoors/meridian/meridian_maintenance)
"abC" = (
/obj/structure/machinery/door/poddoor/hybrisa/secure_red_door{
name = "Armory Lockdown";
@@ -720,7 +712,7 @@
icon_state = "2"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"ace" = (
/obj/effect/decal/hybrisa/checkpoint_decal{
dir = 1;
@@ -950,19 +942,19 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop/north,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"acG" = (
/obj/structure/prop/hybrisa/signs/high_voltage/small{
pixel_x = -6;
pixel_y = 32
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"acH" = (
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop/north,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"acI" = (
/obj/structure/platform_decoration/metal/strata/west,
/turf/open/floor/almayer/tcomms,
@@ -981,11 +973,11 @@
},
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"acL" = (
/obj/structure/fence/dark/warning,
/turf/open/floor/hybrisa/metal/stripe_red,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"acM" = (
/obj/structure/pipes/standard/manifold/hidden/dark{
dir = 4
@@ -1003,7 +995,7 @@
"acO" = (
/obj/structure/fence/dark/warning,
/turf/open/floor/hybrisa/metal/stripe_red/north,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"acP" = (
/obj/structure/platform/metal/almayer,
/obj/structure/machinery/light/small/blue{
@@ -1011,7 +1003,7 @@
},
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"acQ" = (
/obj/effect/decal/hybrisa/road/lines3,
/obj/effect/decal/hybrisa/road/road_edge{
@@ -1029,7 +1021,7 @@
pixel_y = -24
},
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"acS" = (
/obj/structure/platform_decoration/stone/hybrisa/rockdark/east,
/obj/structure/prop/hybrisa/cavedecor/stalagmite4{
@@ -2570,7 +2562,7 @@
dir = 4
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"agO" = (
/obj/structure/prop/hybrisa/cavedecor/stalagmite1{
pixel_x = -6;
@@ -2663,7 +2655,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"ahc" = (
/obj/structure/prop/hybrisa/cavedecor/stalagmite4{
pixel_x = -2;
@@ -3451,8 +3443,9 @@
pixel_x = -9;
pixel_y = 2
},
+/obj/structure/machinery/power/apc/no_power/north,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"ajc" = (
/obj/structure/window/reinforced{
dir = 4
@@ -3782,7 +3775,7 @@
layer = 4
},
/turf/open/floor/prison/floor_plate/southwest,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"ajW" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/machinery/door/poddoor/almayer/open{
@@ -4461,7 +4454,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/structure/pipes/standard/simple/hidden/dark,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"alA" = (
/obj/structure/sign/safety/bulkhead_door{
pixel_x = -17
@@ -5185,6 +5178,7 @@
/obj/item/shard,
/obj/item/trash/cigbutt,
/obj/item/trash/cigbutt,
+/obj/structure/machinery/power/apc/no_power/east,
/turf/open/floor/plating,
/area/lv759/indoors/hobosecret)
"anq" = (
@@ -5397,7 +5391,7 @@
"anK" = (
/obj/structure/prop/hybrisa/vehicles/Colony_Crawlers/Science_1,
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"anL" = (
/obj/item/trash/eat,
/obj/structure/machinery/power/apc/no_power/west,
@@ -5516,7 +5510,7 @@
icon_state = "folding_2"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"anY" = (
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
@@ -6078,12 +6072,23 @@
},
/turf/open/hybrisa/street/cement1,
/area/lv759/outdoors/colony_streets/north_east_street_LZ)
+"apu" = (
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/strata/multi_tiles/southeast,
+/area/lv759/bunker/checkpoint)
"apv" = (
/obj/structure/machinery/door/airlock/hybrisa/personal/autoname{
dir = 1
},
/turf/open/floor/prison/floor_plate/southwest,
/area/lv759/indoors/meridian/meridian_managersoffice)
+"apw" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating,
+/area/lv759/indoors/wy_research_complex/hangarbay)
+"apx" = (
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/lv759/indoors/caves/sensory_tower)
"apy" = (
/obj/structure/machinery/door/poddoor/hybrisa/shutters{
dir = 8
@@ -6093,6 +6098,9 @@
},
/turf/open/floor/hybrisa/metal/yellow_warning_floor,
/area/lv759/indoors/power_plant/gas_generators)
+"apz" = (
+/turf/closed/wall/hybrisa/colony/reinforced/hull,
+/area/lv759/indoors/caves/sensory_tower)
"apA" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -6113,7 +6121,39 @@
name = "destroyed comms tower"
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
+"apB" = (
+/turf/closed/wall/hybrisa/colony/reinforced/hull,
+/area/lv759/indoors/caves/electric_fence2)
+"apC" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence2)
+"apD" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/effect/decal/hybrisa/lattice/full,
+/turf/open/auto_turf/hybrisa_auto_turf/layer0,
+/area/lv759/indoors/caves/electric_fence2)
+"apE" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/platingdmg1,
+/area/lv759/indoors/caves/electric_fence2)
+"apF" = (
+/obj/effect/decal/hybrisa/lattice/full,
+/turf/open/auto_turf/hybrisa_auto_turf/layer0,
+/area/lv759/indoors/caves/electric_fence2)
+"apG" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence2)
+"apH" = (
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence2)
+"apI" = (
+/obj/item/stack/rods,
+/obj/effect/decal/hybrisa/lattice/full,
+/turf/open/auto_turf/hybrisa_auto_turf/layer0,
+/area/lv759/indoors/caves/electric_fence2)
"apJ" = (
/obj/structure/closet/crate,
/obj/item/clothing/head/beanie/gray,
@@ -6121,6 +6161,22 @@
/obj/effect/landmark/objective_landmark/close,
/turf/open/floor/wood,
/area/lv759/indoors/apartment/eastbedrooms)
+"apK" = (
+/turf/open/auto_turf/hybrisa_auto_turf/layer3,
+/area/lv759/indoors/caves/electric_fence2)
+"apL" = (
+/obj/structure/machinery/colony_floodlight,
+/turf/open/floor/mech_bay_recharge_floor,
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
+"apM" = (
+/turf/open/auto_turf/hybrisa_auto_turf/layer2,
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
+"apN" = (
+/turf/open/floor/plating,
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
+"apO" = (
+/turf/open/floor/plating/platingdmg3,
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
"apP" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/paper{
@@ -6130,12 +6186,33 @@
/obj/item/tool/stamp/denied,
/turf/open/floor/hybrisa/carpet/carpet_colorable/twe_blue,
/area/lv759/indoors/colonial_marshals/press_room)
+"apQ" = (
+/turf/open/auto_turf/hybrisa_auto_turf/layer3,
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
+"apR" = (
+/obj/effect/decal/hybrisa/dirt,
+/obj/structure/machinery/power/apc/no_power/south,
+/turf/open/floor/prison/floor_plate/southwest,
+/area/lv759/outdoors/mining_outpost/south_entrance)
+"apS" = (
+/obj/structure/machinery/colony_floodlight,
+/turf/open/floor/mech_bay_recharge_floor,
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
+"apT" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/plating,
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"apU" = (
/obj/item/stack/sheet/cardboard/small_stack{
layer = 2
},
/turf/open/floor/almayer,
/area/lv759/indoors/spaceport/baggagehandling)
+"apV" = (
+/turf/open/floor/plating,
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"apW" = (
/obj/effect/decal/strata_decals/grime/grime4{
dir = 8
@@ -6143,6 +6220,16 @@
/obj/effect/decal/hybrisa/dirt,
/turf/open/hybrisa/street/sidewalkfull,
/area/lv759/outdoors/colony_streets/north_street)
+"apX" = (
+/obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark1,
+/turf/open/auto_turf/hybrisa_auto_turf/layer2,
+/area/lv759/indoors/caves/comms_tower)
+"apY" = (
+/turf/open/auto_turf/hybrisa_auto_turf/layer2,
+/area/lv759/indoors/caves/comms_tower)
+"apZ" = (
+/turf/open/auto_turf/hybrisa_auto_turf/layer3,
+/area/lv759/indoors/caves/comms_tower)
"aqa" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -6153,6 +6240,16 @@
},
/turf/open/floor/hybrisa/tile/tilewhitecheckered/biege,
/area/lv759/indoors/hotel/hotel_hallway)
+"aqb" = (
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/comms_tower)
+"aqc" = (
+/turf/closed/wall/hybrisa/colony/reinforced/hull,
+/area/lv759/indoors/caves/electric_fence3)
+"aqd" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/platingdmg1,
+/area/lv759/indoors/caves/comms_tower)
"aqe" = (
/obj/structure/closet/crate/trashcart{
opened = 1
@@ -6179,6 +6276,14 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/lv759/outdoors/colony_streets/central_streets)
+"aqf" = (
+/obj/effect/decal/hybrisa/lattice/full,
+/turf/open/auto_turf/hybrisa_auto_turf/layer0,
+/area/lv759/indoors/caves/comms_tower)
+"aqg" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/comms_tower)
"aqh" = (
/obj/structure/window/reinforced{
dir = 4
@@ -6191,6 +6296,10 @@
},
/turf/open/floor/hybrisa/carpet/rug_colorable/grey_blue/northeast,
/area/lv759/indoors/weyyu_office/floor)
+"aqi" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/platingdmg1,
+/area/lv759/indoors/caves/electric_fence3)
"aqj" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/pipes/standard/simple/hidden/dark{
@@ -6205,6 +6314,34 @@
},
/turf/open/floor/hybrisa/carpet/carpetbeige,
/area/lv759/indoors/meridian/meridian_office)
+"aqk" = (
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence3)
+"aql" = (
+/obj/effect/decal/hybrisa/lattice/full,
+/turf/open/auto_turf/hybrisa_auto_turf/layer0,
+/area/lv759/indoors/caves/electric_fence3)
+"aqm" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence3)
+"aqn" = (
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/lv759/indoors/caves/comms_tower)
+"aqo" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 2
+ },
+/obj/structure/machinery/power/apc/no_power/south,
+/turf/open/floor/prison/cell_stripe,
+/area/lv759/indoors/caves/wy_research_complex_entrance)
+"aqp" = (
+/turf/open/floor/plating,
+/area/lv759/indoors/caves/comms_tower)
+"aqq" = (
+/turf/open/floor/plating/platingdmg1,
+/area/lv759/indoors/caves/comms_tower)
"aqr" = (
/obj/item/trash/cigbutt{
pixel_x = -9;
@@ -6218,6 +6355,14 @@
/obj/structure/platform/metal/hybrisa/metalplatform1/north,
/turf/open/hybrisa/street/underground_unweedable,
/area/lv759/outdoors/colony_streets/central_streets)
+"aqs" = (
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/hybrisa/street/sidewalk/east,
+/area/lv759/outdoors/landing_zone_2)
+"aqt" = (
+/obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark3,
+/turf/open/auto_turf/hybrisa_auto_turf/layer2,
+/area/lv759/indoors/caves/comms_tower)
"aqu" = (
/obj/vehicle/train/cargo/trolley,
/obj/structure/pipes/standard/simple/hidden/dark{
@@ -6225,6 +6370,36 @@
},
/turf/open/floor/hybrisa/tile/tilegrey,
/area/lv759/indoors/wy_research_complex/hallwaynorth)
+"aqv" = (
+/obj/structure/prop/hybrisa/boulders/wide_boulderdark/wide_boulder1,
+/turf/open/auto_turf/hybrisa_auto_turf/layer2,
+/area/lv759/indoors/caves/comms_tower)
+"aqw" = (
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence1)
+"aqx" = (
+/obj/item/tool/warning_cone{
+ layer = 2;
+ pixel_x = -13;
+ pixel_y = 19
+ },
+/turf/open/floor/plating/platingdmg1,
+/area/lv759/indoors/caves/electric_fence1)
+"aqy" = (
+/obj/effect/decal/hybrisa/lattice/full,
+/turf/open/auto_turf/hybrisa_auto_turf/layer0,
+/area/lv759/indoors/caves/electric_fence1)
+"aqz" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence1)
+"aqA" = (
+/turf/closed/wall/hybrisa/colony/reinforced/hull,
+/area/lv759/indoors/caves/electric_fence1)
+"aqB" = (
+/obj/structure/prop/hybrisa/signs/high_voltage,
+/turf/closed/wall/hybrisa/colony/reinforced/hull,
+/area/lv759/indoors/caves/electric_fence1)
"aqC" = (
/turf/open/floor/strata/red3/west,
/area/lv759/indoors/spaceport/security)
@@ -6237,6 +6412,14 @@
/obj/structure/platform/metal/stair_cut/platform_right,
/turf/open/floor/prison/ramptop/east,
/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
+"aqE" = (
+/obj/item/stack/rods,
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/caves/electric_fence1)
+"aqF" = (
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/lv759/outdoors/landing_zone_2/kmcc_hub_cargo_entrance_south)
"aqG" = (
/obj/structure/platform/metal/almayer/west,
/obj/structure/prop/invuln/lattice_prop{
@@ -6245,14 +6428,38 @@
},
/turf/open/floor/corsat/officetiles,
/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
+"aqH" = (
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/lv759/indoors/weymart/backrooms)
+"aqI" = (
+/obj/effect/decal/hybrisa/lattice/full,
+/turf/open/auto_turf/hybrisa_auto_turf/layer0,
+/area/lv759/indoors/meridian/meridian_maintenance)
"aqJ" = (
/obj/structure/platform_decoration/stone/hybrisa/rockdark/west,
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
/area/lv759/indoors/caves/north_caves/east)
+"aqK" = (
+/turf/open/auto_turf/hybrisa_auto_turf/layer2,
+/area/lv759/indoors/meridian/meridian_maintenance)
+"aqL" = (
+/turf/open/auto_turf/hybrisa_auto_turf/layer3,
+/area/lv759/indoors/meridian/meridian_maintenance)
"aqM" = (
/obj/structure/pipes/standard/simple/hidden/dark,
/turf/open/floor/corsat/officetiles,
/area/lv759/indoors/power_plant/gas_generators)
+"aqN" = (
+/obj/effect/decal/hybrisa/dirt,
+/turf/open/floor/prison/ramptop,
+/area/lv759/indoors/meridian/meridian_office)
+"aqO" = (
+/obj/effect/decal/hybrisa/warning/redandwhite_E,
+/obj/structure/pipes/standard/simple/hidden/dark{
+ dir = 5
+ },
+/turf/open/floor/plating/platingdmg3/west,
+/area/lv759/indoors/weymart)
"aqP" = (
/obj/structure/sign/safety/airlock{
pixel_x = 32;
@@ -6267,6 +6474,19 @@
/obj/structure/pipes/vents/pump_hybrisa,
/turf/open/floor/plating/platingdmg3/west,
/area/lv759/indoors/caves/central_caves)
+"aqQ" = (
+/obj/structure/machinery/power/apc/no_power/south,
+/turf/open/floor/plating/plating_catwalk/prison,
+/area/lv759/outdoors/colony_streets/south_west_street)
+"aqR" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 2
+ },
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/prison/cell_stripe/west,
+/area/lv759/outdoors/power_plant/transformers_south)
"aqS" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/hybrisa/street/sidewalk/north,
@@ -6283,10 +6503,32 @@
},
/turf/open/floor/strata/blue3/north,
/area/lv759/indoors/spaceport/docking_bay_2)
+"aqU" = (
+/obj/structure/machinery/power/apc/no_power/south,
+/turf/open/hybrisa/street/sidewalk/south,
+/area/lv759/outdoors/colony_streets/central_streets)
+"aqV" = (
+/obj/structure/platform_decoration/metal/almayer/north,
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 2
+ },
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/floor/prison/cell_stripe/west,
+/area/lv759/outdoors/power_plant/transformers_north)
+"aqW" = (
+/obj/structure/machinery/power/apc/no_power/south,
+/turf/open/hybrisa/street/sidewalk/south,
+/area/lv759/outdoors/colony_streets/north_west_street)
"aqX" = (
/obj/structure/largecrate/random/barrel/brown,
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
/area/lv759/indoors/caves/central_caves)
+"aqY" = (
+/obj/structure/pipes/standard/simple/hidden/dark,
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/hybrisa/street/sidewalk/east,
+/area/lv759/outdoors/colony_streets/north_east_street)
"aqZ" = (
/obj/structure/barricade/handrail/kutjevo{
dir = 4;
@@ -6295,6 +6537,14 @@
},
/turf/open/floor/hybrisa/tile/tilegrey,
/area/lv759/indoors/wy_research_complex/hallwaysouthwest)
+"ara" = (
+/obj/structure/machinery/power/apc/no_power/west,
+/turf/open/floor/hybrisa/metal/grated,
+/area/lv759/outdoors/colony_streets/north_street)
+"arb" = (
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/plating/platingdmg3,
+/area/lv759/indoors/caves/north_caves)
"arc" = (
/obj/structure/window/framed/hybrisa/marshalls/cell,
/turf/open/floor/plating,
@@ -6754,7 +7004,6 @@
/obj/effect/decal/strata_decals/grime/grime3{
dir = 8
},
-/obj/structure/machinery/power/apc/no_power/south,
/turf/open/floor/strata,
/area/lv759/indoors/colonial_marshals/prisoners_cells)
"auM" = (
@@ -6814,7 +7063,7 @@
/area/lv759/indoors/caves/central_caves)
"avx" = (
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"avA" = (
/obj/structure/prop/structure_lattice{
dir = 4
@@ -7133,7 +7382,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/floor_plate/southwest,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"axU" = (
/obj/structure/surface/table/reinforced/black,
/obj/item/ashtray/bronze{
@@ -7837,7 +8086,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"aDM" = (
/obj/item/clothing/suit/storage/labcoat,
/obj/structure/surface/table/almayer{
@@ -8020,7 +8269,7 @@
"aFb" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"aFe" = (
/obj/structure/fence/electrified{
dir = 1
@@ -8416,7 +8665,7 @@
pixel_y = 6
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"aHF" = (
/obj/structure/machinery/space_heater/radiator/red{
dir = 4;
@@ -8861,7 +9110,7 @@
"aLb" = (
/obj/item/device/motiondetector,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"aLi" = (
/obj/structure/machinery/light,
/turf/open/floor/kutjevo/fake_wood,
@@ -9380,7 +9629,7 @@
"aPn" = (
/obj/item/stack/rods,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"aPr" = (
/obj/structure/platform/metal/hybrisa/metalplatform1/west,
/obj/effect/decal/hybrisa/dirt,
@@ -11207,7 +11456,7 @@
pixel_y = 18
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"bdu" = (
/obj/structure/machinery/space_heater/radiator/red{
dir = 8;
@@ -11342,7 +11591,7 @@
},
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"bes" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -11769,7 +12018,7 @@
"bhw" = (
/obj/structure/largecrate/random/barrel/black,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"bhA" = (
/obj/structure/largecrate/random/mini/ammo{
pixel_x = -6;
@@ -12754,7 +13003,7 @@
pixel_y = 1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"bpl" = (
/obj/item/trash/cigbutt,
/obj/item/trash/cigbutt,
@@ -13057,7 +13306,7 @@
layer = 3.3
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"brv" = (
/obj/structure/machinery/computer/cameras/wooden_tv{
pixel_x = -2;
@@ -13296,7 +13545,7 @@
"bsS" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname,
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"bsT" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco4/west,
@@ -14372,7 +14621,7 @@
pixel_x = 1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"bBE" = (
/obj/effect/decal/cleanable/liquid_fuel,
/obj/structure/pipes/standard/manifold/hidden/dark,
@@ -15060,7 +15309,6 @@
/turf/open/floor/strata/orange_cover,
/area/lv759/indoors/spaceport/docking_bay_1)
"bGK" = (
-/obj/structure/machinery/power/apc/no_power/west,
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_25";
pixel_x = -8
@@ -15399,7 +15647,7 @@
/area/lv759/indoors/hospital/icu)
"bJm" = (
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"bJn" = (
/obj/structure/machinery/space_heater/radiator/red{
dir = 8;
@@ -15463,7 +15711,7 @@
"bJO" = (
/obj/item/tool/crowbar,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"bJR" = (
/turf/open/floor/corsat/officetiles,
/area/lv759/indoors/wy_research_complex/hallwayeast)
@@ -15493,7 +15741,7 @@
color = "#a6aeab"
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"bKm" = (
/obj/item/trash/cigbutt{
pixel_x = -10;
@@ -16189,7 +16437,7 @@
color = "#550d0d"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"bPL" = (
/obj/structure/window/framed/corsat,
/turf/open/floor/plating,
@@ -16499,7 +16747,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"bRM" = (
/obj/effect/decal/cleanable/blood,
/obj/effect/decal/cleanable/blood/drip{
@@ -17411,7 +17659,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"bXK" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/machinery/computer/arcade{
@@ -17998,6 +18246,7 @@
id = "bunker_exit_tunnel"
},
/obj/effect/decal/hybrisa/dirt,
+/obj/structure/blocker/invisible_wall,
/turf/open/floor/hybrisa/metal/red_warning_floor,
/area/lv759/bunker/gonzo)
"caZ" = (
@@ -18295,9 +18544,6 @@
},
/turf/open/floor/prison/floor_plate/southwest,
/area/lv759/outdoors/colony_streets/south_west_street)
-"cdn" = (
-/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/south_west_caves)
"cdy" = (
/obj/effect/decal/hybrisa/road/road_edge,
/obj/effect/decal/hybrisa/road/lines1,
@@ -18710,7 +18956,7 @@
name = "impact"
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"chr" = (
/obj/structure/sign/poster/ad{
layer = 4;
@@ -19544,7 +19790,7 @@
pixel_x = 2
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"cnw" = (
/turf/closed/wall/hybrisa/colony/ribbed,
/area/lv759/indoors/meridian/meridian_factory)
@@ -20183,7 +20429,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"cso" = (
/obj/structure/largecrate/empty/secure{
pixel_x = -4;
@@ -20590,7 +20836,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"cvt" = (
/obj/structure/window/framed/hybrisa/colony/engineering,
/obj/structure/machinery/door/poddoor/hybrisa/open_shutters,
@@ -21206,7 +21452,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"cAn" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -21753,7 +21999,7 @@
/area/lv759/indoors/wy_research_complex/hallwaysouthwest)
"cDZ" = (
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"cEb" = (
/obj/structure/surface/rack,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -22006,7 +22252,7 @@
"cFR" = (
/obj/structure/platform_decoration/metal/almayer,
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"cFZ" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -22311,7 +22557,7 @@
on = 0
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"cHM" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -22637,7 +22883,7 @@
pixel_x = -2
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"cJU" = (
/obj/item/tool/warning_cone{
layer = 2;
@@ -22989,7 +23235,7 @@
id = "engineering_lockdown"
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"cME" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/warnplate/southwest,
@@ -23651,7 +23897,7 @@
pixel_x = -4
},
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"cQF" = (
/obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark2,
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
@@ -23861,7 +24107,7 @@
dir = 4
},
/turf/open/floor/hybrisa/metal/grated/east,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/southeastexit)
"cRW" = (
/obj/effect/decal/hybrisa/road/lines2,
/obj/effect/decal/hybrisa/road/lines1,
@@ -24345,7 +24591,7 @@
pixel_y = 8
},
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_office)
"cWE" = (
/obj/structure/sink{
dir = 4;
@@ -25569,7 +25815,7 @@
on = 0
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"dez" = (
/obj/effect/decal/cleanable/blood/drip{
icon_state = "3"
@@ -26321,7 +26567,7 @@
},
/obj/structure/barricade/handrail/hybrisa/handrail,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"djn" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/hybrisa/street/sidewalk/west,
@@ -26742,13 +26988,13 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"dmr" = (
/obj/item/ammo_magazine/rifle/nsg23{
current_rounds = 17
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"dmu" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -26958,7 +27204,7 @@
},
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"doJ" = (
/obj/effect/hybrisa/misc/fake/pipes/pipe1,
/obj/item/stack/sheet/cardboard{
@@ -28645,7 +28891,7 @@
},
/obj/structure/pipes/standard/simple/hidden/dark,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"dBY" = (
/obj/structure/largecrate/empty,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -28675,7 +28921,7 @@
"dCi" = (
/obj/structure/platform/metal/almayer/north,
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"dCq" = (
/obj/structure/disposalpipe/segment,
/obj/effect/hybrisa/misc/fake/wire/red{
@@ -29184,7 +29430,7 @@
},
/obj/structure/prop/hybrisa/misc/fake/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"dHl" = (
/obj/item/trash/cigbutt{
pixel_y = 8
@@ -29266,7 +29512,7 @@
icon_state = "N"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"dHS" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/hybrisa/tile/cementflat,
@@ -29319,7 +29565,7 @@
},
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"dIk" = (
/obj/structure/prop/hybrisa/misc/elevator_button{
pixel_y = 3;
@@ -29984,7 +30230,7 @@
},
/obj/structure/platform/metal/hybrisa/metalplatform6,
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"dNb" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/prop/hybrisa/fakeplatforms/platform4{
@@ -30067,7 +30313,7 @@
layer = 3.33
},
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"dNR" = (
/obj/structure/machinery/door/window/brigdoor/northleft,
/obj/structure/surface/table/reinforced/prison{
@@ -30371,7 +30617,7 @@
dir = 8
},
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"dQk" = (
/obj/structure/machinery/hybrisa/coffee_machine{
pixel_x = -2;
@@ -31329,7 +31575,7 @@
pixel_y = -24
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"dXz" = (
/obj/structure/barricade/handrail/hybrisa/road/plastic/blue{
dir = 1
@@ -31590,7 +31836,7 @@
layer = 4
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"dZs" = (
/obj/structure/bed/roller,
/obj/structure/machinery/iv_drip{
@@ -31695,7 +31941,7 @@
dir = 8
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"ean" = (
/obj/item/trash/cigbutt{
pixel_x = 4
@@ -32063,6 +32309,7 @@
/obj/structure/prop/hybrisa/signs/high_voltage{
pixel_y = 32
},
+/obj/structure/machinery/power/apc/no_power/east,
/turf/open/floor/plating/plating_catwalk/prison,
/area/lv759/indoors/caves/north_west_caves)
"edp" = (
@@ -32176,7 +32423,7 @@
dir = 1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"eef" = (
/obj/structure/machinery/door/poddoor/hybrisa/ultra_reinforced_door{
explo_proof = 1;
@@ -32386,7 +32633,7 @@
"efF" = (
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"efG" = (
/obj/structure/prop/hybrisa/misc/buildinggreebliessmall{
pixel_y = 20
@@ -32531,7 +32778,7 @@
"egv" = (
/obj/structure/girder,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"egz" = (
/obj/effect/decal/hybrisa/road/lines2,
/obj/effect/decal/hybrisa/road/road_edge{
@@ -32769,7 +33016,7 @@
},
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"ein" = (
/obj/effect/decal/hybrisa/trash{
icon_state = "trash_2"
@@ -33030,7 +33277,7 @@
pixel_y = 20
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"ejV" = (
/turf/closed/wall/hybrisa/spaceport,
/area/lv759/indoors/spaceport/docking_bay_2)
@@ -33306,7 +33553,7 @@
pixel_y = 4
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"emw" = (
/obj/structure/machinery/light/blue{
dir = 4
@@ -33753,7 +34000,7 @@
pixel_y = 10
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"eqf" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -34037,7 +34284,7 @@
pixel_y = 8
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"esm" = (
/obj/effect/decal/hybrisa/meridianlogo/meridianlogo_right,
/turf/open/floor/prison/darkbrown3,
@@ -35533,7 +35780,7 @@
"eEs" = (
/obj/structure/barricade/handrail/hybrisa/handrail,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"eEA" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal4"
@@ -35591,7 +35838,7 @@
},
/obj/structure/pipes/standard/simple/hidden/dark,
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"eEQ" = (
/obj/effect/decal/hybrisa/road/lines1,
/obj/structure/largecrate/supply{
@@ -36330,7 +36577,7 @@
dir = 4
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"eKx" = (
/turf/closed/wall/hybrisa/colony,
/area/lv759/indoors/hotel/hotel_rooms)
@@ -36459,7 +36706,7 @@
"eLf" = (
/obj/structure/largecrate/random/barrel/brown,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"eLk" = (
/obj/structure/prop/hybrisa/fakeplatforms/platform1,
/obj/structure/inflatable/popped/door{
@@ -36702,7 +36949,7 @@
color = "#550d0d"
},
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"eMR" = (
/obj/effect/decal/cleanable/dirt{
layer = 5
@@ -36797,7 +37044,7 @@
pixel_y = -1
},
/turf/open/floor/hybrisa/metal/stripe_red/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"eOc" = (
/obj/structure/closet/secure_closet/hybrisa/nspa{
pixel_x = -2
@@ -37370,7 +37617,7 @@
on = 0
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"eSI" = (
/obj/item/tool/warning_cone{
pixel_x = 4;
@@ -37909,7 +38156,7 @@
/obj/structure/largecrate/random/barrel/brown,
/obj/structure/platform_decoration/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"eXd" = (
/obj/structure/window/reinforced{
dir = 4
@@ -38039,7 +38286,7 @@
/obj/item/ammo_casing/bullet,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"eYj" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/hybrisa/street/sidewalk/east,
@@ -38435,7 +38682,7 @@
},
/obj/structure/platform_decoration/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"fbg" = (
/obj/item/shard,
/obj/item/prop/alien/hugger,
@@ -38597,7 +38844,7 @@
/obj/effect/landmark/objective_landmark/far,
/obj/structure/surface/table/almayer,
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"fcl" = (
/obj/structure/bed/chair{
dir = 4;
@@ -38807,7 +39054,6 @@
/turf/open/floor/prison/ramptop/east,
/area/lv759/indoors/colonial_marshals/hallway_north)
"few" = (
-/obj/structure/machinery/power/apc/no_power/west,
/obj/effect/decal/hybrisa/dirt,
/obj/structure/largecrate/random/mini/ammo{
pixel_x = -7;
@@ -39483,7 +39729,7 @@
"fiP" = (
/obj/structure/platform/metal/almayer/north,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"fiY" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/paper_bin{
@@ -40568,7 +40814,7 @@
pixel_y = -1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"frr" = (
/obj/structure/platform/metal/almayer,
/obj/effect/decal/warning_stripes{
@@ -40986,7 +41232,7 @@
},
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"fuF" = (
/obj/structure/closet/secure_closet/brig,
/turf/open/floor/prison/red/southeast,
@@ -41093,7 +41339,7 @@
icon_state = "N"
},
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"fvr" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_29";
@@ -41719,7 +41965,7 @@
icon_state = "N"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"fzQ" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/barricade/handrail/strata{
@@ -41777,7 +42023,7 @@
pixel_y = 9
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"fAd" = (
/turf/open/floor/corsat/officetiles,
/area/lv759/indoors/wy_research_complex/hangarbay)
@@ -41854,7 +42100,7 @@
dir = 1
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"fAF" = (
/obj/item/trash/eat,
/obj/effect/decal/hybrisa/dirt,
@@ -42200,7 +42446,7 @@
},
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"fDk" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal6"
@@ -42445,7 +42691,6 @@
/turf/open/floor/hybrisa/carpet/carpetblack,
/area/lv759/indoors/casino)
"fFx" = (
-/obj/structure/machinery/power/apc/no_power/west,
/obj/structure/pipes/standard/simple/hidden/dark,
/obj/structure/prop/invuln/overhead_pipe{
color = "#a6aeab";
@@ -42850,7 +43095,7 @@
dir = 4
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"fIt" = (
/obj/structure/barricade/handrail/wire{
dir = 4
@@ -43209,7 +43454,7 @@
icon_state = "N"
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"fLX" = (
/obj/structure/prop/hybrisa/Factory/Robotic_arm{
layer = 4.2;
@@ -43387,7 +43632,7 @@
},
/obj/structure/pipes/vents/pump_hybrisa,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"fNF" = (
/obj/effect/decal/cleanable/blood{
icon_state = "mgibbl3"
@@ -43399,7 +43644,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"fNH" = (
/obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark3,
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
@@ -43419,7 +43664,7 @@
pixel_y = 13
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"fNX" = (
/obj/structure/machinery/medical_pod/sleeper,
/obj/effect/decal/hybrisa/dirt,
@@ -43468,7 +43713,7 @@
icon_state = "N"
},
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"fOk" = (
/obj/structure/closet/secure_closet/hybrisa/nspa,
/turf/open/floor/prison/red/southwest,
@@ -43770,7 +44015,7 @@
dir = 5
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"fQF" = (
/obj/structure/machinery/door/airlock/multi_tile/hybrisa/personal/autoname,
/turf/open/floor/corsat/officetiles,
@@ -45203,7 +45448,7 @@
},
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"gaV" = (
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
@@ -45443,7 +45688,7 @@
pixel_y = 2
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"gcG" = (
/obj/structure/largecrate/empty,
/obj/item/clothing/head/hardhat{
@@ -46533,7 +46778,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"gmh" = (
/obj/item/device/flashlight/lamp/tripod/grey{
on = 0
@@ -47033,7 +47278,7 @@
"gqt" = (
/obj/structure/platform_decoration/metal/almayer/west,
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"gqu" = (
/obj/structure/platform/metal/hybrisa/metalplatform1/east,
/obj/structure/barricade/handrail/strata{
@@ -47104,6 +47349,7 @@
locked = 1
},
/obj/effect/decal/hybrisa/dirt,
+/obj/structure/blocker/invisible_wall,
/turf/open/floor/corsat,
/area/lv759/bunker/gonzo)
"gra" = (
@@ -47249,7 +47495,7 @@
pixel_y = 20
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"gst" = (
/turf/open/auto_turf/hybrisa_auto_turf/layer3,
/area/lv759/indoors/caves/east_caves/north)
@@ -47535,7 +47781,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"gur" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out";
@@ -48161,7 +48407,7 @@
/obj/structure/machinery/power/port_gen,
/obj/structure/platform_decoration/metal/almayer/north,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"gzF" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -48399,7 +48645,7 @@
},
/obj/structure/prop/hybrisa/fakeplatforms/platform3,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"gCc" = (
/obj/structure/machinery/autolathe,
/obj/structure/pipes/standard/simple/hidden/dark{
@@ -48640,7 +48886,7 @@
/obj/structure/platform/metal/almayer/east,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"gDJ" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal4"
@@ -48954,7 +49200,7 @@
/obj/item/stack/rods,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"gGj" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/north,
/obj/effect/hybrisa/misc/fake/pipes/pipe2{
@@ -49022,7 +49268,7 @@
id = "engineering_lockdown"
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"gGQ" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -49559,7 +49805,7 @@
icon_state = "S"
},
/turf/open/floor/hybrisa/metal/stripe_red/north,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"gKp" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/floor_plate/southwest,
@@ -49760,7 +50006,7 @@
pixel_y = 21
},
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"gMg" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -49850,7 +50096,7 @@
/obj/item/ammo_casing/bullet,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"gNd" = (
/obj/item/spacecash/c100,
/turf/open/floor/hybrisa/tile/cuppajoesfloor,
@@ -50108,7 +50354,7 @@
pixel_x = 2
},
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"gPt" = (
/obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco6/east,
/turf/open/floor/prison/darkyellow2/southeast,
@@ -50612,9 +50858,6 @@
},
/turf/open/floor/hybrisa/carpet/carpetblack,
/area/lv759/indoors/weyyu_office/breakroom)
-"gSv" = (
-/turf/open/floor/plating,
-/area/lv759/indoors/caves/south_west_caves)
"gSy" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -50635,7 +50878,7 @@
/obj/item/ammo_casing/bullet,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"gSF" = (
/turf/closed/shuttle/dropship2/WY/StarGlider{
icon_state = "99"
@@ -50651,7 +50894,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"gSM" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal3"
@@ -51482,7 +51725,7 @@
},
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"gZx" = (
/obj/structure/barricade/handrail{
dir = 1;
@@ -51523,6 +51766,7 @@
dir = 4;
pixel_y = 7
},
+/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/prison/red/west,
/area/lv759/indoors/colonial_marshals/wardens_office)
"gZO" = (
@@ -51808,7 +52052,7 @@
/obj/structure/platform/metal/almayer,
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"hcr" = (
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
@@ -51987,7 +52231,7 @@
"hei" = (
/obj/item/stack/folding_barricade/three,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"hej" = (
/obj/structure/sign/safety/maint,
/turf/closed/wall/r_wall/bunker{
@@ -52791,7 +53035,7 @@
pixel_y = 3
},
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"hkb" = (
/obj/item/prop/alien/hugger,
/obj/effect/decal/cleanable/blood/xeno,
@@ -53703,6 +53947,7 @@
color = "#a6aeab";
dir = 5
},
+/obj/structure/blocker/invisible_wall,
/turf/open/floor/corsat,
/area/lv759/bunker/gonzo)
"hrv" = (
@@ -54166,7 +54411,7 @@
},
/obj/structure/largecrate/random/barrel/medical,
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"huO" = (
/obj/structure/prop/hybrisa/misc/elevator_door,
/turf/open/floor/corsat/officetiles,
@@ -54247,7 +54492,7 @@
pixel_x = -17
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"hvD" = (
/obj/structure/prop/hybrisa/fakeplatforms/platform4/deco,
/obj/item/device/flashlight/lamp/tripod/grey{
@@ -54262,7 +54507,7 @@
dir = 6
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"hvK" = (
/obj/structure/machinery/computer/hybrisa/misc/slotmachine{
pixel_x = 5
@@ -54500,6 +54745,7 @@
pixel_y = 8
},
/obj/effect/decal/hybrisa/dirt,
+/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/hybrisa/metal/grated/east,
/area/lv759/outdoors/landing_zone_1)
"hxT" = (
@@ -56006,8 +56252,9 @@
pixel_x = -11;
pixel_y = 5
},
-/turf/open/auto_turf/hybrisa_auto_turf/layer1,
-/area/lv759/outdoors/caveplateau)
+/obj/structure/machinery/power/apc/no_power/north,
+/turf/open/floor/plating/prison,
+/area/lv759/indoors/caves/sensory_tower)
"hIM" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/hybrisa/tile/tilewhite,
@@ -56022,7 +56269,7 @@
"hIR" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"hIS" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/east,
/obj/item/device/flashlight/lamp/tripod/grey{
@@ -56390,6 +56637,7 @@
pixel_x = 5;
pixel_y = 13
},
+/obj/structure/machinery/power/apc/no_power/west,
/turf/open/hybrisa/street/cement3,
/area/lv759/outdoors/colony_streets/south_east_street)
"hLF" = (
@@ -57010,7 +57258,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/structure/platform_decoration/metal/almayer/east,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"hQg" = (
/obj/structure/disposalpipe/segment,
/obj/effect/hybrisa/misc/fake/wire/red{
@@ -57285,7 +57533,7 @@
layer = 3.33
},
/turf/open/floor/hybrisa/metal/stripe_red,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"hSo" = (
/obj/structure/closet/crate/construction,
/obj/item/storage/bag/trash{
@@ -57942,9 +58190,6 @@
/obj/item/stack/sandbags_empty,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
/area/lv759/outdoors/colony_streets/north_street)
-"hXl" = (
-/turf/open/floor/prison/floor_plate/southwest,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
"hXp" = (
/obj/item/tool/pickaxe{
pixel_y = 4
@@ -58549,7 +58794,7 @@
pixel_y = 20
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/southeastexit)
"ibA" = (
/obj/structure/pipes/standard/simple/hidden/dark,
/turf/open/floor/strata/multi_tiles,
@@ -58753,7 +58998,7 @@
color = "#550d0d"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"idx" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/hybrisa/street/sidewalk/west,
@@ -59214,7 +59459,7 @@
pixel_y = 4
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"igF" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/hybrisa/street/sidewalk/south,
@@ -60599,7 +60844,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"irT" = (
/obj/effect/decal/hybrisa/tiretrack{
dir = 8;
@@ -60983,7 +61228,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"iuF" = (
/obj/structure/platform/metal/strata/west,
/obj/structure/barricade/handrail/strata{
@@ -61324,7 +61569,7 @@
pixel_y = 3
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"iwD" = (
/obj/effect/decal/hybrisa/gold/line3{
pixel_y = 1
@@ -62019,7 +62264,7 @@
pixel_y = 10
},
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_office)
"iBf" = (
/obj/item/stack/sheet/cardboard/small_stack{
layer = 2
@@ -62151,7 +62396,7 @@
pixel_y = 25
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"iBT" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal6"
@@ -63258,7 +63503,7 @@
"iKK" = (
/obj/structure/prop/hybrisa/signs/high_voltage,
/turf/closed/wall/hybrisa/colony/reinforced/hull,
-/area/lv759/oob)
+/area/lv759/indoors/caves/electric_fence2)
"iKM" = (
/obj/structure/machinery/power/apc/no_power/north,
/obj/structure/pipes/standard/manifold/hidden/dark{
@@ -64366,7 +64611,7 @@
pixel_y = 6
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"iTX" = (
/obj/structure/stairs{
color = "#b7b8b2"
@@ -64406,7 +64651,7 @@
},
/obj/structure/barricade/handrail/hybrisa/handrail,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"iUh" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/east,
/obj/structure/prop/invuln/lattice_prop{
@@ -64552,7 +64797,7 @@
"iVD" = (
/obj/structure/blocker/forcefield/vehicles,
/turf/open/floor/plating/platingdmg3,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
"iVG" = (
/obj/structure/pipes/standard/manifold/hidden/dark{
dir = 8
@@ -64638,7 +64883,7 @@
pixel_y = 12
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"iWs" = (
/obj/structure/blocker/invisible_wall,
/obj/structure/machinery/door/poddoor{
@@ -65000,7 +65245,7 @@
layer = 3.33
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"iYR" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/pipes/standard/simple/hidden/dark{
@@ -65120,7 +65365,7 @@
/obj/structure/platform_decoration/metal/almayer/north,
/obj/structure/platform_decoration/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"iZM" = (
/turf/closed/wall/hybrisa/colony/office,
/area/lv759/outdoors/colony_streets/central_streets)
@@ -65591,7 +65836,7 @@
pixel_y = 14
},
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"jdw" = (
/turf/open/floor/hybrisa/engineership/engineer_floor13/southwest,
/area/lv759/indoors/derelict_ship)
@@ -67970,7 +68215,7 @@
/area/lv759/indoors/hospital/virology)
"jvt" = (
/turf/open/floor/hybrisa/metal/grated/east,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/southeastexit)
"jvu" = (
/obj/structure/largecrate/empty{
pixel_x = -3;
@@ -68093,7 +68338,7 @@
"jwA" = (
/obj/effect/decal/hybrisa/warning/redandwhite_E,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"jwC" = (
/obj/structure/machinery/floodlight,
/turf/open/floor/plating,
@@ -68995,7 +69240,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/structure/platform_decoration/metal/almayer,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"jDk" = (
/obj/effect/landmark/objective_landmark/close,
/obj/structure/curtain/colorable_transparent{
@@ -69808,7 +70053,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"jKJ" = (
/obj/structure/sink{
dir = 4;
@@ -69961,7 +70206,7 @@
/obj/item/stack/rods,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"jMa" = (
/obj/item/stack/rods,
/turf/open/floor/plating/platingdmg3/west,
@@ -70115,7 +70360,7 @@
},
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"jNz" = (
/obj/structure/roof/hybrisa/billboardsandsigns/bigbillboards{
dir = 1;
@@ -70559,7 +70804,7 @@
dir = 1
},
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"jQJ" = (
/obj/structure/pipes/standard/manifold/hidden/dark{
dir = 1
@@ -70671,7 +70916,7 @@
/obj/structure/platform/metal/almayer/east,
/obj/structure/platform/metal/almayer,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"jRL" = (
/obj/structure/prop/hybrisa/fakeplatforms/platform4/deco{
dir = 8
@@ -70701,7 +70946,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_magazine/rifle/mar40/extended,
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"jRU" = (
/turf/open/floor/prison/darkbrown3/northeast,
/area/lv759/indoors/meridian/meridian_factory)
@@ -70866,7 +71111,7 @@
"jSZ" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"jTb" = (
/obj/structure/platform_decoration/stone/hybrisa/rockdark,
/turf/closed/wall/hybrisa/rock,
@@ -70885,7 +71130,7 @@
layer = 4
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"jTg" = (
/obj/effect/decal/cleanable/blood/drip{
pixel_x = 10;
@@ -71158,7 +71403,7 @@
},
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"jUL" = (
/turf/open/floor/plating/plating_catwalk/prison,
/area/lv759/indoors/wy_security/checkpoint_east)
@@ -71871,7 +72116,7 @@
pixel_y = 10
},
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"kas" = (
/obj/structure/bed/chair{
dir = 8;
@@ -72194,7 +72439,7 @@
on = 0
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"kda" = (
/obj/item/stool{
pixel_x = 4;
@@ -72266,7 +72511,7 @@
layer = 4.21
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"kdP" = (
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
@@ -72340,7 +72585,7 @@
/obj/structure/platform/metal/almayer/west,
/obj/effect/spawner/random/sentry/lowchance,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"kej" = (
/obj/structure/bed/chair/office/dark,
/turf/open/floor/almayer/black,
@@ -73757,7 +74002,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop/east,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"kpi" = (
/obj/structure/prop/hybrisa/misc/graffiti/graffiti3,
/obj/structure/cargo_container/hybrisa/containersextended/kelland_left,
@@ -73960,7 +74205,7 @@
pixel_x = -14
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"kql" = (
/obj/structure/machinery/colony_floodlight/street{
pixel_y = 12
@@ -76115,7 +76360,7 @@
pixel_x = -2
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"kFh" = (
/obj/structure/cargo_container/hybrisa/containersextended/greywyleft,
/turf/open/floor/almayer,
@@ -76318,7 +76563,7 @@
"kGZ" = (
/obj/structure/prop/hybrisa/fakeplatforms/platform3,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"kHf" = (
/obj/item/tool/wet_sign{
pixel_y = 18
@@ -76580,7 +76825,7 @@
color = "#550d0d"
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"kJd" = (
/obj/structure/largecrate/random/barrel/black,
/turf/open/floor/prison/cell_stripe,
@@ -76962,7 +77207,7 @@
},
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"kLT" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal3"
@@ -77322,7 +77567,7 @@
/obj/effect/landmark/corpsespawner/hybrisa/scientist_xenoarchaeologist,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"kPx" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -78309,7 +78554,7 @@
"kWx" = (
/obj/structure/platform/metal/almayer/east,
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"kWB" = (
/obj/structure/prop/hybrisa/cavedecor/stalagmite2{
pixel_x = -5;
@@ -78829,7 +79074,7 @@
pixel_y = -1
},
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"lak" = (
/obj/structure/barricade/handrail/strata{
dir = 4
@@ -78981,7 +79226,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"lbt" = (
/obj/structure/machinery/light{
dir = 8
@@ -79616,7 +79861,7 @@
dir = 8
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"lgc" = (
/obj/item/frame/rack,
/obj/effect/decal/hybrisa/dirt,
@@ -79674,7 +79919,7 @@
dir = 8
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"lgE" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -79688,7 +79933,7 @@
"lgM" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop/east,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"lgO" = (
/obj/item/trash/candy,
/obj/structure/prop/hybrisa/fakeplatforms/platform4{
@@ -80752,7 +80997,7 @@
layer = 3.33
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"loM" = (
/obj/item/trash/cigbutt{
pixel_x = -10;
@@ -81237,7 +81482,7 @@
pixel_y = 12
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"lsb" = (
/obj/effect/decal/hybrisa/road/lines5,
/obj/effect/decal/hybrisa/road/lines1,
@@ -81293,7 +81538,6 @@
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
/area/lv759/indoors/caves/north_east_caves)
"lsU" = (
-/obj/structure/machinery/power/apc/no_power/east,
/obj/structure/pipes/standard/simple/hidden/dark,
/turf/open/floor/plating,
/area/lv759/indoors/landing_zone_2/kmcc_hub_maintenance)
@@ -82453,7 +82697,7 @@
dir = 8
},
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"lAT" = (
/turf/open/floor/hybrisa/metal/yellow_warning_floor,
/area/lv759/indoors/spaceport/docking_bay_1)
@@ -82519,7 +82763,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"lBt" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/north,
/obj/item/hybrisa/misc/trash_bag_full_prop{
@@ -82830,7 +83074,7 @@
pixel_y = 19
},
/turf/open/hybrisa/street/cement1,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"lDW" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/west,
/obj/structure/platform/metal/hybrisa/metalplatform6,
@@ -82888,7 +83132,7 @@
/obj/structure/machinery/floodlight,
/obj/structure/platform/metal/almayer,
/turf/open/floor/mech_bay_recharge_floor,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"lEr" = (
/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname,
/obj/structure/pipes/standard/simple/hidden/dark{
@@ -83055,7 +83299,7 @@
},
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"lFN" = (
/obj/effect/decal/medical_decals{
dir = 1;
@@ -83388,7 +83632,7 @@
layer = 3.33
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"lHz" = (
/obj/item/stock_parts/matter_bin{
pixel_x = -9;
@@ -83409,7 +83653,7 @@
id = "engineering_lockdown"
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"lHL" = (
/obj/structure/prop/hybrisa/fakeplatforms/platform4/deco,
/obj/effect/decal/hybrisa/dirt,
@@ -83498,7 +83742,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"lIg" = (
/obj/effect/decal/hybrisa/road/road_stop{
icon_state = "stop_decal5"
@@ -83564,7 +83808,7 @@
/obj/item/ammo_casing/bullet,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"lIR" = (
/obj/structure/prop/hybrisa/vehicles/Colony_Crawlers/Science_2,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -84014,7 +84258,7 @@
pixel_x = -18
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"lMP" = (
/obj/structure/prop/hybrisa/fakeplatforms/platform1{
dir = 1
@@ -84562,7 +84806,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/largecrate/random/barrel,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"lQz" = (
/obj/item/tool/screwdriver{
pixel_x = -1;
@@ -84681,7 +84925,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"lRn" = (
/obj/effect/decal/hybrisa/dirt_2,
/turf/open/hybrisa/street/cement3,
@@ -84718,7 +84962,7 @@
},
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"lRK" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal4"
@@ -84829,7 +85073,6 @@
/area/lv759/indoors/power_plant)
"lSh" = (
/obj/structure/platform/metal/almayer/west,
-/obj/structure/machinery/power/apc/no_power/east,
/obj/structure/prop/invuln/overhead_pipe{
color = "#a6aeab";
dir = 10
@@ -85577,10 +85820,6 @@
/obj/structure/platform/metal/almayer/east,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
/area/lv759/indoors/caves/north_west_caves)
-"lYb" = (
-/obj/effect/decal/hybrisa/dirt,
-/turf/open/hybrisa/street/cement1,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
"lYc" = (
/obj/structure/surface/rack,
/obj/effect/decal/warning_stripes{
@@ -85838,7 +86077,7 @@
"maj" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop/north,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"mak" = (
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
/area/lv759/indoors/caves/north_caves)
@@ -86126,7 +86365,7 @@
pixel_y = 20
},
/turf/open/hybrisa/street/cement1,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"mcs" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -86607,7 +86846,7 @@
pixel_y = 3
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"mgy" = (
/obj/structure/largecrate/random/case/small,
/obj/item/storage/toolbox/emergency{
@@ -87041,7 +87280,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"mju" = (
/obj/structure/fence/dark,
/turf/open/floor/plating,
@@ -88078,7 +88317,7 @@
pixel_x = 2
},
/turf/open/floor/prison/floor_plate/southwest,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"mrh" = (
/obj/structure/window/framed/hybrisa/marshalls/reinforced,
/obj/structure/machinery/door/poddoor/hybrisa/open_shutters,
@@ -88967,7 +89206,7 @@
/obj/structure/platform_decoration/metal/almayer,
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"myr" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -89379,7 +89618,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/structure/girder,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"mAM" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal6"
@@ -89687,7 +89926,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"mDG" = (
/obj/item/toy/inflatable_duck,
/obj/item/toy/inflatable_duck,
@@ -90105,7 +90344,7 @@
/area/lv759/indoors/colonial_marshals/southwest_maintenance)
"mGR" = (
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"mGS" = (
/obj/structure/machinery/iv_drip{
layer = 4;
@@ -90986,7 +91225,7 @@
/obj/structure/platform/metal/almayer,
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"mOc" = (
/turf/closed/wall/hybrisa/colony/ribbed,
/area/lv759/indoors/wy_security/checkpoint_east)
@@ -91401,7 +91640,7 @@
},
/obj/structure/platform/metal/almayer/north,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"mSp" = (
/obj/structure/machinery/light/small/blue{
dir = 4
@@ -92029,7 +92268,7 @@
pixel_x = -8
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"mYd" = (
/obj/structure/barricade/handrail/strata{
dir = 8
@@ -92210,7 +92449,7 @@
icon_state = "folding_3"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"mZs" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/machinery/iv_drip{
@@ -92561,7 +92800,7 @@
pixel_y = -1
},
/turf/open/floor/hybrisa/metal/stripe_red/west,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"nbS" = (
/obj/structure/window/reinforced{
dir = 1
@@ -93001,7 +93240,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"neX" = (
/obj/structure/platform/metal/strata/west,
/turf/open/floor/strata/blue3/west,
@@ -93049,7 +93288,7 @@
},
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"nfE" = (
/obj/structure/platform_decoration/metal/strata/west,
/obj/effect/decal/hybrisa/road/road_edge{
@@ -93113,7 +93352,7 @@
"nfZ" = (
/obj/structure/platform/metal/almayer/north,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"ngb" = (
/obj/structure/window/framed/hybrisa/colony/reinforced,
/turf/open/floor/plating,
@@ -95176,7 +95415,7 @@
pixel_y = -1
},
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"nwK" = (
/obj/structure/machinery/door/window/brigdoor/eastleft{
dir = 2
@@ -95448,7 +95687,7 @@
id = "engineering_lockdown"
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"nzf" = (
/obj/item/device/flashlight/lamp/tripod/grey{
on = 0
@@ -95458,7 +95697,7 @@
explo_proof = 0
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"nzg" = (
/obj/structure/platform/metal/almayer,
/obj/effect/decal/hybrisa/dirt,
@@ -96040,7 +96279,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"nDX" = (
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
/area/lv759/outdoors/colony_streets/east_central_street)
@@ -97139,7 +97378,7 @@
"nMj" = (
/obj/structure/machinery/big_computers/computerwhite/computer1,
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"nMl" = (
/obj/structure/platform_decoration/metal/almayer/north,
/obj/effect/decal/warning_stripes{
@@ -97153,7 +97392,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/structure/pipes/standard/simple/hidden/dark,
/turf/open/floor/prison/floor_plate/southwest,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"nMp" = (
/obj/structure/machinery/newscaster{
pixel_y = 30
@@ -97450,7 +97689,7 @@
pixel_y = -11
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"nOj" = (
/obj/structure/machinery/door/airlock/multi_tile/hybrisa/generic/autoname{
dir = 1;
@@ -97550,7 +97789,7 @@
pixel_y = 11
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"nOM" = (
/obj/effect/decal/hybrisa/gold/line2{
pixel_x = 1
@@ -99708,7 +99947,7 @@
/area/lv759/outdoors/colony_streets/north_street)
"odA" = (
/turf/open/floor/plating/platingdmg3,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/hangarbay)
"odD" = (
/obj/structure/bed/chair/office/dark,
/turf/open/floor/hybrisa/carpet/carpetbeigedeco,
@@ -99726,7 +99965,7 @@
pixel_x = 2
},
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"odI" = (
/obj/structure/platform_decoration/metal/kutjevo/east,
/obj/effect/decal/warning_stripes{
@@ -100078,7 +100317,7 @@
icon_state = "N"
},
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"ogn" = (
/obj/structure/platform/metal/strata/north,
/obj/item/tool/wet_sign{
@@ -100213,7 +100452,7 @@
},
/obj/structure/machinery/sensortower,
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"ohs" = (
/obj/structure/machinery/light{
dir = 4
@@ -100585,7 +100824,7 @@
pixel_y = 14
},
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"okg" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/machinery/floodlight,
@@ -100708,7 +100947,7 @@
"okS" = (
/obj/structure/fence/electrified,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"olg" = (
/obj/structure/prop/invuln/lattice_prop{
icon_state = "lattice3";
@@ -101293,7 +101532,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"opJ" = (
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
@@ -102182,7 +102421,7 @@
dir = 1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"oxb" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/whitegreen/east,
@@ -102343,7 +102582,7 @@
/obj/structure/platform/metal/almayer/west,
/obj/structure/platform/metal/almayer,
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"oys" = (
/turf/open/floor/prison/red/southeast,
/area/lv759/indoors/colonial_marshals/hallway_south)
@@ -105000,7 +105239,7 @@
pixel_y = 9
},
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"oTG" = (
/obj/structure/machinery/door/airlock/multi_tile/hybrisa/black_double/autoname{
dir = 1
@@ -105254,7 +105493,7 @@
"oUV" = (
/obj/effect/decal/hybrisa/dirt,
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"oUW" = (
/turf/open/floor/hybrisa/tile/tilegrey,
/area/lv759/indoors/wy_research_complex/hallwaysouthwest)
@@ -105937,6 +106176,7 @@
/area/lv759/outdoors/colony_streets/north_street)
"paJ" = (
/obj/structure/largecrate/empty,
+/obj/structure/machinery/power/apc/no_power/south,
/turf/open/floor/prison/floor_plate/southwest,
/area/lv759/outdoors/colony_streets/east_central_street)
"paO" = (
@@ -106570,7 +106810,7 @@
icon_state = "NE-out"
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"pfJ" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/prop/hybrisa/airport/refuelinghose2{
@@ -108742,7 +108982,7 @@
pixel_x = 2
},
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_office)
"pwU" = (
/obj/structure/machinery/door/airlock/hybrisa/personal/autoname{
dir = 1
@@ -109115,7 +109355,7 @@
pixel_x = 16
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"pyU" = (
/obj/effect/decal/warning_stripes{
icon_state = "N"
@@ -109426,7 +109666,7 @@
/area/lv759/outdoors/colony_streets/central_streets)
"pBg" = (
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"pBk" = (
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
@@ -109779,7 +110019,7 @@
/obj/item/device/flashlight/on,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"pDQ" = (
/turf/open/floor/prison/whitegreen/north,
/area/lv759/indoors/hospital/central_hallway)
@@ -109791,7 +110031,7 @@
pixel_y = -1
},
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"pEi" = (
/obj/structure/platform/metal/hybrisa/metalplatform3/west,
/obj/effect/decal/hybrisa/road/lines4{
@@ -111137,7 +111377,7 @@
dir = 8
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"pOX" = (
/obj/structure/toilet{
dir = 4
@@ -111267,7 +111507,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/cargo_container/hybrisa/containersextended/tanleft,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"pQe" = (
/obj/structure/platform/metal/almayer/west,
/obj/structure/largecrate/random/mini{
@@ -111573,7 +111813,7 @@
/obj/item/ammo_casing/bullet,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"pSI" = (
/obj/item/device/flashlight/lamp/tripod/grey{
on = 0
@@ -111625,7 +111865,7 @@
"pSX" = (
/obj/effect/decal/hybrisa/dirt,
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"pSZ" = (
/turf/open/hybrisa/street/sidewalk/southeast,
/area/lv759/outdoors/landing_zone_2)
@@ -111714,7 +111954,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/structure/platform_decoration/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"pTM" = (
/obj/structure/window/framed/hybrisa/research/reinforced,
/turf/open/floor/corsat/officetiles,
@@ -111884,7 +112124,7 @@
"pUJ" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor/plating,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/hangarbay)
"pUK" = (
/obj/effect/decal/hybrisa/road/lines3,
/obj/effect/decal/cleanable/blood,
@@ -113846,7 +114086,7 @@
},
/obj/structure/prop/hybrisa/fakeplatforms/platform3,
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"qkN" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/hybrisa/carpet/carpetgreendeco,
@@ -113900,7 +114140,7 @@
},
/obj/effect/decal/hybrisa/warning/redandwhite_NEcorner,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"qlA" = (
/obj/structure/machinery/light/spot/blue{
dir = 4;
@@ -114026,6 +114266,7 @@
/obj/structure/prop/invuln/pipe_water{
color = "#7ccc5f"
},
+/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/plating/plating_catwalk/prison,
/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"qmF" = (
@@ -114433,7 +114674,7 @@
color = "#a6aeab"
},
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"qpO" = (
/obj/structure/bed/stool{
buckling_y = 14;
@@ -114572,7 +114813,7 @@
dir = 1
},
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"qrc" = (
/obj/structure/prop/hybrisa/boulders/smallboulderdark/boulder_dark3,
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
@@ -115544,7 +115785,7 @@
"qxC" = (
/obj/structure/blocker/forcefield/vehicles,
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
"qxI" = (
/obj/item/device/flashlight,
/obj/item/tool/warning_cone{
@@ -115714,7 +115955,7 @@
/obj/item/tool/shovel,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"qyY" = (
/obj/structure/machinery/colony_floodlight/street{
pixel_y = 12
@@ -115768,7 +116009,7 @@
},
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"qzk" = (
/turf/open/floor/almayer/sterile,
/area/lv759/indoors/wy_research_complex/xenoarcheology)
@@ -116167,7 +116408,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/machinery/floodlight,
/turf/open/floor/mech_bay_recharge_floor,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"qDr" = (
/obj/structure/window/reinforced{
dir = 1;
@@ -116314,7 +116555,7 @@
layer = 3.33
},
/turf/open/floor/hybrisa/metal/stripe_red/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"qEM" = (
/obj/structure/largecrate/random/barrel/red{
layer = 4
@@ -116589,7 +116830,7 @@
dir = 4
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"qHI" = (
/turf/closed/shuttle/dropship2/WY/HorizonRunner{
icon_state = "69"
@@ -117002,16 +117243,6 @@
/obj/effect/decal/strata_decals/grime/grime1,
/turf/open/floor/hybrisa/tile/tilewhite,
/area/lv759/indoors/apartment/eastrestroomsshower)
-"qJO" = (
-/obj/structure/sign/safety/bulkhead_door{
- pixel_x = -17
- },
-/obj/structure/machinery/light/spot/blue{
- dir = 8;
- pixel_x = -8
- },
-/turf/open/floor/plating/platingdmg3,
-/area/lv759/indoors/caves/central_caves)
"qJS" = (
/obj/structure/toilet{
dir = 4
@@ -117518,7 +117749,7 @@
layer = 2.9
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"qNC" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/pipes/standard/simple/hidden/dark{
@@ -118325,7 +118556,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/item/stack/rods,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"qTm" = (
/obj/effect/decal/hybrisa/road/road_edge,
/obj/effect/decal/hybrisa/road/lines1,
@@ -118408,7 +118639,7 @@
pixel_y = 2
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"qTR" = (
/obj/effect/decal/hybrisa/road/lines1{
pixel_x = -1
@@ -119288,7 +119519,7 @@
pixel_y = -1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"raX" = (
/obj/structure/cable/white{
color = "#550d0d";
@@ -120006,7 +120237,7 @@
/obj/item/stack/rods,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"rgx" = (
/obj/effect/decal/hybrisa/road/lines3,
/turf/open/floor/corsat/marked,
@@ -120209,7 +120440,7 @@
/obj/item/ammo_magazine/rifle/mar40,
/obj/structure/closet/crate/green,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"rhV" = (
/obj/effect/decal/hybrisa/checkpoint_decal{
pixel_y = 6
@@ -121376,7 +121607,7 @@
},
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"rrI" = (
/obj/structure/machinery/light/double/blue{
dir = 8
@@ -121551,7 +121782,7 @@
pixel_x = 2
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"rtA" = (
/obj/effect/decal/hybrisa/road/road_stop,
/turf/open/hybrisa/street/asphalt,
@@ -122042,7 +122273,7 @@
layer = 2.5
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"rxx" = (
/obj/structure/bed/chair/wood/normal{
dir = 1
@@ -122435,7 +122666,7 @@
/obj/item/ammo_casing/bullet,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"rzP" = (
/obj/structure/platform_decoration/metal/hybrisa/engineer_corner/east,
/obj/structure/platform_decoration/metal/hybrisa/engineer_corner/north,
@@ -122824,7 +123055,7 @@
"rCF" = (
/obj/structure/platform/metal/almayer/east,
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"rCG" = (
/turf/open/hybrisa/street/asphalt,
/area/lv759/indoors/wy_security/checkpoint_west)
@@ -122866,7 +123097,7 @@
"rCY" = (
/obj/effect/decal/hybrisa/warning/redandwhite_E,
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart)
"rDb" = (
/obj/effect/decal/hybrisa/road/road_stop{
icon_state = "stop_decal3"
@@ -122902,7 +123133,7 @@
},
/obj/structure/barricade/handrail/wire,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"rDt" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/pipes/standard/simple/hidden/dark{
@@ -123987,7 +124218,7 @@
},
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"rKN" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -124366,7 +124597,7 @@
icon_state = "folding_3"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"rNg" = (
/obj/item/stack/rods,
/obj/item/stack/sheet/metal,
@@ -124824,7 +125055,7 @@
},
/obj/structure/platform/metal/almayer,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"rQd" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal2"
@@ -124888,7 +125119,7 @@
"rQB" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/floor/mech_bay_recharge_floor,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/hangarbay)
"rQD" = (
/obj/structure/bed/chair/wood/normal{
dir = 8
@@ -125422,7 +125653,7 @@
},
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/mech_bay_recharge_floor,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"rUl" = (
/obj/structure/machinery/door/poddoor/almayer/closed{
id = "hybrisacheckpoint_northwest";
@@ -125602,6 +125833,7 @@
id = "gonzo_hide_out"
},
/obj/effect/decal/hybrisa/dirt,
+/obj/structure/blocker/invisible_wall,
/turf/open/floor/hybrisa/metal/red_warning_floor,
/area/lv759/bunker/gonzo)
"rVA" = (
@@ -126987,7 +127219,7 @@
pixel_x = 2
},
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"sfT" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 1;
@@ -127120,7 +127352,7 @@
pixel_x = -8
},
/turf/open/floor/plating/platingdmg3,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
"sgL" = (
/obj/item/device/flashlight/lamp/green{
pixel_y = 13;
@@ -128134,7 +128366,7 @@
icon_state = "3"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"soY" = (
/obj/item/stack/sheet/cardboard{
layer = 1
@@ -129073,7 +129305,7 @@
/obj/item/tool/screwdriver,
/obj/item/ammo_casing/bullet,
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"svs" = (
/obj/structure/barricade/handrail{
dir = 4
@@ -130702,7 +130934,7 @@
"sHO" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"sHR" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -131267,7 +131499,7 @@
/obj/effect/decal/hybrisa/warning/redandwhite_SEcorner,
/obj/structure/pipes/vents/pump_hybrisa,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart)
"sMK" = (
/obj/structure/prop/invuln/minecart_tracks{
dir = 9;
@@ -131343,7 +131575,6 @@
/obj/structure/closet/crate/trashcart{
opened = 1
},
-/obj/structure/machinery/power/apc/no_power/east,
/turf/open/floor/prison/red/east,
/area/lv759/indoors/colonial_marshals/holding_cells)
"sNg" = (
@@ -131597,7 +131828,7 @@
dir = 8
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"sOJ" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 6
@@ -133172,6 +133403,7 @@
pixel_x = -2;
pixel_y = 20
},
+/obj/structure/machinery/power/apc/no_power/west,
/turf/open/floor/prison/floor_plate/southwest,
/area/lv759/outdoors/colony_streets/north_east_street_LZ)
"tbE" = (
@@ -133495,7 +133727,7 @@
icon_state = "S"
},
/turf/open/floor/hybrisa/metal/stripe_red/north,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"tdG" = (
/obj/structure/machinery/mill,
/turf/open/floor/prison/cell_stripe,
@@ -133793,7 +134025,7 @@
layer = 3.33
},
/turf/open/floor/hybrisa/metal/stripe_red,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"tfw" = (
/obj/structure/platform/stone/hybrisa/rockdark/north,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
@@ -135008,7 +135240,7 @@
/obj/item/ammo_casing/bullet,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"tnG" = (
/obj/structure/bed/chair/vehicle/white{
pixel_x = 8
@@ -135086,7 +135318,7 @@
id = "engineering_lockdown"
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"tof" = (
/obj/effect/decal/hybrisa/road/road_edge,
/obj/effect/decal/hybrisa/road/lines1,
@@ -135404,7 +135636,7 @@
pixel_y = -16
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"tqa" = (
/obj/effect/decal/cleanable/blood{
icon_state = "mgibbl4"
@@ -135564,7 +135796,7 @@
/obj/structure/platform/metal/almayer/west,
/obj/structure/largecrate/random/barrel,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"trM" = (
/obj/effect/decal/hybrisa/road/lines4,
/obj/effect/decal/hybrisa/road/lines2,
@@ -136132,7 +136364,7 @@
pixel_y = -1
},
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"tvO" = (
/obj/structure/platform/stone/hybrisa/rockdark/west,
/obj/structure/blocker/forcefield/vehicles,
@@ -136418,7 +136650,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"twW" = (
/obj/structure/sign/safety/restrictedarea{
pixel_x = -17
@@ -136731,7 +136963,7 @@
/obj/structure/prop/hybrisa/fakeplatforms/platform4/deco,
/obj/structure/machinery/light/double/blue,
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"tAm" = (
/obj/structure/closet/secure_closet/freezer/fridge/full{
pixel_x = -3
@@ -136790,7 +137022,7 @@
/obj/item/ammo_casing/bullet,
/obj/item/ammo_casing/bullet,
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"tBm" = (
/turf/open/floor/prison/darkbrown3,
/area/lv759/indoors/meridian/meridian_foyer)
@@ -136801,7 +137033,7 @@
layer = 2.5
},
/turf/open/floor/hybrisa/metal/stripe_red/east,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"tBv" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -137086,11 +137318,11 @@
pixel_y = 5
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"tEE" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/east,
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"tEI" = (
/turf/open/floor/prison/darkbrown3/east,
/area/lv759/indoors/meridian/meridian_foyer)
@@ -137988,7 +138220,7 @@
icon_state = "xgib1"
},
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"tLr" = (
/obj/effect/decal/hybrisa/dirt,
/obj/item/tool/weldpack,
@@ -138855,7 +139087,7 @@
dir = 8
},
/turf/open/floor/corsat/officesquares,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"tRW" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop,
@@ -138968,7 +139200,7 @@
"tSX" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/plating/platingdmg3,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/hangarbay)
"tTe" = (
/obj/structure/sink{
dir = 4;
@@ -139581,7 +139813,7 @@
pixel_y = 19
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/caves/electric_fence1)
"tXQ" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal2"
@@ -140425,7 +140657,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/barricade/deployable,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"ufk" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -141273,7 +141505,7 @@
color = "#a6aeab"
},
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"uly" = (
/obj/structure/fence/dark,
/turf/open/floor/plating,
@@ -141513,7 +141745,7 @@
},
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"unu" = (
/obj/effect/decal/hybrisa/road/road_edge{
icon_state = "road_edge_decal2"
@@ -141775,7 +142007,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"upk" = (
/obj/effect/decal/hybrisa/road/road_edge,
/obj/effect/decal/hybrisa/road/lines1,
@@ -142059,7 +142291,7 @@
},
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/floor_plate/southwest,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"urm" = (
/obj/structure/platform/metal/hybrisa/metalplatform2,
/obj/structure/prop/hybrisa/cavedecor/stalagmite4{
@@ -142291,7 +142523,7 @@
layer = 3.3
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"utf" = (
/obj/effect/decal/medical_decals{
dir = 1;
@@ -142718,7 +142950,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/lattice/full,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"uws" = (
/turf/open/hybrisa/street/sidewalk/southeast,
/area/lv759/outdoors/colony_streets/central_streets)
@@ -142801,7 +143033,7 @@
},
/obj/structure/platform/metal/almayer,
/turf/open/floor/plating,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"uxk" = (
/obj/structure/window/reinforced,
/obj/item/storage/fancy/vials{
@@ -142867,7 +143099,7 @@
id = "engineering_lockdown"
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"uxE" = (
/obj/structure/machinery/newscaster{
pixel_y = 30
@@ -143848,7 +144080,7 @@
},
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"uEv" = (
/obj/effect/decal/hybrisa/road/road_stop{
icon_state = "stop_decal2"
@@ -144294,7 +144526,7 @@
layer = 1
},
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"uHj" = (
/obj/structure/surface/table/almayer{
color = "#EBD9B7"
@@ -144845,7 +145077,7 @@
pixel_x = 1
},
/turf/open/floor/hybrisa/metal/stripe_red/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/vehicledeploymentbay)
"uLd" = (
/obj/effect/decal/hybrisa/road/lines1,
/obj/effect/decal/hybrisa/dirt,
@@ -145316,7 +145548,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"uOo" = (
/obj/structure/platform/metal/hybrisa/metalplatform2/east,
/turf/open/auto_turf/hybrisa_auto_turf/layer2,
@@ -145414,7 +145646,7 @@
},
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"uOU" = (
/obj/structure/platform/metal/almayer/west,
/obj/structure/blocker/forcefield/vehicles,
@@ -146312,7 +146544,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"uUM" = (
/obj/effect/decal/hybrisa/road/lines1,
/obj/item/trash/uscm_mre,
@@ -146683,7 +146915,7 @@
/obj/effect/decal/hybrisa/warning/redandwhite_SEcorner,
/obj/structure/pipes/vents/pump_hybrisa,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"uXq" = (
/obj/item/trash/cigbutt,
/obj/effect/decal/hybrisa/dirt,
@@ -146741,7 +146973,7 @@
id = "engineering_lockdown"
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_south)
+/area/lv759/outdoors/power_plant/transformers_south)
"uXS" = (
/obj/structure/machinery/sentry_holder/wy{
dir = 4;
@@ -147067,7 +147299,7 @@
},
/obj/item/tool/shovel,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"vab" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/prop/hybrisa/vehicles/Mining_Crawlers{
@@ -148433,7 +148665,7 @@
dir = 8
},
/turf/open/floor/plating,
-/area/lv759/indoors/caves/south_west_caves)
+/area/lv759/indoors/wy_research_complex/southeastexit)
"vmp" = (
/obj/structure/prop/invuln/fusion_reactor,
/obj/effect/hybrisa/misc/fake/wire/blue{
@@ -148613,8 +148845,9 @@
/obj/structure/barricade/deployable{
dir = 4
},
+/obj/structure/machinery/power/apc/no_power/north,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"vnW" = (
/obj/structure/prop/hybrisa/boulders/large_boulderdark/boulder_dark2,
/obj/structure/prop/ice_colony/flamingo{
@@ -148957,7 +149190,7 @@
},
/obj/structure/largecrate/empty,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"vqN" = (
/obj/structure/bed/chair/comfy/teal,
/obj/structure/extinguisher_cabinet{
@@ -149278,7 +149511,7 @@
icon_state = "N"
},
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"vsS" = (
/obj/structure/largecrate/empty{
pixel_y = 3
@@ -149450,7 +149683,7 @@
"vtU" = (
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop/north,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"vtV" = (
/obj/structure/platform/stone/hybrisa/rockdark,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -149750,7 +149983,7 @@
},
/obj/item/ammo_casing/bullet,
/turf/open/auto_turf/hybrisa_auto_turf/layer0,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"vvW" = (
/obj/structure/machinery/light/double/blue,
/turf/open/floor/plating/plating_catwalk/prison,
@@ -151300,7 +151533,7 @@
pixel_x = -16
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"vHS" = (
/obj/structure/largecrate/random/mini/med{
layer = 3.01;
@@ -152119,7 +152352,7 @@
layer = 3.3
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"vNS" = (
/turf/open/floor/corsat,
/area/lv759/indoors/power_plant/gas_generators)
@@ -153539,7 +153772,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/platform/metal/almayer/east,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"vZd" = (
/obj/structure/machinery/vending/coffee{
density = 0;
@@ -153708,7 +153941,7 @@
},
/obj/structure/prop/hybrisa/fakeplatforms/platform3,
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"wau" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/north,
/obj/structure/platform/metal/hybrisa/metalplatform6/west,
@@ -153728,7 +153961,7 @@
dir = 1
},
/turf/open/floor/plating,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"waE" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -154363,7 +154596,7 @@
pixel_y = -1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"wfc" = (
/obj/effect/decal/hybrisa/road/road_stop{
icon_state = "stop_decal2"
@@ -154618,7 +154851,7 @@
dir = 8
},
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"wgQ" = (
/obj/item/clothing/accessory/stethoscope,
/obj/structure/surface/table,
@@ -155041,14 +155274,14 @@
},
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/east_caves)
+/area/lv759/indoors/caves/electric_fence2)
"wkm" = (
/obj/structure/machinery/colony_floodlight{
layer = 4
},
/obj/structure/platform/metal/almayer/west,
/turf/open/floor/mech_bay_recharge_floor,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"wko" = (
/obj/item/spacecash/c1000,
/obj/item/reagent_container/food/snacks/meatpizzaslice{
@@ -155610,7 +155843,7 @@
pixel_x = 2
},
/turf/open/floor/corsat/spiralplate,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"wow" = (
/obj/item/tool/warning_cone{
pixel_x = -4;
@@ -157261,7 +157494,7 @@
dir = 1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/electric_fence3)
"wCG" = (
/obj/structure/machinery/door/airlock/almayer/generic/autoname{
dir = 1
@@ -158229,7 +158462,7 @@
color = "#550d0d"
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"wKp" = (
/obj/structure/bed/chair{
dir = 8
@@ -158521,6 +158754,7 @@
pixel_x = -4;
pixel_y = 8
},
+/obj/structure/machinery/power/apc/no_power/south,
/turf/open/hybrisa/street/cement3,
/area/lv759/outdoors/colony_streets/east_central_street_left)
"wMn" = (
@@ -158654,7 +158888,7 @@
"wNp" = (
/obj/structure/platform_decoration/metal/almayer,
/turf/closed/wall/hybrisa/colony/engineering/ribbed,
-/area/lv759/indoors/power_plant/transformers_north)
+/area/lv759/outdoors/power_plant/transformers_north)
"wNv" = (
/obj/item/tool/warning_cone{
pixel_x = -11;
@@ -158794,7 +159028,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
/turf/open/floor/prison/ramptop,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"wOI" = (
/obj/structure/prop/invuln/minecart_tracks/bumper{
dir = 4;
@@ -158977,7 +159211,7 @@
pixel_x = -14
},
/turf/open/floor/plating,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"wQx" = (
/obj/item/tool/shovel{
pixel_y = 12
@@ -159289,7 +159523,7 @@
/area/lv759/indoors/caves/south_caves)
"wTa" = (
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"wTd" = (
/obj/structure/platform/metal/hybrisa/metalplatform6/east,
/turf/open/floor/prison/ramptop/north,
@@ -159309,7 +159543,7 @@
pixel_x = 1
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"wTt" = (
/obj/structure/machinery/cm_vending/sorted/boozeomat,
/obj/effect/decal/hybrisa/dirt,
@@ -159862,7 +160096,7 @@
/obj/effect/decal/hybrisa/dirt,
/obj/item/ammo_casing/bullet,
/turf/open/floor/prison,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/caves/comms_tower)
"wXu" = (
/obj/structure/prop/hybrisa/misc/floorprops/grate{
layer = 4
@@ -160537,7 +160771,7 @@
"xcm" = (
/obj/structure/barricade/handrail/hybrisa/handrail,
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"xcn" = (
/obj/structure/platform/stone/hybrisa/rockdark/east,
/obj/item/tool/pickaxe{
@@ -161764,7 +161998,7 @@
dir = 8
},
/turf/open/floor/plating/platingdmg3,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"xlQ" = (
/obj/effect/decal/hybrisa/dirt,
/obj/effect/decal/hybrisa/dirt,
@@ -162455,7 +162689,7 @@
pixel_y = -4
},
/turf/open/floor/plating/plating_catwalk/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"xre" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -163953,7 +164187,7 @@
color = "#550d0d"
},
/turf/open/floor/plating/prison,
-/area/lv759/outdoors/caveplateau)
+/area/lv759/indoors/caves/sensory_tower)
"xAL" = (
/turf/closed/wall/hybrisa/colony/reinforced,
/area/lv759/indoors/casino)
@@ -164013,7 +164247,7 @@
pixel_x = 4
},
/turf/open/floor/plating/platingdmg1,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"xBh" = (
/obj/structure/roof/hybrisa/lattice_prop/lattice_6{
pixel_y = 16;
@@ -164107,7 +164341,7 @@
},
/obj/effect/decal/hybrisa/warning/redandwhite_NEcorner,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart)
"xBV" = (
/obj/item/trash/cigbutt,
/obj/effect/decal/hybrisa/dirt,
@@ -164312,7 +164546,7 @@
dir = 8
},
/turf/open/floor/plating/platingdmg3,
-/area/lv759/indoors/caves/central_caves)
+/area/lv759/indoors/wy_research_complex/hallwaynorthexit)
"xDs" = (
/obj/structure/cargo_container/hybrisa/containersextended/kelland_right,
/turf/open/floor/plating/platingdmg3/west,
@@ -164794,7 +165028,7 @@
/obj/structure/platform/metal/almayer/north,
/obj/structure/cargo_container/hybrisa/containersextended/tanright,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"xHe" = (
/obj/structure/pipes/standard/simple/hidden/dark{
dir = 4
@@ -165688,7 +165922,7 @@
/obj/item/stack/sheet/metal/large_stack,
/obj/item/stack/sheet/plasteel/med_large_stack,
/turf/open/floor/prison/floor_plate/southwest,
-/area/lv759/indoors/caves/west_caves)
+/area/lv759/indoors/weymart/backrooms)
"xOA" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out";
@@ -166639,7 +166873,7 @@
pixel_y = -1
},
/turf/open/floor/hybrisa/metal/stripe_red/west,
-/area/lv759/outdoors/colony_streets/east_central_street_left)
+/area/lv759/outdoors/colony_streets/central_streets)
"xWi" = (
/obj/effect/decal/warning_stripes{
icon_state = "W";
@@ -167091,7 +167325,7 @@
"xZL" = (
/obj/item/stack/sheet/metal,
/turf/open/floor/plating/platingdmg3/west,
-/area/lv759/indoors/caves/central_caves_north)
+/area/lv759/indoors/meridian/meridian_maintenance)
"xZN" = (
/obj/effect/decal/hybrisa/dirt,
/obj/structure/prop/invuln/minecart_tracks{
@@ -170850,7 +171084,7 @@ hnb
aaJ
aaE
wmh
-gSv
+kJU
vuP
gbg
gbg
@@ -171102,7 +171336,7 @@ omK
lpy
bkw
oXo
-gSv
+kJU
vuP
bzC
gbg
@@ -171354,7 +171588,7 @@ fkx
lpy
bkw
oXo
-gSv
+kJU
vuP
vuP
vuP
@@ -171858,7 +172092,7 @@ fkx
lpy
bkw
oXo
-gSv
+kJU
vuP
gbg
vuP
@@ -171984,7 +172218,7 @@ unn
plV
unn
gwv
-nxj
+aqQ
ehY
ehY
iRy
@@ -172362,7 +172596,7 @@ cmu
lpy
bkw
oXo
-gSv
+kJU
gbg
vuP
gbg
@@ -172614,7 +172848,7 @@ aaL
aaJ
aaE
aaB
-gSv
+kJU
vuP
vuP
gbg
@@ -173118,7 +173352,7 @@ fVO
cAb
cAb
nZV
-gSv
+kJU
vuP
vuP
gbg
@@ -173370,7 +173604,7 @@ fVO
cAb
cAb
nZV
-gSv
+kJU
vuP
vuP
vuP
@@ -173874,7 +174108,7 @@ oLn
dMr
aaE
aaC
-gSv
+kJU
vuP
vuP
gbg
@@ -174126,7 +174360,7 @@ aSG
lpy
bkw
pqp
-gSv
+kJU
gbg
gbg
wKx
@@ -174630,7 +174864,7 @@ fkx
tyY
bkw
tPM
-gSv
+kJU
vuP
gbg
gbg
@@ -174882,7 +175116,7 @@ qgD
olv
bkw
aaD
-xgP
+apw
bzC
vuP
gbg
@@ -175058,7 +175292,7 @@ fnO
fnO
fnO
fnO
-bsG
+aqo
tNW
otU
iBo
@@ -175134,7 +175368,7 @@ oyo
cHM
qNX
oXo
-xgP
+apw
vuP
vuP
vuP
@@ -175386,7 +175620,7 @@ fkx
tyY
bkw
oXo
-xgP
+apw
vuP
gbg
afQ
@@ -175638,7 +175872,7 @@ aaM
aaJ
aaG
cRG
-xgP
+apw
vuP
gbg
wKx
@@ -180838,11 +181072,11 @@ unn
unn
tHg
unn
-hcI
+aqA
unn
-hcI
+aqA
unn
-hcI
+aqA
unn
unn
unn
@@ -181090,12 +181324,12 @@ bfH
udz
udJ
dXx
-hcI
-hcI
-hcI
-hcI
-iKK
-iZr
+aqA
+aqA
+aqA
+aqA
+aqB
+aqw
udz
unn
nTP
@@ -181341,13 +181575,13 @@ bfH
rwu
uBN
cwl
-udJ
+aqy
rKM
tdE
fIp
hSk
gaT
-cJU
+aqx
udJ
udz
udz
@@ -181593,13 +181827,13 @@ rwu
bcA
bcA
uBN
-xLz
+aqE
acH
tdE
lgb
hSk
maj
-iZr
+aqw
iZr
bfH
udz
@@ -181845,13 +182079,13 @@ ivU
bcA
bcA
sOg
-iZr
+aqw
maj
tdE
fIp
hSk
maj
-iZr
+aqw
udJ
udJ
bfH
@@ -182097,13 +182331,13 @@ bfH
ivU
sOg
qJB
-udJ
+aqy
acH
tdE
lgb
hSk
acH
-udJ
+aqy
kjY
bfH
bfH
@@ -182355,7 +182589,7 @@ acO
lgb
acL
acH
-iZr
+aqw
udJ
bfH
udz
@@ -182607,7 +182841,7 @@ tdE
fIp
hSk
acK
-iZr
+aqw
iZr
bfH
udz
@@ -182854,11 +183088,11 @@ bfH
bfH
udz
acR
-hcI
-hcI
-hcI
-hcI
-hcI
+aqA
+aqA
+aqA
+aqA
+aqA
acG
udJ
unn
@@ -183044,7 +183278,7 @@ gsg
gsg
gsg
ghC
-ouK
+aqW
sQX
fuR
fuR
@@ -183106,12 +183340,12 @@ bfH
udz
unn
unn
-hcI
-unn
-hcI
+aqA
unn
-hcI
+aqA
unn
+aqA
+aqz
oaW
unn
unn
@@ -184158,7 +184392,7 @@ prc
oYd
rHL
ohF
-jOj
+apL
xwr
qxC
qxC
@@ -184166,7 +184400,7 @@ qxC
iVD
qxC
xwr
-rQB
+apL
wKx
unn
vuP
@@ -184350,7 +184584,7 @@ hcI
hcI
unn
sMJ
-fQB
+aqO
rCY
xBU
udJ
@@ -184410,15 +184644,15 @@ prc
prc
oYd
oYd
-rHL
-qJO
-gkN
-gkN
-bNI
-gkN
-gkN
+apQ
sgG
-vuP
+apN
+apN
+apO
+apN
+apN
+sgG
+apM
vuP
hbV
pLV
@@ -184669,7 +184903,7 @@ prc
prc
prc
prc
-vuP
+oYd
vuP
vuP
hbV
@@ -184921,7 +185155,7 @@ smq
smq
prc
smq
-cdn
+smq
wKx
vuP
hbV
@@ -185081,7 +185315,7 @@ lqr
ink
cWQ
ofM
-nvP
+aqU
tqx
tqx
bPT
@@ -185146,12 +185380,12 @@ gBx
hvj
ecs
oMh
-jOj
+apS
ssN
fan
saY
ssN
-jOj
+apS
oYd
vQc
rHL
@@ -185173,7 +185407,7 @@ smq
smq
prc
qnC
-cdn
+smq
vuP
vuP
aad
@@ -185403,7 +185637,7 @@ ssN
eNW
eNW
ssN
-shp
+apT
rHL
oYd
prc
@@ -185425,7 +185659,7 @@ smq
smq
prc
prc
-pLV
+prc
pLV
pLV
unn
@@ -185652,8 +185886,8 @@ hGb
geQ
okc
xlO
-gkN
-gkN
+apV
+apV
xDr
kak
ltX
@@ -185677,7 +185911,7 @@ gBx
prc
prc
prc
-vuP
+oYd
vuP
pLV
unn
@@ -185929,7 +186163,7 @@ gBY
prc
prc
ohF
-vuP
+oYd
unn
unn
unn
@@ -186629,7 +186863,7 @@ rLJ
iNk
hcI
urh
-bcA
+aqH
jUG
iZr
iZr
@@ -187637,7 +187871,7 @@ xCM
owA
nPX
axP
-bcA
+aqH
qpN
iZr
iZr
@@ -190408,7 +190642,7 @@ cJP
cDZ
gGh
avx
-nie
+aqI
aPn
egv
unn
@@ -190910,7 +191144,7 @@ cns
bXJ
abs
vaa
-nie
+aqI
cDZ
nie
nSB
@@ -191339,7 +191573,7 @@ fuD
ufv
lEB
rAb
-onj
+ara
uCa
sgD
sdF
@@ -191434,7 +191668,7 @@ unn
unn
unn
unn
-unn
+hcI
kLQ
hQc
guq
@@ -191686,7 +191920,7 @@ unn
unn
unn
unn
-unn
+hcI
vnV
nOf
lRl
@@ -192420,7 +192654,7 @@ abx
abx
eEs
mXT
-nie
+aqI
cDZ
owM
mfM
@@ -192451,8 +192685,8 @@ efF
jDi
ulv
fba
-yiW
-rHL
+aqd
+apZ
unn
unn
unn
@@ -192673,7 +192907,7 @@ iBa
eEs
pQd
deo
-nie
+aqI
fKW
mfM
owM
@@ -192691,19 +192925,19 @@ prc
prc
rHL
fWR
-vDm
-pRL
-sYR
+aqv
+aqt
+aqf
unn
epX
fiP
bpi
eMP
-smq
+aqn
kGZ
epX
mSo
-sYR
+aqf
unn
unn
unn
@@ -192921,10 +193155,10 @@ fkg
lCJ
iHv
abD
-jSZ
+aqN
eEs
xHd
-nie
+aqI
cDZ
mfM
owM
@@ -192943,9 +193177,9 @@ prc
prc
prc
fWR
-oYd
-rHL
-pUT
+apY
+apZ
+aqb
unn
unn
unn
@@ -192955,7 +193189,7 @@ unn
unn
unn
unn
-eIW
+aqg
unn
unn
unn
@@ -193197,18 +193431,18 @@ oYd
unn
unn
unn
-oYd
-sYR
-pUT
-gkN
-pUT
+apY
+aqf
+aqb
+aqp
+aqb
tLq
pDP
rzM
-sYR
+aqf
lId
-yiW
-rHL
+aqd
+apZ
unn
unn
unn
@@ -193428,7 +193662,7 @@ abD
cWx
eEs
iwB
-nie
+aqI
wfX
owM
owM
@@ -193450,17 +193684,17 @@ unn
unn
unn
unn
-gkN
-sYR
-pMp
+aqp
+aqf
+aqq
unn
unn
-rHL
+apZ
unn
unn
opH
gSE
-pUT
+aqb
unn
unn
unn
@@ -193713,8 +193947,8 @@ fDg
twS
vvR
rzM
-oYd
-ejv
+apY
+apX
hOo
dFq
prc
@@ -193956,7 +194190,7 @@ unn
unn
anK
bRK
-sYR
+aqf
eSF
unn
unn
@@ -193964,8 +194198,8 @@ unn
fNF
uOj
doI
-oYd
-rHL
+apY
+apZ
unn
oYd
oDU
@@ -194685,10 +194919,10 @@ tQL
nBR
yhn
kru
-abz
+abx
uns
eWY
-mfM
+aqK
mfM
mfM
mfM
@@ -194937,7 +195171,7 @@ apv
xfw
cLW
lbn
-abz
+abx
vqL
eLf
cDZ
@@ -195189,10 +195423,10 @@ tQL
hSH
aoS
aAo
-abz
+abx
fAE
nOI
-fKW
+aqL
mfM
fKW
dxP
@@ -195441,10 +195675,10 @@ rmZ
tnV
mTx
lIY
-abz
+abx
cDZ
-fKW
-mfM
+aqL
+aqK
hoU
mfM
unn
@@ -195693,10 +195927,10 @@ vDl
awT
bFL
wqD
-abz
+abx
egv
bdt
-nie
+aqI
fKW
mfM
cQF
@@ -195945,7 +196179,7 @@ gVO
gVO
gVO
gVO
-abA
+abx
mAI
qyX
aPn
@@ -196197,12 +196431,12 @@ gVO
xay
gVO
isJ
-abA
+abx
nfD
mjh
egv
avx
-nie
+aqI
mfM
owM
owM
@@ -196449,7 +196683,7 @@ gVO
gxn
gVO
gxn
-abA
+abx
iBN
qTk
cDZ
@@ -196701,13 +196935,13 @@ tHn
pOu
pBz
cWE
-abA
+abx
xBg
hIR
aPn
cDZ
gGh
-mfM
+aqK
hoU
owM
mfM
@@ -196729,13 +196963,13 @@ prc
rHL
unn
unn
-unn
+aqc
ajb
rgr
-yiW
-pUT
-sYR
-yiW
+aqi
+aqk
+aql
+aqi
fuE
rHL
prc
@@ -196956,11 +197190,11 @@ abF
abB
cHL
pfE
-nie
+aqI
avx
-nie
+aqI
gZu
-nie
+aqI
avx
nie
mfM
@@ -196981,14 +197215,14 @@ oYd
oYd
unn
unn
-hcI
+aqc
rQc
kph
kph
lgM
kph
vYY
-hcI
+aqc
unn
ohF
prc
@@ -197037,7 +197271,7 @@ brt
esh
mgt
fzY
-guG
+apx
nzf
vNQ
dCi
@@ -197233,14 +197467,14 @@ oYd
unn
unn
unn
-hcI
+aqc
qEL
qEL
qEL
qEL
qEL
qEL
-hcI
+aqc
unn
unn
sPZ
@@ -197281,7 +197515,7 @@ guz
jbZ
unn
unn
-unn
+apz
deA
aCK
lEq
@@ -197289,7 +197523,7 @@ kcU
nMj
soX
acd
-guG
+apx
wTa
qNB
qDi
@@ -197485,14 +197719,14 @@ prc
rHL
unn
unn
-hcI
+aqc
wCD
okS
wCD
okS
wCD
okS
-hcI
+aqc
unn
unn
unn
@@ -197533,7 +197767,7 @@ jbZ
unn
unn
unn
-unn
+apz
hIH
aCK
gmf
@@ -197737,14 +197971,14 @@ prc
oYd
rHL
unn
-hcI
+aqc
tBo
tBo
tBo
tBo
tBo
tBo
-hcI
+aqc
unn
unn
unn
@@ -197785,7 +198019,7 @@ guz
unn
unn
unn
-unn
+apz
hnu
mYu
gmf
@@ -197989,14 +198223,14 @@ prc
prc
unn
unn
-hcI
+aqc
uxg
lgM
kph
kph
kph
ahb
-hcI
+aqc
unn
unn
unn
@@ -198241,13 +198475,13 @@ prc
oYd
oYd
unn
-eIW
-sYR
-yiW
-sYR
-pUT
-eIW
-pUT
+aqm
+aql
+aqi
+aql
+aqk
+aqm
+aqk
unn
unn
unn
@@ -198549,7 +198783,7 @@ rtz
dZq
vHR
aHy
-guG
+apx
iTS
wTq
dCi
@@ -199434,15 +199668,15 @@ bpe
bpe
wLi
wLi
-fTc
+xsr
lDV
-fTc
+xsr
mco
-fTc
-fTc
-lYb
-fTc
-fTc
+xsr
+xsr
+aNg
+xsr
+xsr
mIC
mIC
jHU
@@ -200443,13 +200677,13 @@ oSl
khG
wLi
mra
-hXl
+eGN
ajV
wou
odE
gPs
-ciW
-hXl
+cId
+eGN
mra
mIC
dMH
@@ -204410,7 +204644,7 @@ wVE
cwR
hpH
ifJ
-wVE
+arb
tLI
cGk
unn
@@ -208751,7 +208985,7 @@ kht
vcr
pid
mNa
-iJH
+aqV
iCI
iCI
jhu
@@ -208773,7 +209007,7 @@ nMl
rgy
rgy
vYK
-nMl
+aqR
rgy
rgy
vYK
@@ -211889,11 +212123,11 @@ fRW
tNd
bQY
unn
-hcI
+apB
unn
-hcI
+apB
unn
-hcI
+apB
unn
unn
unn
@@ -212141,12 +212375,12 @@ xHj
tNd
unn
unn
-hcI
-hcI
-hcI
-hcI
-hcI
-unn
+apB
+apB
+apB
+apB
+apB
+apB
unn
unn
unn
@@ -212392,13 +212626,13 @@ xHj
tNd
xHj
nSW
-jvG
+apH
dIi
gKk
eKu
tfu
uOP
-jvG
+apC
nSW
unn
unn
@@ -212644,13 +212878,13 @@ xHj
xHj
fRW
kmB
-nSW
+apF
vtU
gKk
lgz
tfu
vtU
-dWM
+apD
eXH
tZb
unn
@@ -212896,7 +213130,7 @@ tNd
xHj
xHj
nSW
-jvG
+apH
acF
gKk
lgz
@@ -213148,13 +213382,13 @@ ain
tNd
fRW
nSW
-jvG
+apH
vtU
gKk
eKu
tfu
acF
-pVI
+apE
eXH
xHj
xHj
@@ -213400,13 +213634,13 @@ unn
unn
tNd
kmB
-hpt
+apI
acF
gKk
lgz
tfu
vtU
-nSW
+apF
kmB
xHj
xHj
@@ -213652,13 +213886,13 @@ unn
unn
unn
tNd
-jvG
+apH
wkj
gKk
eKu
tfu
rrH
-eXH
+apG
nSW
xHj
tNd
@@ -213904,11 +214138,11 @@ pXa
unn
unn
fRW
-jvG
-hcI
-hcI
-hcI
-hcI
+apH
+apB
+apB
+apB
+apB
iKK
jLX
jvG
@@ -214156,12 +214390,12 @@ unn
unn
unn
unn
-fRW
-hcI
+apK
+apB
unn
-hcI
+apB
unn
-hcI
+apB
uHb
rhH
nSW
@@ -220193,7 +220427,7 @@ mfD
aoe
xRW
way
-anR
+apR
gMi
qok
nRc
@@ -220334,7 +220568,7 @@ eek
eYj
amR
amP
-amP
+aqY
vmg
wmd
kQu
@@ -222668,7 +222902,7 @@ oiE
xDm
kFs
tFN
-qOY
+aqF
cOa
qXH
cky
@@ -222786,7 +223020,7 @@ lnd
lzc
lzc
lnd
-lzc
+apu
lzc
hai
mEE
@@ -224697,7 +224931,7 @@ wwg
wwg
wUM
dsS
-dsS
+aqs
dsS
aoH
hcI
diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm
index c1bae423401e..12c47119c75a 100644
--- a/maps/map_files/New_Varadero/New_Varadero.dmm
+++ b/maps/map_files/New_Varadero/New_Varadero.dmm
@@ -84,11 +84,96 @@
/obj/structure/pipes/unary/freezer/yautja,
/turf/open/floor/strata/grey_multi_tiles,
/area/varadero/interior_protected/vessel)
+"aap" = (
+/turf/closed/wall/r_wall,
+/area/varadero/interior_protected/caves/makeshift_tent)
+"aaq" = (
+/obj/structure/machinery/power/apc/fully_broken/no_cell/north,
+/turf/open/floor/corsat/squareswood/north,
+/area/varadero/interior_protected/vessel)
+"aar" = (
+/turf/closed/wall/rock/brown,
+/area/varadero/interior/maintenance/security/south)
+"aas" = (
+/obj/structure/prop/rock/brown,
+/turf/open/gm/dirt,
+/area/varadero/interior/maintenance/security/south)
+"aat" = (
+/turf/open/gm/coast/east,
+/area/varadero/interior/maintenance/security/south)
+"aau" = (
+/turf/open/gm/dirt,
+/area/varadero/interior/maintenance/security/south)
+"aav" = (
+/obj/item/tool/pickaxe,
+/turf/open/auto_turf/sand_white/layer1,
+/area/varadero/interior/maintenance/security/south)
+"aaw" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
+/turf/open/auto_turf/sand_white/layer1,
+/area/varadero/interior/maintenance/security/south)
+"aax" = (
+/obj/structure/platform/metal/kutjevo_smooth/north{
+ climb_delay = 1
+ },
+/obj/structure/barricade/handrail{
+ desc = "Your platforms look pretty heavy king, let me support them for you.";
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "support struts"
+ },
+/turf/open/gm/river/shallow_ocean_shallow_ocean,
+/area/varadero/interior/beach_bar)
+"aay" = (
+/obj/structure/platform/metal/kutjevo_smooth/north{
+ climb_delay = 1
+ },
+/obj/structure/barricade/handrail{
+ desc = "Your platforms look pretty heavy king, let me support them for you.";
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "support struts"
+ },
+/obj/structure/platform/metal/kutjevo_smooth/east{
+ climb_delay = 1
+ },
+/turf/open/gm/river/shallow_ocean_shallow_ocean,
+/area/varadero/interior/beach_bar)
+"aaz" = (
+/turf/open/floor/plating/icefloor/asteroidplating,
+/area/varadero/interior/beach_bar)
"aaA" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/bed/sofa/vert/grey/top,
/turf/open/floor/shiva/floor3,
/area/varadero/interior/medical)
+"aaB" = (
+/obj/structure/platform/metal/kutjevo_smooth/north{
+ climb_delay = 1
+ },
+/obj/structure/barricade/handrail{
+ desc = "Your platforms look pretty heavy king, let me support them for you.";
+ dir = 1;
+ icon_state = "hr_kutjevo";
+ name = "support struts"
+ },
+/obj/structure/platform/metal/kutjevo_smooth/west{
+ climb_delay = 1
+ },
+/turf/open/gm/river/shallow_ocean_shallow_ocean,
+/area/varadero/interior/beach_bar)
+"aaC" = (
+/obj/structure/platform/metal/kutjevo_smooth/east{
+ climb_delay = 1
+ },
+/turf/open/gm/river/shallow_ocean_shallow_ocean,
+/area/varadero/interior/beach_bar)
+"aaD" = (
+/obj/structure/platform/metal/kutjevo_smooth/west{
+ climb_delay = 1
+ },
+/turf/open/gm/river/shallow_ocean_shallow_ocean,
+/area/varadero/interior/beach_bar)
"aaG" = (
/obj/effect/landmark/lv624/fog_blocker{
time_to_dispel = 25000
@@ -160,7 +245,7 @@
climb_delay = 1
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"afg" = (
/turf/closed/wall/r_wall/elevator{
dir = 8
@@ -2039,7 +2124,7 @@
pixel_y = -2
},
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"byC" = (
/obj/structure/flora/bush/ausbushes/var3/stalkybush,
/turf/open/gm/river/ocean/deep_ocean,
@@ -2125,7 +2210,7 @@
icon_state = "S"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"bBV" = (
/obj/structure/blocker/invisible_wall/water,
/obj/item/lightstick/variant/planted,
@@ -3294,7 +3379,7 @@
"czA" = (
/obj/item/stack/sheet/wood,
/turf/open/floor/plating/icefloor/asteroidplating,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"czG" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/corsat/squareswood/north,
@@ -4172,7 +4257,7 @@
"djP" = (
/obj/structure/bed/chair,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"dkl" = (
/turf/open/floor/shiva/snow_mat,
/area/varadero/interior/maintenance)
@@ -4565,7 +4650,7 @@
"dFm" = (
/obj/structure/largecrate/supply/supplies/water,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"dFt" = (
/obj/structure/prop/fishing/line/long,
/turf/open/gm/coast/beachcorner2/south_west,
@@ -4687,7 +4772,7 @@
climb_delay = 1
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"dLn" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -5585,7 +5670,7 @@
pixel_y = 15
},
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"ezb" = (
/obj/structure/surface/rack,
/obj/item/frame/table,
@@ -5742,7 +5827,7 @@
dir = 4
},
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"eEd" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/r_wall,
@@ -6297,7 +6382,7 @@
"fbZ" = (
/obj/structure/prop/server_equipment/yutani_server,
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"fcf" = (
/obj/structure/surface/table,
/obj/item/device/camera,
@@ -6803,7 +6888,7 @@
icon_state = "W"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"ftA" = (
/obj/structure/sign/safety/coffee,
/obj/structure/sign/safety/galley{
@@ -7804,7 +7889,7 @@
"giY" = (
/obj/structure/platform_decoration/metal/kutjevo/west,
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"gja" = (
/obj/structure/pipes/standard/simple/hidden/green,
/obj/structure/prop/invuln/overhead_pipe{
@@ -8510,7 +8595,7 @@
},
/obj/item/tool/pen/red/clicky,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"gNb" = (
/obj/structure/closet/wardrobe/chaplain_black,
/turf/open/floor/wood,
@@ -8602,9 +8687,7 @@
/turf/open/floor/shiva/floor3,
/area/varadero/interior/security)
"gRU" = (
-/obj/structure/machinery/floodlight{
- name = "Floodlight"
- },
+/obj/structure/machinery/colony_floodlight,
/turf/open/auto_turf/sand_white/layer1,
/area/varadero/interior_protected/caves/digsite)
"gSn" = (
@@ -8636,7 +8719,7 @@
/area/varadero/exterior/lz1_near)
"gTe" = (
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"gTC" = (
/obj/structure/window/framed/colony,
/turf/open/floor/plating,
@@ -8692,7 +8775,7 @@
/obj/structure/surface/table,
/obj/structure/machinery/faxmachine,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"gXh" = (
/obj/structure/machinery/constructable_frame{
icon_state = "box_1"
@@ -9058,8 +9141,8 @@
/obj/structure/sign/safety/fire_haz{
pixel_y = 7
},
-/turf/closed/wall/rock/brown,
-/area/varadero/interior/oob)
+/turf/closed/wall/r_wall,
+/area/varadero/interior_protected/caves/makeshift_tent)
"hoC" = (
/obj/structure/prop/rock/brown,
/turf/open/auto_turf/sand_white/layer1,
@@ -9274,9 +9357,7 @@
/turf/open/floor/shiva/red/southwest,
/area/varadero/interior/administration)
"hxb" = (
-/obj/structure/machinery/floodlight{
- name = "Floodlight"
- },
+/obj/structure/machinery/colony_floodlight,
/obj/structure/platform_decoration/metal/kutjevo/west,
/turf/open/auto_turf/sand_white/layer1,
/area/varadero/interior_protected/caves/digsite)
@@ -10243,7 +10324,7 @@
},
/obj/structure/platform_decoration/metal/kutjevo,
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"imz" = (
/turf/closed/wall/r_wall/elevator/gears,
/area/varadero/interior/records)
@@ -10537,8 +10618,9 @@
/area/varadero/interior/maintenance/north)
"ixQ" = (
/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/machinery/power/apc/no_power/east,
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"iyd" = (
/turf/open/floor/asteroidwarning/northwest,
/area/varadero/exterior/lz1_near)
@@ -11237,9 +11319,7 @@
/turf/open/floor/shiva/floor3,
/area/varadero/interior/administration)
"iWX" = (
-/obj/structure/machinery/floodlight{
- name = "Floodlight"
- },
+/obj/structure/machinery/colony_floodlight,
/turf/open/auto_turf/sand_white/layer1,
/area/varadero/exterior/eastbeach)
"iXy" = (
@@ -11586,7 +11666,7 @@
icon_state = "SW-out"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"jnq" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -11624,7 +11704,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"jpm" = (
/obj/structure/machinery/door/airlock/almayer/maint{
name = "\improper Underground Maintenance";
@@ -12219,7 +12299,7 @@
"jLU" = (
/obj/structure/reagent_dispensers/fueltank/gas,
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"jMq" = (
/obj/structure/barricade/handrail/wire{
layer = 3.01
@@ -12446,7 +12526,7 @@
/obj/structure/surface/table,
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"jXn" = (
/obj/structure/bed/chair{
icon_state = "chair_alt";
@@ -12667,9 +12747,6 @@
},
/turf/open/floor/shiva/multi_tiles,
/area/varadero/interior/medical)
-"kfG" = (
-/turf/closed/wall,
-/area/varadero/interior/caves/east)
"kfJ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/med_data/laptop{
@@ -13092,7 +13169,7 @@
/obj/item/tool/wrench,
/obj/item/tool/weldingtool,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"kzE" = (
/obj/structure/surface/table/woodentable,
/obj/item/reagent_container/food/drinks/bottle/holywater,
@@ -13351,7 +13428,7 @@
/area/varadero/interior/maintenance/north)
"kKS" = (
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"kKX" = (
/obj/item/device/reagent_scanner{
pixel_x = 7;
@@ -13744,9 +13821,6 @@
/turf/open/floor/plating/icefloor/asteroidplating,
/area/varadero/interior/maintenance/north)
"ldw" = (
-/obj/structure/machinery/light/small{
- dir = 8
- },
/turf/open/gm/coast/beachcorner/north_east,
/area/varadero/interior/caves/east)
"ldJ" = (
@@ -15200,7 +15274,7 @@
icon_state = "S"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"mms" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -15213,7 +15287,7 @@
dir = 8
},
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"mmG" = (
/obj/item/device/flashlight/lamp/tripod,
/turf/open/floor/plating/icefloor/asteroidplating,
@@ -15389,9 +15463,7 @@
/turf/open/gm/river/shallow_ocean_shallow_ocean,
/area/varadero/exterior/pontoon_beach)
"mtp" = (
-/obj/structure/machinery/floodlight{
- name = "Floodlight"
- },
+/obj/structure/machinery/colony_floodlight,
/turf/open/floor/plating/icefloor/asteroidplating,
/area/varadero/exterior/eastbeach)
"mts" = (
@@ -15453,9 +15525,7 @@
/turf/open/floor/shiva/green/east,
/area/varadero/interior/hall_SE)
"mvO" = (
-/obj/structure/machinery/floodlight{
- name = "Floodlight"
- },
+/obj/structure/machinery/colony_floodlight,
/turf/open/floor/shiva/yellow/north,
/area/varadero/interior/electrical)
"mwd" = (
@@ -15581,7 +15651,7 @@
/obj/structure/surface/rack,
/obj/item/storage/toolbox/electrical,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"mzT" = (
/obj/structure/pipes/standard/simple/hidden/green{
dir = 4
@@ -15819,9 +15889,7 @@
/obj/structure/machinery/light{
dir = 1
},
-/obj/structure/machinery/floodlight{
- name = "Floodlight"
- },
+/obj/structure/machinery/colony_floodlight,
/turf/open/floor/shiva/yellow/north,
/area/varadero/interior/electrical)
"mNO" = (
@@ -16161,7 +16229,7 @@
icon_state = "S"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"ncC" = (
/obj/item/ammo_magazine/handful/lever_action,
/obj/structure/machinery/storm_siren{
@@ -16216,7 +16284,7 @@
pixel_x = 12
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"neJ" = (
/obj/effect/landmark/objective_landmark/far,
/turf/open/floor/plating/icefloor/asteroidplating,
@@ -18290,7 +18358,7 @@
dir = 1
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"oTs" = (
/obj/structure/blocker/fog,
/turf/open/gm/coast/beachcorner2/south_east,
@@ -18320,7 +18388,7 @@
icon_state = "W"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"oUp" = (
/turf/open/floor/shiva/red/southeast,
/area/varadero/interior/morgue)
@@ -18438,7 +18506,7 @@
pixel_y = -2
},
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"oXE" = (
/obj/structure/surface/table,
/obj/structure/prop/invuln/lattice_prop{
@@ -19650,7 +19718,7 @@
"pSg" = (
/obj/structure/inflatable/door,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"pSu" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -19947,6 +20015,7 @@
pixel_y = 5
},
/obj/item/clothing/head/helmet,
+/obj/structure/machinery/power/apc/no_power/south,
/turf/open/floor/wood,
/area/varadero/interior/dock_control)
"qeh" = (
@@ -20172,7 +20241,7 @@
},
/obj/structure/platform_decoration/metal/kutjevo/north,
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"qlW" = (
/obj/structure/surface/table,
/obj/item/trash/plate,
@@ -20444,7 +20513,7 @@
climb_delay = 1
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"qxu" = (
/turf/open/floor/plating/icefloor/asteroidplating,
/area/varadero/interior/hall_N)
@@ -20631,7 +20700,7 @@
"qCT" = (
/obj/structure/inflatable,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"qDh" = (
/obj/structure/prop/invuln/lattice_prop{
icon_state = "lattice2";
@@ -21088,7 +21157,7 @@
/obj/structure/surface/rack,
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"qUQ" = (
/turf/open/floor/shiva/redfull,
/area/varadero/interior/medical)
@@ -21986,7 +22055,7 @@
pixel_x = 7
},
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"rCN" = (
/obj/structure/barricade/handrail/wire{
layer = 3.1
@@ -22818,7 +22887,7 @@
pixel_y = 1
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"shP" = (
/obj/item/clothing/suit/armor/vest,
/turf/open/floor/shiva/floor3,
@@ -23199,7 +23268,7 @@
},
/obj/item/weapon/gun/energy/yautja/plasmapistol,
/turf/open/floor/interior/plastic,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"syb" = (
/obj/structure/surface/rack,
/obj/item/ammo_magazine/pistol/mod88,
@@ -23840,7 +23909,7 @@
icon_state = "4-8"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"sVH" = (
/obj/structure/prop/invuln/lattice_prop{
icon_state = "lattice1";
@@ -24098,7 +24167,7 @@
pixel_x = 11
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"tjF" = (
/turf/open/floor/shiva/redfull/west,
/area/varadero/interior/medical)
@@ -24913,7 +24982,7 @@
climb_delay = 1
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"tWT" = (
/obj/structure/blocker/invisible_wall/water,
/turf/open/gm/coast/west,
@@ -24959,7 +25028,7 @@
icon_state = "S"
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"tYg" = (
/turf/open/floor/shiva/red,
/area/varadero/interior/medical)
@@ -26612,7 +26681,7 @@
pixel_y = 6
},
/turf/open/auto_turf/sand_white/layer1,
-/area/varadero/interior/caves/east)
+/area/varadero/interior/maintenance/security/south)
"vpr" = (
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor/asteroidfloor/north,
@@ -27287,7 +27356,7 @@
pixel_y = -19
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"vOW" = (
/obj/item/clothing/suit/armor/vest,
/turf/open/floor/wood,
@@ -28021,7 +28090,7 @@
pixel_y = 5
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"wot" = (
/turf/open/floor/shiva/floor3,
/area/varadero/interior/records)
@@ -29899,7 +29968,7 @@
pixel_x = -3
},
/turf/open/gm/river/shallow_ocean_shallow_ocean,
-/area/varadero/exterior/pontoon_beach)
+/area/varadero/interior/beach_bar)
"xVe" = (
/obj/item/prop/helmetgarb/bullet_pipe{
pixel_x = -8;
@@ -30211,7 +30280,7 @@
pixel_y = 1
},
/turf/open/floor/plating,
-/area/varadero/interior_protected/caves/digsite)
+/area/varadero/interior_protected/caves/makeshift_tent)
"ygh" = (
/obj/structure/platform/metal/kutjevo_smooth{
climb_delay = 1
@@ -48261,12 +48330,12 @@ qwQ
pFZ
sLr
imq
-qcQ
-qcQ
-qcQ
-qcQ
+aaC
+aaC
+aaC
+aaC
qxt
-qcQ
+aaC
giY
ihw
sLr
@@ -48631,7 +48700,7 @@ opd
iEe
diK
xlC
-faT
+aax
pFZ
sLr
faT
@@ -48813,7 +48882,7 @@ ncn
lXv
sFc
xlC
-faT
+aax
pFZ
sLr
faT
@@ -48995,7 +49064,7 @@ gyE
anA
uqU
xwd
-faT
+aax
pFZ
sLr
faT
@@ -49177,7 +49246,7 @@ gLw
hso
ijO
xlC
-pfU
+aay
xZj
sLr
faT
@@ -49352,14 +49421,14 @@ lTR
lTR
pFZ
vss
-vss
+aaz
gLw
sKF
aSt
gLw
pNk
aSt
-vss
+aaz
vss
sLr
faT
@@ -49723,7 +49792,7 @@ qCE
abu
tnD
hFM
-rEi
+aaB
sjb
vss
vss
@@ -49905,7 +49974,7 @@ gLw
oMg
mhf
eQm
-faT
+aax
pFZ
sLr
rEi
@@ -50269,7 +50338,7 @@ xQJ
uVR
saQ
hFM
-faT
+aax
pFZ
sLr
faT
@@ -50627,12 +50696,12 @@ qwQ
pFZ
sLr
qlS
-viu
-viu
-viu
+aaD
+aaD
+aaD
xUM
-viu
-viu
+aaD
+aaD
vOF
pFZ
sLr
@@ -52735,9 +52804,9 @@ eVy
bLn
wlW
eVy
-kfG
-eyt
-eyt
+lBn
+aar
+aar
uXS
vZv
kNa
@@ -52917,9 +52986,9 @@ wlW
gUX
eVy
eVy
-kfG
-eyt
-eyt
+lBn
+aar
+aar
uXS
uXS
uXS
@@ -53099,9 +53168,9 @@ wlW
cKb
eVy
wlW
-kfG
-xAx
-eyt
+lBn
+aat
+aar
uXS
vZv
kNa
@@ -53282,8 +53351,8 @@ gUX
eVy
eVy
vph
-qIF
-sgk
+aau
+jti
uXS
uXS
uXS
@@ -53463,9 +53532,9 @@ nkK
gUX
eVy
jsg
-qIF
-kbQ
-kbQ
+aau
+wlW
+wlW
uXS
dGR
kNa
@@ -53645,9 +53714,9 @@ lNy
gUX
eVy
eVy
-kfG
-nMJ
-uqW
+lBn
+aav
+aas
uXS
uXS
uXS
@@ -53827,9 +53896,9 @@ dLn
gUX
eVy
eVy
-kbQ
-kbQ
-eyt
+wlW
+wlW
+aar
uXS
pjk
qZr
@@ -54009,9 +54078,9 @@ sLl
gUX
eVy
eVy
-kbQ
-kbQ
-kbQ
+wlW
+wlW
+wlW
uXS
vZv
vZO
@@ -54191,9 +54260,9 @@ eVy
gUX
eVy
eVy
-kfG
-ofC
-kbQ
+lBn
+aaw
+wlW
uXS
uXS
uXS
@@ -62584,7 +62653,7 @@ dHD
avD
avD
avD
-snS
+aaq
snS
snS
snS
@@ -68225,7 +68294,7 @@ kkv
kkv
pGs
pGs
-pGs
+aap
fbZ
sVk
gTe
@@ -68407,12 +68476,12 @@ pGs
pGs
pGs
pGs
-pGs
-pGs
+aap
+aap
joO
jLU
hni
-pGs
+aap
pGs
pGs
pGs
@@ -68590,10 +68659,10 @@ pGs
pGs
pGs
pGs
-pGs
-pGs
-pGs
-pGs
+aap
+aap
+aap
+aap
pGs
pGs
pGs
diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
index e07d5503529e..7e18a14462d3 100644
--- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
+++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
@@ -97,6 +97,10 @@
},
/turf/open/floor/strata/floor3,
/area/strata/ug/interior/jungle/structures/research/old_tunnels)
+"aau" = (
+/obj/structure/machinery/power/apc/no_power/east,
+/turf/open/asphalt/cement/cement12,
+/area/strata/ag/exterior/paths/north_outpost)
"aav" = (
/obj/structure/largecrate/random/barrel/green,
/turf/open/auto_turf/snow/brown_base/layer3,
@@ -50559,7 +50563,7 @@ aac
aac
aac
bLj
-hJT
+aau
awA
ayw
awJ
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index ea932b246a08..3e2819642a5f 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -72,7 +72,7 @@
vector_y = -98
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_aft)
"aan" = (
/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
/turf/open/floor/almayer,
@@ -189,10 +189,29 @@
},
/turf/open/floor/almayer/red/north,
/area/almayer/shipboard/brig/processing)
+"aaB" = (
+/obj/structure/stairs{
+ dir = 1
+ },
+/obj/effect/projector{
+ name = "Almayer_Up4";
+ vector_x = -19;
+ vector_y = 104
+ },
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/structure/machinery/power/apc/almayer/east,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/lower/port_aft)
"aaC" = (
/obj/structure/lattice,
/turf/open/space/basic,
/area/space)
+"aaD" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/structure/machinery/power/apc/almayer/north,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/lower/port_fore)
"aaE" = (
/obj/structure/sign/safety/storage{
pixel_x = 8;
@@ -211,7 +230,15 @@
vector_y = 98
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/starboard_aft)
+"aaG" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/obj/structure/machinery/power/apc/almayer/north,
+/turf/open/floor/almayer/plate,
+/area/almayer/living/tankerbunks)
"aaH" = (
/obj/effect/step_trigger/teleporter_vector{
name = "Almayer_Down1";
@@ -219,7 +246,85 @@
vector_y = -98
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_aft)
+"aaI" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/lower/starboard_fore)
+"aaJ" = (
+/turf/closed/wall/almayer,
+/area/almayer/living/starboard_emb)
+"aaK" = (
+/obj/structure/toilet{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/starboard_emb)
+"aaL" = (
+/obj/structure/toilet{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/starboard_emb)
+"aaM" = (
+/obj/structure/sink{
+ dir = 1;
+ pixel_y = -10
+ },
+/obj/structure/pipes/vents/scrubber{
+ dir = 1
+ },
+/obj/structure/surface/rack{
+ density = 0;
+ pixel_x = 26
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/turf/open/floor/almayer/dark_sterile,
+/area/almayer/living/starboard_emb)
+"aaN" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "N";
+ pixel_y = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "S";
+ pixel_y = -1
+ },
+/turf/open/floor/almayer/dark_sterile,
+/area/almayer/living/starboard_emb)
+"aaO" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "NW-out";
+ pixel_y = 1
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "SW-out";
+ pixel_y = -1
+ },
+/turf/open/floor/almayer/dark_sterile,
+/area/almayer/living/starboard_emb)
"aaP" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/secdoor/glass/reinforced{
dir = 2;
@@ -235,10 +340,96 @@
},
/turf/open/floor/almayer/test_floor4,
/area/almayer/shipboard/brig/starboard_hallway)
+"aaQ" = (
+/obj/structure/toilet{
+ pixel_y = 16
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/starboard_emb)
+"aaR" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/starboard_emb)
+"aaS" = (
+/obj/structure/machinery/shower{
+ dir = 1
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/starboard_emb)
+"aaT" = (
+/obj/structure/stairs,
+/obj/effect/projector{
+ name = "Almayer_Up1";
+ vector_x = -19;
+ vector_y = 98
+ },
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/structure/machinery/power/apc/almayer/east,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/lower/starboard_aft)
+"aaU" = (
+/obj/structure/machinery/shower{
+ pixel_y = 16
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/starboard_emb)
+"aaV" = (
+/obj/structure/stairs{
+ icon_state = "ramptop"
+ },
+/obj/effect/projector{
+ name = "Almayer_Down4";
+ vector_x = 19;
+ vector_y = -104
+ },
+/obj/structure/machinery/power/apc/almayer/west,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/upper/port_aft)
+"aaW" = (
+/obj/effect/step_trigger/clone_cleaner,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/upper/port_fore)
+"aaX" = (
+/turf/open/floor/almayer/silver,
+/area/almayer/command/intel_bunks)
"aaY" = (
/obj/structure/lattice,
/turf/open/space,
/area/space)
+"aaZ" = (
+/obj/structure/barricade/handrail,
+/obj/structure/machinery/power/apc/almayer/east,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/maint/hull/upper/p_stern)
"aba" = (
/obj/structure/machinery/door/airlock/almayer/secure/reinforced{
dir = 2;
@@ -247,10 +438,41 @@
},
/turf/open/floor/almayer/test_floor4,
/area/almayer/powered)
+"abb" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/almayer/research/containment/floor2/north,
+/area/almayer/command/intel_bunks)
+"abc" = (
+/obj/structure/machinery/power/apc/almayer/east,
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/maint/hull/upper/s_stern)
+"abd" = (
+/obj/effect/step_trigger/clone_cleaner,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/upper/starboard_fore)
+"abe" = (
+/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/power/apc/almayer/north,
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/upper/starboard_fore)
"abf" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/north1)
+"abg" = (
+/obj/structure/stairs{
+ dir = 1;
+ icon_state = "ramptop"
+ },
+/obj/effect/projector{
+ name = "Almayer_Down1";
+ vector_x = 19;
+ vector_y = -98
+ },
+/turf/open/floor/plating/almayer/no_build,
+/area/almayer/stair_clone/upper/starboard_aft)
"abh" = (
/turf/closed/wall/almayer/outer,
/area/almayer/lifeboat_pumps/north2)
@@ -644,7 +866,7 @@
dir = 1
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_aft)
"adq" = (
/turf/closed/wall/almayer,
/area/almayer/lifeboat_pumps/north1)
@@ -830,7 +1052,7 @@
vector_y = 100
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/starboard_fore)
"aeM" = (
/obj/structure/machinery/light{
dir = 1
@@ -888,7 +1110,7 @@
vector_y = -104
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_aft)
"aeW" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage,
@@ -1352,7 +1574,7 @@
vector_y = -102
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_fore)
"aiQ" = (
/obj/structure/machinery/faxmachine{
sub_name = "Combat Correspondent";
@@ -1373,7 +1595,7 @@
vector_y = 100
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/starboard_fore)
"aiW" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -1719,7 +1941,7 @@
vector_y = -102
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_fore)
"alX" = (
/turf/open/floor/almayer,
/area/almayer/command/cic)
@@ -1828,7 +2050,7 @@
dir = 2
},
/turf/open/floor/plating,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"amX" = (
/turf/open/floor/almayer/red/north,
/area/almayer/shipboard/navigation)
@@ -1888,7 +2110,7 @@
vector_y = 104
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/port_aft)
"anp" = (
/obj/structure/flora/bush/ausbushes/var3/ppflowers,
/turf/open/gm/grass/grass1,
@@ -2057,7 +2279,7 @@
vector_y = -100
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/starboard_fore)
"aoA" = (
/obj/structure/machinery/light,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -2190,7 +2412,7 @@
vector_y = -98
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_aft)
"apo" = (
/obj/structure/disposalpipe/trunk,
/obj/structure/machinery/disposal,
@@ -2207,7 +2429,7 @@
vector_y = -100
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_fore)
"apt" = (
/obj/structure/machinery/power/apc/almayer/north,
/turf/open/floor/almayer/plate,
@@ -2454,7 +2676,7 @@
vector_y = 104
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/port_midship_hallway)
+/area/almayer/stair_clone/lower/port_aft)
"aqN" = (
/turf/open/floor/almayer/plate,
/area/almayer/command/cic)
@@ -2687,7 +2909,7 @@
vector_y = -100
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_fore)
"asn" = (
/obj/structure/window/framed/almayer/white,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -2766,7 +2988,7 @@
vector_y = -104
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_aft)
"asN" = (
/obj/structure/machinery/computer/crew,
/obj/structure/machinery/light,
@@ -3468,7 +3690,7 @@
pixel_y = 18
},
/turf/open/floor/almayer,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"axe" = (
/turf/open/floor/almayer/orangecorner/west,
/area/almayer/engineering/upper_engineering)
@@ -3923,7 +4145,7 @@
vector_y = 102
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/port_fore)
"azA" = (
/turf/open/floor/almayer/red,
/area/almayer/shipboard/navigation)
@@ -3943,7 +4165,7 @@
vector_y = 102
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/port_fore)
"azJ" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/door_control{
@@ -5085,7 +5307,7 @@
},
/obj/structure/machinery/door/firedoor/border_only/almayer,
/turf/open/floor/plating,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"aGA" = (
/obj/effect/decal/warning_stripes{
icon_state = "NE-out";
@@ -5245,8 +5467,9 @@
/turf/open/floor/almayer/plate,
/area/almayer/command/cic)
"aHM" = (
+/obj/structure/machinery/power/apc/almayer/south,
/turf/open/floor/almayer/silver,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"aHR" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -7014,7 +7237,7 @@
dir = 2
},
/turf/open/floor/almayer/test_floor4,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"aUe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7113,7 +7336,7 @@
/area/almayer/living/captain_mess)
"aUH" = (
/turf/closed/wall/almayer,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"aUL" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -7346,7 +7569,7 @@
pixel_y = -32
},
/turf/open/floor/almayer/silver,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"aWg" = (
/obj/structure/machinery/door_control{
id = "CMP Office Shutters";
@@ -7515,7 +7738,7 @@
pixel_y = 6
},
/turf/open/floor/almayer/cargo,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"aXA" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8;
@@ -7527,7 +7750,7 @@
pixel_x = -1
},
/turf/open/floor/almayer/silver/southwest,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"aXD" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/segment,
@@ -7648,7 +7871,7 @@
vector_y = -104
},
/turf/open/floor/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_aft)
"aZI" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/almayer/plate,
@@ -8190,7 +8413,7 @@
vector_y = 98
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/starboard_aft)
"bea" = (
/obj/structure/machinery/landinglight/ds1/delayone{
dir = 4
@@ -10211,7 +10434,7 @@
vector_y = 104
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/port_midship_hallway)
+/area/almayer/stair_clone/lower/port_aft)
"bvb" = (
/obj/structure/machinery/light{
dir = 8
@@ -12410,7 +12633,7 @@
dir = 4
},
/turf/open/floor/almayer/orange/northwest,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"bNi" = (
/obj/structure/surface/table/almayer,
/obj/item/paper,
@@ -14692,7 +14915,7 @@
pixel_y = 2
},
/turf/open/floor/almayer/silver/north,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"cke" = (
/obj/structure/machinery/vending/cola{
density = 0;
@@ -14727,7 +14950,7 @@
dir = 1
},
/turf/open/floor/almayer/silver/north,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"ckP" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/almayer/silver/east,
@@ -15136,7 +15359,7 @@
pixel_y = 13
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"cnR" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -17074,7 +17297,7 @@
pixel_y = -2
},
/turf/open/floor/plating,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"dbq" = (
/turf/open/floor/almayer/plating_striped/north,
/area/almayer/engineering/upper_engineering/port)
@@ -17108,7 +17331,7 @@
pixel_y = 7
},
/turf/open/floor/almayer/silver/north,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"dbw" = (
/obj/structure/machinery/suit_storage_unit/compression_suit/uscm,
/obj/structure/sign/safety/hazard{
@@ -17477,7 +17700,7 @@
dir = 8
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_fore)
"dkP" = (
/turf/open/floor/almayer/orangecorner/east,
/area/almayer/hallways/lower/starboard_midship_hallway)
@@ -17734,7 +17957,7 @@
"drk" = (
/obj/structure/closet,
/turf/open/floor/almayer/silver/north,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"dro" = (
/obj/structure/surface/table/almayer,
/obj/effect/spawner/random/powercell,
@@ -17984,7 +18207,7 @@
vector_y = -98
},
/turf/open/floor/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_aft)
"dxJ" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -18166,7 +18389,7 @@
},
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/port_midship_hallway)
+/area/almayer/stair_clone/lower/port_aft)
"dBi" = (
/obj/structure/platform/metal/almayer/north,
/obj/structure/platform/metal/almayer/east,
@@ -19765,7 +19988,7 @@
pixel_y = 13
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"ehX" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -20024,8 +20247,9 @@
"enK" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/structure/machinery/power/apc/almayer/south,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"enQ" = (
/obj/structure/surface/rack,
/obj/item/frame/table,
@@ -20147,7 +20371,7 @@
can_buckle = 0
},
/turf/open/floor/almayer/silver/northeast,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"eqD" = (
/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
dir = 9
@@ -21541,7 +21765,7 @@
pixel_y = 32
},
/turf/open/floor/almayer/sterile_green_side/north,
-/area/almayer/medical/lower_medical_medbay)
+/area/almayer/medical/cryo_tubes)
"eTC" = (
/obj/structure/machinery/cm_vending/sorted/medical/bolted,
/obj/structure/medical_supply_link,
@@ -23058,7 +23282,7 @@
vector_y = 104
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/port_midship_hallway)
+/area/almayer/stair_clone/lower/port_aft)
"fCi" = (
/obj/structure/surface/table/almayer,
/obj/item/organ/lungs/prosthetic,
@@ -23696,7 +23920,7 @@
pixel_y = 13
},
/turf/open/floor/almayer/orange/northwest,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"fPu" = (
/obj/structure/bed/chair{
dir = 1
@@ -24288,7 +24512,7 @@
vector_y = 104
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/port_midship_hallway)
+/area/almayer/stair_clone/lower/port_aft)
"gfd" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -24870,7 +25094,7 @@
icon_state = "W"
},
/turf/open/floor/almayer/dark_sterile,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"gsi" = (
/obj/structure/sign/safety/nonpress_0g{
pixel_x = 8;
@@ -24984,7 +25208,7 @@
vector_y = 102
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"guP" = (
/turf/open/floor/almayer/orangecorner/west,
/area/almayer/maint/upper/u_a_s)
@@ -25309,7 +25533,7 @@
/obj/structure/closet,
/obj/item/clothing/head/bearpelt,
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"gAS" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer/dark_sterile,
@@ -26081,7 +26305,7 @@
pixel_x = -1
},
/turf/open/floor/almayer/silver/west,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"gSk" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26545,7 +26769,7 @@
pixel_y = 3
},
/turf/open/floor/almayer/silver/southeast,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"hcw" = (
/obj/structure/surface/table/reinforced/black,
/obj/item/explosive/grenade/high_explosive/training,
@@ -26640,7 +26864,7 @@
name = "\improper Tool Closet"
},
/turf/open/floor/almayer/test_floor4,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"heO" = (
/obj/structure/largecrate/random/barrel/green,
/turf/open/floor/plating/plating_catwalk,
@@ -27562,7 +27786,7 @@
vector_y = 100
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"hxe" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -28603,7 +28827,7 @@
pixel_y = 12
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"hUU" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/box/bodybags{
@@ -28776,7 +29000,7 @@
vector_y = -104
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/upper/port)
+/area/almayer/stair_clone/upper/port_aft)
"hXY" = (
/turf/open/floor/almayer/blue/east,
/area/almayer/squads/delta)
@@ -29077,7 +29301,7 @@
pixel_y = 13
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"iey" = (
/obj/structure/surface/table/almayer,
/obj/item/roller,
@@ -29489,7 +29713,7 @@
uses = 1
},
/turf/open/floor/plating,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"ipk" = (
/obj/structure/stairs/perspective{
icon_state = "p_stair_full"
@@ -29614,7 +29838,7 @@
pixel_y = -6
},
/turf/open/floor/plating,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"irU" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -30136,7 +30360,7 @@
vector_y = 98
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/lower/starboard_midship_hallway)
+/area/almayer/stair_clone/lower/starboard_aft)
"iFA" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 1
@@ -30271,7 +30495,7 @@
health = 80
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"iIR" = (
/obj/structure/machinery/cm_vending/sorted/marine_food{
density = 0;
@@ -30357,7 +30581,7 @@
/area/almayer/lifeboat_pumps/south1)
"iKM" = (
/turf/open/floor/almayer/mono,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"iKZ" = (
/obj/structure/pipes/standard/simple/hidden/supply/no_boom{
dir = 4
@@ -31093,10 +31317,10 @@
/turf/open/floor/almayer/red/southeast,
/area/almayer/lifeboat_pumps/south2)
"iXW" = (
-/obj/structure/machinery/power/apc/almayer/east,
/obj/effect/decal/warning_stripes{
icon_state = "S"
},
+/obj/structure/machinery/power/apc/almayer/east,
/turf/open/floor/almayer/sterile_green,
/area/almayer/medical/lower_medical_lobby)
"iYe" = (
@@ -31354,7 +31578,7 @@
vector_y = -102
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/port_fore)
"jcE" = (
/obj/structure/machinery/vending/coffee{
density = 0;
@@ -31535,7 +31759,7 @@
health = 80
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"jgl" = (
/obj/structure/machinery/door/airlock/almayer/generic{
name = "Bathroom"
@@ -32072,7 +32296,7 @@
vector_y = -104
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/port)
+/area/almayer/stair_clone/upper/port_aft)
"jpp" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{
name = "\improper Medical Bay";
@@ -32211,7 +32435,7 @@
vector_y = 102
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"jsd" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out"
@@ -32309,7 +32533,7 @@
},
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"juS" = (
/obj/structure/machinery/gear{
id = "vehicle_elevator_gears"
@@ -32937,7 +33161,7 @@
pixel_x = -17
},
/turf/open/floor/almayer/cargo,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"jKK" = (
/obj/structure/surface/table/almayer,
/obj/item/facepaint/green,
@@ -33175,10 +33399,6 @@
/obj/effect/step_trigger/clone_cleaner,
/turf/open/floor/almayer/red/east,
/area/almayer/hallways/upper/starboard)
-"jOE" = (
-/obj/structure/machinery/power/apc/almayer/south,
-/turf/open/floor/almayer/orange,
-/area/almayer/engineering/lower)
"jOG" = (
/obj/structure/machinery/firealarm{
dir = 4;
@@ -33582,7 +33802,7 @@
pixel_y = 32
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"jYa" = (
/obj/structure/machinery/vending/hydroseeds,
/turf/open/floor/almayer/plate,
@@ -33743,7 +33963,7 @@
pixel_y = -14
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"kan" = (
/turf/closed/wall/almayer/white,
/area/almayer/medical/lower_medical_medbay)
@@ -33754,7 +33974,7 @@
vector_y = 100
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"kaB" = (
/obj/structure/machinery/cm_vending/gear/tl{
density = 0;
@@ -33818,7 +34038,7 @@
},
/obj/structure/machinery/light,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/port_fore)
"kbn" = (
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/grass/grass1,
@@ -34087,7 +34307,7 @@
dir = 1
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"kiy" = (
/obj/structure/machinery/light{
dir = 8
@@ -35218,7 +35438,7 @@
vector_y = -102
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/port_fore)
"kEE" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
@@ -36815,7 +37035,7 @@
vector_y = -100
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/starboard_fore)
"lne" = (
/obj/structure/bed/chair,
/turf/open/floor/almayer/orange,
@@ -37025,7 +37245,7 @@
dir = 4
},
/turf/open/floor/almayer/orange/southwest,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"lrq" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/shipboard/brig/armory)
@@ -37684,7 +37904,7 @@
vector_y = 98
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/starboard_midship_hallway)
+/area/almayer/stair_clone/lower/starboard_aft)
"lFA" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/pouch/tools/tank,
@@ -37778,7 +37998,7 @@
dir = 1
},
/turf/open/floor/almayer/mono,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"lIQ" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 10
@@ -38919,7 +39139,7 @@
"mkG" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer/silver,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"mkH" = (
/obj/structure/surface/rack{
density = 0;
@@ -39457,7 +39677,7 @@
},
/obj/structure/machinery/light,
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_aft)
"mxo" = (
/obj/docking_port/stationary/escape_pod/south,
/turf/open/floor/plating,
@@ -39866,7 +40086,7 @@
vector_y = 98
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/lower/starboard_midship_hallway)
+/area/almayer/stair_clone/lower/starboard_aft)
"mFN" = (
/obj/effect/step_trigger/ares_alert/mainframe,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -40278,7 +40498,7 @@
/obj/effect/landmark/start/intel,
/obj/effect/landmark/late_join/intel,
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"mMV" = (
/obj/structure/pipes/vents/scrubber,
/obj/item/device/radio/intercom{
@@ -40432,10 +40652,10 @@
vector_y = 102
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"mQC" = (
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"mQY" = (
/obj/structure/machinery/door/airlock/almayer/maint{
dir = 1
@@ -40758,7 +40978,7 @@
vector_y = -102
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/port_fore)
"mWQ" = (
/obj/structure/flora/pottedplant{
desc = "It is made of Fiberbush(tm). It contains asbestos.";
@@ -41668,7 +41888,7 @@
vector_y = -104
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_aft)
"nnL" = (
/obj/structure/toilet{
dir = 8
@@ -41950,7 +42170,7 @@
dir = 4
},
/turf/open/floor/almayer/test_floor4,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"ntI" = (
/obj/structure/machinery/light{
dir = 4
@@ -42562,7 +42782,7 @@
dir = 8
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"nGi" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -42984,7 +43204,7 @@
vector_y = 104
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/lower/port_midship_hallway)
+/area/almayer/stair_clone/lower/port_aft)
"nRE" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 9
@@ -43485,7 +43705,7 @@
/area/almayer/lifeboat_pumps/south1)
"obC" = (
/turf/open/floor/almayer/silver/east,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"obE" = (
/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep,
/obj/structure/machinery/light{
@@ -43918,7 +44138,7 @@
vector_y = -98
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/upper/starboard)
+/area/almayer/stair_clone/upper/starboard_aft)
"ojQ" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_17";
@@ -44434,8 +44654,9 @@
vector_x = 19;
vector_y = -98
},
+/obj/structure/machinery/power/apc/almayer/west,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/starboard)
+/area/almayer/stair_clone/upper/starboard_aft)
"oug" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -44610,7 +44831,7 @@
},
/obj/effect/landmark/late_join/intel,
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"oyG" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -44982,7 +45203,7 @@
dir = 4
},
/turf/open/floor/almayer/red/north,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"oFm" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer/orange/east,
@@ -45087,7 +45308,7 @@
dir = 4
},
/turf/open/floor/almayer/orange,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"oGW" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -45273,7 +45494,7 @@
dir = 8
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"oLr" = (
/obj/structure/surface/rack,
/obj/item/reagent_container/food/snacks/monkeycube/wrapped/farwacube{
@@ -45815,7 +46036,7 @@
vector_y = 102
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"oVo" = (
/turf/open/floor/almayer/plate,
/area/almayer/maint/upper/u_a_s)
@@ -45874,7 +46095,7 @@
vector_y = 98
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/starboard_midship_hallway)
+/area/almayer/stair_clone/lower/starboard_aft)
"oWF" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/effect/decal/warning_stripes{
@@ -46288,7 +46509,7 @@
vector_y = 104
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone)
+/area/almayer/stair_clone/lower/port_aft)
"pfD" = (
/obj/structure/machinery/cm_vending/sorted/marine_food,
/turf/open/floor/almayer,
@@ -46882,7 +47103,7 @@
vector_y = -98
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/starboard)
+/area/almayer/stair_clone/upper/starboard_aft)
"ptK" = (
/turf/closed/wall/almayer,
/area/almayer/engineering/upper_engineering/starboard)
@@ -46953,7 +47174,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"pvi" = (
/turf/open/floor/almayer/red/southeast,
/area/almayer/hallways/upper/aft_hallway)
@@ -47635,6 +47856,7 @@
/area/almayer/lifeboat_pumps/north2)
"pMp" = (
/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/power/apc/almayer/east,
/turf/open/floor/almayer/plate,
/area/almayer/medical/morgue)
"pMA" = (
@@ -47896,7 +48118,7 @@
name = "\improper Tool Closet"
},
/turf/open/floor/almayer/test_floor4,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"pRX" = (
/obj/structure/machinery/portable_atmospherics/hydroponics,
/turf/open/floor/almayer/test_floor5,
@@ -49117,8 +49339,9 @@
/area/almayer/command/airoom)
"qqa" = (
/obj/effect/step_trigger/clone_cleaner,
+/obj/structure/machinery/power/apc/almayer/south,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/port_fore)
"qqf" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer,
@@ -49287,7 +49510,7 @@
"qvC" = (
/obj/structure/machinery/power/apc/almayer/east,
/turf/open/floor/plating,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"qvE" = (
/obj/structure/machinery/light{
unacidable = 1;
@@ -49457,7 +49680,7 @@
dir = 4
},
/turf/open/floor/almayer/test_floor4,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"qxE" = (
/obj/structure/disposalpipe/segment,
/obj/structure/sign/safety/biolab{
@@ -50096,7 +50319,7 @@
pixel_y = 10
},
/turf/open/floor/almayer/orange,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"qJZ" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -50218,7 +50441,7 @@
pixel_y = 6
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"qLS" = (
/obj/structure/pipes/standard/manifold/hidden/supply/no_boom,
/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3,
@@ -50514,7 +50737,7 @@
dir = 8
},
/turf/open/floor/plating,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"qSX" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out";
@@ -50748,7 +50971,7 @@
vector_y = -104
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/upper/port)
+/area/almayer/stair_clone/upper/port_aft)
"qYd" = (
/turf/open/floor/almayer/red/southeast,
/area/almayer/lifeboat_pumps/south2)
@@ -50768,7 +50991,7 @@
dir = 8
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_fore)
"qYu" = (
/obj/structure/pipes/vents/pump/no_boom,
/turf/open/floor/almayer/plate,
@@ -51917,7 +52140,7 @@
pixel_y = -1
},
/turf/open/floor/almayer/dark_sterile,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"rux" = (
/obj/structure/surface/table/almayer,
/obj/item/paper_bin/uscm,
@@ -52821,7 +53044,7 @@
icon_state = "W"
},
/turf/open/floor/almayer/dark_sterile,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"rNd" = (
/obj/effect/landmark/start/marine/engineer/delta,
/obj/effect/landmark/late_join/delta,
@@ -53429,7 +53652,7 @@
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"saL" = (
/obj/structure/machinery/door/airlock/almayer/generic/corporate{
name = "Corporate Liaison's Closet"
@@ -54278,7 +54501,7 @@
},
/obj/structure/machinery/light,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"srT" = (
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 8
@@ -54345,7 +54568,7 @@
health = null
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/port_fore)
"stu" = (
/obj/structure/machinery/sentry_holder/almayer,
/turf/open/floor/almayer/mono,
@@ -54414,7 +54637,7 @@
},
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/starboard_midship_hallway)
+/area/almayer/stair_clone/lower/starboard_aft)
"svf" = (
/obj/structure/machinery/light{
dir = 1
@@ -55030,7 +55253,7 @@
pixel_x = -1
},
/turf/open/floor/almayer/silver/northwest,
-/area/almayer/engineering/port_atmos)
+/area/almayer/command/intel_bunks)
"sII" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -55093,7 +55316,7 @@
dir = 4
},
/turf/open/floor/almayer/orange/north,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"sKa" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 8;
@@ -55362,7 +55585,7 @@
vector_y = -100
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/starboard_fore)
"sSa" = (
/obj/structure/machinery/door/airlock/almayer/marine/requisitions{
dir = 2;
@@ -55550,7 +55773,7 @@
vector_y = -100
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/upper/fore_hallway)
+/area/almayer/stair_clone/upper/starboard_fore)
"sWp" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -55721,7 +55944,7 @@
dir = 1
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"sZy" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -55847,7 +56070,7 @@
vector_y = -98
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/upper/starboard)
+/area/almayer/stair_clone/upper/starboard_aft)
"tcd" = (
/obj/structure/surface/table/almayer,
/obj/item/device/radio{
@@ -57008,7 +57231,7 @@
icon_state = "pipe-c"
},
/turf/open/floor/almayer,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"txf" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -57512,7 +57735,7 @@
dir = 4
},
/turf/open/floor/almayer/test_floor4,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"tIu" = (
/obj/structure/bed/chair/office/dark{
dir = 8
@@ -57997,7 +58220,7 @@
pixel_y = 8
},
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"tVh" = (
/obj/structure/bed/chair/comfy{
dir = 8
@@ -60125,7 +60348,7 @@
pixel_y = 12
},
/turf/open/floor/plating,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"uRR" = (
/obj/structure/machinery/door/airlock/almayer/security/glass{
name = "Brig"
@@ -60414,7 +60637,7 @@
vector_y = 104
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/lower/port_midship_hallway)
+/area/almayer/stair_clone/lower/port_aft)
"uWV" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -60552,7 +60775,7 @@
vector_y = 100
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"uZo" = (
/obj/structure/bed/stool,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -61279,7 +61502,7 @@
},
/obj/item/toy/plush/barricade,
/turf/open/floor/almayer/plate,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"vlX" = (
/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep,
/turf/open/floor/almayer/plate,
@@ -61872,7 +62095,7 @@
icon_state = "W"
},
/turf/open/floor/almayer/dark_sterile,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"vwj" = (
/obj/structure/machinery/power/apc/almayer/south,
/turf/open/floor/almayer/plate,
@@ -62441,7 +62664,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/almayer,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"vHn" = (
/turf/closed/wall/almayer/outer,
/area/almayer/maint/hull/upper/u_m_s)
@@ -62481,7 +62704,7 @@
pixel_y = 1
},
/turf/open/floor/almayer/dark_sterile,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"vHt" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/door_control{
@@ -62986,7 +63209,7 @@
health = null
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/stair_clone/upper)
+/area/almayer/stair_clone/upper/starboard_fore)
"vQf" = (
/turf/open/floor/almayer/silvercorner/north,
/area/almayer/command/securestorage)
@@ -64437,7 +64660,7 @@
pixel_y = -32
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"wrT" = (
/obj/structure/surface/table/almayer,
/obj/item/device/radio/marine,
@@ -65609,7 +65832,7 @@
pixel_y = -3
},
/turf/open/floor/almayer/orange/southwest,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"wNt" = (
/turf/open/floor/almayer/redcorner/north,
/area/almayer/shipboard/brig/processing)
@@ -65621,7 +65844,7 @@
vector_y = 98
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/starboard_midship_hallway)
+/area/almayer/stair_clone/lower/starboard_aft)
"wNC" = (
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 2
@@ -65635,7 +65858,7 @@
vector_y = 100
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/lower/starboard_fore_hallway)
+/area/almayer/stair_clone/lower/starboard_fore)
"wNS" = (
/obj/effect/decal/warning_stripes{
icon_state = "S"
@@ -65701,7 +65924,7 @@
vector_y = 102
},
/turf/open/floor/almayer/no_build/plate,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"wQA" = (
/obj/structure/pipes/standard/simple/visible{
dir = 5
@@ -66008,7 +66231,7 @@
vector_y = 98
},
/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hallways/lower/starboard_midship_hallway)
+/area/almayer/stair_clone/lower/starboard_aft)
"wWz" = (
/turf/closed/wall/almayer/research/containment/wall/north,
/area/almayer/medical/containment/cell)
@@ -67250,7 +67473,7 @@
pixel_y = 13
},
/turf/open/floor/plating,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"xxB" = (
/obj/structure/machinery/fuelpump,
/turf/open/floor/almayer,
@@ -67554,7 +67777,7 @@
vector_y = -104
},
/turf/open/floor/almayer/no_build,
-/area/almayer/hallways/upper/port)
+/area/almayer/stair_clone/upper/port_aft)
"xDn" = (
/turf/open/floor/almayer/silver/north,
/area/almayer/shipboard/brig/cic_hallway)
@@ -68337,7 +68560,7 @@
pixel_y = 13
},
/turf/open/floor/almayer/orange/north,
-/area/almayer/living/port_emb)
+/area/almayer/living/starboard_emb)
"xUa" = (
/obj/structure/machinery/light{
dir = 4
@@ -68548,10 +68771,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/starboard_point_defense)
-"xYE" = (
-/obj/structure/machinery/power/apc/almayer/east,
-/turf/open/floor/plating,
-/area/almayer/maint/lower/constr)
"xYP" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/cryo_cells)
@@ -68805,7 +69024,7 @@
vector_y = 102
},
/turf/open/floor/plating/almayer/no_build,
-/area/almayer/hallways/lower/port_fore_hallway)
+/area/almayer/stair_clone/lower/port_fore)
"ydE" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -83329,7 +83548,7 @@ sje
sje
jhS
bSv
-aIX
+aaG
aIX
bSv
xcI
@@ -89626,7 +89845,7 @@ bcm
jNG
tTC
vMb
-xYE
+tTC
iuI
lDA
hOV
@@ -98419,9 +98638,9 @@ gLl
gLl
gLl
gxm
-qqa
-qqa
-qqa
+abe
+abd
+abd
gxm
gxm
gxm
@@ -98457,8 +98676,8 @@ gxm
gxm
gxm
gxm
-qqa
-qqa
+aaW
+aaW
qqa
gxm
vIo
@@ -98727,7 +98946,7 @@ wDr
wDr
wDr
jXR
-enK
+aaI
enK
wDr
kgt
@@ -98758,7 +98977,7 @@ knm
sPY
qPU
wDr
-sai
+aaD
sai
wrN
wDr
@@ -103580,15 +103799,15 @@ bdH
kyw
deq
lfx
-nsY
-nsY
+aaJ
+aaJ
pRT
-nsY
-nsY
-nsY
-nsY
-nsY
-nsY
+aaJ
+aaJ
+aaJ
+aaJ
+aaJ
+aaJ
bwG
bwG
msC
@@ -103783,15 +104002,15 @@ aaa
kyw
lfx
deq
-nsY
-xWT
-kxd
+aaJ
+aaU
+aaN
jgk
-nsY
-rSG
+aaJ
+aaQ
rur
-oqS
-nsY
+aaK
+aaJ
hsh
cPP
deq
@@ -103986,15 +104205,15 @@ aaa
kyw
lfx
deq
-nsY
-xWT
-kxd
-viu
-nsY
+aaJ
+aaU
+aaN
+aaS
+aaJ
iIP
-kxd
-dDt
-nsY
+aaN
+aaL
+aaJ
exb
deq
deq
@@ -104189,15 +104408,15 @@ aaa
kyw
lfx
deq
-nsY
+aaJ
gsg
vHq
vvY
-nsY
+aaJ
rNb
-bxC
-jiU
-nsY
+aaO
+aaM
+aaJ
jvt
hiu
deq
@@ -104392,15 +104611,15 @@ aaf
kyw
lfx
deq
-nsY
-nsY
+aaJ
+aaJ
qxC
-nsY
-nsY
-nsY
+aaJ
+aaJ
+aaJ
ntx
-nsY
-nsY
+aaJ
+aaJ
qWL
kIk
eXD
@@ -104595,7 +104814,7 @@ kyw
kyw
deq
caq
-nsY
+aaJ
tUS
bNh
wNl
@@ -104603,7 +104822,7 @@ nGh
fPp
lqN
vlO
-nsY
+aaJ
xxG
smA
ktR
@@ -104798,7 +105017,7 @@ veq
deq
deq
lfx
-nsY
+aaJ
kio
sJY
qJY
@@ -104806,7 +105025,7 @@ qLH
xTW
oGP
cnM
-nsY
+aaJ
kqB
txH
txH
@@ -105009,7 +105228,7 @@ twW
vHh
pvh
sZs
-nsY
+aaJ
bwG
erL
scX
@@ -105137,7 +105356,7 @@ uwZ
wWm
jQt
nwi
-sNz
+abb
uyH
uwZ
kGQ
@@ -105204,15 +105423,15 @@ lfx
vvH
bwG
bwG
-nsY
+aaJ
gAP
oEX
irT
-tyb
+aaR
xxm
qSK
ieu
-nsY
+aaJ
mZc
lfx
neH
@@ -105305,12 +105524,12 @@ gxm
ojH
ojH
taV
-ouf
-ouf
-ouf
-ouf
-ouf
-ouf
+abg
+abg
+abg
+abg
+abg
+abg
ouf
aLc
wBI
@@ -105371,7 +105590,7 @@ nIN
vmJ
elv
vRR
-qXS
+aaV
qXS
qXS
qXS
@@ -105407,15 +105626,15 @@ deq
deq
qCH
cXm
-nsY
+aaJ
hUz
dbn
qvC
-tyb
+aaR
uRM
ipe
ehR
-nsY
+aaJ
xEe
lfx
tdH
@@ -105508,13 +105727,13 @@ gxm
ojH
ojH
taV
-ouf
-ouf
-ouf
-ouf
-ouf
-ouf
-ouf
+abg
+abg
+abg
+abg
+abg
+abg
+abg
sdf
cRL
hGG
@@ -105610,15 +105829,15 @@ lfx
yih
qCH
spT
-nsY
-nsY
-nsY
-nsY
+aaJ
+aaJ
+aaJ
+aaJ
tIp
-nsY
-nsY
-nsY
-nsY
+aaJ
+aaJ
+aaJ
+aaJ
bwG
bwG
bwG
@@ -105711,13 +105930,13 @@ gxm
ojH
ojH
taV
-ouf
-ouf
-ouf
+abg
+abg
+abg
ptA
-ouf
-ouf
-ouf
+abg
+abg
+abg
fTj
jOD
oOw
@@ -108860,7 +109079,7 @@ wNz
wNz
wNz
wNz
-suU
+aaT
bwP
bwP
bwP
@@ -108926,7 +109145,7 @@ bSJ
fqA
fqA
fqA
-dBg
+aaB
aqL
aqL
aqL
@@ -109009,7 +109228,7 @@ xIj
amM
ckd
mQC
-aHM
+aaX
aZv
xzh
xzh
@@ -118832,7 +119051,7 @@ sqg
oBr
qGC
oBr
-fcS
+sKf
gdJ
oyR
oJk
@@ -119035,7 +119254,7 @@ lKM
sqg
nSq
oBr
-sKf
+fcS
gdJ
cjt
pRZ
@@ -119051,7 +119270,7 @@ ish
pRZ
fcS
nAY
-jOE
+cjt
ljv
mPc
sqg
@@ -120756,7 +120975,7 @@ fLl
fLl
fLl
rht
-aqZ
+abc
aqZ
aqZ
aqZ
@@ -120782,7 +121001,7 @@ ksw
ksw
rHB
ksw
-vJR
+aaZ
rPq
eZm
eZm
diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
index 870364c7c31e..3436638d0855 100644
--- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
+++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm
@@ -3956,10 +3956,6 @@
"qY" = (
/turf/open/gm/grass/grassbeach/west,
/area/whiskey_outpost/outside/lane/one_south)
-"ra" = (
-/obj/structure/machinery/power/apc/almayer/east,
-/turf/closed/wall/r_wall,
-/area/whiskey_outpost/inside/bunker)
"rb" = (
/obj/structure/sign/prop1,
/turf/closed/wall/r_wall,
@@ -9191,10 +9187,6 @@
/obj/structure/platform_decoration/metal/almayer/east,
/turf/open/jungle,
/area/whiskey_outpost/outside/south)
-"RU" = (
-/obj/structure/machinery/cm_vending/clothing/medic,
-/turf/open/floor/asteroidfloor/north,
-/area)
"RV" = (
/obj/item/storage/box/m94,
/turf/open/shuttle/dropship/light_grey_left_to_right,
@@ -20557,7 +20549,7 @@ JT
CC
qz
CE
-RU
+CE
kA
lB
lO
@@ -26029,7 +26021,7 @@ vc
fj
xa
xJ
-ra
+aj
aj
fj
fj
diff --git a/sound/voice/alien_echoroar_1.ogg b/sound/voice/alien_echoroar_1.ogg
new file mode 100644
index 000000000000..e46ac612b6e9
Binary files /dev/null and b/sound/voice/alien_echoroar_1.ogg differ
diff --git a/sound/voice/alien_echoroar_2.ogg b/sound/voice/alien_echoroar_2.ogg
new file mode 100644
index 000000000000..dd4ec770d0a1
Binary files /dev/null and b/sound/voice/alien_echoroar_2.ogg differ
diff --git a/sound/voice/alien_echoroar_3.ogg b/sound/voice/alien_echoroar_3.ogg
new file mode 100644
index 000000000000..506ed83a9442
Binary files /dev/null and b/sound/voice/alien_echoroar_3.ogg differ
diff --git a/tgui/packages/tgui-panel/chat/middleware.js b/tgui/packages/tgui-panel/chat/middleware.js
index 9d43c45aef7b..34b3b0909d94 100644
--- a/tgui/packages/tgui-panel/chat/middleware.js
+++ b/tgui/packages/tgui-panel/chat/middleware.js
@@ -82,6 +82,8 @@ const loadChatFromStorage = async (store) => {
export const chatMiddleware = (store) => {
let initialized = false;
let loaded = false;
+ const sequences = [];
+ const sequences_requested = [];
chatRenderer.events.on('batchProcessed', (countByType) => {
// Use this flag to workaround unread messages caused by
// loading them from storage. Side effect of that, is that
@@ -103,9 +105,40 @@ export const chatMiddleware = (store) => {
loadChatFromStorage(store);
}
if (type === 'chat/message') {
- // Normalize the payload
- const batch = Array.isArray(payload) ? payload : [payload];
- chatRenderer.processBatch(batch);
+ let payload_obj;
+ try {
+ payload_obj = JSON.parse(payload);
+ } catch {
+ return;
+ }
+ const sequence = payload_obj.sequence;
+ if (sequences.includes(sequence)) {
+ return;
+ }
+ const sequence_count = sequences.length;
+ seq_check: if (sequence_count > 0) {
+ if (sequences_requested.includes(sequence)) {
+ sequences_requested.splice(sequences_requested.indexOf(sequence), 1);
+ // if we are receiving a message we requested, we can stop reliability checks
+ break seq_check;
+ }
+
+ // cannot do reliability if we don't have any messages
+ const expected_sequence = sequences[sequence_count - 1] + 1;
+ if (sequence !== expected_sequence) {
+ for (
+ let requesting = expected_sequence;
+ requesting < sequence;
+ requesting++
+ ) {
+ sequences_requested.push(requesting);
+ Byond.sendMessage('chat/resend', requesting);
+ }
+ }
+ }
+
+ sequences.push(sequence);
+ chatRenderer.processBatch([payload_obj.content]);
return;
}
if (type === loadChat.type) {
diff --git a/tgui/packages/tgui/backend.ts b/tgui/packages/tgui/backend.ts
index 9190d74dbe23..04f4ead718ef 100644
--- a/tgui/packages/tgui/backend.ts
+++ b/tgui/packages/tgui/backend.ts
@@ -204,7 +204,7 @@ export const backendMiddleware = (store) => {
// Signal renderer that we have resumed
resumeRenderer();
// Setup drag
- setupDrag();
+ setupDrag(payload.config?.window?.fancy);
// We schedule this for the next tick here because resizing and unhiding
// during the same tick will flash with a white background.
setTimeout(() => {
diff --git a/tgui/packages/tgui/drag.ts b/tgui/packages/tgui/drag.ts
index 0884b1b0bd78..963134a9b192 100644
--- a/tgui/packages/tgui/drag.ts
+++ b/tgui/packages/tgui/drag.ts
@@ -164,7 +164,12 @@ export const recallWindowGeometry = async (
};
// Setup draggable window
-export const setupDrag = async () => {
+export const setupDrag = async (fancy: boolean) => {
+ if (fancy) {
+ screenOffset = [0, 0];
+ return;
+ }
+
// Calculate screen offset caused by the windows taskbar
let windowPosition = getWindowPosition();
diff --git a/tgui/packages/tgui/interfaces/SecurityRecords.jsx b/tgui/packages/tgui/interfaces/SecurityRecords.jsx
new file mode 100644
index 000000000000..6ea6875382c4
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/SecurityRecords.jsx
@@ -0,0 +1,690 @@
+import { useCallback, useEffect, useState } from 'react';
+
+import { useBackend } from '../backend';
+import {
+ Box,
+ Button,
+ Divider,
+ Dropdown,
+ Flex,
+ Input,
+ Modal,
+ Section,
+ Table,
+} from '../components';
+import { Window } from '../layouts';
+
+export const SecurityRecords = () => {
+ const { data, act } = useBackend();
+ const { records = [], scanner = {}, fallback_image } = data;
+ const [recordsArray, setRecordsArray] = useState(
+ Array.isArray(records) ? records : [],
+ );
+ const [selectedRecord, setSelectedRecord] = useState(null);
+ const [editField, setEditField] = useState(null); // Field being edited
+ const [editValue, setEditValue] = useState(''); // Value for input
+ const [commentModalOpen, setCommentModalOpen] = useState(false);
+ const [newComment, setNewComment] = useState('');
+ const [viewFingerprintScanner, setViewFingerprintScanner] = useState(false); // Track fingerprint scanner view
+ const [sortConfig, setSortConfig] = useState({ key: null, direction: 'asc' });
+ const [filterText, setFilterText] = useState('');
+ const [currentPhoto, setCurrentPhoto] = useState('front'); // State to track the current photo (front or side)
+ const [recordPhotos, setRecordPhotos] = useState({
+ front: null,
+ side: null,
+ });
+
+ useEffect(() => {
+ if (Array.isArray(records)) {
+ setRecordsArray(records);
+ }
+ }, [records]);
+
+ useEffect(() => {
+ if (selectedRecord) {
+ const updatedRecord = recordsArray.find(
+ (record) => record.id === selectedRecord.id,
+ );
+ if (updatedRecord) {
+ setSelectedRecord(updatedRecord);
+ } else {
+ goBack();
+ }
+ }
+
+ if (data.photo_front || data.photo_side) {
+ setRecordPhotos({
+ front: data.photo_front || fallback_image,
+ side: data.photo_side || fallback_image,
+ });
+ }
+ }, [recordsArray, selectedRecord]);
+
+ const handleSave = (value) => {
+ act('update_field', { id: selectedRecord.id, field: editField, value });
+ closeEditModal();
+ };
+
+ const handleAddComment = () => {
+ if (newComment.trim()) {
+ act('add_comment', { id: selectedRecord.id, comment: newComment });
+
+ setNewComment('');
+ closeCommentModal();
+ }
+ };
+
+ const changePhoto = () => {
+ setCurrentPhoto((prevPhoto) => (prevPhoto === 'front' ? 'side' : 'front'));
+ };
+
+ const handleUpdatePhoto = () => {
+ act('update_photo', { id: selectedRecord.id, photo_profile: currentPhoto });
+ };
+
+ const handleSort = (key) => {
+ const direction =
+ sortConfig.key === key && sortConfig.direction === 'asc' ? 'desc' : 'asc';
+ setSortConfig({ key, direction });
+
+ const sortedRecords = [...recordsArray].sort((a, b) => {
+ if (a[key] < b[key]) return direction === 'asc' ? -1 : 1;
+ if (a[key] > b[key]) return direction === 'asc' ? 1 : -1;
+ return 0;
+ });
+
+ setRecordsArray(sortedRecords);
+ };
+
+ const filteredRecords = recordsArray.filter((record) =>
+ Object.values(record).some((value) =>
+ String(value).toLowerCase().includes(filterText.toLowerCase()),
+ ),
+ );
+
+ //* Functions for handling modals state
+
+ const openEditModal = (field, value) => {
+ setEditField(field);
+ setEditValue(value);
+ };
+
+ const closeEditModal = () => {
+ setEditField(null);
+ setEditValue('');
+ };
+
+ const openCommentModal = () => {
+ setCommentModalOpen(true);
+ };
+
+ const closeCommentModal = () => {
+ setCommentModalOpen(false);
+ setNewComment('');
+ };
+
+ const personalDataFields = [
+ {
+ label: 'Name:',
+ contentKey: 'general_name',
+ isEditable: true,
+ type: 'text',
+ },
+ { label: 'ID:', contentKey: 'id', isEditable: false },
+ {
+ label: 'Rank:',
+ contentKey: 'general_rank',
+ isEditable: true,
+ type: 'text',
+ },
+ {
+ label: 'Sex:',
+ contentKey: 'general_sex',
+ isEditable: true,
+ type: 'select',
+ options: ['Male', 'Female'],
+ },
+ {
+ label: 'Age:',
+ contentKey: 'general_age',
+ isEditable: true,
+ type: 'number',
+ },
+ ];
+
+ const medicalDataFields = [
+ {
+ label: 'Physical Status:',
+ contentKey: 'general_p_stat',
+ isEditable: false,
+ },
+ {
+ label: 'Mental Status:',
+ contentKey: 'general_m_stat',
+ isEditable: false,
+ },
+ ];
+
+ const criminalStatuses = {
+ '*Arrest*': { background: '#990c28', font: '#ffffff' },
+ Incarcerated: { background: '#faa20a', font: '#ffffff' },
+ Released: { background: '#2981b3', font: '#ffffff' },
+ Suspect: { background: '#686A6C', font: '#ffffff' },
+ NJP: { background: '#b60afa', font: '#ffffff' },
+ None: { background: 'inherit', font: 'inherit' },
+ };
+
+ const securityDataFields = [
+ {
+ label: 'Criminal Status:',
+ contentKey: 'security_criminal',
+ isEditable: true,
+ type: 'select',
+ options: Object.keys(criminalStatuses),
+ },
+ ];
+
+ // Function to get styles based on status
+ const getStyle = (status) =>
+ criminalStatuses[status] || { background: 'inherit', font: 'inherit' };
+
+ const selectRecord = useCallback(
+ (record) => {
+ act('select_record', { id: record.id });
+ setSelectedRecord(record);
+ },
+ [act],
+ );
+
+ const goBack = useCallback(() => {
+ setSelectedRecord(null);
+ }, []);
+
+ const renderField = (field, record) => {
+ return (
+
+
+ {field.label}
+
+ {field.isEditable ? (
+
+ openEditModal(field.contentKey, record[field.contentKey])
+ }
+ >
+ {record[field.contentKey]}
+
+ ) : (
+ {record[field.contentKey]}
+ )}
+
+ );
+ };
+
+ const renderFingerprintScannerSection = () =>
+ scanner.connected ? (
+
+
+ setViewFingerprintScanner(true)} color="blue">
+ Open Fingerprint Scanner
+
+
+ Found {scanner.count} fingerprint{scanner.count > 1 ? 's' : ''}
+
+
+
+ ) : null;
+
+ const renderFingerprintScannerView = () => (
+
+ {scanner.count > 0 ? (
+ <>
+
+ Fingerprints: {scanner.count}
+
+
+
+
+ Name
+
+
+ Rank
+
+
+ Squad
+
+
+ Description
+
+
+ {scanner.data.map((fingerprint, index) => (
+
+
+ {fingerprint.name || 'Unknown'}
+
+
+ {fingerprint.rank || 'Unknown'}
+
+
+ {fingerprint.squad || 'Unknown'}
+
+
+ {fingerprint.description || 'No Description'}
+
+
+ ))}
+
+ >
+ ) : (
+ No fingerprints available.
+ )}
+
+ {
+ act('print_fingerprint_report');
+ }}
+ color="green"
+ >
+ Print Fingerprint Report
+
+ {
+ act('clear_fingerprints');
+ }}
+ color="red"
+ >
+ Clear Fingerprints
+
+ {
+ act('eject_fingerprint_scanner');
+ setViewFingerprintScanner(false);
+ }}
+ color="blue"
+ >
+ Eject Scanner
+
+
+
+ setViewFingerprintScanner(false)}>Back
+
+ );
+
+ const renderRecordDetails = (record) => (
+
+
+
+
+
+
+ Personal Data
+
+ {personalDataFields.map((field) => renderField(field, record))}
+
+
+
+
+
+
+
+
+
+ Update
+
+
+ {currentPhoto === 'front' ? 'Side' : 'Front'}
+
+
+
+
+
+
+
+
+
+ Medical Data
+
+ {medicalDataFields.map((field) => renderField(field, record))}
+
+
+
+ Security Data
+
+ {!record.security_criminal ? (
+
+
+ Security record not found
+
+
+ act('new_security_record', {
+ id: record.id,
+ name: record.general_name,
+ })
+ }
+ color="green"
+ >
+ Create security record
+
+
+ ) : (
+ <>
+ {securityDataFields.map((field) => renderField(field, record))}
+
+ Incidents:
+
+
+
+
+ Comments Log
+
+
+ {record.security_comments &&
+ Object.keys(record.security_comments).length > 0
+ ? Object.entries(record.security_comments).map(
+ ([key, comment]) => (
+
+ {comment.deleted_by ? (
+
+ Comment deleted by {comment.deleted_by} at{' '}
+ {comment.deleted_at || 'unknown time'}.
+
+ ) : (
+ <>
+ {comment.entry}
+
+ Created at: {comment.created_at} /{' '}
+ {comment?.created_by?.name} (
+ {comment?.created_by?.rank}){' '}
+
+ {
+ act('delete_comment', {
+ id: selectedRecord.id,
+ key,
+ });
+ }}
+ mt={1}
+ >
+ Delete
+
+ >
+ )}
+
+ ),
+ )
+ : 'No comments available.'}
+
+
+ setCommentModalOpen(true)}>
+ Add Comment
+
+
+ >
+ )}
+
+
+
+ act('print_personal_record', { id: record.id })}
+ color="blue"
+ >
+ Print record
+
+ act('delete_general_record', { id: record.id })}
+ >
+ Delete general record
+
+
+
+
+ Back
+
+
+ );
+
+ const renderRecordsTable = () => (
+
+ );
+
+ const renderEditModal = () => {
+ const currentField = [...personalDataFields, ...securityDataFields].find(
+ (field) => field.contentKey === editField,
+ );
+
+ const handleKeyDown = (e) => {
+ if (e.key === 'Enter') {
+ handleSave(editValue);
+ }
+ };
+
+ return (
+
+
+
+ );
+ };
+
+ const renderCommentModal = () => (
+
+
+
+ );
+
+ return (
+
+
+ {viewFingerprintScanner ? (
+ renderFingerprintScannerView()
+ ) : selectedRecord ? (
+ renderRecordDetails(selectedRecord)
+ ) : (
+ <>
+ {renderFingerprintScannerSection()}
+ {renderRecordsTable()}
+ >
+ )}
+ {editField && renderEditModal()}
+ {commentModalOpen && renderCommentModal()}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/styles/components/Button.scss b/tgui/packages/tgui/styles/components/Button.scss
index 4e3dd63130d3..5876549f1743 100644
--- a/tgui/packages/tgui/styles/components/Button.scss
+++ b/tgui/packages/tgui/styles/components/Button.scss
@@ -53,6 +53,9 @@ $bg-map: colors.$bg-map !default;
user-select: none;
-ms-user-select: none;
+ // After All, Why Not?
+ cursor: pointer;
+
.fa,
.fas,
.far {
diff --git a/tgui/packages/tgui/styles/interfaces/SecurityRecords.scss b/tgui/packages/tgui/styles/interfaces/SecurityRecords.scss
new file mode 100644
index 000000000000..fc5a56450e3e
--- /dev/null
+++ b/tgui/packages/tgui/styles/interfaces/SecurityRecords.scss
@@ -0,0 +1,27 @@
+@use '../base.scss';
+
+.SecurityRecords_CellStyle {
+ padding-top: 4px;
+ padding-bottom: 3px;
+ text-align: center;
+}
+
+.SecurityRecords_BoxStyle {
+ padding-top: 5px;
+ padding-bottom: 5px;
+}
+
+.SecurityRecords_SectionHeaderStyle {
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+
+.SecurityRecords_GrayItalicStyle {
+ font-size: 0.9rem;
+ color: gray;
+ font-style: italic;
+}
+
+.SecurityRecords_CursorPointer {
+ cursor: pointer;
+}
diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss
index 39a260ce223c..9e137519446f 100644
--- a/tgui/packages/tgui/styles/main.scss
+++ b/tgui/packages/tgui/styles/main.scss
@@ -77,6 +77,7 @@
@include meta.load-css('./interfaces/ResearchTerminal.scss');
@include meta.load-css('./interfaces/Roulette.scss');
@include meta.load-css('./interfaces/Safe.scss');
+@include meta.load-css('./interfaces/SecurityRecords.scss');
@include meta.load-css('./interfaces/SentryUi.scss');
@include meta.load-css('./interfaces/SidePanel.scss');
@include meta.load-css('./interfaces/SmartFridge.scss');