diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
index c888c78180..b6f4a0bf02 100644
--- a/code/__DEFINES/__game.dm
+++ b/code/__DEFINES/__game.dm
@@ -104,7 +104,7 @@ block( \
#define SOUND_MIDI (1<<1)
#define SOUND_AMBIENCE (1<<2)
#define SOUND_LOBBY (1<<3)
-#define SOUND_INTERNET (1<<4)
+#define SOUND_INTERNET (1<<4) // Unused currently. Kept for default prefs compat only
#define SOUND_REBOOT (1<<5)
#define SOUND_ADMIN_MEME (1<<6)
#define SOUND_ADMIN_ATMOSPHERIC (1<<7)
diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm
index 38e5693dcb..deee80c7a9 100644
--- a/code/__DEFINES/hud.dm
+++ b/code/__DEFINES/hud.dm
@@ -23,3 +23,5 @@
#define NOTIFY_ATTACK "attack"
#define NOTIFY_ORBIT "orbit"
#define NOTIFY_JOIN_XENO "join_xeno"
+#define NOTIFY_XENO_TACMAP "xeno_tacmap"
+#define NOTIFY_USCM_TACMAP "uscm_tacmap"
diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm
index 8db62f5726..c2ebdbb779 100644
--- a/code/__DEFINES/minimap.dm
+++ b/code/__DEFINES/minimap.dm
@@ -5,7 +5,17 @@
#define MINIMAP_FLAG_UPP (1<<3)
#define MINIMAP_FLAG_CLF (1<<4)
#define MINIMAP_FLAG_YAUTJA (1<<5)
-#define MINIMAP_FLAG_ALL (1<<6) - 1
+#define MINIMAP_FLAG_XENO_CORRUPTED (1<<6)
+#define MINIMAP_FLAG_XENO_ALPHA (1<<7)
+#define MINIMAP_FLAG_XENO_BRAVO (1<<8)
+#define MINIMAP_FLAG_XENO_CHARLIE (1<<9)
+#define MINIMAP_FLAG_XENO_DELTA (1<<10)
+#define MINIMAP_FLAG_XENO_FERAL (1<<11)
+#define MINIMAP_FLAG_XENO_TAMED (1<<12)
+#define MINIMAP_FLAG_XENO_MUTATED (1<<13)
+#define MINIMAP_FLAG_XENO_FORSAKEN (1<<14)
+#define MINIMAP_FLAG_XENO_RENEGADE (1<<15)
+#define MINIMAP_FLAG_ALL (1<<16) - 1
///Converts the overworld x and y to minimap x and y values
#define MINIMAP_SCALE 2
@@ -77,9 +87,3 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
#define TACMAP_BASE_OCCLUDED "Occluded"
#define TACMAP_BASE_OPEN "Open"
-
-#define TACMAP_DEFAULT "Default"
-#define TACMAP_XENO "Xeno"
-#define TACMAP_YAUTJA "Yautja"
-#define TACMAP_FACTION "Faction"
-
diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm
index a6bb381100..541d95d281 100644
--- a/code/__DEFINES/sounds.dm
+++ b/code/__DEFINES/sounds.dm
@@ -27,7 +27,7 @@
#define SOUND_CHANNEL_AMBIENCE 1019
#define SOUND_CHANNEL_WALKMAN 1020
#define SOUND_CHANNEL_SOUNDSCAPE 1021
-#define SOUND_CHANNEL_ADMIN_MIDI 1022
+//#define SOUND_CHANNEL_ADMIN_MIDI 1022
#define SOUND_CHANNEL_LOBBY 1023
#define SOUND_CHANNEL_Z 1024
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index edfee05953..e5f3ebb4e6 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -109,6 +109,7 @@
// Subsystems shutdown in the reverse of the order they initialize in
// The numbers just define the ordering, they are meaningless otherwise.
+#define SS_INIT_PROFILER 86
#define SS_INIT_INPUT 85
#define SS_INIT_TOPIC 83
#define SS_INIT_LOBBYART 82
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index af8af22ca7..7f69a4acc4 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -147,6 +147,8 @@
#define TRAIT_IMMOBILIZED "immobilized"
/// Apply this to make a mob not dense, and remove it when you want it to no longer make them undense, other sorces of undesity will still apply. Always define a unique source when adding a new instance of this!
#define TRAIT_UNDENSE "undense"
+/// Apply this to identify a mob as merged with weeds
+#define TRAIT_MERGED_WITH_WEEDS "merged_with_weeds"
// SPECIES TRAITS
/// Knowledge of Yautja technology
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 1116f1acb2..24e39ff16c 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -682,8 +682,9 @@ world
* * moving - whether or not to use a moving state for the given icon
* * sourceonly - if TRUE, only generate the asset and send back the asset url, instead of tags that display the icon to players
* * extra_clases - string of extra css classes to use when returning the icon string
+ * * keyonly - if TRUE, only returns the asset key to use get_asset_url manually. Overrides sourceonly.
*/
-/proc/icon2html(atom/thing, client/target, icon_state, dir = SOUTH, frame = 1, moving = FALSE, sourceonly = FALSE, extra_classes = null)
+/proc/icon2html(atom/thing, client/target, icon_state, dir = SOUTH, frame = 1, moving = FALSE, sourceonly = FALSE, extra_classes = null, keyonly = FALSE)
if (!thing)
return
@@ -714,6 +715,8 @@ world
SSassets.transport.register_asset(name, thing)
for (var/thing2 in targets)
SSassets.transport.send_assets(thing2, name)
+ if(keyonly)
+ return name
if(sourceonly)
return SSassets.transport.get_asset_url(name)
return ""
@@ -756,6 +759,8 @@ world
SSassets.transport.register_asset(key, rsc_ref, file_hash, icon_path)
for (var/client_target in targets)
SSassets.transport.send_assets(client_target, key)
+ if(keyonly)
+ return key
if(sourceonly)
return SSassets.transport.get_asset_url(key)
return ""
diff --git a/code/__HELPERS/job.dm b/code/__HELPERS/job.dm
index 89fe687764..220236c6f7 100644
--- a/code/__HELPERS/job.dm
+++ b/code/__HELPERS/job.dm
@@ -14,32 +14,10 @@
all_jobs += new jobtype
return all_jobs
-
/proc/get_all_centcom_jobs() return list()
-//gets the actual job rank (ignoring alt titles)
-//this is used solely for sechuds
-/obj/proc/GetJobRealName()
- if (!istype(src,/obj/item/card/id)) return
- var/obj/item/card/id/I = src
- if(I.rank in GLOB.joblist) return I.rank
- if(I.assignment in GLOB.joblist) return I.assignment
- return "Unknown"
-
/proc/get_all_job_icons() return GLOB.joblist + list("Prisoner")//For all existing HUD icons
-/obj/proc/GetJobName() //Used in secHUD icon generation
- var/obj/item/card/id/I = src
- if(istype(I))
- var/job_icons = get_all_job_icons()
- var/centcom = get_all_centcom_jobs()
-
- if(I.assignment in job_icons) return I.assignment//Check if the job has a hud icon
- if(I.rank in job_icons) return I.rank
- if(I.assignment in centcom) return "Centcom"//Return with the NT logo if it is a Centcom job
- if(I.rank in centcom) return "Centcom"
- return "Unknown" //Return unknown if none of the above apply
-
/proc/get_actual_job_name(mob/M)
if(!M)
return null
diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
index 1e1e9cefd5..3ba92a7c4d 100644
--- a/code/_globalvars/global_lists.dm
+++ b/code/_globalvars/global_lists.dm
@@ -6,6 +6,14 @@ GLOBAL_LIST_EMPTY(CMBFaxes)
GLOBAL_LIST_EMPTY(GeneralFaxes) //Inter-machine faxes
GLOBAL_LIST_EMPTY(fax_contents) //List of fax contents to maintain it even if source paper is deleted
+//datum containing a reference to the flattend map png url, the actual png is stored in the user's cache.
+GLOBAL_LIST_EMPTY(uscm_flat_tacmap_data)
+GLOBAL_LIST_EMPTY(xeno_flat_tacmap_data)
+
+//datum containing the svg overlay coords in array format.
+GLOBAL_LIST_EMPTY(uscm_svg_tacmap_data)
+GLOBAL_LIST_EMPTY(xeno_svg_tacmap_data)
+
GLOBAL_LIST_EMPTY(failed_fultons) //A list of fultoned items which weren't collected and fell back down
GLOBAL_LIST_EMPTY(larva_burst_by_hive)
diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm
index 3acedaa870..f84bac20b1 100644
--- a/code/_globalvars/misc.dm
+++ b/code/_globalvars/misc.dm
@@ -14,6 +14,22 @@ GLOBAL_LIST_INIT(pill_icon_mappings, map_pill_icons())
/// In-round override to default OOC color
GLOBAL_VAR(ooc_color_override)
+// tacmap cooldown for xenos and marines
+GLOBAL_VAR_INIT(uscm_canvas_cooldown, 0)
+GLOBAL_VAR_INIT(xeno_canvas_cooldown, 0)
+
+// getFlatIcon cooldown for xenos and marines
+GLOBAL_VAR_INIT(uscm_flatten_map_icon_cooldown, 0)
+GLOBAL_VAR_INIT(xeno_flatten_map_icon_cooldown, 0)
+
+// latest unannounced flat tacmap for xenos and marines
+GLOBAL_VAR(uscm_unannounced_map)
+GLOBAL_VAR(xeno_unannounced_map)
+
+//global tacmaps for action button access
+GLOBAL_DATUM_INIT(uscm_tacmap_status, /datum/tacmap/drawing/status_tab_view, new)
+GLOBAL_DATUM_INIT(xeno_tacmap_status, /datum/tacmap/drawing/status_tab_view/xeno, new)
+
/// List of roles that can be setup for each gamemode
GLOBAL_LIST_INIT(gamemode_roles, list())
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index cfc6c4d034..4a23ebd882 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -34,6 +34,12 @@ GLOBAL_LIST_EMPTY(radial_menus)
/atom/movable/screen/radial/slice/clicked(mob/user)
+ if(QDELETED(src))
+ return
+
+ if(!parent)
+ CRASH("clicked() called on a radial slice with a null parent while not deleted/deleting")
+
if(user.client == parent.current_user)
if(next_page)
parent.next_page()
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 9c9784286d..0bfa0a7592 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -13,7 +13,7 @@
var/obj/structure/S = A
S.do_climb(src, mods)
return TRUE
- else if(!(isitem(A) && get_dist(src, A) <= 1) && client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_SWAP_HANDS)
+ else if(!(isitem(A) && get_dist(src, A) <= 1) && (client && (client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_SWAP_HANDS)))
swap_hand()
return TRUE
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
index 4ff82381f9..26533a5cd9 100644
--- a/code/controllers/configuration/entries/general.dm
+++ b/code/controllers/configuration/entries/general.dm
@@ -616,3 +616,5 @@ This maintains a list of ip addresses that are able to bypass topic filtering.
/datum/config_entry/string/playersave_path
config_entry_value = "data/player_saves"
protection = CONFIG_ENTRY_HIDDEN|CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/auto_profile
diff --git a/code/controllers/subsystem/hijack.dm b/code/controllers/subsystem/hijack.dm
index 55b5aa75ca..a256a7f2a8 100644
--- a/code/controllers/subsystem/hijack.dm
+++ b/code/controllers/subsystem/hijack.dm
@@ -216,13 +216,13 @@ SUBSYSTEM_DEF(hijack)
switch(announce)
if(1)
- marine_announcement("Emergency fuel replenishment at 25 percent. Lifeboat emergency early launch now available.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
+ marine_announcement("Emergency fuel replenishment is at 25 percent. Lifeboat emergency early launch is now available.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
if(2)
- marine_announcement("Emergency fuel replenishment at 50 percent.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
+ marine_announcement("Emergency fuel replenishment is at 50 percent.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
if(3)
- marine_announcement("Emergency fuel replenishment at 75 percent.[marine_warning_areas ? "\nTo increase speed restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
+ marine_announcement("Emergency fuel replenishment is at 75 percent.[marine_warning_areas ? "\nTo increase speed, restore power to the following areas: [marine_warning_areas]" : " All fueling areas operational."]", HIJACK_ANNOUNCE)
if(4)
- marine_announcement("Emergency fuel replenishment at 100 percent. Safe utilization of lifeboats now possible.", HIJACK_ANNOUNCE)
+ marine_announcement("Emergency fuel replenishment is at 100 percent. Safe utilization of lifeboats and pods is now possible.", HIJACK_ANNOUNCE)
if(!admin_sd_blocked)
addtimer(CALLBACK(src, PROC_REF(unlock_self_destruct)), 8 SECONDS)
diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index 83bb088bc9..491be1708a 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -263,8 +263,6 @@ SUBSYSTEM_DEF(minimaps)
removal_cbs[target] = CALLBACK(src, PROC_REF(removeimage), blip, target)
RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_marker))
-
-
/**
* removes an image from raw tracked lists, invoked by callback
*/
@@ -358,7 +356,7 @@ SUBSYSTEM_DEF(minimaps)
return FALSE
/**
- * Fetches a /atom/movable/screen/minimap instance or creates on if none exists
+ * Fetches a /atom/movable/screen/minimap instance or creates one if none exists
* Note this does not destroy them when the map is unused, might be a potential thing to do?
* Arguments:
* * zlevel: zlevel to fetch map for
@@ -374,6 +372,170 @@ SUBSYSTEM_DEF(minimaps)
hashed_minimaps[hash] = map
return map
+/**
+ * Fetches the datum containing an announced flattend map png reference.
+ *
+ * Arguments:
+ * * faction: FACTION_MARINE or XENO_HIVE_NORMAL
+ */
+/proc/get_tacmap_data_png(faction)
+ var/list/map_list
+
+ if(faction == FACTION_MARINE)
+ map_list = GLOB.uscm_flat_tacmap_data
+ else if(faction == XENO_HIVE_NORMAL)
+ map_list = GLOB.xeno_flat_tacmap_data
+ else
+ return null
+
+ var/map_length = length(map_list)
+
+ if(map_length == 0)
+ return null
+
+ return map_list[map_length]
+
+/**
+ * Fetches the datum containing the latest unannounced flattend map png reference.
+ *
+ * Arguments:
+ * * faction: FACTION_MARINE or XENO_HIVE_NORMAL
+ */
+/proc/get_unannounced_tacmap_data_png(faction)
+ if(faction == FACTION_MARINE)
+ return GLOB.uscm_unannounced_map
+ else if(faction == XENO_HIVE_NORMAL)
+ return GLOB.xeno_unannounced_map
+
+ return null
+
+/**
+ * Fetches the last set of svg coordinates for the tacmap drawing.
+ *
+ * Arguments:
+ * * faction: which faction get the map for: FACTION_MARINE or XENO_HIVE_NORMAL
+ */
+/proc/get_tacmap_data_svg(faction)
+ var/list/map_list
+
+ if(faction == FACTION_MARINE)
+ map_list = GLOB.uscm_svg_tacmap_data
+ else if(faction == XENO_HIVE_NORMAL)
+ map_list = GLOB.xeno_svg_tacmap_data
+ else
+ return null
+
+ var/map_length = length(map_list)
+
+ if(map_length == 0)
+ return null
+
+ return map_list[map_length]
+
+/**
+ * Re-sends relevant flattened tacmaps to a single client.
+ *
+ * Arguments:
+ * * user: The mob that is either an observer, marine, or xeno
+ */
+/proc/resend_current_map_png(mob/user)
+ if(!user.client)
+ return
+
+ var/is_observer = user.faction == FACTION_NEUTRAL && isobserver(user)
+ if(is_observer || user.faction == FACTION_MARINE)
+ // Send marine maps
+ var/datum/flattened_tacmap/latest = get_tacmap_data_png(FACTION_MARINE)
+ if(latest)
+ SSassets.transport.send_assets(user.client, latest.asset_key)
+ var/datum/flattened_tacmap/unannounced = get_unannounced_tacmap_data_png(FACTION_MARINE)
+ if(unannounced && (!latest || latest.asset_key != unannounced.asset_key))
+ SSassets.transport.send_assets(user.client, unannounced.asset_key)
+
+ var/mob/living/carbon/xenomorph/xeno = user
+ if(is_observer || istype(xeno) && xeno.hivenumber == XENO_HIVE_NORMAL)
+ // Send xeno maps
+ var/datum/flattened_tacmap/latest = get_tacmap_data_png(XENO_HIVE_NORMAL)
+ if(latest)
+ SSassets.transport.send_assets(user.client, latest.asset_key)
+ var/datum/flattened_tacmap/unannounced = get_unannounced_tacmap_data_png(XENO_HIVE_NORMAL)
+ if(unannounced && (!latest || latest.asset_key != unannounced.asset_key))
+ SSassets.transport.send_assets(user.client, unannounced.asset_key)
+
+/**
+ * Flattens the current map and then distributes it for the specified faction as an unannounced map.
+ *
+ * Arguments:
+ * * faction: Which faction to distribute the map to: FACTION_MARINE or XENO_HIVE_NORMAL
+ * Return:
+ * * Returns a boolean value, TRUE if the operation was successful, FALSE if it was not (on cooldown generally).
+ */
+/datum/tacmap/drawing/proc/distribute_current_map_png(faction)
+ if(faction == FACTION_MARINE)
+ if(!COOLDOWN_FINISHED(GLOB, uscm_flatten_map_icon_cooldown))
+ return FALSE
+ COOLDOWN_START(GLOB, uscm_flatten_map_icon_cooldown, flatten_map_cooldown_time)
+ else if(faction == XENO_HIVE_NORMAL)
+ if(!COOLDOWN_FINISHED(GLOB, xeno_flatten_map_icon_cooldown))
+ return FALSE
+ COOLDOWN_START(GLOB, xeno_flatten_map_icon_cooldown, flatten_map_cooldown_time)
+ else
+ return FALSE
+
+ var/icon/flat_map = getFlatIcon(map_holder.map, appearance_flags = TRUE)
+ if(!flat_map)
+ to_chat(usr, SPAN_WARNING("A critical error has occurred! Contact a coder.")) // tf2heavy: "Oh, this is bad!"
+ return FALSE
+
+ // Send to only relevant clients
+ var/list/faction_clients = list()
+ for(var/client/client as anything in GLOB.clients)
+ if(!client || !client.mob)
+ continue
+ var/mob/client_mob = client.mob
+ if(client_mob.faction == faction)
+ faction_clients += client
+ else if(client_mob.faction == FACTION_NEUTRAL && isobserver(client_mob))
+ faction_clients += client
+ else if(isxeno(client_mob))
+ var/mob/living/carbon/xenomorph/xeno = client_mob
+ if(xeno.hivenumber == faction)
+ faction_clients += client
+
+ // This may be unnecessary to do this way if the asset url is always the same as the lookup key
+ var/flat_tacmap_key = icon2html(flat_map, faction_clients, keyonly = TRUE)
+ if(!flat_tacmap_key)
+ to_chat(usr, SPAN_WARNING("A critical error has occurred! Contact a coder."))
+ return FALSE
+ var/flat_tacmap_png = SSassets.transport.get_asset_url(flat_tacmap_key)
+ var/datum/flattened_tacmap/new_flat = new(flat_tacmap_png, flat_tacmap_key)
+
+ if(faction == FACTION_MARINE)
+ GLOB.uscm_unannounced_map = new_flat
+ else //if(faction == XENO_HIVE_NORMAL)
+ GLOB.xeno_unannounced_map = new_flat
+
+ return TRUE
+
+/**
+ * Globally stores svg coords for a given faction.
+ *
+ * Arguments:
+ * * faction: which faction to save the data for: FACTION_MARINE or XENO_HIVE_NORMAL
+ * * svg_coords: an array of coordinates corresponding to an svg.
+ * * ckey: the ckey of the user who submitted this
+ */
+/datum/tacmap/drawing/proc/store_current_svg_coords(faction, svg_coords, ckey)
+ var/datum/svg_overlay/svg_store_overlay = new(svg_coords, ckey)
+
+ if(faction == FACTION_MARINE)
+ GLOB.uscm_svg_tacmap_data += svg_store_overlay
+ else if(faction == XENO_HIVE_NORMAL)
+ GLOB.xeno_svg_tacmap_data += svg_store_overlay
+ else
+ qdel(svg_store_overlay)
+ debug_log("SVG coordinates for [faction] are not implemented!")
+
/datum/controller/subsystem/minimaps/proc/fetch_tacmap_datum(zlevel, flags)
var/hash = "[zlevel]-[flags]"
if(hashed_tacmaps[hash])
@@ -478,7 +640,7 @@ SUBSYSTEM_DEF(minimaps)
marker_flags = MINIMAP_FLAG_USCM
/datum/action/minimap/observer
- minimap_flags = MINIMAP_FLAG_XENO|MINIMAP_FLAG_USCM|MINIMAP_FLAG_UPP|MINIMAP_FLAG_CLF|MINIMAP_FLAG_UPP
+ minimap_flags = MINIMAP_FLAG_ALL
marker_flags = NONE
hidden = TRUE
@@ -488,17 +650,61 @@ SUBSYSTEM_DEF(minimaps)
var/targeted_ztrait = ZTRAIT_GROUND
var/atom/owner
+ /// tacmap holder for holding the minimap
var/datum/tacmap_holder/map_holder
+/datum/tacmap/drawing
+ /// A url that will point to the wiki map for the current map as a fall back image
+ var/static/wiki_map_fallback
+
+ /// color selection for the tactical map canvas, defaults to black.
+ var/toolbar_color_selection = "black"
+ var/toolbar_updated_selection = "black"
+
+ var/canvas_cooldown_time = 4 MINUTES
+ var/flatten_map_cooldown_time = 3 MINUTES
+
+ /// boolean value to keep track if the canvas has been updated or not, the value is used in tgui state.
+ var/updated_canvas = FALSE
+ /// current flattend map
+ var/datum/flattened_tacmap/new_current_map
+ /// previous flattened map
+ var/datum/flattened_tacmap/old_map
+ /// current svg
+ var/datum/svg_overlay/current_svg
+
+ var/action_queue_change = 0
+
+ /// The last time the map has been flattened - used as a key to trick react into updating the canvas
+ var/last_update_time = 0
+ /// A temporary lock out time before we can open the new canvas tab to allow the tacmap time to fire
+ var/tacmap_ready_time = 0
+
/datum/tacmap/New(atom/source, minimap_type)
allowed_flags = minimap_type
owner = source
+/datum/tacmap/drawing/status_tab_view/New()
+ var/datum/tacmap/drawing/status_tab_view/uscm_tacmap
+ allowed_flags = MINIMAP_FLAG_USCM
+ owner = uscm_tacmap
+
+/datum/tacmap/drawing/status_tab_view/xeno/New()
+ var/datum/tacmap/drawing/status_tab_view/xeno/xeno_tacmap
+ allowed_flags = MINIMAP_FLAG_XENO
+ owner = xeno_tacmap
+
/datum/tacmap/Destroy()
map_holder = null
owner = null
return ..()
+/datum/tacmap/drawing/Destroy()
+ new_current_map = null
+ old_map = null
+ current_svg = null
+ return ..()
+
/datum/tacmap/tgui_interact(mob/user, datum/tgui/ui)
if(!map_holder)
var/level = SSmapping.levels_by_trait(targeted_ztrait)
@@ -512,11 +718,216 @@ SUBSYSTEM_DEF(minimaps)
ui = new(user, src, "TacticalMap")
ui.open()
+/datum/tacmap/drawing/tgui_interact(mob/user, datum/tgui/ui)
+ var/mob/living/carbon/xenomorph/xeno = user
+ var/is_xeno = istype(xeno)
+ var/faction = is_xeno ? xeno.hivenumber : user.faction
+ if(faction == FACTION_NEUTRAL && isobserver(user))
+ faction = allowed_flags == MINIMAP_FLAG_XENO ? XENO_HIVE_NORMAL : FACTION_MARINE
+
+ new_current_map = get_unannounced_tacmap_data_png(faction)
+ old_map = get_tacmap_data_png(faction)
+ current_svg = get_tacmap_data_svg(faction)
+
+ var/use_live_map = faction == FACTION_MARINE && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || is_xeno
+
+ if(use_live_map && !map_holder)
+ var/level = SSmapping.levels_by_trait(targeted_ztrait)
+ if(!level[1])
+ return
+ map_holder = SSminimaps.fetch_tacmap_datum(level[1], allowed_flags)
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ if(!wiki_map_fallback)
+ var/wiki_url = CONFIG_GET(string/wikiurl)
+ var/obj/item/map/current_map/new_map = new
+ if(wiki_url && new_map.html_link)
+ wiki_map_fallback ="[wiki_url]/[new_map.html_link]"
+ else
+ debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[new_map.html_link]'")
+ qdel(new_map)
+
+ // Ensure we actually have the map image sent
+ resend_current_map_png(user)
+
+ if(use_live_map)
+ tacmap_ready_time = SSminimaps.next_fire + 2 SECONDS
+ addtimer(CALLBACK(src, PROC_REF(on_tacmap_fire), faction), SSminimaps.next_fire - world.time + 1 SECONDS)
+ user.client.register_map_obj(map_holder.map)
+
+ ui = new(user, src, "TacticalMap")
+ ui.open()
+
+/datum/tacmap/drawing/ui_data(mob/user)
+ var/list/data = list()
+
+ data["newCanvasFlatImage"] = new_current_map?.flat_tacmap
+ data["oldCanvasFlatImage"] = old_map?.flat_tacmap
+ data["svgData"] = current_svg?.svg_data
+
+ data["actionQueueChange"] = action_queue_change
+
+ data["toolbarColorSelection"] = toolbar_color_selection
+ data["toolbarUpdatedSelection"] = toolbar_updated_selection
+
+ if(isxeno(user))
+ data["canvasCooldown"] = max(GLOB.xeno_canvas_cooldown - world.time, 0)
+ else
+ data["canvasCooldown"] = max(GLOB.uscm_canvas_cooldown - world.time, 0)
+
+ data["nextCanvasTime"] = canvas_cooldown_time
+ data["updatedCanvas"] = updated_canvas
+
+ data["lastUpdateTime"] = last_update_time
+ data["tacmapReady"] = world.time > tacmap_ready_time
+
+ return data
+
/datum/tacmap/ui_static_data(mob/user)
var/list/data = list()
- data["mapRef"] = map_holder.map_ref
+ data["mapRef"] = map_holder?.map_ref
+ data["canDraw"] = FALSE
+ data["canViewTacmap"] = TRUE
+ data["canViewCanvas"] = FALSE
+ data["isXeno"] = FALSE
+
return data
+/datum/tacmap/drawing/ui_static_data(mob/user)
+ var/list/data = list()
+
+ data["mapRef"] = map_holder?.map_ref
+ data["canDraw"] = FALSE
+ data["mapFallback"] = wiki_map_fallback
+
+ var/mob/living/carbon/xenomorph/xeno = user
+ var/is_xeno = istype(xeno)
+ var/faction = is_xeno ? xeno.hivenumber : user.faction
+
+ data["isXeno"] = is_xeno
+ data["canViewTacmap"] = is_xeno
+ data["canViewCanvas"] = faction == FACTION_MARINE || faction == XENO_HIVE_NORMAL
+
+ if(faction == FACTION_MARINE && skillcheck(user, SKILL_LEADERSHIP, SKILL_LEAD_EXPERT) || faction == XENO_HIVE_NORMAL && isqueen(user))
+ data["canDraw"] = TRUE
+ data["canViewTacmap"] = TRUE
+
+ return data
+
+/datum/tacmap/drawing/status_tab_view/ui_static_data(mob/user)
+ var/list/data = list()
+ data["mapFallback"] = wiki_map_fallback
+ data["canDraw"] = FALSE
+ data["canViewTacmap"] = FALSE
+ data["canViewCanvas"] = TRUE
+ data["isXeno"] = FALSE
+
+ return data
+
+/datum/tacmap/drawing/status_tab_view/xeno/ui_static_data(mob/user)
+ var/list/data = list()
+ data["mapFallback"] = wiki_map_fallback
+ data["canDraw"] = FALSE
+ data["canViewTacmap"] = FALSE
+ data["canViewCanvas"] = TRUE
+ data["isXeno"] = TRUE
+
+ return data
+
+/datum/tacmap/drawing/ui_close(mob/user)
+ . = ..()
+ action_queue_change = 0
+ updated_canvas = FALSE
+ toolbar_color_selection = "black"
+ toolbar_updated_selection = "black"
+
+/datum/tacmap/drawing/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ var/mob/user = ui.user
+ var/mob/living/carbon/xenomorph/xeno = user
+ var/faction = istype(xeno) ? xeno.hivenumber : user.faction
+ if(faction == FACTION_NEUTRAL && isobserver(user))
+ faction = allowed_flags == MINIMAP_FLAG_XENO ? XENO_HIVE_NORMAL : FACTION_MARINE
+
+ switch (action)
+ if ("menuSelect")
+ if(params["selection"] != "new canvas")
+ if(updated_canvas)
+ updated_canvas = FALSE
+ toolbar_updated_selection = toolbar_color_selection // doing this if it == canvas can cause a latency issue with the stroke.
+ else
+ distribute_current_map_png(faction)
+ last_update_time = world.time
+ // An attempt to get the image to load on first try in the interface, but doesn't seem always reliable
+
+ new_current_map = get_unannounced_tacmap_data_png(faction)
+ old_map = get_tacmap_data_png(faction)
+ current_svg = get_tacmap_data_svg(faction)
+
+ if ("updateCanvas")
+ // forces state change, this will export the svg.
+ toolbar_updated_selection = "export"
+ updated_canvas = TRUE
+ action_queue_change += 1
+
+ if ("clearCanvas")
+ toolbar_updated_selection = "clear"
+ updated_canvas = FALSE
+ action_queue_change += 1
+
+ if ("undoChange")
+ toolbar_updated_selection = "undo"
+ updated_canvas = FALSE
+ action_queue_change += 1
+
+ if ("selectColor")
+ var/newColor = params["color"]
+ if(newColor)
+ toolbar_color_selection = newColor
+ toolbar_updated_selection = newColor
+ action_queue_change += 1
+
+ if ("onDraw")
+ updated_canvas = FALSE
+
+ if ("selectAnnouncement")
+ if(!istype(params["image"], /list)) // potentially very serious?
+ return FALSE
+
+ if(faction == FACTION_MARINE)
+ GLOB.uscm_flat_tacmap_data += new_current_map
+ else if(faction == XENO_HIVE_NORMAL)
+ GLOB.xeno_flat_tacmap_data += new_current_map
+
+ store_current_svg_coords(faction, params["image"], user)
+ current_svg = get_tacmap_data_svg(faction)
+ old_map = get_tacmap_data_png(faction)
+
+ if(faction == FACTION_MARINE)
+ COOLDOWN_START(GLOB, uscm_canvas_cooldown, canvas_cooldown_time)
+ var/mob/living/carbon/human/human_leader = user
+ for(var/datum/squad/current_squad in RoleAuthority.squads)
+ current_squad.send_maptext("Tactical map update in progress...", "Tactical Map:")
+ human_leader.visible_message(SPAN_BOLDNOTICE("Tactical map update in progress..."))
+ playsound_client(human_leader.client, "sound/effects/sos-morse-code.ogg")
+ notify_ghosts(header = "Tactical Map", message = "The USCM tactical map has been updated.", ghost_sound = "sound/effects/sos-morse-code.ogg", notify_volume = 80, action = NOTIFY_USCM_TACMAP, enter_link = "uscm_tacmap=1", enter_text = "View", source = owner)
+
+ else if(faction == XENO_HIVE_NORMAL)
+ var/mutable_appearance/appearance = mutable_appearance(icon('icons/mob/hud/actions_xeno.dmi'), "toggle_queen_zoom")
+ COOLDOWN_START(GLOB, xeno_canvas_cooldown, canvas_cooldown_time)
+ xeno_maptext("The Queen has updated your hive mind map", "You sense something unusual...", faction)
+ notify_ghosts(header = "Tactical Map", message = "The Xenomorph tactical map has been updated.", ghost_sound = "sound/voice/alien_distantroar_3.ogg", notify_volume = 50, action = NOTIFY_XENO_TACMAP, enter_link = "xeno_tacmap=1", enter_text = "View", source = user, alert_overlay = appearance)
+
+ toolbar_updated_selection = toolbar_color_selection
+ message_admins("[key_name(user)] has updated the tactical map for [faction].")
+ updated_canvas = FALSE
+
+ return TRUE
+
/datum/tacmap/ui_status(mob/user)
if(!(isatom(owner)))
return UI_INTERACTIVE
@@ -529,7 +940,7 @@ SUBSYSTEM_DEF(minimaps)
else
return UI_CLOSE
-/datum/tacmap/xeno/ui_status(mob/user)
+/datum/tacmap/drawing/xeno/ui_status(mob/user)
if(!isxeno(user))
return UI_CLOSE
@@ -552,3 +963,71 @@ SUBSYSTEM_DEF(minimaps)
/datum/tacmap_holder/Destroy()
map = null
return ..()
+
+/datum/flattened_tacmap
+ var/flat_tacmap
+ var/asset_key
+ var/time
+
+/datum/flattened_tacmap/New(flat_tacmap, asset_key)
+ src.flat_tacmap = flat_tacmap
+ src.asset_key = asset_key
+ src.time = time_stamp()
+
+/datum/svg_overlay
+ var/svg_data
+ var/ckey
+ var/name
+ var/time
+
+/datum/svg_overlay/New(svg_data, mob/user)
+ src.svg_data = svg_data
+ src.ckey = user?.persistent_ckey
+ src.name = user?.real_name
+ src.time = time_stamp()
+
+/// Callback when timer indicates the tacmap is flattenable now
+/datum/tacmap/drawing/proc/on_tacmap_fire(faction)
+ distribute_current_map_png(faction)
+ last_update_time = world.time
+
+/// Gets the MINIMAP_FLAG for the provided faction or hivenumber if one exists
+/proc/get_minimap_flag_for_faction(faction)
+ switch(faction)
+ if(XENO_HIVE_NORMAL)
+ return MINIMAP_FLAG_XENO
+ if(FACTION_MARINE)
+ return MINIMAP_FLAG_USCM
+ if(FACTION_UPP)
+ return MINIMAP_FLAG_UPP
+ if(FACTION_WY)
+ return MINIMAP_FLAG_USCM
+ if(FACTION_CLF)
+ return MINIMAP_FLAG_CLF
+ if(FACTION_PMC)
+ return MINIMAP_FLAG_PMC
+ if(FACTION_YAUTJA)
+ return MINIMAP_FLAG_YAUTJA
+ if(XENO_HIVE_CORRUPTED)
+ return MINIMAP_FLAG_XENO_CORRUPTED
+ if(XENO_HIVE_ALPHA)
+ return MINIMAP_FLAG_XENO_ALPHA
+ if(XENO_HIVE_BRAVO)
+ return MINIMAP_FLAG_XENO_BRAVO
+ if(XENO_HIVE_CHARLIE)
+ return MINIMAP_FLAG_XENO_CHARLIE
+ if(XENO_HIVE_DELTA)
+ return MINIMAP_FLAG_XENO_DELTA
+ if(XENO_HIVE_FERAL)
+ return MINIMAP_FLAG_XENO_FERAL
+ if(XENO_HIVE_TAMED)
+ return MINIMAP_FLAG_XENO_TAMED
+ if(XENO_HIVE_MUTATED)
+ return MINIMAP_FLAG_XENO_MUTATED
+ if(XENO_HIVE_FORSAKEN)
+ return MINIMAP_FLAG_XENO_FORSAKEN
+ if(XENO_HIVE_YAUTJA)
+ return MINIMAP_FLAG_YAUTJA
+ if(XENO_HIVE_RENEGADE)
+ return MINIMAP_FLAG_XENO_RENEGADE
+ return 0
diff --git a/code/controllers/subsystem/profiler.dm b/code/controllers/subsystem/profiler.dm
new file mode 100644
index 0000000000..f9ba79046c
--- /dev/null
+++ b/code/controllers/subsystem/profiler.dm
@@ -0,0 +1,74 @@
+#define PROFILER_FILENAME "profiler.json"
+#define SENDMAPS_FILENAME "sendmaps.json"
+
+SUBSYSTEM_DEF(profiler)
+ name = "Profiler"
+ init_order = SS_INIT_PROFILER
+ runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
+ wait = 300 SECONDS
+ var/fetch_cost = 0
+ var/write_cost = 0
+
+/datum/controller/subsystem/profiler/stat_entry(msg)
+ msg += "F:[round(fetch_cost,1)]ms"
+ msg += "|W:[round(write_cost,1)]ms"
+ return msg
+
+/datum/controller/subsystem/profiler/Initialize()
+ if(CONFIG_GET(flag/auto_profile))
+ StartProfiling()
+ else
+ StopProfiling() //Stop the early start profiler
+ return SS_INIT_SUCCESS
+
+/datum/controller/subsystem/profiler/OnConfigLoad()
+ if(CONFIG_GET(flag/auto_profile))
+ StartProfiling()
+ can_fire = TRUE
+ else
+ StopProfiling()
+ can_fire = FALSE
+
+/datum/controller/subsystem/profiler/fire()
+ DumpFile()
+
+/datum/controller/subsystem/profiler/Shutdown()
+ if(CONFIG_GET(flag/auto_profile))
+ DumpFile(allow_yield = FALSE)
+ world.Profile(PROFILE_CLEAR, type = "sendmaps")
+ return ..()
+
+/datum/controller/subsystem/profiler/proc/StartProfiling()
+ world.Profile(PROFILE_START)
+ world.Profile(PROFILE_START, type = "sendmaps")
+
+/datum/controller/subsystem/profiler/proc/StopProfiling()
+ world.Profile(PROFILE_STOP)
+ world.Profile(PROFILE_STOP, type = "sendmaps")
+
+/datum/controller/subsystem/profiler/proc/DumpFile(allow_yield = TRUE)
+ var/timer = TICK_USAGE_REAL
+ var/current_profile_data = world.Profile(PROFILE_REFRESH, format = "json")
+ var/current_sendmaps_data = world.Profile(PROFILE_REFRESH, type = "sendmaps", format="json")
+ fetch_cost = MC_AVERAGE(fetch_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+ if(allow_yield)
+ CHECK_TICK
+
+ if(!length(current_profile_data)) //Would be nice to have explicit proc to check this
+ stack_trace("Warning, profiling stopped manually before dump.")
+ var/prof_file = file("[GLOB.log_directory]/[PROFILER_FILENAME]")
+ if(fexists(prof_file))
+ fdel(prof_file)
+ if(!length(current_sendmaps_data)) //Would be nice to have explicit proc to check this
+ stack_trace("Warning, sendmaps profiling stopped manually before dump.")
+ var/sendmaps_file = file("[GLOB.log_directory]/[SENDMAPS_FILENAME]")
+ if(fexists(sendmaps_file))
+ fdel(sendmaps_file)
+
+ timer = TICK_USAGE_REAL
+ WRITE_FILE(prof_file, current_profile_data)
+ WRITE_FILE(sendmaps_file, current_sendmaps_data)
+ write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
+
+#undef PROFILER_FILENAME
+#undef SENDMAPS_FILENAME
diff --git a/code/datums/components/weed_food.dm b/code/datums/components/weed_food.dm
index 16be8665f5..648478aa61 100644
--- a/code/datums/components/weed_food.dm
+++ b/code/datums/components/weed_food.dm
@@ -260,6 +260,7 @@
merged = TRUE
ADD_TRAIT(parent_mob, TRAIT_UNDENSE, XENO_WEED_TRAIT)
+ ADD_TRAIT(parent_mob, TRAIT_MERGED_WITH_WEEDS, XENO_WEED_TRAIT)
parent_mob.anchored = TRUE
parent_mob.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
parent_mob.plane = FLOOR_PLANE
@@ -288,6 +289,7 @@
UnregisterSignal(absorbing_weeds, COMSIG_PARENT_QDELETING)
absorbing_weeds = null
+ REMOVE_TRAIT(parent_mob, TRAIT_MERGED_WITH_WEEDS, XENO_WEED_TRAIT)
parent_mob.anchored = FALSE
parent_mob.mouse_opacity = MOUSE_OPACITY_ICON
parent_mob.plane = GAME_PLANE
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index c6fc23c68e..11ba151464 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -37,6 +37,15 @@
/// Has the looping started yet?
var/loop_started = FALSE
+ /**
+ * Let's you make a "loud" sound that "projects." IE you can hear this sound from a further distance away.
+ * Think of like an air raid siren. They're loud if you're close yeah... but you can hear them from mad far away, bruv
+ * with a longer "falloff distance." Fixes the extra_range stuff
+ */
+ var/is_sound_projecting = FALSE
+ ///only applicable to is_sound_projecting: max range till sound volume starts dropping as distance increases
+ var/falloff_distance = 50
+
/* // as of yet unused varen \\
/// How much the sound will be affected by falloff per tile.
@@ -130,19 +139,18 @@
sound_to_play.channel = get_free_channel()
sound_to_play.volume = volume_override || volume //Use volume as fallback if theres no override
SEND_SOUND(parent, sound_to_play)
- else
- playsound(
- parent,
- sound_to_play,
- volume,
- vary,
- extra_range//,
- // falloff_exponent = falloff_exponent,
- // pressure_affected = pressure_affected,
- // ignore_walls = ignore_walls,
- // falloff_distance = falloff_distance,
- // use_reverb = use_reverb
- )
+ return
+ if (is_sound_projecting)
+ playsound(parent, sound_to_play, volume, vary, extra_range, VOLUME_SFX, 0, 0, falloff_distance)
+ return
+
+ playsound(
+ parent,
+ sound_to_play,
+ volume,
+ vary,
+ extra_range
+ )
/// Returns the sound we should now be playing.
/datum/looping_sound/proc/get_sound(_mid_sounds)
diff --git a/code/datums/looping_sounds/misc_sounds.dm b/code/datums/looping_sounds/misc_sounds.dm
new file mode 100644
index 0000000000..6411b3f51f
--- /dev/null
+++ b/code/datums/looping_sounds/misc_sounds.dm
@@ -0,0 +1,3 @@
+/datum/looping_sound/looping_launch_announcement_alarm
+ mid_sounds = list('sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg' = 1)
+ start_sound = list('sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg' = 1)
diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm
index b0df9bca77..ff12635107 100644
--- a/code/datums/mob_hud.dm
+++ b/code/datums/mob_hud.dm
@@ -283,6 +283,12 @@ var/list/datum/mob_hud/huds = list(
return
/mob/living/carbon/xenomorph/med_hud_set_health()
+ if(QDELETED(src))
+ return
+
+ if(!(HEALTH_HUD_XENO in hud_list))
+ CRASH("hud_list lacks HEALTH_HUD_XENO despite not being deleted in med_hud_set_health()")
+
var/image/holder = hud_list[HEALTH_HUD_XENO]
var/health_hud_type = "xenohealth"
diff --git a/code/datums/soundOutput.dm b/code/datums/soundOutput.dm
index bc5ffd8efc..1f4512b28d 100644
--- a/code/datums/soundOutput.dm
+++ b/code/datums/soundOutput.dm
@@ -152,11 +152,6 @@
adjust_volume_prefs(VOLUME_AMB, "Set the volume for ambience and soundscapes", 0)
soundOutput.update_ambience(null, null, TRUE)
-/client/verb/adjust_volume_admin_music()
- set name = "Adjust Volume Admin MIDIs"
- set category = "Preferences.Sound"
- adjust_volume_prefs(VOLUME_ADM, "Set the volume for admin MIDIs", SOUND_CHANNEL_ADMIN_MIDI)
-
/client/verb/adjust_volume_lobby_music()
set name = "Adjust Volume LobbyMusic"
set category = "Preferences.Sound"
diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm
index 29c4fddfcb..28b08f09eb 100644
--- a/code/game/area/almayer.dm
+++ b/code/game/area/almayer.dm
@@ -28,12 +28,12 @@
SShijack.progress_areas[src] = power_equip
/area/shuttle/almayer/elevator_maintenance/upperdeck
- name = "\improper Maintenance Elevator"
+ name = "\improper Upper Deck Maintenance Elevator"
icon_state = "shuttle"
fake_zlevel = 1
/area/shuttle/almayer/elevator_maintenance/lowerdeck
- name = "\improper Maintenance Elevator"
+ name = "\improper Lower Deck Maintenance Elevator"
icon_state = "shuttle"
fake_zlevel = 2
@@ -92,22 +92,22 @@
soundscape_interval = 120
/area/almayer/command/securestorage
- name = "\improper Secure Storage"
+ name = "\improper Upper Deck Secure Storage"
icon_state = "corporatespace"
- fake_zlevel = 2 // lowerdeck
+ fake_zlevel = 1 // upperdeck
/area/almayer/command/computerlab
- name = "\improper Computer Lab"
+ name = "\improper Upper Deck Computer Lab"
icon_state = "ceroom"
- fake_zlevel = 2 // lowerdeck
+ fake_zlevel = 1 // upperdeck
/area/almayer/command/telecomms
- name = "\improper Telecommunications"
+ name = "\improper Upper Deck Telecommunications"
icon_state = "tcomms"
fake_zlevel = 1 // upperdeck
/area/almayer/command/self_destruct
- name = "\improper Self-Destruct Core Room"
+ name = "\improper Upper Deck Self-Destruct Core Room"
icon_state = "selfdestruct"
fake_zlevel = 1 // upperdeck
@@ -117,7 +117,7 @@
fake_zlevel = 1 // upperdeck
/area/almayer/command/combat_correspondent
- name = "\improper Combat Correspondent Office"
+ name = "\improper Upper Deck Combat Correspondent Office"
icon_state = "selfdestruct"
fake_zlevel = 1 // upperdeck
@@ -125,36 +125,36 @@
minimap_color = MINIMAP_AREA_ENGI
/area/almayer/engineering/upper_engineering
- name = "\improper Upper Engineering"
+ name = "\improper Upper Deck Engineering"
icon_state = "upperengineering"
fake_zlevel = 1 // upperdeck
/area/almayer/engineering/upper_engineering/starboard
- name = "\improper Starboard Upper Engineering"
+ name = "\improper Upper Deck Starboard Engineering"
/area/almayer/engineering/upper_engineering/port
- name = "\improper Port Upper Engineering"
+ name = "\improper Upper Deck Port Engineering"
/area/almayer/engineering/upper_engineering/notunnel
flags_area = AREA_NOTUNNEL
/area/almayer/engineering/ce_room
- name = "\improper Chief Engineer Office"
+ name = "\improper Upper Deck Chief Engineer Office"
icon_state = "ceroom"
fake_zlevel = 1 // upperdeck
/area/almayer/engineering/lower_engine_monitoring
- name = "\improper Engine Reactor Monitoring"
+ name = "\improper Lower Deck Engine Reactor Monitoring"
icon_state = "lowermonitoring"
fake_zlevel = 2 // lowerdeck
/area/almayer/engineering/lower_engineering
- name = "\improper Engineering Lower"
+ name = "\improper Lower Deck Engineering"
icon_state = "lowerengineering"
fake_zlevel = 2 // lowerdeck
/area/almayer/engineering/engineering_workshop
- name = "\improper Engineering Workshop"
+ name = "\improper Lower Deck Engineering Workshop"
icon_state = "workshop"
fake_zlevel = 2 // lowerdeck
@@ -172,17 +172,17 @@
hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
/area/almayer/engineering/starboard_atmos
- name = "\improper Atmospherics Starboard"
+ name = "\improper Upper Deck Starboard Atmospherics"
icon_state = "starboardatmos"
fake_zlevel = 1 // upperdeck
/area/almayer/engineering/port_atmos
- name = "\improper Atmospherics Port"
+ name = "\improper Upper Deck Port Atmospherics"
icon_state = "portatmos"
fake_zlevel = 1 // upperdeck
/area/almayer/engineering/laundry
- name = "\improper Laundry Room"
+ name = "\improper Upper Deck Laundry Room"
icon_state = "laundry"
fake_zlevel = 1 // upperdeck
@@ -203,17 +203,17 @@
fake_zlevel = 2 // lowerdeck
/area/almayer/shipboard/starboard_missiles
- name = "\improper Missile Tubes Starboard"
+ name = "\improper Upper Deck Starboard Missile Tubes"
icon_state = "starboardmissile"
fake_zlevel = 1 // upperdeck
/area/almayer/shipboard/port_missiles
- name = "\improper Missile Tubes Port"
+ name = "\improper Upper Deck Port Missile Tubes"
icon_state = "portmissile"
fake_zlevel = 1 // upperdeck
/area/almayer/shipboard/weapon_room
- name = "\improper Weapon Control Room"
+ name = "\improper Lower Deck Weapon Control"
icon_state = "weaponroom"
fake_zlevel = 2 // lowerdeck
@@ -221,12 +221,12 @@
flags_area = AREA_NOTUNNEL
/area/almayer/shipboard/starboard_point_defense
- name = "\improper Point Defense Starboard"
+ name = "\improper Lower Deck Starboard Point Defense"
icon_state = "starboardpd"
fake_zlevel = 2 // lowerdeck
/area/almayer/shipboard/port_point_defense
- name = "\improper Point Defense Port"
+ name = "\improper Lower Deck Port Point Defense"
icon_state = "portpd"
fake_zlevel = 2 // lowerdeck
@@ -292,7 +292,7 @@
icon_state = "chiefmpoffice"
/area/almayer/shipboard/sea_office
- name = "\improper Senior Enlisted Advisor Office"
+ name = "\improper Lower Deck Senior Enlisted Advisor Office"
icon_state = "chiefmpoffice"
fake_zlevel = 2 // lowerdeck
@@ -318,7 +318,7 @@
soundscape_interval = 50
/area/almayer/hallways/vehiclehangar
- name = "\improper Vehicle Storage"
+ name = "\improper Lower Deck Vehicle Storage"
icon_state = "exoarmor"
fake_zlevel = 2
@@ -326,135 +326,136 @@
minimap_color = MINIMAP_AREA_COLONY
/area/almayer/living/tankerbunks
- name = "\improper Vehicle Crew Bunks"
+ name = "\improper Lower Deck Vehicle Crew Bunks"
icon_state = "livingspace"
fake_zlevel = 2
/area/almayer/living/auxiliary_officer_office
- name = "\improper Auxiliary Support Officer office"
+ name = "\improper Lower Deck Auxiliary Support Officer office"
icon_state = "livingspace"
fake_zlevel = 2
/area/almayer/squads/tankdeliveries
- name = "\improper Vehicle ASRS"
+ name = "\improper Lower Deck Vehicle ASRS"
icon_state = "req"
fake_zlevel = 2
/area/almayer/hallways/exoarmor
- name = "\improper Vehicle Armor Storage"
+ name = "\improper Lower Deck Vehicle Armor Storage"
icon_state = "exoarmor"
fake_zlevel = 2 // lowerdeck
/area/almayer/hallways/repair_bay
- name = "\improper Deployment Workshop"
+ name = "\improper Lower Deck Deployment Workshop"
icon_state = "dropshiprepair"
fake_zlevel = 2 // lowerdeck
/area/almayer/hallways/mission_planner
- name = "\improper Dropship Central Computer Room"
+ name = "\improper Lower Deck Dropship Central Computer Room"
icon_state = "missionplanner"
fake_zlevel = 2 // lowerdeck
/area/almayer/hallways/starboard_umbilical
- name = "\improper Umbilical Starboard"
+ name = "\improper Lower Deck Starboard Umbilical Hallway"
icon_state = "starboardumbilical"
fake_zlevel = 2 // lowerdeck
/area/almayer/hallways/port_umbilical
- name = "\improper Umbilical Port"
+ name = "\improper Lower Deck Port Umbilical Hallway"
icon_state = "portumbilical"
fake_zlevel = 2 // lowerdeck
/area/almayer/hallways/aft_hallway
- name = "\improper Hallway Aft"
+ name = "\improper Upper Deck Aft Hallway"
icon_state = "aft"
fake_zlevel = 1 // upperdeck
/area/almayer/hallways/stern_hallway
- name = "\improper Hallway Stern"
+ name = "\improper Upper Deck Stern Hallway"
icon_state = "stern"
fake_zlevel = 1 // upperdeck
/area/almayer/hallways/port_hallway
- name = "\improper Hallway Port"
+ name = "\improper Lower Deck Port Hallway"
icon_state = "port"
fake_zlevel = 2 // lowerdeck
/area/almayer/hallways/starboard_hallway
- name = "\improper Hallway Starboard"
+ name = "\improper Lower Deck Starboard Hallway"
icon_state = "starboard"
fake_zlevel = 2 // lowerdeck
/area/almayer/stair_clone
- name = "\improper Stairs"
+ name = "\improper Lower Deck Stairs"
icon_state = "stairs_lowerdeck"
fake_zlevel = 2 // lowerdeck
resin_construction_allowed = FALSE
/area/almayer/stair_clone/upper
+ name = "\improper Upper Deck Stairs"
icon_state = "stairs_upperdeck"
fake_zlevel = 1 // upperdeck
/area/almayer/hull/lower_hull
- name = "\improper Hull Lower"
+ name = "\improper Lower Deck Hull"
icon_state = "lowerhull"
fake_zlevel = 2 // lowerdeck
/area/almayer/hull/upper_hull
- name = "\improper Hull Upper"
+ name = "\improper Upper Deck Hull"
icon_state = "upperhull"
fake_zlevel = 1 // upperdeck
/area/almayer/hull/upper_hull/u_f_s
- name = "\improper Upper Fore-Starboard Hull"
+ name = "\improper Upper Deck Fore-Starboard Hull"
icon_state = "upperhull"
/area/almayer/hull/upper_hull/u_m_s
- name = "\improper Upper Midship-Starboard Hull"
+ name = "\improper Upper Deck Starboard-Midship Hull"
icon_state = "upperhull"
/area/almayer/hull/upper_hull/u_a_s
- name = "\improper Upper Aft-Starboard Hull"
+ name = "\improper Upper Deck Starboard-Aft Hull"
icon_state = "upperhull"
/area/almayer/hull/upper_hull/u_f_p
- name = "\improper Upper Fore-Port Hull"
+ name = "\improper Upper Deck Port-Fore Hull"
icon_state = "upperhull"
/area/almayer/hull/upper_hull/u_m_p
- name = "\improper Upper Midship-Port Hull"
+ name = "\improper Upper Deck Port-Midship Hull"
icon_state = "upperhull"
/area/almayer/hull/upper_hull/u_a_p
- name = "\improper Upper Aft-Port Hull"
+ name = "\improper Upper Deck Port-Aft Hull"
icon_state = "upperhull"
/area/almayer/hull/lower_hull/l_f_s
- name = "\improper Lower Fore-Starboard Hull"
+ name = "\improper Lower Deck Starboard-Fore Hull"
icon_state = "upperhull"
/area/almayer/hull/lower_hull/l_m_s
- name = "\improper Lower Midship-Starboard Hull"
+ name = "\improper Lower Deck Starboard-Midship Hull"
icon_state = "upperhull"
/area/almayer/hull/lower_hull/l_a_s
- name = "\improper Lower Aft-Starboard Hull"
+ name = "\improper Lower Deck Starboard Hull"
icon_state = "upperhull"
/area/almayer/hull/lower_hull/l_f_p
- name = "\improper Lower Fore-Port Hull"
+ name = "\improper Lower Deck Port-Fore Hull"
icon_state = "upperhull"
/area/almayer/hull/lower_hull/l_m_p
- name = "\improper Lower Midship-Port Hull"
+ name = "\improper Lower Deck Port-Midship Hull"
icon_state = "upperhull"
/area/almayer/hull/lower_hull/l_a_p
- name = "\improper Lower Aft-Port Hull"
+ name = "\improper Lower Deck Port-Aft Hull"
icon_state = "upperhull"
/area/almayer/living/cryo_cells
- name = "\improper Cryo Cells"
+ name = "\improper Lower Deck Cryo Cells"
icon_state = "cryo"
fake_zlevel = 2 // lowerdeck
@@ -464,22 +465,22 @@
fake_zlevel = 2 // lowerdeck
/area/almayer/living/port_emb
- name = "\improper Extended Mission Bunks"
+ name = "\improper Lower Deck Port Extended Mission Bunks"
icon_state = "portemb"
fake_zlevel = 2 // lowerdeck
/area/almayer/living/starboard_emb
- name = "\improper Extended Mission Bunks"
+ name = "\improper Lower Deck Starboard Extended Mission Bunks"
icon_state = "starboardemb"
fake_zlevel = 2 // lowerdeck
/area/almayer/living/port_garden
- name = "\improper Garden"
+ name = "\improper Port Garden"
icon_state = "portemb"
fake_zlevel = 1 // upperdeck
/area/almayer/living/starboard_garden
- name = "\improper Garden"
+ name = "\improper Starboard Garden"
icon_state = "starboardemb"
fake_zlevel = 1 // upperdeck
@@ -494,12 +495,12 @@
fake_zlevel = 2 // lowerdeck
/area/almayer/living/officer_rnr
- name = "\improper Officer's Lounge"
+ name = "\improper Upper Deck Officer's Lounge"
icon_state = "officerrnr"
fake_zlevel = 1 // upperdeck
/area/almayer/living/officer_study
- name = "\improper Officer's Study"
+ name = "\improper Upper Deck Officer's Study"
icon_state = "officerstudy"
fake_zlevel = 1 // upperdeck
@@ -514,17 +515,17 @@
fake_zlevel = 2 // lowerdeck
/area/almayer/living/gym
- name = "\improper Gym"
+ name = "\improper Lower Deck Gym"
icon_state = "officerrnr"
fake_zlevel = 2 // lowerdeck
/area/almayer/living/cafeteria_officer
- name = "\improper Officer Cafeteria"
+ name = "\improper Upper Deck Officer Cafeteria"
icon_state = "food"
fake_zlevel = 1 // upperdeck
/area/almayer/living/offices
- name = "\improper Conference Office"
+ name = "\improper Lower Deck Conference Office"
icon_state = "briefing"
fake_zlevel = 2 // lowerdeck
@@ -552,7 +553,7 @@
fake_zlevel = 1 // upperdeck
/area/almayer/living/synthcloset
- name = "\improper Synthetic Storage Closet"
+ name = "\improper Upper Deck Synthetic Storage Closet"
icon_state = "livingspace"
fake_zlevel = 1 // upperdeck
@@ -730,16 +731,16 @@
hijack_evacuation_type = EVACUATION_TYPE_ADDITIVE
/area/almayer/lifeboat_pumps/north1
- name = "North West Lifeboat Fuel Pump"
+ name = "Starboard Fore Lifeboat Fuel Pump"
/area/almayer/lifeboat_pumps/north2
- name = "North East Lifeboat Fuel Pump"
+ name = "Starboard Aft Lifeboat Fuel Pump"
/area/almayer/lifeboat_pumps/south1
- name = "South West Lifeboat Fuel Pump"
+ name = "Port Fore Lifeboat Fuel Pump"
/area/almayer/lifeboat_pumps/south2
- name = "South East Lifeboat Fuel Pump"
+ name = "Port Aft Lifeboat Fuel Pump"
/area/almayer/command/lifeboat
name = "\improper Lifeboat Docking Port"
@@ -751,7 +752,7 @@
icon_state = "lifeboat"
/area/space/almayer/lifeboat_dock
- name = "\improper Lifeboat Docking Port"
+ name = "\improper Port Lifeboat Docking"
icon_state = "lifeboat"
fake_zlevel = 1 // upperdeck
diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm
index 4a27341775..d990f82f19 100644
--- a/code/game/gamemodes/cm_initialize.dm
+++ b/code/game/gamemodes/cm_initialize.dm
@@ -362,21 +362,27 @@ Additional game mode variables.
else
available_xenos_non_ssd += cur_xeno
- // Only offer buried larva if there is no queue:
- // This basically means this block of code will almost never execute, because we are instead relying on the hive cores/larva pops to handle their larva
- // Technically this should be after a get_alien_candidates() call to be accurate, but we are intentionally trying to not call that proc as much as possible
- if(GLOB.xeno_queue_candidate_count < 1)
- var/datum/hive_status/hive
- for(var/hivenumber in GLOB.hive_datum)
- hive = GLOB.hive_datum[hivenumber]
- if(!hive.hardcore && hive.stored_larva && (hive.hive_location || (world.time < XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time)))
- if(SSticker.mode && (SSticker.mode.flags_round_type & MODE_RANDOM_HIVE))
- available_xenos |= "any buried larva"
- LAZYADD(available_xenos["any buried larva"], hive)
- else
- var/larva_option = "buried larva ([hive])"
- available_xenos += larva_option
- available_xenos[larva_option] = list(hive)
+ var/datum/hive_status/hive
+ for(var/hivenumber in GLOB.hive_datum)
+ hive = GLOB.hive_datum[hivenumber]
+ if(hive.hardcore)
+ continue
+ if(!hive.stored_larva)
+ continue
+ // Only offer buried larva if there is no queue because we are instead relying on the hive cores/larva pops to handle their larva:
+ // Technically this should be after a get_alien_candidates() call to be accurate, but we are intentionally trying to not call that proc as much as possible
+ if(hive.hive_location && GLOB.xeno_queue_candidate_count > 0)
+ continue
+ if(!hive.hive_location && (world.time > XENO_BURIED_LARVA_TIME_LIMIT + SSticker.round_start_time))
+ continue
+
+ if(SSticker.mode && (SSticker.mode.flags_round_type & MODE_RANDOM_HIVE))
+ available_xenos |= "any buried larva"
+ LAZYADD(available_xenos["any buried larva"], hive)
+ else
+ var/larva_option = "buried larva ([hive])"
+ available_xenos += larva_option
+ available_xenos[larva_option] = list(hive)
if(!available_xenos.len || (instant_join && !available_xenos_non_ssd.len))
if(!xeno_candidate.client || !xeno_candidate.client.prefs || !(xeno_candidate.client.prefs.be_special & BE_ALIEN_AFTER_DEATH))
@@ -429,7 +435,7 @@ Additional game mode variables.
for(var/mob_name in picked_hive.banished_ckeys)
if(picked_hive.banished_ckeys[mob_name] == xeno_candidate.ckey)
to_chat(xeno_candidate, SPAN_WARNING("You are banished from the [picked_hive], you may not rejoin unless the Queen re-admits you or dies."))
- return
+ return FALSE
if(isnewplayer(xeno_candidate))
var/mob/new_player/noob = xeno_candidate
noob.close_spawn_windows()
@@ -449,9 +455,6 @@ Additional game mode variables.
return FALSE
new_xeno = userInput
- if(!xeno_candidate)
- return FALSE
-
if(!(new_xeno in GLOB.living_xeno_list) || new_xeno.stat == DEAD)
to_chat(xeno_candidate, SPAN_WARNING("You cannot join if the xenomorph is dead."))
return FALSE
@@ -485,14 +488,14 @@ Additional game mode variables.
else new_xeno = pick(available_xenos_non_ssd) //Just picks something at random.
if(istype(new_xeno) && xeno_candidate && xeno_candidate.client)
if(isnewplayer(xeno_candidate))
- var/mob/new_player/N = xeno_candidate
- N.close_spawn_windows()
+ var/mob/new_player/noob = xeno_candidate
+ noob.close_spawn_windows()
for(var/mob_name in new_xeno.hive.banished_ckeys)
if(new_xeno.hive.banished_ckeys[mob_name] == xeno_candidate.ckey)
to_chat(xeno_candidate, SPAN_WARNING("You are banished from this hive, You may not rejoin unless the Queen re-admits you or dies."))
- return
+ return FALSE
if(transfer_xeno(xeno_candidate, new_xeno))
- return 1
+ return TRUE
to_chat(xeno_candidate, "JAS01: Something went wrong, tell a coder.")
/datum/game_mode/proc/attempt_to_join_as_facehugger(mob/xeno_candidate)
@@ -600,7 +603,14 @@ Additional game mode variables.
for(var/obj/effect/alien/resin/special/pylon/cycled_pylon as anything in hive.hive_structures[XENO_STRUCTURE_PYLON])
if(cycled_pylon.lesser_drone_spawns >= 1)
- selection_list += "[cycled_pylon.name] at [get_area(cycled_pylon)]"
+ var/pylon_number = 1
+ var/pylon_name = "[cycled_pylon.name] at [get_area(cycled_pylon)]"
+ //For renaming the pylon if we have duplicates
+ var/pylon_selection_name = pylon_name
+ while(pylon_selection_name in selection_list)
+ pylon_selection_name = "[pylon_name] ([pylon_number])"
+ pylon_number ++
+ selection_list += pylon_selection_name
selection_list_structure += cycled_pylon
if(!length(selection_list))
@@ -620,20 +630,21 @@ Additional game mode variables.
/datum/game_mode/proc/transfer_xeno(xeno_candidate, mob/living/new_xeno)
if(!xeno_candidate || !isxeno(new_xeno) || QDELETED(new_xeno))
return FALSE
+
var/datum/mind/xeno_candidate_mind
if(ismind(xeno_candidate))
xeno_candidate_mind = xeno_candidate
else if(ismob(xeno_candidate))
- var/mob/M = xeno_candidate
- if(M.mind)
- xeno_candidate_mind = M.mind
+ var/mob/xeno_candidate_mob = xeno_candidate
+ if(xeno_candidate_mob.mind)
+ xeno_candidate_mind = xeno_candidate_mob.mind
else
- xeno_candidate_mind = new /datum/mind(M.key, M.ckey)
+ xeno_candidate_mind = new /datum/mind(xeno_candidate_mob.key, xeno_candidate_mob.ckey)
xeno_candidate_mind.active = TRUE
xeno_candidate_mind.current = new_xeno
else if(isclient(xeno_candidate))
- var/client/C = xeno_candidate
- xeno_candidate_mind = new /datum/mind(C.key, C.ckey)
+ var/client/xeno_candidate_client = xeno_candidate
+ xeno_candidate_mind = new /datum/mind(xeno_candidate_client.key, xeno_candidate_client.ckey)
xeno_candidate_mind.active = TRUE
xeno_candidate_mind.current = new_xeno
else
diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm
index 97578eb115..fb4f5ee14d 100644
--- a/code/game/jobs/job/civilians/other/mess_seargent.dm
+++ b/code/game/jobs/job/civilians/other/mess_seargent.dm
@@ -1,13 +1,31 @@
/datum/job/civilian/chef
title = JOB_MESS_SERGEANT
- total_positions = 1
+ total_positions = 2
spawn_positions = 1
+ allow_additional = TRUE
+ scaled = TRUE
selection_class = "job_ot"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
supervisors = "the auxiliary support officer"
gear_preset = /datum/equipment_preset/uscm_ship/chef
entry_message_body = "Your job is to service the marines with excellent food, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!"
+/datum/job/civilian/chef/set_spawn_positions(count)
+ spawn_positions = mess_sergeant_slot_formula(count)
+
+/datum/job/civilian/chef/get_total_positions(latejoin = FALSE)
+ var/positions = spawn_positions
+ if(latejoin)
+ positions = mess_sergeant_slot_formula(get_total_marines())
+ if(positions <= total_positions_so_far)
+ positions = total_positions_so_far
+ else
+ total_positions_so_far = positions
+ else
+ total_positions_so_far = positions
+
+ return positions
+
/obj/effect/landmark/start/chef
name = JOB_MESS_SERGEANT
icon_state = "chef_spawn"
diff --git a/code/game/jobs/slot_scaling.dm b/code/game/jobs/slot_scaling.dm
index 7230f57eb7..2d444d06e5 100644
--- a/code/game/jobs/slot_scaling.dm
+++ b/code/game/jobs/slot_scaling.dm
@@ -50,3 +50,6 @@
/proc/working_joe_slot_formula(playercount)
return job_slot_formula(playercount,30,1,3,6)
+
+/proc/mess_sergeant_slot_formula(playercount)
+ return job_slot_formula(playercount, 70, 1, 1, 2)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 3332577683..b39f59530a 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -43,7 +43,7 @@
var/stat_msg1
var/stat_msg2
- var/datum/tacmap/tacmap
+ var/datum/tacmap/drawing/tacmap
var/minimap_type = MINIMAP_FLAG_USCM
processing = TRUE
diff --git a/code/game/machinery/computer/groundside_operations.dm b/code/game/machinery/computer/groundside_operations.dm
index 9856ae8f97..f2b36276c8 100644
--- a/code/game/machinery/computer/groundside_operations.dm
+++ b/code/game/machinery/computer/groundside_operations.dm
@@ -25,7 +25,11 @@
add_pmcs = FALSE
else if(SSticker.current_state < GAME_STATE_PLAYING)
RegisterSignal(SSdcs, COMSIG_GLOB_MODE_PRESETUP, PROC_REF(disable_pmc))
- tacmap = new(src, minimap_type)
+ if(announcement_faction == FACTION_MARINE)
+ tacmap = new /datum/tacmap/drawing(src, minimap_type)
+ else
+ tacmap = new(src, minimap_type) // Non-drawing version
+
return ..()
/obj/structure/machinery/computer/groundside_operations/Destroy()
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 1cf6b52da1..717e089db0 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -101,6 +101,21 @@
. = ..()
screen_loc = null
+/obj/item/card/id/proc/GetJobName() //Used in secHUD icon generation
+
+ var/job_icons = get_all_job_icons()
+ var/centcom = get_all_centcom_jobs()
+
+ if(assignment in job_icons)
+ return assignment//Check if the job has a hud icon
+ if(rank in job_icons)
+ return rank
+ if(assignment in centcom)
+ return "Centcom"//Return with the NT logo if it is a Centcom job
+ if(rank in centcom)
+ return "Centcom"
+ return "Unknown" //Return unknown if none of the above apply
+
/obj/item/card/id/attack_self(mob/user as mob)
..()
user.visible_message("[user] shows you: [icon2html(src, viewers(user))] [name]: assignment: [assignment]")
diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm
index 6abd709801..69e745da08 100644
--- a/code/game/objects/items/devices/cictablet.dm
+++ b/code/game/objects/items/devices/cictablet.dm
@@ -24,7 +24,10 @@
COOLDOWN_DECLARE(distress_cooldown)
/obj/item/device/cotablet/Initialize()
- tacmap = new(src, minimap_type)
+ if(announcement_faction == FACTION_MARINE)
+ tacmap = new /datum/tacmap/drawing(src, minimap_type)
+ else
+ tacmap = new(src, minimap_type) // Non-drawing version
if(SSticker.mode && MODE_HAS_FLAG(MODE_FACTION_CLASH))
add_pmcs = FALSE
else if(SSticker.current_state < GAME_STATE_PLAYING)
diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm
index 830df96590..ac0a2263cd 100644
--- a/code/game/objects/items/explosives/plastic.dm
+++ b/code/game/objects/items/explosives/plastic.dm
@@ -26,7 +26,7 @@
/obj/item/explosive/plastic/Destroy()
disarm()
- . = ..()
+ return ..()
/obj/item/explosive/plastic/explosion_throw(severity, direction, scatter_multiplier)
if(active)
@@ -156,7 +156,9 @@
plant_target.overlays -= overlay
qdel(overlay)
plant_target.contents -= src
- forceMove(get_turf(plant_target))
+ var/turf/plant_turf = get_turf(plant_target)
+ if(plant_turf)
+ forceMove(plant_turf)
plant_target = null
if(customizable)
if(active) //deactivate
diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm
index b20c567150..35558bf019 100644
--- a/code/game/objects/items/props/helmetgarb.dm
+++ b/code/game/objects/items/props/helmetgarb.dm
@@ -529,7 +529,7 @@
/obj/item/prop/helmetgarb/family_photo/pickup(mob/user, silent)
. = ..()
if(!owner)
- RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner))
+ RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner), override = TRUE)
///Sets the owner of the family photo to the human it spawns with, needs var/source for signals
diff --git a/code/game/objects/items/reagent_containers/food/fortunecookie.dm b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
index a878ff589d..270bd4d7c4 100644
--- a/code/game/objects/items/reagent_containers/food/fortunecookie.dm
+++ b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
@@ -93,7 +93,7 @@
user.put_in_hands(cookiefortune)
cookiefortune = null
else
- to_chat(SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
+ to_chat(user, SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
else
. = ..()
@@ -109,7 +109,7 @@
user.put_in_hands(cookiefortune)
cookiefortune = null
else
- to_chat(SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
+ to_chat(user, SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
else
. = ..()
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 3912e2d641..82e091be90 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -313,6 +313,8 @@ Also change the icon to reflect the amount of sheets, if possible.*/
if(mods["alt"])
if(!CAN_PICKUP(user, src))
return
+ if(amount <= 1)
+ return
var/desired = tgui_input_number(user, "How much would you like to split off from this stack?", "How much?", 1, amount-1, 1)
if(!desired)
return
diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm
index 0b4a7cc987..f70f934970 100644
--- a/code/game/objects/items/tools/misc_tools.dm
+++ b/code/game/objects/items/tools/misc_tools.dm
@@ -289,7 +289,7 @@
/obj/item/tool/pen/fountain/pickup(mob/user, silent)
. = ..()
if(!owner_name)
- RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner))
+ RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner), override = TRUE)
///Sets the owner of the pen to who it spawns with, requires var/source for signals
/obj/item/tool/pen/fountain/proc/set_owner(datum/source)
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index 851f203c52..88946f5fa4 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -591,7 +591,7 @@
/obj/item/toy/plush/random_plushie/pickup(mob/user, silent)
. = ..()
- RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(create_plushie))
+ RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(create_plushie), override = TRUE)
///The randomizer picking and spawning a plushie on either the ground or in the humans backpack. Needs var/source due to signals
/obj/item/toy/plush/random_plushie/proc/create_plushie(datum/source)
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 6ff298dc9b..cfe7531f5f 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -46,9 +46,8 @@
material_sheet = new parts_type(current_turf, 2)
// Move the objects back to the turf, above the crate material
- for(var/atom/movable/moving_atom in contents)
- var/atom/movable/current_atom = contents[1]
- current_atom.forceMove(current_turf)
+ for(var/atom/movable/moving_atom as anything in contents)
+ moving_atom.forceMove(current_turf)
deconstruct(TRUE)
diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm
index 9e5a70dc80..c7cee6b5c8 100644
--- a/code/game/objects/structures/props.dm
+++ b/code/game/objects/structures/props.dm
@@ -812,14 +812,14 @@
/obj/structure/prop/brazier/campfire/attackby(obj/item/attacking_item, mob/user)
if(!istype(attacking_item, /obj/item/stack/sheet/wood))
- to_chat(SPAN_NOTICE("You cannot fuel [src] with [attacking_item]."))
+ to_chat(user, SPAN_NOTICE("You cannot fuel [src] with [attacking_item]."))
return
var/obj/item/stack/sheet/wood/fuel = attacking_item
if(remaining_fuel >= initial(remaining_fuel))
to_chat(user, SPAN_NOTICE("You cannot fuel [src] further."))
return
if(!fuel.use(1))
- to_chat(SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src]."))
+ to_chat(user, SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src]."))
return
visible_message(SPAN_NOTICE("[user] fuels [src] with [fuel]."))
remaining_fuel++
diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm
index a9a7332dfb..d71d42ff2c 100644
--- a/code/game/turfs/floor_types.dm
+++ b/code/game/turfs/floor_types.dm
@@ -203,6 +203,13 @@
icon_state = "default"
plating_type = /turf/open/floor/plating/almayer
+/// Admin level thunderdome floor. Doesn't get damaged by explosions and such for pristine testing
+/turf/open/floor/tdome
+ icon = 'icons/turf/almayer.dmi'
+ icon_state = "plating"
+ plating_type = /turf/open/floor/tdome
+ hull_floor = TRUE
+
//Cargo elevator
/turf/open/floor/almayer/empty
name = "empty space"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index c60555cb4e..8c556d2a9a 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -70,6 +70,7 @@ var/list/admin_verbs_default = list(
/client/proc/cmd_admin_say, /*staff-only ooc chat*/
/client/proc/cmd_mod_say, /* alternate way of typing asay, no different than cmd_admin_say */
/client/proc/staffwho,
+ /client/proc/cmd_admin_tacmaps_panel,
)
var/list/admin_verbs_admin = list(
@@ -100,10 +101,8 @@ var/list/admin_verbs_ban = list(
)
var/list/admin_verbs_sounds = list(
- /client/proc/play_web_sound,
- /client/proc/play_sound,
- /client/proc/stop_web_sound,
- /client/proc/stop_sound,
+ /client/proc/play_admin_sound,
+ /client/proc/stop_admin_sound,
/client/proc/cmd_admin_vox_panel
)
diff --git a/code/modules/admin/tacmap_panel/tacmap_admin_panel.dm b/code/modules/admin/tacmap_panel/tacmap_admin_panel.dm
new file mode 100644
index 0000000000..dcc8c7d5b6
--- /dev/null
+++ b/code/modules/admin/tacmap_panel/tacmap_admin_panel.dm
@@ -0,0 +1,9 @@
+/client/proc/cmd_admin_tacmaps_panel()
+ set name = "Tacmaps Panel"
+ set category = "Admin.Panels"
+
+ if(!check_rights(R_ADMIN|R_MOD))
+ to_chat(src, "Only administrators may use this command.")
+ return
+
+ GLOB.tacmap_admin_panel.tgui_interact(mob)
diff --git a/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm b/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm
new file mode 100644
index 0000000000..e4b6f68460
--- /dev/null
+++ b/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm
@@ -0,0 +1,152 @@
+GLOBAL_DATUM_INIT(tacmap_admin_panel, /datum/tacmap_admin_panel, new)
+
+#define LATEST_SELECTION -1
+
+/datum/tacmap_admin_panel
+ var/name = "Tacmap Panel"
+ /// The index picked last for USCM (zero indexed), -1 will try to select latest if it exists
+ var/uscm_selection = LATEST_SELECTION
+ /// The index picked last for Xenos (zero indexed), -1 will try to select latest if it exists
+ var/xeno_selection = LATEST_SELECTION
+ /// A url that will point to the wiki map for the current map as a fall back image
+ var/static/wiki_map_fallback
+ /// The last time the map selection was changed - used as a key to trick react into updating the map
+ var/last_update_time = 0
+
+/datum/tacmap_admin_panel/tgui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ if(!wiki_map_fallback)
+ var/wiki_url = CONFIG_GET(string/wikiurl)
+ var/obj/item/map/current_map/new_map = new
+ if(wiki_url && new_map.html_link)
+ wiki_map_fallback ="[wiki_url]/[new_map.html_link]"
+ else
+ debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[new_map.html_link]'")
+ qdel(new_map)
+
+ // Ensure we actually have the latest map images sent (recache can handle older/different faction maps)
+ resend_current_map_png(user)
+
+ ui = new(user, src, "TacmapAdminPanel", "Tacmap Panel")
+ ui.open()
+
+/datum/tacmap_admin_panel/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/tacmap_admin_panel/ui_data(mob/user)
+ var/list/data = list()
+ var/list/uscm_ckeys = list()
+ var/list/xeno_ckeys = list()
+ var/list/uscm_names = list()
+ var/list/xeno_names = list()
+ var/list/uscm_times = list()
+ var/list/xeno_times = list()
+
+ // Assumption: Length of flat_tacmap_data is the same as svg_tacmap_data
+ var/uscm_length = length(GLOB.uscm_svg_tacmap_data)
+ if(uscm_selection < 0 || uscm_selection >= uscm_length)
+ uscm_selection = uscm_length - 1
+ for(var/i = 1, i <= uscm_length, i++)
+ var/datum/svg_overlay/current_svg = GLOB.uscm_svg_tacmap_data[i]
+ uscm_ckeys += current_svg.ckey
+ uscm_names += current_svg.name
+ uscm_times += current_svg.time
+ data["uscm_ckeys"] = uscm_ckeys
+ data["uscm_names"] = uscm_names
+ data["uscm_times"] = uscm_times
+
+ var/xeno_length = length(GLOB.xeno_svg_tacmap_data)
+ if(xeno_selection < 0 || xeno_selection >= xeno_length)
+ xeno_selection = xeno_length - 1
+ for(var/i = 1, i <= xeno_length, i++)
+ var/datum/svg_overlay/current_svg = GLOB.xeno_svg_tacmap_data[i]
+ xeno_ckeys += current_svg.ckey
+ xeno_names += current_svg.name
+ xeno_times += current_svg.time
+ data["xeno_ckeys"] = xeno_ckeys
+ data["xeno_names"] = xeno_names
+ data["xeno_times"] = xeno_times
+
+ if(uscm_selection == LATEST_SELECTION)
+ data["uscm_map"] = null
+ data["uscm_svg"] = null
+ else
+ var/datum/flattened_tacmap/selected_flat = GLOB.uscm_flat_tacmap_data[uscm_selection + 1]
+ var/datum/svg_overlay/selected_svg = GLOB.uscm_svg_tacmap_data[uscm_selection + 1]
+ data["uscm_map"] = selected_flat.flat_tacmap
+ data["uscm_svg"] = selected_svg.svg_data
+
+ if(xeno_selection == LATEST_SELECTION)
+ data["xeno_map"] = null
+ data["xeno_svg"] = null
+ else
+ var/datum/flattened_tacmap/selected_flat = GLOB.xeno_flat_tacmap_data[xeno_selection + 1]
+ var/datum/svg_overlay/selected_svg = GLOB.xeno_svg_tacmap_data[xeno_selection + 1]
+ data["xeno_map"] = selected_flat.flat_tacmap
+ data["xeno_svg"] = selected_svg.svg_data
+
+ data["uscm_selection"] = uscm_selection
+ data["xeno_selection"] = xeno_selection
+ data["map_fallback"] = wiki_map_fallback
+ data["last_update_time"] = last_update_time
+
+ return data
+
+/datum/tacmap_admin_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ var/mob/user = ui.user
+ var/client/client_user = user.client
+ if(!client_user)
+ return // Is this even possible?
+
+ switch(action)
+ if("recache")
+ var/is_uscm = params["uscm"]
+ var/datum/flattened_tacmap/selected_flat
+ if(is_uscm)
+ if(uscm_selection == LATEST_SELECTION)
+ return TRUE
+ selected_flat = GLOB.uscm_flat_tacmap_data[uscm_selection + 1]
+ else
+ if(xeno_selection == LATEST_SELECTION)
+ return TRUE
+ selected_flat = GLOB.xeno_flat_tacmap_data[xeno_selection + 1]
+ SSassets.transport.send_assets(client_user, selected_flat.asset_key)
+ last_update_time = world.time
+ return TRUE
+
+ if("change_selection")
+ var/is_uscm = params["uscm"]
+ if(is_uscm)
+ uscm_selection = params["index"]
+ else
+ xeno_selection = params["index"]
+ last_update_time = world.time
+ return TRUE
+
+ if("delete")
+ var/is_uscm = params["uscm"]
+ var/datum/svg_overlay/selected_svg
+ if(is_uscm)
+ if(uscm_selection == LATEST_SELECTION)
+ return TRUE
+ selected_svg = GLOB.uscm_svg_tacmap_data[uscm_selection + 1]
+ else
+ if(xeno_selection == LATEST_SELECTION)
+ return TRUE
+ selected_svg = GLOB.xeno_svg_tacmap_data[xeno_selection + 1]
+ selected_svg.svg_data = null
+ last_update_time = world.time
+ message_admins("[key_name_admin(usr)] deleted the tactical map drawing by [selected_svg.ckey].")
+ return TRUE
+
+/datum/tacmap_admin_panel/ui_close(mob/user)
+ . = ..()
+ uscm_selection = LATEST_SELECTION
+ xeno_selection = LATEST_SELECTION
+
+#undef LATEST_SELECTION
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index cef0625c0a..2806b8c3ba 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -15,11 +15,17 @@
if(!src.mob)
return
+ var/list/area_turfs = get_area_turfs(A)
+
+ if(!length(area_turfs))
+ to_chat(src, "There aren't any turfs in this area!")
+ return
+
if(!isobserver(mob))
src.admin_ghost()
src.mob.on_mob_jump()
- src.mob.forceMove(pick(get_area_turfs(A)))
+ src.mob.forceMove(pick(area_turfs))
message_admins(WRAP_STAFF_LOG(usr, "jumped to area [get_area(usr)] ([usr.loc.x],[usr.loc.y],[usr.loc.z])."), usr.loc.x, usr.loc.y, usr.loc.z)
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index 9d622fce50..0763a0e107 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -1,45 +1,83 @@
-/client/proc/play_web_sound()
+/client/proc/play_admin_sound()
set category = "Admin.Fun"
- set name = "Play Internet Sound"
+ set name = "Play Admin Sound"
if(!check_rights(R_SOUNDS))
return
- var/ytdl = CONFIG_GET(string/invoke_youtubedl)
- if(!ytdl)
- to_chat(src, SPAN_BOLDWARNING("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value
+ var/sound_mode = tgui_input_list(src, "Play a sound from which source?", "Select Source", list("Web", "Upload"))
+ if(!sound_mode)
return
- var/web_sound_input = input("Enter content URL (supported sites only)", "Play Internet Sound via youtube-dl") as text|null
- if(!istext(web_sound_input) || !length(web_sound_input))
- return
+ var/list/data = list()
+ var/log_title = TRUE
+ var/web_sound_input
+ var/asset_name
+ var/must_send_assets = FALSE
+ var/announce_title = TRUE
+
+ if(sound_mode == "Web")
+ var/ytdl = CONFIG_GET(string/invoke_youtubedl)
+ if(!ytdl)
+ to_chat(src, SPAN_BOLDWARNING("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value
+ return
- web_sound_input = trim(web_sound_input)
+ web_sound_input = input("Enter content URL (supported sites only)", "Play Internet Sound via youtube-dl") as text|null
+ if(!istext(web_sound_input) || !length(web_sound_input))
+ return
- if(findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol))
- to_chat(src, SPAN_WARNING("Non-http(s) URIs are not allowed."))
- to_chat(src, SPAN_WARNING("For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website."))
- return
+ web_sound_input = trim(web_sound_input)
- var/web_sound_url = ""
- var/list/music_extra_data = list()
- var/title
+ if(findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol))
+ to_chat(src, SPAN_WARNING("Non-http(s) URIs are not allowed."))
+ to_chat(src, SPAN_WARNING("For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website."))
+ return
- var/list/output = world.shelleo("[ytdl] --geo-bypass --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_url_scrub(web_sound_input)]\"")
- var/errorlevel = output[SHELLEO_ERRORLEVEL]
- var/stdout = output[SHELLEO_STDOUT]
- var/stderr = output[SHELLEO_STDERR]
+ var/list/output = world.shelleo("[ytdl] --geo-bypass --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_url_scrub(web_sound_input)]\"")
+ var/errorlevel = output[SHELLEO_ERRORLEVEL]
+ var/stdout = output[SHELLEO_STDOUT]
+ var/stderr = output[SHELLEO_STDERR]
- if(errorlevel)
- to_chat(src, SPAN_WARNING("Youtube-dl URL retrieval FAILED: [stderr]"))
- return
+ if(errorlevel)
+ to_chat(src, SPAN_WARNING("Youtube-dl URL retrieval FAILED: [stderr]"))
+ return
- var/list/data = list()
- try
- data = json_decode(stdout)
- catch(var/exception/e)
- to_chat(src, SPAN_WARNING("Youtube-dl JSON parsing FAILED: [e]: [stdout]"))
- return
+ try
+ data = json_decode(stdout)
+ catch(var/exception/e)
+ to_chat(src, SPAN_WARNING("Youtube-dl JSON parsing FAILED: [e]: [stdout]"))
+ return
+
+ else if(sound_mode == "Upload")
+ var/current_transport = CONFIG_GET(string/asset_transport)
+ if(!current_transport || current_transport == "simple")
+ if(tgui_alert(usr, "WARNING: Your server is using simple asset transport. Sounds will have to be sent directly to players, which may freeze the game for long durations. Are you SURE?", "Really play direct sound?", list("Yes", "No")) != "Yes")
+ return
+ must_send_assets = TRUE
+
+ var/soundfile = input(usr, "Choose a sound file to play", "Upload Sound") as null|file
+ if(!soundfile)
+ return
+
+ var/static/regex/only_extension = regex(@{"^.*\.([a-z0-9]{1,5})$"}, "gi")
+ var/extension = only_extension.Replace("[soundfile]", "$1")
+ if(!length(extension))
+ to_chat(src, SPAN_WARNING("Invalid filename extension."))
+ return
+
+ var/static/playsound_notch = 1
+ asset_name = "admin_sound_[playsound_notch++].[extension]"
+ SSassets.transport.register_asset(asset_name, soundfile)
+ message_admins("[key_name_admin(src)] uploaded admin sound '[soundfile]' to asset transport.")
+
+ var/static/regex/remove_extension = regex(@{"\.[a-z0-9]+$"}, "gi")
+ data["title"] = remove_extension.Replace("[soundfile]", "")
+ data["url"] = SSassets.transport.get_asset_url(asset_name)
+ web_sound_input = "[soundfile]"
+ log_title = FALSE
+ var/title
+ var/web_sound_url = ""
+ var/list/music_extra_data = list()
if(data["url"])
music_extra_data["link"] = data["url"]
music_extra_data["title"] = data["title"]
@@ -48,19 +86,28 @@
music_extra_data["start"] = data["start_time"]
music_extra_data["end"] = data["end_time"]
- if(web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol))
+ if(!must_send_assets && web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol))
to_chat(src, SPAN_BOLDWARNING("BLOCKED: Content URL not using http(s) protocol"), confidential = TRUE)
to_chat(src, SPAN_WARNING("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol"), confidential = TRUE)
return
+ switch(tgui_alert(src, "Show the name of this sound to the players?", "Sound Name", list("Yes","No","Cancel")))
+ if("No")
+ music_extra_data["title"] = "Admin sound"
+ announce_title = FALSE
+ if("Cancel")
+ return
+
var/list/targets = list()
var/list/sound_type_list = list(
"Meme" = SOUND_ADMIN_MEME,
"Atmospheric" = SOUND_ADMIN_ATMOSPHERIC
)
- var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All Inview", "Single Inview"))
+
+ var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All In View Range", "Single Mob"))
var/sound_type = tgui_input_list(src, "What kind of sound is this?", "Select Sound Type", sound_type_list)
sound_type = sound_type_list[sound_type]
+
switch(style)
if("Globally")
targets = GLOB.mob_list
@@ -70,30 +117,40 @@
targets = GLOB.human_mob_list + GLOB.dead_mob_list
if("Ghosts")
targets = GLOB.observer_list + GLOB.dead_mob_list
- if("All Inview")
- targets = viewers(usr.client.view, src)
- if("Single Inview")
- var/mob/choice = tgui_input_list(src, "Select the mob to play to:","Select Mob", sortmobs())
+ if("All In View Range")
+ var/list/atom/ranged_atoms = urange(usr.client.view, get_turf(usr))
+ for(var/mob/receiver in ranged_atoms)
+ targets += receiver
+ if("Single Mob")
+ var/list/mob/all_mobs = sortmobs()
+ var/list/mob/all_client_mobs = list()
+ for(var/mob/mob in all_mobs)
+ if(mob.client)
+ all_client_mobs += mob
+ var/mob/choice = tgui_input_list(src, "Select the mob to play to:","Select Mob", all_client_mobs)
if(QDELETED(choice))
return
targets.Add(choice)
else
return
- for(var/i in targets)
- var/mob/M = i
- var/client/client = M?.client
- if((client?.prefs.toggles_sound & SOUND_INTERNET) && (client?.prefs.toggles_sound & sound_type))
+ for(var/mob/mob as anything in targets)
+ var/client/client = mob?.client
+ if((client?.prefs?.toggles_sound & SOUND_MIDI) && (client?.prefs?.toggles_sound & sound_type))
+ if(must_send_assets)
+ SSassets.transport.send_assets(client, asset_name)
client?.tgui_panel?.play_music(web_sound_url, music_extra_data)
+ if(announce_title)
+ to_chat(client, SPAN_BOLDANNOUNCE("An admin played: [music_extra_data["title"]]"), confidential = TRUE)
else
client?.tgui_panel?.stop_music()
- log_admin("[key_name(src)] played web sound: [web_sound_input] - [title] - [style]")
- message_admins("[key_name_admin(src)] played web sound: [web_sound_input] - [title] - [style]")
+ log_admin("[key_name(src)] played admin sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")
+ message_admins("[key_name_admin(src)] played admin sound: [web_sound_input] -[log_title ? " [title] -" : ""] [style]")
-/client/proc/stop_web_sound()
+/client/proc/stop_admin_sound()
set category = "Admin.Fun"
- set name = "Stop Internet Sounds"
+ set name = "Stop Admin Sounds"
if(!check_rights(R_SOUNDS))
return
@@ -105,86 +162,3 @@
log_admin("[key_name(src)] stopped the currently playing web sounds.")
message_admins("[key_name_admin(src)] stopped the currently playing web sounds.")
-/client/proc/play_sound(S as sound)
- set category = "Admin.Fun"
- set name = "Play Midi Sound"
- if(!check_rights(R_SOUNDS))
- return
-
- var/freq = 1
- var/vol = tgui_input_number(src, "What volume would you like the sound to play at?", "Volume", 25, 100, 1)
- if(!vol)
- return
- vol = clamp(vol, 1, 100)
-
- var/sound/admin_sound = new()
- admin_sound.file = S
- admin_sound.priority = 250
- admin_sound.channel = SOUND_CHANNEL_ADMIN_MIDI
- admin_sound.frequency = freq
- admin_sound.wait = 1
- admin_sound.repeat = FALSE
- admin_sound.status = SOUND_STREAM
- admin_sound.volume = vol
-
- var/showtitle = FALSE
- var/res = alert(src, "Show the title of this song to the players?",, "Yes","No", "Cancel")
- switch(res)
- if("Yes")
- showtitle = TRUE
- if("Cancel")
- return
-
- var/list/targets = list()
- var/list/sound_type_list = list(
- "Meme" = SOUND_ADMIN_MEME,
- "Atmospheric" = SOUND_ADMIN_ATMOSPHERIC
- )
- var/style = tgui_input_list(src, "Who do you want to play this to?", "Select Listeners", list("Globally", "Xenos", "Marines", "Ghosts", "All Inview", "Single Inview"))
- var/sound_type = tgui_input_list(src, "What kind of sound is this?", "Select Sound Type", sound_type_list)
- sound_type = sound_type_list[sound_type]
- switch(style)
- if("Globally")
- targets = GLOB.mob_list
- if("Xenos")
- targets = GLOB.xeno_mob_list + GLOB.dead_mob_list
- if("Marines")
- targets = GLOB.human_mob_list + GLOB.dead_mob_list
- if("Ghosts")
- targets = GLOB.observer_list + GLOB.dead_mob_list
- if("All Inview")
- targets = viewers(usr.client.view, src)
- if("Single Inview")
- var/mob/choice = tgui_input_list(src, "Select the mob to play to:","Select Mob", sortmobs())
- if(QDELETED(choice))
- return
- targets.Add(choice)
- else
- return
-
- for(var/items in targets)
- var/mob/Mob = items
- var/client/client = Mob?.client
- if((client?.prefs.toggles_sound & SOUND_INTERNET) && (client?.prefs.toggles_sound & sound_type))
- admin_sound.volume = vol * client?.admin_music_volume
- SEND_SOUND(Mob, admin_sound)
- admin_sound.volume = vol
- if(showtitle)
- to_chat(client, SPAN_BOLDANNOUNCE("An admin played: [S]"), confidential = TRUE)
-
- log_admin("[key_name(src)] played midi sound [S] - [style]")
- message_admins("[key_name_admin(src)] played midi sound [S] - [style]")
-
-/client/proc/stop_sound()
- set category = "Admin.Fun"
- set name = "Stop Midi Sounds"
-
- if(!check_rights(R_SOUNDS))
- return
-
- for(var/mob/M in GLOB.player_list)
- if(M.client)
- SEND_SOUND(M, sound(null))
-
- log_admin("[key_name(src)] stopped midi sounds.")
- message_admins("[key_name_admin(src)] stopped midi sounds.")
diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm
index 90bbd6ef9a..4fd9e7c88a 100644
--- a/code/modules/almayer/machinery.dm
+++ b/code/modules/almayer/machinery.dm
@@ -80,13 +80,19 @@
use_power = USE_POWER_IDLE
density = TRUE
idle_power_usage = 2
- ///flags that we want to be shown when you interact with this table
var/datum/tacmap/map
+ ///flags that we want to be shown when you interact with this table
var/minimap_type = MINIMAP_FLAG_USCM
+ ///The faction that is intended to use this structure (determines type of tacmap used)
+ var/faction = FACTION_MARINE
/obj/structure/machinery/prop/almayer/CICmap/Initialize()
. = ..()
- map = new(src, minimap_type)
+
+ if (faction == FACTION_MARINE)
+ map = new /datum/tacmap/drawing(src, minimap_type)
+ else
+ map = new(src, minimap_type) // Non-drawing version
/obj/structure/machinery/prop/almayer/CICmap/Destroy()
QDEL_NULL(map)
@@ -99,12 +105,15 @@
/obj/structure/machinery/prop/almayer/CICmap/upp
minimap_type = MINIMAP_FLAG_UPP
+ faction = FACTION_UPP
/obj/structure/machinery/prop/almayer/CICmap/clf
minimap_type = MINIMAP_FLAG_CLF
+ faction = FACTION_CLF
/obj/structure/machinery/prop/almayer/CICmap/pmc
minimap_type = MINIMAP_FLAG_PMC
+ faction = FACTION_PMC
//Nonpower using props
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 459a216918..c3a0c52d0c 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -147,7 +147,6 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
return
cmd_admin_pm(receiver_client, null)
return
-
else if(href_list["FaxView"])
var/datum/fax/info = locate(href_list["FaxView"])
@@ -164,6 +163,14 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
else if(href_list["medals_panel"])
GLOB.medals_panel.tgui_interact(mob)
+ else if(href_list["tacmaps_panel"])
+ GLOB.tacmap_admin_panel.tgui_interact(mob)
+
+ else if(href_list["MapView"])
+ if(isxeno(mob))
+ return
+ GLOB.uscm_tacmap_status.tgui_interact(mob)
+
//NOTES OVERHAUL
if(href_list["add_merit_info"])
var/key = href_list["add_merit_info"]
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 834a0a1b46..16b88e6293 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -586,8 +586,7 @@ var/const/MAX_SAVE_SLOTS = 10
dat += "Tooltips: [tooltips ? "Enabled" : "Disabled"]
"
dat += "tgui Window Mode: [(tgui_fancy) ? "Fancy (default)" : "Compatible (slower)"]
"
dat += "tgui Window Placement: [(tgui_lock) ? "Primary monitor" : "Free (default)"]
"
- dat += "Play Admin Midis: [(toggles_sound & SOUND_MIDI) ? "Yes" : "No"]
"
- dat += "Play Admin Internet Sounds: [(toggles_sound & SOUND_INTERNET) ? "Yes" : "No"]
"
+ dat += "Play Admin Sounds: [(toggles_sound & SOUND_MIDI) ? "Yes" : "No"]
"
dat += "Toggle Meme or Atmospheric Sounds: Toggle
"
dat += "Set Eye Blur Type: Set
"
dat += "Play Lobby Music: [(toggles_sound & SOUND_LOBBY) ? "Yes" : "No"]
"
@@ -1809,11 +1808,10 @@ var/const/MAX_SAVE_SLOTS = 10
if("rand_body")
be_random_body = !be_random_body
- if("hear_midis")
+ if("hear_admin_sounds")
toggles_sound ^= SOUND_MIDI
-
- if("hear_internet")
- toggles_sound ^= SOUND_INTERNET
+ if(!(toggles_sound & SOUND_MIDI))
+ user?.client?.tgui_panel?.stop_music()
if("lobby_music")
toggles_sound ^= SOUND_LOBBY
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index 67b90928cd..49e5ab34b6 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -48,25 +48,10 @@
to_chat(src, "You will [(prefs.toggles_sound & SOUND_REBOOT) ? "now" : "no longer"] hear server reboot sounds.")
/client/verb/togglemidis()
- set name = "Silence Current Midi"
+ set name = "Silence Current Admin Sound"
set category = "Preferences.Sound"
- set desc = "Toggles hearing sounds uploaded by admins"
- // prefs.toggles_sound ^= SOUND_MIDI // Toggle on/off
- // prefs.save_preferences() // We won't save the change - it'll be a temporary switch instead of permanent, but they can still make it permanent in character setup.
- if(prefs.toggles_sound & SOUND_MIDI) // Not using && midi_playing here - since we can't tell how long an admin midi is, the user should always be able to turn it off at any time.
- to_chat(src, SPAN_BOLDNOTICE("The currently playing midi has been silenced."))
- var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = SOUND_CHANNEL_ADMIN_MIDI)
- break_sound.priority = 250
- src << break_sound //breaks the client's sound output on SOUND_CHANNEL_ADMIN_MIDI
- if(src.mob.client.midi_silenced) return
- if(midi_playing)
- total_silenced++
- message_admins("A player has silenced the currently playing midi. Total: [total_silenced] player(s).", 1)
- src.mob.client.midi_silenced = 1
- spawn(30 SECONDS) // Prevents message_admins() spam. Should match with the midi_playing_timer spawn() in playsound.dm
- src.mob.client.midi_silenced = 0
- else
- to_chat(src, SPAN_BOLDNOTICE("You have 'Play Admin Midis' disabled in your Character Setup, so this verb is useless to you."))
+ set desc = "Stops the current admin sound. You can also use the STOP icon in the player above tgchat."
+ tgui_panel?.stop_music()
/client/verb/togglechat()
set name = "Toggle Abovehead Chat"
diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
index 5ada6dcb51..04473bc62c 100644
--- a/code/modules/clothing/under/marine_uniform.dm
+++ b/code/modules/clothing/under/marine_uniform.dm
@@ -1004,7 +1004,7 @@
return
if(!linked_hood)
- to_chat(SPAN_BOLDWARNING("You are missing a linked_hood! This should not be possible."))
+ to_chat(user, SPAN_BOLDWARNING("You are missing a linked_hood! This should not be possible."))
CRASH("[user] attempted to toggle hood on [src] that was missing a linked_hood.")
playsound(user.loc, "armorequip", 25, 1)
diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm
index b1fe57d55d..247118b965 100644
--- a/code/modules/cm_aliens/XenoStructures.dm
+++ b/code/modules/cm_aliens/XenoStructures.dm
@@ -418,18 +418,23 @@
update_icon()
isSwitchingStates = 0
layer = DOOR_OPEN_LAYER
- spawn(close_delay)
- if(!isSwitchingStates && state == 1)
- Close()
+ addtimer(CALLBACK(src, PROC_REF(Close)), close_delay, TIMER_UNIQUE|TIMER_OVERRIDE)
+
+/obj/structure/mineral_door/resin/proc/close_blocked()
+ for(var/turf/turf in locs)
+ for(var/mob/living/living_mob in turf)
+ if(!HAS_TRAIT(living_mob, TRAIT_MERGED_WITH_WEEDS))
+ return TRUE
+ return FALSE
/obj/structure/mineral_door/resin/Close()
- if(!state || !loc) return //already closed
+ if(!state || !loc || isSwitchingStates)
+ return //already closed or changing
//Can't close if someone is blocking it
- for(var/turf/turf in locs)
- if(locate(/mob/living) in turf)
- spawn (close_delay)
- Close()
- return
+ if(close_blocked())
+ addtimer(CALLBACK(src, PROC_REF(Close)), close_delay, TIMER_UNIQUE|TIMER_OVERRIDE)
+ return
+
isSwitchingStates = 1
playsound(loc, "alien_resin_move", 25)
flick("[mineralType]closing",src)
@@ -440,10 +445,10 @@
update_icon()
isSwitchingStates = 0
layer = DOOR_CLOSED_LAYER
- for(var/turf/turf in locs)
- if(locate(/mob/living) in turf)
- Open()
- return
+
+ if(close_blocked())
+ Open()
+ return
/obj/structure/mineral_door/resin/Dismantle(devastated = 0)
qdel(src)
diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm
index 88964d76c3..a7cb15a31c 100644
--- a/code/modules/cm_aliens/structures/special/pylon_core.dm
+++ b/code/modules/cm_aliens/structures/special/pylon_core.dm
@@ -248,7 +248,7 @@
/obj/effect/alien/resin/special/pylon/core/proc/update_minimap_icon()
SSminimaps.remove_marker(src)
- SSminimaps.add_marker(src, z, MINIMAP_FLAG_XENO, "core")
+ SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(linked_hive?.hivenumber), "core")
/obj/effect/alien/resin/special/pylon/core/process()
. = ..()
@@ -272,12 +272,14 @@
if(spawning_larva || (last_larva_queue_time + spawn_cooldown * 4) < world.time)
last_larva_queue_time = world.time
var/list/players_with_xeno_pref = get_alien_candidates(linked_hive)
- if(length(players_with_xeno_pref))
- if(spawning_larva && spawn_burrowed_larva(players_with_xeno_pref[1]))
- // We were in spawning_larva mode and successfully spawned someone
- count_spawned = 1
- // Update everyone's queue status
- message_alien_candidates(players_with_xeno_pref, dequeued = count_spawned)
+ if(spawning_larva)
+ var/i = 0
+ while(i < length(players_with_xeno_pref) && can_spawn_larva())
+ if(spawn_burrowed_larva(players_with_xeno_pref[++i]))
+ // We were in spawning_larva mode and successfully spawned someone
+ count_spawned++
+ // Update everyone's queue status
+ message_alien_candidates(players_with_xeno_pref, dequeued = count_spawned)
if(linked_hive.hijack_burrowed_surge && (last_surge_time + surge_cooldown) < world.time)
last_surge_time = world.time
@@ -318,7 +320,7 @@
to_chat(new_xeno, SPAN_XENOANNOUNCE("You are a xenomorph larva awakened from slumber!"))
playsound(new_xeno, 'sound/effects/xeno_newlarva.ogg', 50, 1)
if(new_xeno.client)
- if(new_xeno.client?.prefs.toggles_flashing & FLASH_POOLSPAWN)
+ if(new_xeno.client.prefs.toggles_flashing & FLASH_POOLSPAWN)
window_flash(new_xeno.client)
linked_hive.stored_larva--
diff --git a/code/modules/cm_aliens/structures/tunnel.dm b/code/modules/cm_aliens/structures/tunnel.dm
index 5c3d98268d..9ef7bfe87c 100644
--- a/code/modules/cm_aliens/structures/tunnel.dm
+++ b/code/modules/cm_aliens/structures/tunnel.dm
@@ -48,7 +48,7 @@
if(resin_trap)
qdel(resin_trap)
- SSminimaps.add_marker(src, z, MINIMAP_FLAG_XENO, "xenotunnel")
+ SSminimaps.add_marker(src, z, get_minimap_flag_for_faction(hivenumber), "xenotunnel")
/obj/structure/tunnel/Destroy()
if(hive)
diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm
index 5cf988c906..6de3a17396 100644
--- a/code/modules/cm_marines/overwatch.dm
+++ b/code/modules/cm_marines/overwatch.dm
@@ -39,8 +39,11 @@
/obj/structure/machinery/computer/overwatch/Initialize()
. = ..()
- tacmap = new(src, minimap_type)
+ if (faction == FACTION_MARINE)
+ tacmap = new /datum/tacmap/drawing(src, minimap_type)
+ else
+ tacmap = new(src, minimap_type) // Non-drawing version
/obj/structure/machinery/computer/overwatch/Destroy()
QDEL_NULL(tacmap)
diff --git a/code/modules/cm_preds/yaut_machines.dm b/code/modules/cm_preds/yaut_machines.dm
index a1782ca22b..f076c6782d 100644
--- a/code/modules/cm_preds/yaut_machines.dm
+++ b/code/modules/cm_preds/yaut_machines.dm
@@ -6,6 +6,7 @@
breakable = FALSE
minimap_type = MINIMAP_FLAG_ALL
+ faction = FACTION_YAUTJA
/obj/structure/machinery/autolathe/yautja
name = "yautja autolathe"
diff --git a/code/modules/cm_tech/techs/marine/tier4/nuke.dm b/code/modules/cm_tech/techs/marine/tier4/nuke.dm
index f970f37a3f..932caa4a68 100644
--- a/code/modules/cm_tech/techs/marine/tier4/nuke.dm
+++ b/code/modules/cm_tech/techs/marine/tier4/nuke.dm
@@ -36,7 +36,7 @@
return
if(ROUND_TIME < NUKE_UNLOCK_TIME)
- to_chat(unlocking_mob, SPAN_WARNING("You cannot purchase this node before [NUKE_UNLOCK_TIME / (1 MINUTES)] minutes into the operation."))
+ to_chat(unlocking_mob, SPAN_WARNING("You cannot purchase this node before [Ceiling((NUKE_UNLOCK_TIME + SSticker.round_start_time) / (1 MINUTES))] minutes into the operation."))
return FALSE
return TRUE
diff --git a/code/modules/desert_dam/motion_sensor/sensortower.dm b/code/modules/desert_dam/motion_sensor/sensortower.dm
index 5783d0ce9f..6a718607aa 100644
--- a/code/modules/desert_dam/motion_sensor/sensortower.dm
+++ b/code/modules/desert_dam/motion_sensor/sensortower.dm
@@ -68,7 +68,7 @@
return
SSminimaps.remove_marker(current_xeno)
- current_xeno.add_minimap_marker(MINIMAP_FLAG_USCM|MINIMAP_FLAG_XENO)
+ current_xeno.add_minimap_marker(MINIMAP_FLAG_USCM|get_minimap_flag_for_faction(current_xeno.hivenumber))
minimap_added += WEAKREF(current_xeno)
/obj/structure/machinery/sensortower/proc/checkfailure()
@@ -233,6 +233,25 @@
..()
update_icon()
+/* Decreases the buildstate of the sensor tower and switches it off if affected by any explosion.
+Higher severity explosion will damage the sensor tower more
+*/
+/obj/structure/machinery/sensortower/ex_act(severity)
+ if(buildstate == SENSORTOWER_BUILDSTATE_WRENCH)
+ return
+ switch(severity)
+ if(0 to EXPLOSION_THRESHOLD_LOW)
+ buildstate += 1
+ if(EXPLOSION_THRESHOLD_LOW to EXPLOSION_THRESHOLD_MEDIUM)
+ buildstate = clamp(buildstate + 2, SENSORTOWER_BUILDSTATE_WORKING, SENSORTOWER_BUILDSTATE_WRENCH)
+ if(EXPLOSION_THRESHOLD_HIGH to INFINITY)
+ buildstate = 3
+ if(is_on)
+ is_on = FALSE
+ cur_tick = 0
+ stop_processing()
+ update_icon()
+
#undef SENSORTOWER_BUILDSTATE_WORKING
#undef SENSORTOWER_BUILDSTATE_BLOWTORCH
#undef SENSORTOWER_BUILDSTATE_WIRECUTTERS
diff --git a/code/modules/droppod/droppod_ui.dm b/code/modules/droppod/droppod_ui.dm
index 33202e38a0..b0c6683a4f 100644
--- a/code/modules/droppod/droppod_ui.dm
+++ b/code/modules/droppod/droppod_ui.dm
@@ -76,7 +76,8 @@ GLOBAL_LIST_INIT(droppod_target_mode, list(
/datum/admin_podlauncher/proc/refresh_bay()
bay = locate(/area/admin/droppod/loading) in GLOB.sorted_areas
if(!bay)
- to_chat(SPAN_WARNING("There's no /area/admin/droppod/loading. You can make one yourself, but yell at the mappers to fix this."))
+ if(holder)
+ to_chat(holder, SPAN_WARNING("There's no /area/admin/droppod/loading. You can make one yourself, but yell at the mappers to fix this."))
CRASH("No /area/admin/droppod/loading has been mapped into the admin z-level!")
ordered_area = list()
for(var/turf/T in bay)
@@ -221,7 +222,8 @@ GLOBAL_LIST_INIT(droppod_target_mode, list(
custom_dropoff = TRUE
temp_pod.dropoff_point = get_turf(target)
- to_chat(SPAN_NOTICE("You have selected [temp_pod.dropoff_point] as your dropoff location."))
+ if(holder)
+ to_chat(holder, SPAN_NOTICE("You have selected [temp_pod.dropoff_point] as your dropoff location."))
SStgui.update_uis(src)
return COMPONENT_INTERRUPT_CLICK
diff --git a/code/modules/escape_menu/admin_buttons.dm b/code/modules/escape_menu/admin_buttons.dm
index e6771d05bf..661901c1b7 100644
--- a/code/modules/escape_menu/admin_buttons.dm
+++ b/code/modules/escape_menu/admin_buttons.dm
@@ -46,7 +46,7 @@
new /atom/movable/screen/escape_menu/home_button(
null,
src,
- "Medal Panel",
+ "Medals Panel",
/* offset = */ 5,
CALLBACK(src, PROC_REF(home_medal)),
)
@@ -56,8 +56,18 @@
new /atom/movable/screen/escape_menu/home_button(
null,
src,
- "Teleport Panel",
+ "Tacmaps Panel",
/* offset = */ 6,
+ CALLBACK(src, PROC_REF(home_tacmaps)),
+ )
+ )
+
+ page_holder.give_screen_object(
+ new /atom/movable/screen/escape_menu/home_button(
+ null,
+ src,
+ "Teleport Panel",
+ /* offset = */ 7,
CALLBACK(src, PROC_REF(home_teleport)),
)
)
@@ -67,7 +77,7 @@
null,
src,
"Inview Panel",
- /* offset = */ 7,
+ /* offset = */ 8,
CALLBACK(src, PROC_REF(home_inview)),
)
)
@@ -77,7 +87,7 @@
null,
src,
"Unban Panel",
- /* offset = */ 8,
+ /* offset = */ 9,
CALLBACK(src, PROC_REF(home_unban)),
)
)
@@ -87,7 +97,7 @@
null,
src,
"Shuttle Manipulator",
- /* offset = */ 9,
+ /* offset = */ 10,
CALLBACK(src, PROC_REF(home_shuttle)),
)
)
@@ -117,6 +127,12 @@
GLOB.medals_panel.tgui_interact(client?.mob)
+/datum/escape_menu/proc/home_tacmaps()
+ if(!client?.admin_holder.check_for_rights(R_ADMIN|R_MOD))
+ return
+
+ GLOB.tacmap_admin_panel.tgui_interact(client?.mob)
+
/datum/escape_menu/proc/home_teleport()
if(!client?.admin_holder.check_for_rights(R_MOD))
return
diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm
index 703649808f..9ba1b783a1 100644
--- a/code/modules/keybindings/setup.dm
+++ b/code/modules/keybindings/setup.dm
@@ -15,7 +15,7 @@
for(var/k in 1 to length(macro_set))
var/list/split_name = splittext(macro_set[k], ".")
- if(findtext(split_name[2], "srvkeybinds-") == 1)
+ if((length(split_name) >= 2) && (findtext(split_name[2], "srvkeybinds-") == 1))
var/macro_name = "[split_name[1]].[split_name[2]]" // [3] is "command"
erase_output = "[erase_output];[macro_name].parent=null"
winset(src, null, erase_output)
diff --git a/code/modules/maptext_alerts/screen_alerts.dm b/code/modules/maptext_alerts/screen_alerts.dm
index 820c64301b..0b923f7dc7 100644
--- a/code/modules/maptext_alerts/screen_alerts.dm
+++ b/code/modules/maptext_alerts/screen_alerts.dm
@@ -246,3 +246,8 @@
ghost_user.do_observe(target)
if(NOTIFY_JOIN_XENO)
ghost_user.join_as_alien()
+ if(NOTIFY_USCM_TACMAP)
+ GLOB.uscm_tacmap_status.tgui_interact(ghost_user)
+ if(NOTIFY_XENO_TACMAP)
+ GLOB.xeno_tacmap_status.tgui_interact(ghost_user)
+
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index da0560e151..a68a67cfdf 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -377,6 +377,10 @@
handle_joining_as_freed_mob(locate(href_list["claim_freed"]))
if(href_list["join_xeno"])
join_as_alien()
+ if(href_list[NOTIFY_USCM_TACMAP])
+ GLOB.uscm_tacmap_status.tgui_interact(src)
+ if(href_list[NOTIFY_XENO_TACMAP])
+ GLOB.xeno_tacmap_status.tgui_interact(src)
/mob/dead/observer/proc/set_huds_from_prefs()
if(!client || !client.prefs)
@@ -898,6 +902,23 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
GLOB.hive_datum[hives[faction]].hive_ui.open_hive_status(src)
+/mob/dead/observer/verb/view_uscm_tacmap()
+ set name = "View USCM Tacmap"
+ set category = "Ghost.View"
+
+ GLOB.uscm_tacmap_status.tgui_interact(src)
+
+/mob/dead/observer/verb/view_xeno_tacmap()
+ set name = "View Xeno Tacmap"
+ set category = "Ghost.View"
+
+ var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL]
+ if(!hive || !length(hive.totalXenos))
+ to_chat(src, SPAN_ALERT("There seems to be no living normal hive at the moment"))
+ return
+
+ GLOB.xeno_tacmap_status.tgui_interact(src)
+
/mob/dead/verb/join_as_alien()
set category = "Ghost.Join"
set name = "Join as Xeno"
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index ab3ce823c6..dea179e6ad 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -2,80 +2,6 @@
BLOOD SYSTEM
*/
-/mob/living/proc/handle_blood()
- return
-
-// Takes care blood loss and regeneration
-/mob/living/carbon/human/handle_blood()
- if(NO_BLOOD in species.flags)
- return
-
- if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood.
- //Blood regeneration if there is some space
- if(blood_volume < max_blood && nutrition >= 1)
- blood_volume += 0.1 // regenerate blood VERY slowly
- nutrition -= 0.25
- else if(blood_volume > max_blood)
- blood_volume -= 0.1 // The reverse in case we've gotten too much blood in our body
- if(blood_volume > limit_blood)
- blood_volume = limit_blood // This should never happen, but lets make sure
-
- var/b_volume = blood_volume
-
- // Damaged heart virtually reduces the blood volume, as the blood isn't
- // being pumped properly anymore.
- if(species && species.has_organ["heart"])
- var/datum/internal_organ/heart/heart = internal_organs_by_name["heart"]
- if(!heart)
- b_volume = 0
- else if(chem_effect_flags & CHEM_EFFECT_ORGAN_STASIS)
- b_volume *= 1
- else if(heart.damage >= heart.organ_status >= ORGAN_BRUISED)
- b_volume *= Clamp(100 - (2 * heart.damage), 30, 100) / 100
-
- //Effects of bloodloss
- if(b_volume <= BLOOD_VOLUME_SAFE)
- /// The blood volume turned into a %, with BLOOD_VOLUME_NORMAL being 100%
- var/blood_percentage = b_volume / (BLOOD_VOLUME_NORMAL / 100)
- /// How much oxyloss will there be from the next time blood processes
- var/additional_oxyloss = (100 - blood_percentage) / 5
- /// The limit of the oxyloss gained, ignoring oxyloss from the switch statement
- var/maximum_oxyloss = Clamp((100 - blood_percentage) / 2, oxyloss, 100)
- if(oxyloss < maximum_oxyloss)
- oxyloss += round(max(additional_oxyloss, 0))
-
- switch(b_volume)
- if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
- if(prob(1))
- var/word = pick("dizzy","woozy","faint")
- to_chat(src, SPAN_DANGER("You feel [word]."))
- if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
- if(eye_blurry < 50)
- AdjustEyeBlur(6)
- oxyloss += 3
- if(prob(15))
- apply_effect(rand(1,3), PARALYZE)
- var/word = pick("dizzy","woozy","faint")
- to_chat(src, SPAN_DANGER("You feel very [word]."))
- if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
- if(eye_blurry < 50)
- AdjustEyeBlur(6)
- oxyloss += 8
- toxloss += 3
- if(prob(15))
- apply_effect(rand(1,3), PARALYZE)
- var/word = pick("dizzy","woozy","faint")
- to_chat(src, SPAN_DANGER("You feel extremely [word]."))
- if(0 to BLOOD_VOLUME_SURVIVE)
- death(create_cause_data("blood loss"))
-
-// Xeno blood regeneration
-/mob/living/carbon/xenomorph/handle_blood()
- if(stat != DEAD) //Only living xenos regenerate blood
- //Blood regeneration if there is some space
- if(blood_volume < max_blood)
- blood_volume = min(blood_volume + 1, max_blood)
-
//Makes a blood drop, leaking amt units of blood from the mob
/mob/living/carbon/proc/drip(amt)
if(!blood_volume)
@@ -91,7 +17,7 @@
/mob/living/carbon/human/drip(amt)
if(in_stasis) // stasis now stops bloodloss
return
- if(NO_BLOOD in species.flags)
+ if((species.flags & NO_BLOOD) && !(species.flags & IS_SYNTHETIC))
return
..()
@@ -272,7 +198,7 @@
return "xenoblood"
/mob/living/carbon/human/get_blood_id()
- if((NO_BLOOD in species.flags))
+ if(species.flags & NO_BLOOD)
return
if(special_blood)
return special_blood
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index f6fefe1c45..c6bce7757d 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -115,7 +115,9 @@
. += "Primary Objective: [html_decode(assigned_squad.primary_objective)]"
if(assigned_squad.secondary_objective)
. += "Secondary Objective: [html_decode(assigned_squad.secondary_objective)]"
-
+ if(faction == FACTION_MARINE)
+ . += ""
+ . += "View Tactical Map"
if(mobility_aura)
. += "Active Order: MOVE"
if(protection_aura)
@@ -1649,3 +1651,9 @@
return FALSE
. = ..()
+
+/mob/living/carbon/human/make_dizzy(amount)
+ dizziness = min(500, dizziness + amount) // store what will be new value
+ // clamped to max 500
+ if(dizziness > 100 && !is_dizzy)
+ INVOKE_ASYNC(src, PROC_REF(dizzy_process))
diff --git a/code/modules/mob/living/carbon/human/species/human.dm b/code/modules/mob/living/carbon/human/species/human.dm
index 6a59e97af8..add78365a3 100644
--- a/code/modules/mob/living/carbon/human/species/human.dm
+++ b/code/modules/mob/living/carbon/human/species/human.dm
@@ -1,3 +1,85 @@
+// handles all blood related problems for humans and synthetics, moved from blood.dm
+/mob/living/proc/handle_blood()
+ return
+
+// Takes care blood loss and regeneration
+/mob/living/carbon/human/handle_blood()
+ if((species.flags & NO_BLOOD) && !(species.flags & IS_SYNTHETIC))
+ return
+
+ if(stat != DEAD && bodytemperature >= 170) //Dead or cryosleep people do not pump the blood.
+ //Blood regeneration if there is some space
+ if(blood_volume < max_blood && nutrition >= 1)
+ blood_volume += 0.1 // regenerate blood VERY slowly
+ nutrition -= 0.25
+ else if(blood_volume > max_blood)
+ blood_volume -= 0.1 // The reverse in case we've gotten too much blood in our body
+ if(blood_volume > limit_blood)
+ blood_volume = limit_blood // This should never happen, but lets make sure
+
+ var/b_volume = blood_volume
+
+ // Damaged heart virtually reduces the blood volume, as the blood isn't
+ // being pumped properly anymore.
+ if(species && species.has_organ["heart"])
+ var/datum/internal_organ/heart/heart = internal_organs_by_name["heart"]
+ if(!heart)
+ b_volume = 0
+ else if(chem_effect_flags & CHEM_EFFECT_ORGAN_STASIS)
+ b_volume *= 1
+ else if(heart.damage >= heart.organ_status >= ORGAN_BRUISED)
+ b_volume *= Clamp(100 - (2 * heart.damage), 30, 100) / 100
+
+ //Effects of bloodloss
+ if(b_volume <= BLOOD_VOLUME_SAFE)
+ /// The blood volume turned into a %, with BLOOD_VOLUME_NORMAL being 100%
+ var/blood_percentage = b_volume / (BLOOD_VOLUME_NORMAL / 100)
+ /// How much oxyloss will there be from the next time blood processes
+ var/additional_oxyloss = (100 - blood_percentage) / 5
+ /// The limit of the oxyloss gained, ignoring oxyloss from the switch statement
+ var/maximum_oxyloss = Clamp((100 - blood_percentage) / 2, oxyloss, 100)
+ if(oxyloss < maximum_oxyloss)
+ oxyloss += round(max(additional_oxyloss, 0))
+
+ switch(b_volume)
+ if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
+ if(species.flags & IS_SYNTHETIC)
+ if(prob(1))
+ to_chat(src, SPAN_DANGER("Subdermal damage detected in critical region. Operational impact minimal. Diagnosis queued for maintenance cycle."))
+ else
+ if(prob(1))
+ var/word = pick("dizzy","woozy","faint")
+ to_chat(src, SPAN_DANGER("You feel [word]."))
+ if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
+ if(species.flags & IS_SYNTHETIC)
+ if(prob(3))
+ apply_effect(rand(1, 2), WEAKEN)
+ to_chat(src, SPAN_DANGER("Internal power cell fault detected.\nSeek nearest recharging station."))
+ else
+ if(eye_blurry < 50)
+ AdjustEyeBlur(6)
+ oxyloss += 3
+ if(prob(15))
+ apply_effect(rand(1,3), PARALYZE)
+ var/word = pick("dizzy","woozy","faint")
+ to_chat(src, SPAN_DANGER("You feel very [word]."))
+ if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
+ if(species.flags & IS_SYNTHETIC)
+ if(prob(5))
+ apply_effect(rand(1, 2), PARALYZE)
+ to_chat(src, SPAN_DANGER("Critical power cell failure detected.\nSeek recharging station immediately."))
+ else
+ if(eye_blurry < 50)
+ AdjustEyeBlur(6)
+ oxyloss += 8
+ toxloss += 3
+ if(prob(15))
+ apply_effect(rand(1, 3), PARALYZE)
+ var/word = pick("dizzy", "woozy", "faint")
+ to_chat(src, SPAN_DANGER("You feel extremely [word]."))
+ if(0 to BLOOD_VOLUME_SURVIVE)
+ death(create_cause_data(species.flags & IS_SYNTHETIC ? "power failure" : "blood loss"))
+
/datum/species/human
group = SPECIES_HUMAN
name = "Human"
diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
index 6361605033..fa1b2ac4a1 100644
--- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm
@@ -695,6 +695,12 @@
to_chat(src, SPAN_INFO("shift click the compass to watch the mark, alt click to stop tracking"))
/mob/living/carbon/xenomorph/proc/stop_tracking_resin_mark(destroyed, silent = FALSE) //tracked_marker shouldnt be nulled outside this PROC!! >:C
+ if(QDELETED(src))
+ return
+
+ if(!hud_used)
+ CRASH("hud_used is null in stop_tracking_resin_mark")
+
var/atom/movable/screen/mark_locator/ML = hud_used.locate_marker
ML.overlays.Cut()
diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
index a1080b0cc9..c916bef3da 100644
--- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
+++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
@@ -509,7 +509,11 @@
if(queen.can_not_harm(src))
return COMPONENT_SCREECH_ACT_CANCEL
-/mob/living/carbon/xenomorph/proc/add_minimap_marker(flags = MINIMAP_FLAG_XENO)
+/// Adds a minimap marker for this xeno using the provided flags.
+/// If flags is 0, it will use get_minimap_flag_for_faction for this xeno
+/mob/living/carbon/xenomorph/proc/add_minimap_marker(flags)
+ if(!flags)
+ flags = get_minimap_flag_for_faction(hivenumber)
if(IS_XENO_LEADER(src))
SSminimaps.add_marker(src, z, hud_flags = flags, given_image = caste.get_minimap_icon(), overlay_iconstates = list(caste.minimap_leadered_overlay))
return
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
index 0d7a86c583..400a4a80ba 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm
@@ -234,16 +234,16 @@
xeno_attack_delay(stabbing_xeno)
return ..()
-/datum/action/xeno_action/activable/prae_abduct/use_ability(atom/A)
- var/mob/living/carbon/xenomorph/X = owner
+/datum/action/xeno_action/activable/prae_abduct/use_ability(atom/atom)
+ var/mob/living/carbon/xenomorph/xeno = owner
- if(!A || A.layer >= FLY_LAYER || !isturf(X.loc))
+ if(!atom || atom.layer >= FLY_LAYER || !isturf(xeno.loc))
return
- if(!action_cooldown_check() || X.action_busy)
+ if(!action_cooldown_check() || xeno.action_busy)
return
- if(!X.check_state())
+ if(!xeno.check_state())
return
if(!check_plasma_owner())
@@ -252,11 +252,11 @@
// Build our turflist
var/list/turf/turflist = list()
var/list/telegraph_atom_list = list()
- var/facing = get_dir(X, A)
- var/turf/T = X.loc
- var/turf/temp = X.loc
- for(var/x in 0 to max_distance)
- temp = get_step(T, facing)
+ var/facing = get_dir(xeno, atom)
+ var/turf/turf = xeno.loc
+ var/turf/temp = xeno.loc
+ for(var/distance in 0 to max_distance)
+ temp = get_step(turf, facing)
if(facing in diagonals) // check if it goes through corners
var/reverse_face = reverse_dir[facing]
var/turf/back_left = get_step(temp, turn(reverse_face, 45))
@@ -267,103 +267,103 @@
break
var/blocked = FALSE
- for(var/obj/structure/S in temp)
- if(S.opacity || ((istype(S, /obj/structure/barricade) || istype(S, /obj/structure/girder) && S.density || istype(S, /obj/structure/machinery/door)) && S.density))
+ for(var/obj/structure/structure in temp)
+ if(structure.opacity || ((istype(structure, /obj/structure/barricade) || istype(structure, /obj/structure/girder) && structure.density || istype(structure, /obj/structure/machinery/door)) && structure.density))
blocked = TRUE
break
if(blocked)
break
- T = temp
+ turf = temp
- if (T in turflist)
+ if (turf in turflist)
break
- turflist += T
- facing = get_dir(T, A)
- telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/brown/abduct_hook(T, windup)
+ turflist += turf
+ facing = get_dir(turf, atom)
+ telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/brown/abduct_hook(turf, windup)
if(!length(turflist))
- to_chat(X, SPAN_XENOWARNING("You don't have any room to do your abduction!"))
+ to_chat(xeno, SPAN_XENOWARNING("You don't have any room to do your abduction!"))
return
- X.visible_message(SPAN_XENODANGER("\The [X]'s segmented tail starts coiling..."), SPAN_XENODANGER("You begin coiling your tail, aiming towards \the [A]..."))
- X.emote("roar")
+ xeno.visible_message(SPAN_XENODANGER("\The [xeno]'s segmented tail starts coiling..."), SPAN_XENODANGER("You begin coiling your tail, aiming towards \the [atom]..."))
+ xeno.emote("roar")
- var/throw_target_turf = get_step(X.loc, facing)
+ var/throw_target_turf = get_step(xeno.loc, facing)
- ADD_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
- X.update_canmove()
- if(!do_after(X, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1))
- to_chat(X, SPAN_XENOWARNING("You relax your tail."))
+ ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
+ xeno.update_canmove()
+ if(!do_after(xeno, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1))
+ to_chat(xeno, SPAN_XENOWARNING("You relax your tail."))
apply_cooldown()
- for (var/obj/effect/xenomorph/xeno_telegraph/XT in telegraph_atom_list)
- telegraph_atom_list -= XT
- qdel(XT)
+ for (var/obj/effect/xenomorph/xeno_telegraph/xenotelegraph in telegraph_atom_list)
+ telegraph_atom_list -= xenotelegraph
+ qdel(xenotelegraph)
- REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
- X.update_canmove()
+ REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
+ xeno.update_canmove()
return
if(!check_and_use_plasma_owner())
return
- REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
- X.update_canmove()
+ REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
+ xeno.update_canmove()
- playsound(get_turf(X), 'sound/effects/bang.ogg', 25, 0)
- X.visible_message(SPAN_XENODANGER("\The [X] suddenly uncoils its tail, firing it towards [A]!"), SPAN_XENODANGER("You uncoil your tail, sending it out towards \the [A]!"))
+ playsound(get_turf(xeno), 'sound/effects/bang.ogg', 25, 0)
+ xeno.visible_message(SPAN_XENODANGER("\The [xeno] suddenly uncoils its tail, firing it towards [atom]!"), SPAN_XENODANGER("You uncoil your tail, sending it out towards \the [atom]!"))
var/list/targets = list()
for (var/turf/target_turf in turflist)
- for (var/mob/living/carbon/H in target_turf)
- if(!isxeno_human(H) || X.can_not_harm(H) || H.is_dead() || H.is_mob_incapacitated(TRUE))
+ for (var/mob/living/carbon/target in target_turf)
+ if(!isxeno_human(target) || xeno.can_not_harm(target) || target.is_dead() || target.is_mob_incapacitated(TRUE) || target.mob_size >= MOB_SIZE_BIG)
continue
- targets += H
+ targets += target
if (LAZYLEN(targets) == 1)
- X.balloon_alert(X, "your tail catches and slows one target!", text_color = "#51a16c")
+ xeno.balloon_alert(xeno, "your tail catches and slows one target!", text_color = "#51a16c")
else if (LAZYLEN(targets) == 2)
- X.balloon_alert(X, "your tail catches and roots two targets!", text_color = "#51a16c")
+ xeno.balloon_alert(xeno, "your tail catches and roots two targets!", text_color = "#51a16c")
else if (LAZYLEN(targets) >= 3)
- X.balloon_alert(X, "your tail catches and stuns [LAZYLEN(targets)] targets!", text_color = "#51a16c")
+ xeno.balloon_alert(xeno, "your tail catches and stuns [LAZYLEN(targets)] targets!", text_color = "#51a16c")
- for (var/mob/living/carbon/H in targets)
- X.visible_message(SPAN_XENODANGER("\The [X]'s hooked tail coils itself around [H]!"), SPAN_XENODANGER("Your hooked tail coils itself around [H]!"))
+ for (var/mob/living/carbon/target in targets)
+ xeno.visible_message(SPAN_XENODANGER("\The [xeno]'s hooked tail coils itself around [target]!"), SPAN_XENODANGER("Your hooked tail coils itself around [target]!"))
- H.apply_effect(0.2, WEAKEN)
+ target.apply_effect(0.2, WEAKEN)
if (LAZYLEN(targets) == 1)
- new /datum/effects/xeno_slow(H, X, , ,25)
- H.apply_effect(1, SLOW)
+ new /datum/effects/xeno_slow(target, xeno, , ,25)
+ target.apply_effect(1, SLOW)
else if (LAZYLEN(targets) == 2)
- ADD_TRAIT(H, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
- H.update_canmove()
- if (ishuman(H))
- var/mob/living/carbon/human/Hu = H
- Hu.update_xeno_hostile_hud()
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), H), get_xeno_stun_duration(H, 25))
- to_chat(H, SPAN_XENOHIGHDANGER("[X] has pinned you to the ground! You cannot move!"))
+ ADD_TRAIT(target, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct"))
+ target.update_canmove()
+ if (ishuman(target))
+ var/mob/living/carbon/human/human = target
+ human.update_xeno_hostile_hud()
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target), get_xeno_stun_duration(target, 25))
+ to_chat(target, SPAN_XENOHIGHDANGER("[xeno] has pinned you to the ground! You cannot move!"))
- H.set_effect(2, DAZE)
+ target.set_effect(2, DAZE)
else if (LAZYLEN(targets) >= 3)
- H.apply_effect(get_xeno_stun_duration(H, 1.3), WEAKEN)
- to_chat(H, SPAN_XENOHIGHDANGER("You are slammed into the other victims of [X]!"))
+ target.apply_effect(get_xeno_stun_duration(target, 1.3), WEAKEN)
+ to_chat(target, SPAN_XENOHIGHDANGER("You are slammed into the other victims of [xeno]!"))
- shake_camera(H, 10, 1)
+ shake_camera(target, 10, 1)
- var/obj/effect/beam/tail_beam = X.beam(H, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 8)
+ var/obj/effect/beam/tail_beam = xeno.beam(target, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 8)
var/image/tail_image = image('icons/effects/status_effects.dmi', "hooked")
- H.overlays += tail_image
+ target.overlays += tail_image
- H.throw_atom(throw_target_turf, get_dist(throw_target_turf, H)-1, SPEED_VERY_FAST)
+ target.throw_atom(throw_target_turf, get_dist(throw_target_turf, target)-1, SPEED_VERY_FAST)
qdel(tail_beam) // hook beam catches target, throws them back, is deleted (throw_atom has sleeps), then hook beam catches another target, repeat
- addtimer(CALLBACK(src, /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay, H, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise.
+ addtimer(CALLBACK(src, /datum/action/xeno_action/activable/prae_abduct/proc/remove_tail_overlay, target, tail_image), 0.5 SECONDS) //needed so it can actually be seen as it gets deleted too quickly otherwise.
apply_cooldown()
return ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
index 65ea443c13..23da1ce659 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm
@@ -698,5 +698,5 @@
set name = "View Xeno Tacmap"
set desc = "This opens a tactical map, where you can see where every xenomorph is."
set category = "Alien"
-
hive.tacmap.tgui_interact(src)
+
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
index 102722d939..5f542c3ffa 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/lesser_drone.dm
@@ -95,3 +95,11 @@
if (PF)
PF.flags_pass = PASS_MOB_IS_XENO|PASS_MOB_THRU_XENO
PF.flags_can_pass_all = PASS_MOB_IS_XENO|PASS_MOB_THRU_XENO
+
+/mob/living/carbon/xenomorph/lesser_drone/ghostize(can_reenter_corpse = FALSE, aghosted = FALSE)
+ . = ..()
+ if(. && !aghosted)
+ gib()
+
+/mob/living/carbon/xenomorph/lesser_drone/handle_ghost_message()
+ return
diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
index 2a5b423541..afca63a59a 100644
--- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
@@ -362,7 +362,7 @@
/// This number divides the total xenos counted for slots to give the max number of lesser drones
var/playable_lesser_drones_max_divisor = 3
- var/datum/tacmap/xeno/tacmap
+ var/datum/tacmap/drawing/xeno/tacmap
var/minimap_type = MINIMAP_FLAG_XENO
/datum/hive_status/New()
@@ -370,6 +370,7 @@
hive_ui = new(src)
mark_ui = new(src)
faction_ui = new(src)
+ minimap_type = get_minimap_flag_for_faction(hivenumber)
tacmap = new(src, minimap_type)
if(!internal_faction)
internal_faction = name
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index e3eef5213d..3d591d9027 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -620,20 +620,13 @@
adds a dizziness amount to a mob
use this rather than directly changing var/dizziness
since this ensures that the dizzy_process proc is started
-currently only humans get dizzy
+currently only mob/living/carbon/human get dizzy
value of dizziness ranges from 0 to 1000
below 100 is not dizzy
*/
/mob/proc/make_dizzy(amount)
- if(!istype(src, /mob/living/carbon/human)) // for the moment, only humans get dizzy
- return
-
- dizziness = min(500, dizziness + amount) // store what will be new value
- // clamped to max 500
- if(dizziness > 100 && !is_dizzy)
- INVOKE_ASYNC(src, PROC_REF(dizzy_process))
-
+ return
/*
dizzy process - wiggles the client's pixel offset over time
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 3d0d2a20b1..0d6d906252 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -150,7 +150,7 @@
observer.set_huds_from_prefs()
qdel(src)
- return 1
+ return TRUE
if("late_join")
@@ -276,11 +276,11 @@
if(player.get_playtime(STATISTIC_HUMAN) == 0 && player.get_playtime(STATISTIC_XENO) == 0)
msg_admin_niche("NEW JOIN: [key_name(character, 1, 1, 0)]. IP: [character.lastKnownIP], CID: [character.computer_id]")
if(character.client)
- var/client/C = character.client
- if(C.player_data && C.player_data.playtime_loaded && length(C.player_data.playtimes) == 0)
+ var/client/client = character.client
+ if(client.player_data && client.player_data.playtime_loaded && length(client.player_data.playtimes) == 0)
msg_admin_niche("NEW PLAYER: [key_name(character, 1, 1, 0)]. IP: [character.lastKnownIP], CID: [character.computer_id]")
- if(C.player_data && C.player_data.playtime_loaded && ((round(C.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1)) <= 5))
- msg_sea("NEW PLAYER: [key_name(character, 0, 1, 0)] only has [(round(C.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1))] hours as a human. Current role: [get_actual_job_name(character)] - Current location: [get_area(character)]")
+ if(client.player_data && client.player_data.playtime_loaded && ((round(client.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1)) <= 5))
+ msg_sea("NEW PLAYER: [key_name(character, 0, 1, 0)] only has [(round(client.get_total_human_playtime() DECISECONDS_TO_HOURS, 0.1))] hours as a human. Current role: [get_actual_job_name(character)] - Current location: [get_area(character)]")
character.client.init_verbs()
qdel(src)
diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm
index 55c4ff518b..756a590704 100644
--- a/code/modules/projectiles/guns/flamer/flamer.dm
+++ b/code/modules/projectiles/guns/flamer/flamer.dm
@@ -467,7 +467,8 @@ GLOBAL_LIST_EMPTY(flamer_particles)
tied_reagent = new R.type() // Can't get deleted this way
tied_reagent.make_alike(R)
- tied_reagents = obj_reagents
+ if(obj_reagents)
+ tied_reagents = obj_reagents
target_clicked = target
diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm
index 17a2c0f268..1e72a42538 100644
--- a/code/modules/projectiles/guns/specialist/sniper.dm
+++ b/code/modules/projectiles/guns/specialist/sniper.dm
@@ -154,7 +154,7 @@
target.overlays -= lockon_direction_icon
qdel(laser_beam)
- if(!check_can_use(target, TRUE))
+ if(!check_can_use(target, TRUE) || target.is_dead())
return
var/obj/projectile/aimed_proj = sniper_rifle.in_chamber
diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm
index 1f9029317b..d86d409a6b 100644
--- a/code/modules/shuttle/computers/dropship_computer.dm
+++ b/code/modules/shuttle/computers/dropship_computer.dm
@@ -308,6 +308,9 @@
.["door_status"] = is_remote ? list() : shuttle.get_door_data()
.["has_flyby_skill"] = skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)
+ // Launch Alarm Variables
+ .["playing_launch_announcement_alarm"] = shuttle.playing_launch_announcement_alarm
+
.["destinations"] = list()
// add flight
.["destinations"] += list(
@@ -370,6 +373,7 @@
msg_admin_niche(log)
log_interact(user, msg = "[log]")
shuttle.send_for_flyby()
+ stop_playing_launch_announcement_alarm()
return TRUE
update_equipment(is_optimised, FALSE)
@@ -399,6 +403,7 @@
var/log = "[key_name(user)] launched the dropship [src.shuttleId] on transport."
msg_admin_niche(log)
log_interact(user, msg = "[log]")
+ stop_playing_launch_announcement_alarm()
return TRUE
if("button-push")
playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME, 1)
@@ -458,6 +463,23 @@
if("cancel-flyby")
if(shuttle.in_flyby && shuttle.timer && shuttle.timeLeft(1) >= DROPSHIP_WARMUP_TIME)
shuttle.setTimer(DROPSHIP_WARMUP_TIME)
+ if("play_launch_announcement_alarm")
+ if (shuttle.mode != SHUTTLE_IDLE && shuttle.mode != SHUTTLE_RECHARGING)
+ to_chat(usr, SPAN_WARNING("The Launch Announcement Alarm is designed to tell people that you're going to take off soon."))
+ return
+ shuttle.alarm_sound_loop.start()
+ shuttle.playing_launch_announcement_alarm = TRUE
+ return
+ if ("stop_playing_launch_announcement_alarm")
+ stop_playing_launch_announcement_alarm()
+ return
+
+/obj/structure/machinery/computer/shuttle/dropship/flight/proc/stop_playing_launch_announcement_alarm()
+ var/obj/docking_port/mobile/marine_dropship/shuttle = SSshuttle.getShuttle(shuttleId)
+
+ shuttle.alarm_sound_loop.stop()
+ shuttle.playing_launch_announcement_alarm = FALSE
+ return
/obj/structure/machinery/computer/shuttle/dropship/flight/lz1
icon = 'icons/obj/structures/machinery/computer.dmi'
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 7bbdb214d3..85fc38bf5f 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -343,6 +343,9 @@
var/rechargeTime = 0 //time spent after arrival before being able to launch again
var/prearrivalTime = 0 //delay after call time finishes for sound effects, explosions, etc.
+ var/playing_launch_announcement_alarm = FALSE // FALSE = off ; TRUE = on
+ var/datum/looping_sound/looping_launch_announcement_alarm/alarm_sound_loop
+
var/landing_sound = 'sound/effects/engine_landing.ogg'
var/ignition_sound = 'sound/effects/engine_startup.ogg'
/// Default shuttle audio ambience while flying
@@ -383,6 +386,7 @@
/obj/docking_port/mobile/Destroy(force)
if(force)
+ QDEL_NULL(alarm_sound_loop)
SSshuttle.mobile -= src
destination = null
previous = null
@@ -410,6 +414,14 @@
initial_engines = count_engines()
current_engines = initial_engines
+ //Launch Announcement Alarm variables setup
+ alarm_sound_loop = new(src)
+ alarm_sound_loop.mid_length = 20
+ alarm_sound_loop.extra_range = 30
+ alarm_sound_loop.volume = 100
+ alarm_sound_loop.is_sound_projecting = TRUE
+ alarm_sound_loop.falloff_distance = 7
+
#ifdef DOCKING_PORT_HIGHLIGHT
highlight("#0f0")
#endif
diff --git a/code/modules/tgui_panel/audio.dm b/code/modules/tgui_panel/audio.dm
index 6806961599..d66421df53 100644
--- a/code/modules/tgui_panel/audio.dm
+++ b/code/modules/tgui_panel/audio.dm
@@ -3,8 +3,6 @@
* SPDX-License-Identifier: MIT
*/
-/// Admin music volume, from 0 to 1.
-/client/var/admin_music_volume = 1
/**
* public
@@ -22,8 +20,9 @@
/datum/tgui_panel/proc/play_music(url, extra_data)
if(!is_ready())
return
- if(!findtext(url, GLOB.is_http_protocol))
- return
+ // Commented to allow playing via simple asset transport. Just check when calling.
+// if(!findtext(url, GLOB.is_http_protocol))
+// return
var/list/payload = list()
if(length(extra_data) > 0)
for(var/key in extra_data)
diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm
index 9fb8b02b01..f33f190d80 100644
--- a/code/modules/tgui_panel/tgui_panel.dm
+++ b/code/modules/tgui_panel/tgui_panel.dm
@@ -85,9 +85,10 @@
),
))
return TRUE
- if(type == "audio/setAdminMusicVolume")
- client.admin_music_volume = payload["volume"]
- return TRUE
+// Deprecated due to removal of old sound play commands
+// if(type == "audio/setAdminMusicVolume")
+// client.admin_music_volume = payload["volume"]
+// return TRUE
if(type == "telemetry")
analyze_telemetry(payload)
return TRUE
diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm
index b3dc005c08..e668196d38 100644
--- a/code/modules/tooltip/tooltip.dm
+++ b/code/modules/tooltip/tooltip.dm
@@ -98,10 +98,12 @@ Notes:
last_target = null
/datum/tooltip/proc/do_hide()
- winshow(owner, control, FALSE)
+ if(owner)
+ winshow(owner, control, FALSE)
/datum/tooltip/Destroy(force, ...)
last_target = null
+ owner = null
return ..()
//Open a tooltip for user, at a location based on params
diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm
index 1e9fba7371..998fd3e19f 100644
--- a/code/modules/vehicles/apc/apc_command.dm
+++ b/code/modules/vehicles/apc/apc_command.dm
@@ -59,7 +59,7 @@
continue
SSminimaps.remove_marker(current_xeno)
- current_xeno.add_minimap_marker(MINIMAP_FLAG_USCM|MINIMAP_FLAG_XENO)
+ current_xeno.add_minimap_marker(MINIMAP_FLAG_USCM|get_minimap_flag_for_faction(current_xeno.hivenumber))
minimap_added += WEAKREF(current_xeno)
else
if(WEAKREF(current_xeno) in minimap_added)
diff --git a/colonialmarines.dme b/colonialmarines.dme
index 86c1486ebc..b1fc28f93e 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -271,6 +271,7 @@
#include "code\controllers\subsystem\police_clues.dm"
#include "code\controllers\subsystem\power.dm"
#include "code\controllers\subsystem\predships.dm"
+#include "code\controllers\subsystem\profiler.dm"
#include "code\controllers\subsystem\projectiles.dm"
#include "code\controllers\subsystem\quadtrees.dm"
#include "code\controllers\subsystem\reagents.dm"
@@ -563,6 +564,7 @@
#include "code\datums\langchat\langchat.dm"
#include "code\datums\looping_sounds\_looping_sound.dm"
#include "code\datums\looping_sounds\item_sounds.dm"
+#include "code\datums\looping_sounds\misc_sounds.dm"
#include "code\datums\origin\civilian.dm"
#include "code\datums\origin\origin.dm"
#include "code\datums\origin\upp.dm"
@@ -1400,6 +1402,8 @@
#include "code\modules\admin\tabs\event_tab.dm"
#include "code\modules\admin\tabs\round_tab.dm"
#include "code\modules\admin\tabs\server_tab.dm"
+#include "code\modules\admin\tacmap_panel\tacmap_admin_panel.dm"
+#include "code\modules\admin\tacmap_panel\tacmap_admin_panel_tgui.dm"
#include "code\modules\admin\topic\topic.dm"
#include "code\modules\admin\topic\topic_chems.dm"
#include "code\modules\admin\topic\topic_events.dm"
diff --git a/config/example/config.txt b/config/example/config.txt
index 8e8bb2b754..8a976e02a5 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -140,6 +140,9 @@ RULESURL https://cm-ss13.com/viewtopic.php?f=57&t=5094
## Ban appeals URL - usually for a forum or wherever people should go to contact your admins.
BANAPPEALS https://cm-ss13.com/viewforum.php?f=76
+## Discord URL - uncomment and add a valid Discord invite link (remember to make it a permanent one, since it does not default to it) to make the Discord button work properly.
+## DISCORDURL
+
## In-game features
## Remove the # to show a popup 'reply to' window to every non-admin that recieves an adminPM.
## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)
diff --git a/html/changelogs/AutoChangeLog-pr-4912.yml b/html/changelogs/AutoChangeLog-pr-4912.yml
deleted file mode 100644
index 29dd976c40..0000000000
--- a/html/changelogs/AutoChangeLog-pr-4912.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "fira"
-delete-after: True
-changes:
- - bugfix: "Fixed the tank driving through vehicle blockers and accessing \"deep\" parts of the map it wasn't intended to push."
- - bugfix: "Tentatively fixed some visual bugs with turret based vehicles."
- - bugfix: "Fixed using the tank coupon as first vehicle spawn causing Gear Vendor to still give out APC gear."
- - admin: "Added an APC coupon in same vein as Tank Coupon for Admins to use."
- - admin: "Tank/APC Coupons now spawn broken down versions of the vehicles, for the full VC experience. You want a ready to use one, just spawn it."
- - admin: "Tank/APC coupons do not spawn VC pamphlets in ASRS anymore."
- - admin: "Added a vehicle_flag for tanks to bypass blockers (in a legit fashion this time). Abuse at your discretion."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4937.yml b/html/changelogs/AutoChangeLog-pr-4937.yml
deleted file mode 100644
index 4c7bb250ae..0000000000
--- a/html/changelogs/AutoChangeLog-pr-4937.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ihatethisengine"
-delete-after: True
-changes:
- - rscadd: "Cloaked lurker devouring now shows a message to target again."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-4938.yml b/html/changelogs/AutoChangeLog-pr-4938.yml
deleted file mode 100644
index 8c84372326..0000000000
--- a/html/changelogs/AutoChangeLog-pr-4938.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "fira"
-delete-after: True
-changes:
- - admin: "Moderators are now immune to inactivity kick, much like Admins."
\ No newline at end of file
diff --git a/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml
index acb5a065d7..89f61d3562 100644
--- a/html/changelogs/archive/2023-11.yml
+++ b/html/changelogs/archive/2023-11.yml
@@ -242,3 +242,92 @@
- rscadd: Faxes sent from HighCom fax machines now appear in their correct category.
sleepynecrons:
- imageadd: fixes biosuit body sprite not properly covering mobs
+2023-11-18:
+ Cthulhu80, Drathek:
+ - rscadd: Adds drawing to tactical maps, viewable via stat panel for marines and
+ xeno tacmap for xenos.
+ - bugfix: Corrupted (and other hives) now have separate tactical maps.
+ fira:
+ - admin: Moderators are now immune to inactivity kick, much like Admins.
+ - bugfix: Fixed the tank driving through vehicle blockers and accessing "deep" parts
+ of the map it wasn't intended to push.
+ - bugfix: Tentatively fixed some visual bugs with turret based vehicles.
+ - bugfix: Fixed using the tank coupon as first vehicle spawn causing Gear Vendor
+ to still give out APC gear.
+ - admin: Added an APC coupon in same vein as Tank Coupon for Admins to use.
+ - admin: Tank/APC Coupons now spawn broken down versions of the vehicles, for the
+ full VC experience. You want a ready to use one, just spawn it.
+ - admin: Tank/APC coupons do not spawn VC pamphlets in ASRS anymore.
+ - admin: Added a vehicle_flag for tanks to bypass blockers (in a legit fashion this
+ time). Abuse at your discretion.
+ ihatethisengine:
+ - rscadd: Cloaked lurker devouring now shows a message to target again.
+2023-11-20:
+ Zonespace27:
+ - bugfix: Jump-to-area verb will now warn you if there aren't any turfs in the given
+ area.
+2023-11-21:
+ hislittlecuzingames:
+ - code_imp: Added ability to have looping sounds from further away
+2023-11-22:
+ AnturK:
+ - server: the server now supports auto-profiling
+ Birdtalon:
+ - code_imp: Removes some istype(src)
+ Morrow:
+ - rscadd: Mess tech positions now scale from 1 to 2 after 70 marines are in the
+ game
+ hislittlecuzingames:
+ - rscadd: Launch Announcement Alarm for dropships to notify ground forces of departure.
+2023-11-23:
+ Birdtalon:
+ - rscdel: Lesser drones die upon ghosting and are not offered to observers.
+ - rscadd: Explosion handling logic to experimental sensor tower.
+ - bugfix: Explosions no longer delete experimental sensor tower.
+ - bugfix: Pylons now differentiated in the input list with a (1) if in the same
+ area.
+ Drathek:
+ - bugfix: Resin doors will now close on dead mobs that are merged with weeds (currently
+ only human).
+ - bugfix: Resin doors will now restart their closing timer each open making the
+ delay to close consistent.
+ - code_imp: Added a TRAIT_MERGED_WITH_WEEDS that is set whenever the mob is currently
+ merged with weeds.
+ - bugfix: 'Fixed buried larva spawn grace period at start of round if there is a
+ queue: Now join as xeno when there''s a queue will only prevent buried larva
+ spawns if there is no core.'
+ - bugfix: 'Tweaked larva queue spawning: Now spawns as many larva as possible each
+ cycle rather than one.'
+ LC4492:
+ - maptweak: 'Changes to the CO office: The bathroom now faces into the CO''s bedroom,
+ and not to his main office. Victory cabinet have been moved to the Officer''s
+ mess because of logical issues. Extra-detail to the office, including an exclusive
+ stamp, table flags and others. The safe is now inside the CO''s bedroom, and
+ not in his office. The energy APC is now inside the CO''s bedroom, and not in
+ his office. Jones finally have a BED again, or something like that. Other minor
+ changes to objects, such the addition of a cane, a box of glasses for serving
+ guests, etc.'
+ QuickLode:
+ - rscadd: Damage to Synthetic's internal causes debuffs, eventual powercell failure.(death)
+ - bugfix: Synthetic's should no longer lose blood.
+ - code_imp: moves blood proc to human.dm from blood.dm with above changes.
+ SortieEnMer:
+ - qol: Match Unlock Time in Nuke Timelock Message with Nuke Techtree Description
+ Steelpoint:
+ - maptweak: Secure Storage on LV-624 has been broken open, making it far less defendable
+ but easier to access.
+ fira:
+ - bugfix: The Thunderdome floor is now explosion-proof.
+ - balance: Default Web Music Player volume is now 20% down from 50%. It was found
+ too effective against new players.
+ - admin: '"Play Internet Sound" is now "Play Admin Sound" and optionally allow to
+ hide the track name.'
+ - admin: '"Play Admin Sound" can now be used with uploaded tracks, which use CDN
+ delivery and the in-chat music player, granting players more control over them.'
+ - admin: Removed "Play Midi Sound".
+ ihatethisengine:
+ - balance: Oppressor no longer can abduct big xenos.
+ zzzmike:
+ - qol: ARES hijack announcement specifies that pods will not crash at 100% fuel
+ - qol: Location name standardization. So, North is now Starboard. This is already
+ how it is for everything except pumps.
diff --git a/html/statbrowser.js b/html/statbrowser.js
index 105270ad29..289536d37d 100644
--- a/html/statbrowser.js
+++ b/html/statbrowser.js
@@ -374,6 +374,8 @@ function draw_debug() {
document.getElementById("statcontent").appendChild(table3);
}
function draw_status() {
+ var status_tab_map_href_exception =
+ "View Tactical Map";
if (!document.getElementById("Status")) {
createStatusTab("Status");
current_tab = "Status";
@@ -384,6 +386,13 @@ function draw_status() {
document
.getElementById("statcontent")
.appendChild(document.createElement("br"));
+ } else if (
+ // hardcoded because merely using .includes() to test for a href seems unreliable for some reason.
+ status_tab_parts[i] == status_tab_map_href_exception
+ ) {
+ var maplink = document.createElement("a");
+ maplink.innerHTML = status_tab_parts[i];
+ document.getElementById("statcontent").appendChild(maplink);
} else {
var div = document.createElement("div");
div.textContent = status_tab_parts[i];
diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm
index 50cf8be727..c9c82635d8 100644
--- a/maps/map_files/LV624/LV624.dmm
+++ b/maps/map_files/LV624/LV624.dmm
@@ -281,6 +281,13 @@
icon_state = "cult"
},
/area/lv624/ground/caves/west_caves)
+"abH" = (
+/obj/effect/landmark/good_item,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"abI" = (
/obj/effect/landmark/xeno_spawn,
/turf/open/gm/dirt,
@@ -391,6 +398,11 @@
icon_state = "bar"
},
/area/lv624/lazarus/canteen)
+"aco" = (
+/obj/effect/landmark/crap_item,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"acp" = (
/turf/closed/wall/cult,
/area/lv624/ground/caves/west_caves)
@@ -493,6 +505,12 @@
icon_state = "floor4"
},
/area/lv624/ground/barrens/north_east_barrens)
+"acK" = (
+/obj/structure/tunnel{
+ id = "hole1"
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"acL" = (
/obj/item/tool/shovel,
/turf/open/shuttle{
@@ -564,19 +582,19 @@
/obj/effect/decal/cleanable/blood/gibs/xeno/down,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
+"acY" = (
+/obj/effect/landmark/hunter_primary,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"acZ" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
/area/lv624/ground/caves/north_central_caves)
-"adb" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"adc" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
@@ -767,16 +785,6 @@
icon_state = "asteroidfloor"
},
/area/lv624/ground/barrens/north_east_barrens)
-"adW" = (
-/obj/structure/surface/rack,
-/obj/item/stack/sheet/mineral/diamond{
- amount = 2
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/lv624/ground/barrens/north_east_barrens/ceiling)
"adX" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
/turf/open/gm/dirt,
@@ -995,13 +1003,6 @@
/obj/structure/cargo_container/grant/right,
/turf/open/floor,
/area/lv624/ground/barrens/containers)
-"afc" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"afd" = (
/obj/structure/fence,
/turf/open/floor{
@@ -1181,15 +1182,6 @@
"afS" = (
/turf/closed/wall/mineral/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"afT" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -10;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"afU" = (
/obj/structure/surface/table/woodentable/poor,
/turf/open/floor/wood,
@@ -2518,6 +2510,13 @@
/obj/structure/flora/jungle/alienplant1,
/turf/open/gm/river,
/area/lv624/ground/river/west_river)
+"amI" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"amK" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
@@ -2645,6 +2644,10 @@
icon_state = "whiteyellowcorner"
},
/area/lv624/lazarus/corporate_dome)
+"anM" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"anP" = (
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/grass/grass1,
@@ -2682,10 +2685,6 @@
icon_state = "whitebluefull"
},
/area/lv624/lazarus/medbay)
-"aok" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"aol" = (
/obj/structure/machinery/smartfridge,
/turf/open/floor{
@@ -3085,12 +3084,6 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/river/east_river)
-"arm" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
"arn" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/west_jungle)
@@ -6153,15 +6146,6 @@
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/river,
/area/lv624/ground/jungle/west_jungle)
-"aDk" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -10;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"aDl" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
@@ -7379,10 +7363,6 @@
icon_state = "warningcorner"
},
/area/lv624/lazarus/landing_zones/lz1)
-"aHy" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
"aHB" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
@@ -7636,6 +7616,12 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/west_jungle)
+"aIA" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"aIB" = (
/obj/structure/closet,
/turf/open/floor{
@@ -7643,6 +7629,17 @@
icon_state = "purple"
},
/area/lv624/lazarus/sleep_female)
+"aIE" = (
+/obj/structure/flora/bush/ausbushes/var3/stalkybush,
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 11;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"aIH" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/clothing/mask/cigarette/cigar,
@@ -8857,22 +8854,6 @@
icon_state = "cult"
},
/area/lv624/lazarus/armory)
-"aOA" = (
-/obj/item/storage/toolbox/syndicate,
-/obj/structure/surface/rack,
-/obj/effect/landmark/crap_item,
-/obj/effect/landmark/crap_item,
-/obj/item/clothing/suit/armor/vest/security,
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = 25;
- pixel_y = 5
- },
-/turf/open/floor{
- icon_state = "cult"
- },
-/area/lv624/lazarus/armory)
"aOB" = (
/turf/open/floor/plating{
dir = 1;
@@ -9162,6 +9143,14 @@
icon_state = "chapel"
},
/area/lv624/lazarus/chapel)
+"aPM" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"aPN" = (
/obj/structure/window_frame/colony/reinforced,
/turf/open/floor/plating,
@@ -9444,22 +9433,6 @@
icon_state = "bar"
},
/area/lv624/lazarus/canteen)
-"aQW" = (
-/obj/structure/surface/table,
-/obj/item/stack/medical/bruise_pack{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/clothing/mask/surgical,
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/item/storage/belt/medical/full,
-/turf/open/floor{
- dir = 1;
- icon_state = "whiteblue"
- },
-/area/lv624/lazarus/medbay)
"aQX" = (
/obj/effect/landmark/hunter_primary,
/obj/structure/flora/jungle/vines/light_2,
@@ -9937,6 +9910,15 @@
icon_state = "grimy"
},
/area/lv624/lazarus/captain)
+"aSR" = (
+/obj/structure/surface/table,
+/obj/item/tool/crowbar,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"aST" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/clothing/under/CM_uniform,
@@ -10054,12 +10036,6 @@
icon_state = "dark"
},
/area/lv624/lazarus/engineering)
-"aTr" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"aTs" = (
/obj/structure/machinery/power/smes/buildable{
capacity = 1e+006;
@@ -10090,6 +10066,12 @@
/obj/item/shard,
/turf/open/floor/plating,
/area/lv624/lazarus/captain)
+"aTy" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"aTB" = (
/obj/structure/machinery/light/small,
/turf/open/floor{
@@ -10759,33 +10741,6 @@
/obj/item/ore/silver,
/turf/open/floor/greengrid,
/area/lv624/lazarus/secure_storage)
-"aWb" = (
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = 25;
- pixel_y = 5
- },
-/obj/structure/machinery/door_control{
- id = "secure_outer_blast";
- name = "Secure Outer Doors";
- pixel_x = 25;
- pixel_y = -5
- },
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/secure_storage)
-"aWc" = (
-/obj/structure/computerframe{
- anchored = 1
- },
-/obj/structure/machinery/door_control{
- id = "secure_outer_blast";
- name = "Secure Outer Doors";
- pixel_x = 25;
- pixel_y = -5
- },
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/secure_storage)
"aWd" = (
/obj/structure/machinery/cm_vending/sorted/tech/comp_storage,
/turf/open/floor{
@@ -10902,28 +10857,6 @@
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"aWu" = (
-/obj/structure/machinery/door/poddoor/almayer{
- dir = 4;
- id = "secure_inner_blast";
- layer = 3.3;
- name = "\improper Secure Armory Blast Door";
- unacidable = 1
- },
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/secure_storage)
-"aWv" = (
-/obj/structure/machinery/door/poddoor/almayer{
- dir = 4;
- id = "secure_outer_blast";
- layer = 3.3;
- name = "\improper Secure Armory Blast Door";
- unacidable = 1
- },
-/turf/open/floor/plating{
- icon_state = "platebotc"
- },
-/area/lv624/lazarus/secure_storage)
"aWw" = (
/obj/effect/decal/remains/xeno,
/turf/open/gm/dirt,
@@ -11489,6 +11422,11 @@
icon_state = "red"
},
/area/lv624/lazarus/security)
+"aYI" = (
+/turf/open/gm/dirt{
+ icon_state = "desert0"
+ },
+/area/lv624/ground/caves/south_west_caves)
"aYM" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/structure/machinery/computer/med_data/laptop,
@@ -11752,28 +11690,21 @@
/obj/structure/flora/grass/tallgrass/jungle,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"bac" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"bad" = (
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
+"bak" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"bav" = (
/obj/effect/decal/cleanable/blood/gibs/xeno/up,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/north_west_jungle)
-"baF" = (
-/obj/structure/surface/table,
-/obj/structure/prop/mech/drill,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "vault"
- },
-/area/lv624/lazarus/robotics)
"baN" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass2,
@@ -11798,6 +11729,15 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
+"bbA" = (
+/obj/structure/prop/mech/tesla_energy_relay{
+ layer = 2.5
+ },
+/obj/structure/largecrate/random,
+/turf/open/floor/plating{
+ icon_state = "platebot"
+ },
+/area/lv624/lazarus/robotics)
"bbC" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/grass/grass2,
@@ -11848,6 +11788,29 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/west_central_jungle)
+"bcb" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/obj/structure/flora/bush/ausbushes/ppflowers,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
+"bcU" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -10;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
+"bdu" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"bdL" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/stack/sheet/metal{
@@ -11872,26 +11835,6 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirt,
/area/lv624/ground/caves/sand_temple)
-"beD" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
-"beN" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
-"beW" = (
-/obj/structure/flora/bush/ausbushes/var3/ywflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
"bfc" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/dirt,
@@ -11905,17 +11848,6 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/turf/open/gm/dirt,
/area/lv624/ground/caves/east_caves)
-"bgD" = (
-/obj/item/weapon/baseballbat/metal,
-/obj/item/weapon/baseballbat/metal{
- pixel_x = 5
- },
-/obj/structure/surface/rack,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/lv624/lazarus/fitness)
"bgL" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/west,
@@ -11927,35 +11859,25 @@
"bhr" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/south_east_jungle)
-"bil" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"bit" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"bjA" = (
-/obj/structure/flora/bush/ausbushes/var3/fullgrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
-"bjM" = (
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_color = "yellow";
- phone_id = "Communications";
- pixel_y = 24
- },
-/turf/open/floor{
- dir = 9;
- icon_state = "brown"
+"bje" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
},
-/area/lv624/lazarus/comms)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"bkG" = (
/turf/open/gm/coast/beachcorner/north_west,
/area/lv624/ground/river/central_river)
+"bkK" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"bkP" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/blocker/forcefield/multitile_vehicles,
@@ -11970,6 +11892,15 @@
icon_state = "floor4"
},
/area/lv624/lazarus/crashed_ship_containers)
+"bnq" = (
+/obj/structure/surface/table,
+/obj/item/handset,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ dir = 9;
+ icon_state = "purple"
+ },
+/area/lv624/lazarus/sleep_female)
"bnz" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 1;
@@ -11983,6 +11914,12 @@
/obj/structure/flora/bush/ausbushes/pointybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
+"bnM" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"bnX" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/coast/beachcorner/south_west,
@@ -11990,29 +11927,10 @@
"boe" = (
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"bol" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
-"bow" = (
-/obj/structure/flora/jungle/planttop1,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"boy" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
-"bpM" = (
-/obj/structure/filingcabinet,
-/turf/open/floor/plating{
- dir = 1;
- icon_state = "warnplate"
- },
-/area/lv624/ground/barrens/east_barrens/ceiling)
"bqf" = (
/obj/structure/surface/rack,
/obj/item/explosive/grenade/smokebomb{
@@ -12029,10 +11947,6 @@
},
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
-"bqV" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"brh" = (
/obj/structure/flora/jungle/plantbot1,
/obj/structure/flora/jungle/vines/light_1,
@@ -12084,6 +11998,15 @@
"btX" = (
/turf/open/gm/river,
/area/lv624/ground/caves/sand_temple)
+"btY" = (
+/obj/structure/bed,
+/obj/item/bedsheet/purple,
+/obj/structure/pipes/standard/simple/hidden/cyan,
+/turf/open/floor{
+ dir = 9;
+ icon_state = "purple"
+ },
+/area/lv624/lazarus/sleep_female)
"buo" = (
/obj/structure/machinery/atm{
name = "Weyland-Yutani Automatic Teller Machine";
@@ -12094,25 +12017,6 @@
icon_state = "whitepurplecorner"
},
/area/lv624/lazarus/fitness)
-"buv" = (
-/obj/structure/closet{
- density = 0;
- icon_state = "open";
- opened = 1
- },
-/obj/item/device/flashlight,
-/obj/item/device/radio/intercom{
- freerange = 1;
- frequency = 1469;
- name = "General Listening Channel";
- pixel_x = -30
- },
-/obj/item/clothing/under/colonist,
-/turf/open/floor{
- dir = 9;
- icon_state = "purple"
- },
-/area/lv624/lazarus/sleep_female)
"buw" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 5
@@ -12129,6 +12033,17 @@
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/south_medbay_road)
+"bvj" = (
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
+"bvS" = (
+/obj/structure/flora/bush/ausbushes/var3/ywflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
+"bvX" = (
+/obj/structure/flora/bush/ausbushes/ppflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"bwc" = (
/turf/open/gm/coast/beachcorner2/north_east,
/area/lv624/ground/barrens/west_barrens)
@@ -12139,6 +12054,12 @@
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
+"bxb" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"byl" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
@@ -12161,6 +12082,16 @@
dir = 4
},
/area/lv624/ground/jungle/south_west_jungle/ceiling)
+"bzv" = (
+/obj/structure/closet/wardrobe,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whiteblue"
+ },
+/area/lv624/lazarus/medbay)
"bzD" = (
/obj/structure/largecrate/random,
/obj/item/storage/fancy/crayons{
@@ -12172,13 +12103,6 @@
icon_state = "asteroidfloor"
},
/area/lv624/lazarus/corporate_dome)
-"bAc" = (
-/obj/structure/surface/table,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"bAB" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
/area/lv624/ground/jungle/south_east_jungle)
@@ -12189,6 +12113,14 @@
"bBu" = (
/turf/open/gm/coast/beachcorner2/south_west,
/area/lv624/ground/jungle/west_jungle)
+"bBT" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"bCe" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/south_east_jungle)
@@ -12202,6 +12134,14 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
+"bEj" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"bEq" = (
/turf/open/gm/dirtgrassborder/north,
/area/lv624/ground/barrens/south_eastern_barrens)
@@ -12237,12 +12177,6 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/river,
/area/lv624/ground/river/west_river)
-"bGi" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"bGV" = (
/obj/structure/machinery/iv_drip,
/turf/open/floor{
@@ -12261,6 +12195,12 @@
/obj/effect/landmark/corpsespawner/wygoon,
/turf/open/floor/wood,
/area/lv624/ground/caves/north_central_caves)
+"bJQ" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"bLs" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
@@ -12282,6 +12222,15 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
+"bOm" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 4;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/barrens/north_east_barrens)
"bOy" = (
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
dir = 1;
@@ -12296,15 +12245,17 @@
},
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_east_jungle)
-"bQh" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
-"bQp" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+"bPE" = (
+/obj/structure/flora/bush/ausbushes/pointybush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+/area/lv624/ground/caves/north_west_caves)
+"bQz" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"bQA" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -12316,16 +12267,21 @@
"bQP" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/north_east_jungle)
-"bQZ" = (
-/obj/structure/flora/bush/ausbushes/palebush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"bRP" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
+"bRf" = (
+/obj/item/weapon/baseballbat/metal,
+/obj/item/weapon/baseballbat/metal{
+ pixel_x = 5
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
+/obj/structure/surface/rack,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/lv624/lazarus/fitness)
+"bRk" = (
+/obj/structure/flora/jungle/planttop1,
+/turf/open/gm/dirtgrassborder/south,
+/area/lv624/ground/jungle/south_central_jungle)
"bRV" = (
/obj/structure/stairs/perspective{
color = "#6b675e";
@@ -12348,13 +12304,6 @@
},
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
-"bUo" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/obj/structure/flora/bush/ausbushes/reedbush,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"bUs" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/ammo_magazine/shotgun/buckshot,
@@ -12362,13 +12311,6 @@
icon_state = "bcarpet07"
},
/area/lv624/ground/caves/north_central_caves)
-"bUA" = (
-/obj/structure/flora/bush/ausbushes/ausbush,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"bUU" = (
/obj/structure/machinery/light/small{
dir = 4
@@ -12377,10 +12319,6 @@
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
-"bWe" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"bXd" = (
/obj/item/device/flashlight/on,
/obj/effect/decal/cleanable/blood/drip,
@@ -12389,20 +12327,6 @@
icon_state = "floor4"
},
/area/lv624/lazarus/crashed_ship_containers)
-"bXm" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
-"bYT" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
"bZb" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 5
@@ -12425,34 +12349,18 @@
"cag" = (
/turf/open/gm/coast/south,
/area/lv624/ground/caves/sand_temple)
-"cay" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"caX" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 5
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"ccb" = (
-/obj/effect/decal/grass_overlay/grass1,
-/obj/structure/flora/bush/ausbushes/pointybush,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"ccn" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 4
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"ccy" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"cdj" = (
/obj/structure/window_frame/colony,
/obj/effect/decal/cleanable/blood/drip,
@@ -12475,13 +12383,14 @@
"cfD" = (
/turf/closed/wall/r_wall/unmeltable,
/area/lv624/lazarus/quartstorage/outdoors)
+"cfL" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/gm/grass/grass1/weedable,
+/area/lv624/ground/caves/north_east_caves)
"cfN" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/north_jungle)
-"cfR" = (
-/obj/structure/flora/bush/ausbushes/palebush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"cfT" = (
/obj/structure/bed/chair{
dir = 8
@@ -12505,25 +12414,20 @@
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/east_central_jungle)
-"chb" = (
-/obj/item/bedsheet/medical,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/lv624/lazarus/medbay)
"chf" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core,
/turf/open/gm/dirt,
/area/lv624/ground/caves/west_caves)
-"chP" = (
+"chi" = (
/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
pixel_x = -10;
+ pixel_y = -2;
light_on = 1;
light_range = 1;
light_system = 1
},
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/caves/south_west_caves)
"cij" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
@@ -12553,11 +12457,13 @@
},
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"ckm" = (
-/turf/open/gm/dirt{
- icon_state = "desert_dug"
+"clO" = (
+/obj/effect/landmark/crap_item,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
},
-/area/lv624/ground/caves/south_west_caves)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"cmf" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
@@ -12569,13 +12475,6 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
-"cmR" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"cng" = (
/obj/structure/stairs/perspective{
color = "#6b675e";
@@ -12587,10 +12486,12 @@
icon_state = "squareswood"
},
/area/lv624/ground/caves/sand_temple)
-"cnk" = (
-/obj/effect/decal/grass_overlay/grass1,
+"cop" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
+ },
/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
+/area/lv624/ground/caves/east_caves)
"cpQ" = (
/turf/open/gm/dirtgrassborder/north,
/area/lv624/ground/caves/sand_temple)
@@ -12609,6 +12510,14 @@
/obj/structure/flora/jungle/vines/light_1,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/north_west_jungle)
+"cqC" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"cqE" = (
/obj/structure/barricade/wooden,
/obj/structure/flora/jungle/vines/light_2,
@@ -12618,15 +12527,22 @@
},
/area/lv624/lazarus/landing_zones/lz1)
"cqH" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -5;
- pixel_y = -5;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
+/obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle,
/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/caves/central_caves)
+"cqN" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
+"crn" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"crF" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/obj/structure/flora/jungle/vines/heavy,
@@ -12636,44 +12552,24 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/coast/south,
/area/lv624/ground/river/central_river)
-"csJ" = (
-/turf/open/gm/dirt{
- icon_state = "desert_dug"
- },
-/area/lv624/ground/caves/west_caves)
"csM" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/central_barrens)
+"cuu" = (
+/obj/structure/surface/rack,
+/obj/item/ore/silver,
+/turf/open/floor/greengrid,
+/area/lv624/lazarus/secure_storage)
"cvk" = (
/obj/structure/fence,
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/west_central_jungle)
-"cvu" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"cwv" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
-"cwE" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_id = "Research Dome";
- pixel_y = 24
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"cwV" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
@@ -12684,13 +12580,9 @@
icon_state = "desert_dug"
},
/area/lv624/ground/barrens/west_barrens)
-"cxT" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
+"cxi" = (
+/obj/structure/flora/bush/ausbushes/var3/brflowers,
+/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/caves/south_central_caves)
"cys" = (
/obj/structure/foamed_metal,
@@ -12739,17 +12631,14 @@
icon_state = "cult"
},
/area/lv624/ground/caves/south_west_caves)
-"cCn" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"cCr" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/east_jungle)
+"cCP" = (
+/turf/open/gm/dirt{
+ icon_state = "desert1"
+ },
+/area/lv624/ground/caves/south_west_caves)
"cDr" = (
/obj/structure/girder,
/turf/open/gm/grass/grass1,
@@ -12770,16 +12659,16 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/jungle/north_west_jungle)
-"cEe" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"cEh" = (
/obj/structure/flora/bush/ausbushes/pointybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"cEi" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"cEn" = (
/obj/effect/decal/remains/xeno,
/turf/open/gm/dirt,
@@ -12792,17 +12681,12 @@
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"cGg" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"cHU" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8;
- pixel_y = 13
+"cHW" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"cIL" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
@@ -12811,18 +12695,19 @@
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
-"cJA" = (
-/obj/effect/landmark/monkey_spawn,
-/turf/open/gm/grass/grass1,
-/area/lv624/ground/jungle/south_east_jungle)
-"cJS" = (
+"cIU" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
+/area/lv624/ground/caves/south_central_caves)
+"cJA" = (
+/obj/effect/landmark/monkey_spawn,
+/turf/open/gm/grass/grass1,
+/area/lv624/ground/jungle/south_east_jungle)
"cKj" = (
/obj/effect/landmark/yautja_teleport,
/turf/open/gm/grass/grass1,
@@ -12841,15 +12726,17 @@
/obj/effect/landmark/lv624/fog_blocker,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/river/west_river)
+"cMG" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"cNH" = (
/obj/structure/surface/rack,
/obj/item/storage/box/beakers,
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
-"cNK" = (
-/obj/structure/flora/bush/ausbushes/genericbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"cOs" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/lazarus/quartstorage/outdoors)
@@ -12867,9 +12754,23 @@
},
/turf/open/floor/wood,
/area/lv624/ground/caves/north_central_caves)
+"cPL" = (
+/obj/structure/surface/table,
+/obj/item/book/manual/research_and_development,
+/obj/item/cell/hyper,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"cPV" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
+"cQB" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"cQJ" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
@@ -12895,12 +12796,12 @@
/obj/item/tool/surgery/surgicaldrill/predatorsurgicaldrill,
/turf/open/gm/dirt,
/area/lv624/ground/caves/sand_temple)
-"cSX" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
+"cSL" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"cTi" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
@@ -12922,6 +12823,10 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_nexus_road)
+"cWs" = (
+/obj/structure/flora/bush/ausbushes/var3/sunnybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"cXd" = (
/obj/effect/landmark/monkey_spawn,
/obj/structure/flora/jungle/vines/heavy,
@@ -12930,6 +12835,21 @@
"cXk" = (
/turf/open/gm/coast/west,
/area/lv624/ground/barrens/west_barrens)
+"cXU" = (
+/obj/structure/surface/rack,
+/obj/item/stack/sheet/metal{
+ amount = 50;
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/stack/sheet/metal{
+ amount = 30
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
+ },
+/area/lv624/ground/barrens/north_east_barrens/ceiling)
"cYi" = (
/obj/structure/surface/table,
/obj/item/reagent_container/food/snacks/pie,
@@ -12944,18 +12864,38 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz2)
+"cZN" = (
+/obj/item/storage/firstaid/adv/empty,
+/obj/structure/machinery/door_control{
+ id = "secure_outer_blast";
+ name = "Secure Outer Doors";
+ pixel_x = 25;
+ pixel_y = -5
+ },
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_color = "blue";
+ phone_id = "Corporate Office";
+ pixel_y = 24
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whiteyellow"
+ },
+/area/lv624/lazarus/corporate_dome)
"daz" = (
/obj/structure/prop/brazier/torch,
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/mineral/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"daN" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+"daY" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
/obj/effect/decal/grass_overlay/grass1{
- dir = 5
+ dir = 9
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
+/area/lv624/ground/caves/south_central_caves)
"dbA" = (
/obj/structure/xenoautopsy/tank,
/turf/open/shuttle{
@@ -12988,12 +12928,12 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/corporate_dome)
-"dhn" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
+"dfJ" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
+/obj/effect/landmark/corpsespawner/scientist,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"dhp" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/river,
@@ -13023,12 +12963,6 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
-"djY" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"dkN" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/closed/wall/rock/brown,
@@ -13042,6 +12976,12 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/caves/sand_temple)
+"dlq" = (
+/obj/structure/filingcabinet,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/lv624/lazarus/engineering)
"dmf" = (
/turf/open/gm/coast/south,
/area/lv624/ground/jungle/west_jungle)
@@ -13049,23 +12989,27 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
+"dmT" = (
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"dmZ" = (
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_east_jungle)
+"doe" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"dop" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"dou" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
+"dpl" = (
+/turf/open/floor/plating{
+ icon_state = "platebotc"
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/lazarus/secure_storage)
"dql" = (
/obj/structure/largecrate,
/turf/open/floor{
@@ -13097,26 +13041,13 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/east_jungle)
-"dtc" = (
+"dtr" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"dtu" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
-"dve" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
+ dir = 10
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/caves/east_caves)
"dvf" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/grass/grass1,
@@ -13179,24 +13110,30 @@
},
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/caves/sand_temple)
-"dxH" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+"dzM" = (
/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
+ dir = 1
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"dyk" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
+/area/lv624/ground/caves/north_east_caves)
+"dAu" = (
+/obj/effect/landmark/crap_item,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
+"dBS" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -10;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
+"dCD" = (
+/obj/effect/decal/grass_overlay/grass1{
dir = 9
},
-/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"dAv" = (
-/obj/effect/landmark/crap_item,
-/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/barrens/north_east_barrens)
"dCL" = (
/obj/item/reagent_container/food/drinks/cans/waterbottle{
@@ -13217,11 +13154,6 @@
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/caves/sand_temple)
-"dDK" = (
-/turf/open/gm/dirt{
- icon_state = "desert1"
- },
-/area/lv624/ground/caves/west_caves)
"dEc" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
/area/lv624/ground/jungle/south_central_jungle)
@@ -13244,6 +13176,14 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
+"dFz" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"dGc" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/barrens/south_eastern_barrens)
@@ -13256,11 +13196,9 @@
/turf/open/gm/dirt,
/area/lv624/ground/caves/central_caves)
"dHg" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
+/obj/structure/flora/bush/ausbushes/var3/stalkybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"dHo" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
@@ -13271,33 +13209,23 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/medbay)
-"dIr" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+"dIj" = (
+/obj/structure/flora/bush/ausbushes/reedbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
+"dIu" = (
+/obj/structure/flora/bush/ausbushes/genericbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
+"dIv" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"dIO" = (
/turf/open/gm/dirt{
icon_state = "desert0"
},
/area/lv624/ground/barrens/central_barrens)
-"dIQ" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/device/flashlight/lamp{
- pixel_x = 6;
- pixel_y = 14
- },
-/obj/structure/phone_base/colony_net/rotary{
- phone_category = "Lazarus Landing";
- phone_color = "red";
- phone_id = "Marshal Office"
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "redcorner"
- },
-/area/lv624/lazarus/security)
"dJG" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 10
@@ -13307,9 +13235,16 @@
"dKg" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"dKT" = (
-/obj/structure/flora/bush/ausbushes/pointybush,
+"dKl" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
+"dLm" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
/area/lv624/ground/caves/central_caves)
"dLn" = (
/obj/effect/acid_hole,
@@ -13321,9 +13256,11 @@
},
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/east_jungle)
-"dLX" = (
-/obj/structure/flora/bush/ausbushes/grassybush,
-/turf/open/auto_turf/strata_grass/layer1,
+"dLW" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
/area/lv624/ground/caves/east_caves)
"dLY" = (
/turf/open/gm/grass/grass1,
@@ -13345,13 +13282,6 @@
"dNj" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_barrens)
-"dNn" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"dNx" = (
/obj/structure/flora/jungle/vines/heavy,
/obj/structure/flora/jungle/vines/heavy,
@@ -13363,11 +13293,19 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
+"dOb" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"dOf" = (
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
+"dOA" = (
+/obj/structure/flora/bush/ausbushes/grassybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"dOC" = (
/obj/structure/kitchenspike,
/obj/effect/decal/cleanable/blood,
@@ -13380,38 +13318,21 @@
/obj/effect/landmark/queen_spawn,
/turf/open/gm/dirt,
/area/lv624/ground/caves/central_caves)
-"dPs" = (
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_id = "Lakeside Bar";
- pixel_y = 32
- },
-/turf/open/floor/wood,
-/area/lv624/ground/caves/north_central_caves)
-"dQy" = (
-/obj/structure/filingcabinet,
+"dSx" = (
+/obj/structure/bookcase,
+/obj/item/book/manual/research_and_development,
+/obj/item/book/manual/medical_diagnostics_manual,
+/obj/item/book/manual/security_space_law,
/turf/open/floor{
- icon_state = "dark"
+ dir = 5;
+ icon_state = "whiteblue"
},
-/area/lv624/lazarus/engineering)
-"dQR" = (
-/obj/structure/flora/bush/ausbushes/var3/fernybush,
-/turf/open/gm/grass/grass2,
-/area/lv624/lazarus/yggdrasil)
-"dSH" = (
-/obj/structure/surface/rack,
-/obj/item/ore/silver,
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/secure_storage)
+/area/lv624/lazarus/corporate_dome)
"dTm" = (
/turf/open/gm/dirt{
icon_state = "desert1"
},
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"dUm" = (
-/obj/structure/flora/bush/ausbushes/ppflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"dVH" = (
/turf/open/gm/dirt,
/area/lv624/ground/river/central_river)
@@ -13440,10 +13361,20 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
+"dWM" = (
+/obj/effect/landmark/monkey_spawn,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"dXq" = (
/obj/structure/platform_decoration/mineral/sandstone/runed,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
+"dYx" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"dYE" = (
/obj/structure/fence,
/turf/open/gm/dirt,
@@ -13463,6 +13394,14 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
+"eaI" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"eaJ" = (
/obj/item/stack/sheet/wood{
amount = 2
@@ -13476,6 +13415,14 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/colony/south_nexus_road)
+"ecn" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"ecy" = (
/turf/closed/wall/sulaco,
/area/lv624/lazarus/crashed_ship_containers)
@@ -13495,12 +13442,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
-"eeh" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"eeW" = (
/obj/structure/flora/bush/ausbushes/var3/leafybush,
/turf/open/gm/grass/grass1,
@@ -13508,9 +13449,27 @@
"efp" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_tcomms_road)
+"eft" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"efX" = (
/turf/open/gm/coast/east,
/area/lv624/ground/river/east_river)
+"egc" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
+"egU" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"ehy" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
name = "Hydroponics"
@@ -13542,6 +13501,14 @@
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_jungle)
+"ejp" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"ejx" = (
/obj/structure/disposalpipe/segment,
/obj/structure/window/framed/colony,
@@ -13573,20 +13540,22 @@
icon_state = "green"
},
/area/lv624/lazarus/hydroponics)
-"elz" = (
+"elp" = (
/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 5
+ dir = 10
+ },
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"emk" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/area/lv624/ground/caves/east_caves)
+"enn" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/obj/effect/decal/grass_overlay/grass1{
dir = 10
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
+/area/lv624/ground/barrens/north_east_barrens)
"eny" = (
/obj/structure/flora/grass/tallgrass/jungle,
/turf/open/gm/grass/grass1,
@@ -13601,6 +13570,10 @@
icon_state = "whitebluecorner"
},
/area/lv624/lazarus/medbay)
+"eoW" = (
+/obj/structure/flora/bush/ausbushes/pointybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"epG" = (
/obj/structure/showcase,
/obj/structure/window/reinforced{
@@ -13615,19 +13588,6 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
-"epJ" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"eqe" = (
-/obj/structure/flora/bush/ausbushes/var3/sunnybush{
- icon_state = "fernybush_2";
- pixel_y = 10
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"eqs" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 9
@@ -13643,6 +13603,10 @@
icon_state = "whitebluefull"
},
/area/lv624/lazarus/medbay)
+"eqS" = (
+/obj/structure/flora/bush/ausbushes/var3/brflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"erx" = (
/turf/open/gm/coast/beachcorner/south_east,
/area/lv624/ground/jungle/west_jungle)
@@ -13657,6 +13621,10 @@
icon_state = "cult"
},
/area/lv624/ground/caves/south_west_caves)
+"etU" = (
+/obj/structure/flora/bush/ausbushes/var3/fernybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"euW" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/tool/candle,
@@ -13668,19 +13636,6 @@
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
-"ewQ" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 4;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"ewU" = (
-/obj/structure/flora/bush/ausbushes/pointybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"exf" = (
/turf/open/gm/dirtgrassborder/north,
/area/lv624/ground/jungle/south_west_jungle)
@@ -13731,17 +13686,10 @@
},
/turf/open/floor/sandstone/runed,
/area/lv624/ground/barrens/south_eastern_barrens)
-"eBo" = (
+"eAu" = (
/obj/structure/surface/table,
-/obj/effect/landmark/crap_item,
-/obj/structure/machinery/light{
- dir = 4
- },
-/turf/open/floor{
- dir = 9;
- icon_state = "green"
- },
-/area/lv624/lazarus/hydroponics)
+/turf/open/floor/plating,
+/area/lv624/ground/barrens/central_barrens)
"eBu" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass2,
@@ -13765,6 +13713,11 @@
/obj/structure/machinery/computer/shuttle/dropship/flight/lz2,
/turf/open/gm/dirt,
/area/lv624/landing/console2)
+"eCY" = (
+/turf/open/floor/plating{
+ icon_state = "platingdmg3"
+ },
+/area/lv624/lazarus/secure_storage)
"eDy" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass1,
@@ -13774,23 +13727,9 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
-"eEp" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"eER" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
/area/lv624/ground/barrens/south_eastern_barrens)
-"eFL" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"eFS" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
@@ -13801,20 +13740,6 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
-"eGm" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 6;
- pixel_y = -8;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"eGu" = (
-/obj/structure/flora/bush/ausbushes/lavendergrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
"eGx" = (
/obj/structure/surface/rack,
/obj/item/storage/firstaid/adv,
@@ -13845,42 +13770,16 @@
"eHQ" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/jungle/north_west_jungle)
-"eHW" = (
-/obj/structure/flora/bush/ausbushes/ausbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
-"eII" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
-"eJW" = (
-/obj/structure/prop/mech/tesla_energy_relay{
- layer = 2.5
- },
-/obj/structure/largecrate/random,
-/turf/open/floor/plating{
- icon_state = "platebot"
- },
-/area/lv624/lazarus/robotics)
"eKs" = (
/obj/structure/flora/bush/ausbushes/var3/sunnybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"eMt" = (
-/obj/structure/filingcabinet/medical,
-/turf/open/floor,
-/area/lv624/lazarus/fitness)
-"eNl" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1{
+"eMe" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
dir = 8
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
-"eNn" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/barrens/north_east_barrens)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"eNK" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west,
/area/lv624/ground/jungle/south_east_jungle)
@@ -13910,16 +13809,6 @@
"ePw" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/jungle/south_east_jungle)
-"ePP" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"ePV" = (
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
@@ -13928,20 +13817,13 @@
/obj/structure/largecrate/random,
/turf/open/floor,
/area/lv624/lazarus/landing_zones/lz1)
+"eQL" = (
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/barrens/north_east_barrens)
"eSg" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/east_jungle)
-"eSm" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 11;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"eTd" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west,
@@ -13952,30 +13834,25 @@
"eTQ" = (
/turf/open/gm/dirtgrassborder/north,
/area/lv624/ground/jungle/south_east_jungle)
-"eUP" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
-"eUS" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"eVH" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/floor{
icon_state = "cult"
},
/area/lv624/ground/caves/south_west_caves)
+"eYb" = (
+/obj/structure/flora/bush/ausbushes/var3/sunnybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"eYD" = (
/obj/structure/flora/bush/ausbushes/var3/stalkybush,
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/river,
/area/lv624/ground/river/east_river)
+"eZg" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"eZC" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -13991,12 +13868,6 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
-"eZU" = (
-/obj/structure/tunnel{
- id = "hole1"
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"fau" = (
/turf/open/floor/plating{
dir = 1;
@@ -14009,23 +13880,20 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"fbx" = (
-/obj/structure/closet/crate,
-/obj/item/ammo_magazine/rifle/mar40,
-/obj/item/ammo_magazine/rifle/mar40,
-/obj/item/ammo_magazine/rifle/mar40,
-/obj/item/ammo_magazine/rifle/mar40,
-/obj/item/ammo_magazine/rifle/mar40,
-/obj/item/ammo_magazine/rifle/mar40/extended,
-/obj/item/ammo_magazine/rifle/mar40/extended,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/lv624/ground/barrens/north_east_barrens/ceiling)
"fbD" = (
/obj/structure/flora/jungle/planttop1,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/east_jungle)
+"fcQ" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -5;
+ pixel_y = -5;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"fdl" = (
/turf/open/floor,
/area/lv624/lazarus/hydroponics)
@@ -14037,12 +13905,6 @@
icon_state = "dark"
},
/area/lv624/lazarus/quartstorage)
-"feu" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/lv624/lazarus/engineering)
"ffb" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
dir = 2;
@@ -14116,10 +13978,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"fjj" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/libertycap,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"fjM" = (
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/quartstorage/outdoors)
@@ -14142,17 +14000,11 @@
icon_state = "asteroidfloor"
},
/area/lv624/lazarus/corporate_dome)
-"fot" = (
-/obj/structure/surface/table/reinforced/prison{
- color = "#6b675e"
- },
-/obj/item/stack/sheet/mineral/sandstone{
- amount = 50
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/sand_temple)
-"fpk" = (
-/obj/structure/flora/bush/ausbushes/lavendergrass,
+"fmV" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
+"fmW" = (
/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/caves/south_west_caves)
"fpn" = (
@@ -14161,10 +14013,12 @@
"fqh" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/east_jungle)
-"fqv" = (
-/obj/structure/flora/bush/ausbushes/var3/fernybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+"fqi" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"fqM" = (
/obj/structure/machinery/power/apc{
start_charge = 0
@@ -14174,6 +14028,25 @@
icon_state = "asteroidwarning"
},
/area/lv624/ground/colony/telecomm/sw_lz2)
+"fqP" = (
+/obj/structure/surface/rack,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_color = "yellow";
+ phone_id = "Engineering";
+ pixel_y = 24
+ },
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/lv624/lazarus/engineering)
+"frV" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"fsa" = (
/obj/structure/surface/table,
/turf/open/floor{
@@ -14181,6 +14054,12 @@
icon_state = "barber"
},
/area/lv624/lazarus/kitchen)
+"fsc" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"fsu" = (
/obj/structure/machinery/light{
dir = 8
@@ -14193,16 +14072,6 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
-"ftW" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -1;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"fur" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/caves/sand_temple)
@@ -14213,22 +14082,6 @@
"fuY" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/north_east_jungle)
-"fvi" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 6;
- pixel_y = -8;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
-"fvs" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"fvt" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -14243,19 +14096,6 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/caves/sand_temple)
-"fwa" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8;
- pixel_y = 13
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"fwF" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"fyA" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
@@ -14305,13 +14145,18 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_west_caves)
-"fBW" = (
-/obj/structure/surface/table,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor/plating{
- icon_state = "platebot"
+"fBC" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/trash/chips,
+/obj/structure/phone_base/colony_net/rotary{
+ phone_category = "Lazarus Landing";
+ phone_color = "blue";
+ phone_id = "Director's Office"
},
-/area/lv624/lazarus/robotics)
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/lv624/lazarus/hop)
"fDq" = (
/obj/structure/barricade/wooden{
dir = 4
@@ -14322,24 +14167,18 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz1)
-"fDw" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/explosive/grenade/high_explosive/stick,
-/obj/item/explosive/grenade/high_explosive/stick{
- pixel_x = 6
- },
-/obj/item/explosive/grenade/high_explosive/stick{
- pixel_x = -6
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/lv624/ground/barrens/north_east_barrens/ceiling)
+"fDE" = (
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"fDO" = (
/obj/structure/flora/jungle/alienplant1,
/turf/open/gm/river,
/area/lv624/ground/barrens/west_barrens)
+"fDT" = (
+/turf/open/gm/dirt{
+ icon_state = "desert_dug"
+ },
+/area/lv624/ground/caves/south_west_caves)
"fEn" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
@@ -14348,20 +14187,10 @@
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
-"fEG" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"fEU" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_west_barrens)
-"fFq" = (
-/turf/open/gm/dirt{
- icon_state = "desert2"
- },
-/area/lv624/ground/caves/south_west_caves)
"fFA" = (
/obj/structure/machinery/cm_vending/sorted/tech/tool_storage,
/turf/open/floor{
@@ -14390,9 +14219,10 @@
icon_state = "asteroidfloor"
},
/area/lv624/ground/colony/telecomm/cargo)
-"fGm" = (
-/obj/structure/flora/bush/ausbushes/palebush,
-/turf/open/auto_turf/strata_grass/layer1,
+"fGn" = (
+/obj/effect/decal/grass_overlay/grass1,
+/obj/structure/flora/bush/ausbushes/pointybush,
+/turf/open/gm/dirt,
/area/lv624/ground/caves/east_caves)
"fGO" = (
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
@@ -14415,10 +14245,6 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"fHU" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"fIj" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
@@ -14432,22 +14258,24 @@
/obj/structure/window/framed/colony/reinforced,
/turf/open/floor,
/area/lv624/lazarus/medbay)
-"fIR" = (
-/obj/structure/flora/bush/ausbushes/reedbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
+"fIW" = (
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"fJQ" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 1
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_tcomms_road)
-"fKj" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
+"fKc" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
+/area/lv624/ground/caves/south_west_caves)
+"fLh" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"fMl" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{
dir = 1;
@@ -14458,35 +14286,12 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
-"fMX" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"fNA" = (
/obj/structure/barricade/wooden,
/turf/open/shuttle{
icon_state = "floor4"
},
/area/lv624/lazarus/crashed_ship_containers)
-"fOf" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
-"fOg" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
-"fOA" = (
-/obj/structure/flora/bush/ausbushes/palebush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"fPi" = (
/turf/open/gm/coast/north,
/area/lv624/ground/caves/sand_temple)
@@ -14496,25 +14301,14 @@
"fQL" = (
/turf/open/gm/coast/beachcorner2/south_east,
/area/lv624/ground/river/west_river)
-"fRt" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"fRD" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
-"fSw" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/caves/north_east_caves)
-"fSW" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+"fRU" = (
+/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
+/area/lv624/ground/caves/west_caves)
"fSX" = (
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/east_jungle)
@@ -14522,13 +14316,6 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/colony/north_tcomms_road)
-"fTq" = (
-/obj/structure/closet/crate/hydroponics/prespawned,
-/turf/open/floor{
- dir = 9;
- icon_state = "green"
- },
-/area/lv624/lazarus/hydroponics)
"fTE" = (
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
dir = 1;
@@ -14541,10 +14328,14 @@
"fTM" = (
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_east_caves)
-"fWt" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
+"fTN" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/barrens/north_east_barrens)
+/area/lv624/ground/caves/north_west_caves)
+"fUj" = (
+/obj/structure/flora/bush/ausbushes/var3/stalkybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"fXr" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
@@ -14558,6 +14349,10 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_central_caves)
+"fYG" = (
+/obj/structure/flora/bush/ausbushes/ppflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"fZO" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/north_west_jungle)
@@ -14583,10 +14378,6 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
/area/lv624/ground/river/west_river)
-"gbK" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
"gcn" = (
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/grass/grass1,
@@ -14595,6 +14386,16 @@
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/south_central_jungle)
+"gcB" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 6;
+ pixel_y = -8;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"gcI" = (
/obj/effect/landmark/crap_item,
/turf/open/shuttle{
@@ -14636,10 +14437,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"ghC" = (
-/obj/structure/flora/bush/ausbushes/var3/sunnybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"git" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
@@ -14655,9 +14452,6 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
/turf/open/gm/dirt,
/area/lv624/ground/caves/east_caves)
-"gkW" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
"glp" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/gm/river,
@@ -14666,21 +14460,63 @@
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"gnr" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
+"gmi" = (
+/obj/item/handset{
+ desc = "A model of an ancient Earth communication device.";
+ force = 8
+ },
+/obj/structure/surface/rack,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/lv624/lazarus/main_hall)
+"gnt" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -5;
+ pixel_y = -5;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"gnx" = (
/turf/open/floor{
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
+"gnR" = (
+/obj/structure/closet/cabinet,
+/obj/item/reagent_container/food/snacks/syndicake{
+ layer = 2.6
+ },
+/turf/open/floor{
+ icon_state = "grimy"
+ },
+/area/lv624/lazarus/captain)
"god" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/colony/north_nexus_road)
+"gos" = (
+/obj/structure/flora/bush/ausbushes/var3/fernybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
+"gox" = (
+/obj/item/clothing/suit/redtag,
+/obj/structure/closet/athletic_mixed,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/lv624/lazarus/fitness)
"gpC" = (
/obj/structure/flora/jungle/vines/light_2,
/obj/structure/flora/jungle/vines/heavy,
@@ -14699,6 +14535,17 @@
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
+"grW" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
+"gsq" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"gss" = (
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/shuttle{
@@ -14733,6 +14580,17 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/closed/wall/mineral/sandstone/runed/decor,
/area/lv624/ground/jungle/south_west_jungle/ceiling)
+"gvm" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
+"gvr" = (
+/obj/structure/flora/bush/ausbushes/var3/stalkybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"gwP" = (
/turf/open/gm/dirt,
/area/lv624/ground/caves/west_caves)
@@ -14751,23 +14609,27 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
+"gze" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"gzo" = (
/turf/open/gm/dirt{
icon_state = "desert3"
},
/area/lv624/ground/barrens/east_barrens)
-"gzz" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"gzD" = (
/obj/structure/machinery/light/small,
/turf/open/floor{
icon_state = "dark"
},
/area/lv624/lazarus/quartstorage)
+"gzH" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"gzW" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/gm/dirt,
@@ -14783,18 +14645,6 @@
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
-"gBz" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
-"gBA" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"gBG" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
@@ -14811,15 +14661,21 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"gDW" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"gEn" = (
/obj/structure/flora/jungle/vines/light_1,
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"gEX" = (
+/obj/structure/surface/table,
+/obj/item/alien_embryo{
+ pixel_y = 4
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"gFg" = (
/obj/item/ammo_casing/bullet{
icon_state = "casing_9_1"
@@ -14832,20 +14688,14 @@
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_east_jungle)
-"gFC" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"gGd" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
-"gJf" = (
-/obj/structure/flora/bush/ausbushes/ausbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+"gHt" = (
+/obj/vehicle/train/cargo/trolley,
+/turf/open/floor,
+/area/lv624/ground/barrens/containers)
"gKg" = (
/obj/item/clothing/head/hardhat/orange,
/turf/open/floor/plating{
@@ -14853,6 +14703,10 @@
icon_state = "warnplate"
},
/area/lv624/lazarus/engineering)
+"gKw" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/gm/dirtgrassborder/east,
+/area/lv624/ground/jungle/south_central_jungle)
"gMe" = (
/obj/effect/landmark/nightmare{
insert_tag = "lv-rightsidepass"
@@ -14865,31 +14719,22 @@
},
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"gOo" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
+"gPu" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/caves/central_caves)
"gPN" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
/area/lv624/ground/barrens/south_eastern_barrens)
-"gQj" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"gQr" = (
/turf/open/gm/coast/beachcorner/south_east,
/area/lv624/ground/caves/sand_temple)
-"gQA" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+"gRk" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"gRm" = (
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/dirtgrassborder/north,
@@ -14897,44 +14742,38 @@
"gRx" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/colony/south_medbay_road)
+"gTj" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"gTv" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"gTE" = (
-/obj/structure/flora/bush/ausbushes/pointybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
-"gTF" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
"gTM" = (
/obj/structure/platform/mineral/sandstone/runed{
dir = 1
},
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
-"gUd" = (
-/obj/structure/flora/bush/ausbushes/var3/stalkybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
-"gUm" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"gUq" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/south_east_jungle)
-"gVL" = (
+"gVw" = (
/obj/effect/decal/grass_overlay/grass1{
- dir = 6
+ dir = 8
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/caves/south_central_caves)
+"gVR" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"gWf" = (
/obj/structure/surface/rack,
/obj/item/stack/sandbags/large_stack{
@@ -14950,16 +14789,16 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
+"gWE" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/floor/sandstone/runed,
+/area/lv624/ground/caves/south_east_caves)
"gWI" = (
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"gXm" = (
-/obj/structure/surface/table,
-/turf/open/floor{
- icon_state = "vault"
- },
-/area/lv624/lazarus/robotics)
"gXu" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony,
/turf/open/floor{
@@ -14977,26 +14816,20 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/north,
/area/lv624/ground/colony/north_nexus_road)
-"gYU" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -10;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
"gZh" = (
/obj/structure/prop/brazier,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/caves/sand_temple)
-"gZR" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
+"han" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
+"hav" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"haN" = (
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/grass/grass1,
@@ -15021,12 +14854,6 @@
/obj/item/stack/yautja_rope,
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"hbX" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"hcN" = (
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
@@ -15047,17 +14874,22 @@
icon_state = "asteroidwarning"
},
/area/lv624/lazarus/landing_zones/lz2)
+"hez" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"heC" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 6
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"heL" = (
-/turf/open/gm/dirt{
- icon_state = "desert3"
- },
-/area/lv624/ground/caves/south_west_caves)
"heZ" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 5
@@ -15069,10 +14901,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
-"hfY" = (
-/obj/structure/flora/bush/ausbushes/var3/brflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
"hgt" = (
/obj/structure/flora/bush/ausbushes/grassybush,
/obj/structure/flora/jungle/vines/light_1,
@@ -15088,6 +14916,11 @@
},
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/west_jungle)
+"hhs" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"hhv" = (
/turf/open/floor{
dir = 8;
@@ -15098,6 +14931,12 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/colony/west_tcomms_road)
+"hjo" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"hke" = (
/obj/structure/platform/mineral/sandstone/runed,
/obj/structure/stairs/perspective{
@@ -15107,14 +14946,25 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
-"hkW" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
+"hkT" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
+"hmq" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_west_caves)
-"hlu" = (
-/obj/structure/flora/bush/ausbushes/var3/sunnybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
+"hmJ" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"hmK" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
@@ -15130,6 +14980,16 @@
icon_state = "bot"
},
/area/lv624/ground/caves/north_central_caves)
+"hpK" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -10;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"hqQ" = (
/obj/structure/flora/bush/ausbushes/var3/sunnybush,
/turf/open/gm/grass/grass1,
@@ -15156,26 +15016,15 @@
"hsc" = (
/turf/closed/wall/r_wall,
/area/lv624/ground/river/central_river)
-"htR" = (
+"htV" = (
/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 6;
- pixel_y = -8;
+ pixel_x = 4;
light_on = 1;
light_range = 1;
light_system = 1
},
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
-"htU" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/tool/shovel,
-/obj/item/stack/sheet/wood{
- amount = 16
- },
-/turf/open/shuttle{
- icon_state = "floor4"
- },
-/area/lv624/lazarus/crashed_ship_containers)
+/area/lv624/ground/caves/west_caves)
"huH" = (
/obj/structure/flora/jungle/planttop1,
/obj/structure/flora/jungle/vines/light_3,
@@ -15184,16 +15033,15 @@
"hwR" = (
/turf/open/gm/coast/east,
/area/lv624/ground/river/central_river)
-"hxv" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
+"hxt" = (
+/obj/structure/surface/table/reinforced/prison{
+ color = "#6b675e"
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
+/obj/item/stack/sheet/mineral/sandstone{
+ amount = 50
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/sand_temple)
"hxL" = (
/obj/effect/landmark/hunter_primary,
/obj/structure/flora/grass/tallgrass/jungle/corner{
@@ -15205,10 +15053,13 @@
/obj/effect/decal/remains/xeno,
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"hyo" = (
-/obj/structure/flora/bush/ausbushes/var3/stalkybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+"hyF" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"hyK" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/grass/grass1,
@@ -15226,12 +15077,6 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_central_caves)
-"hzV" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"hBt" = (
/obj/structure/barricade/wooden{
dir = 1;
@@ -15250,6 +15095,19 @@
/obj/effect/decal/remains/xeno,
/turf/open/gm/dirt,
/area/lv624/ground/colony/west_tcomms_road)
+"hEc" = (
+/obj/structure/machinery/power/terminal{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/blood/oil,
+/turf/open/floor{
+ icon_state = "platebot"
+ },
+/area/lv624/lazarus/engineering)
+"hEe" = (
+/obj/effect/landmark/crap_item,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/barrens/north_east_barrens)
"hEl" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/closed/wall/strata_ice/jungle,
@@ -15262,12 +15120,9 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/colony/north_tcomms_road)
-"hFR" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
+"hGN" = (
+/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
+/area/lv624/ground/jungle/south_central_jungle)
"hHc" = (
/obj/structure/window/framed/colony/reinforced,
/obj/structure/foamed_metal,
@@ -15283,10 +15138,6 @@
"hIh" = (
/turf/open/gm/coast/beachcorner/north_east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"hIn" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"hIq" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 5
@@ -15310,14 +15161,10 @@
},
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/east_jungle)
-"hLe" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
+"hKP" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/caves/north_west_caves)
"hLu" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/south_central_jungle)
@@ -15348,6 +15195,10 @@
/obj/item/clothing/under/colonist,
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
+"hNT" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"hPV" = (
/obj/effect/decal/remains/xeno{
pixel_x = 31
@@ -15364,6 +15215,18 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
+"hRy" = (
+/turf/open/gm/dirt{
+ icon_state = "desert3"
+ },
+/area/lv624/ground/caves/south_west_caves)
+"hRB" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"hRI" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/grass/grass1,
@@ -15389,6 +15252,10 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/east_central_jungle)
+"hTR" = (
+/obj/structure/flora/bush/ausbushes/var3/ywflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"hUs" = (
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/south_west_jungle)
@@ -15396,18 +15263,6 @@
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/caves/sand_temple)
-"hVr" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"hVR" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"hWj" = (
/turf/open/gm/coast/beachcorner/south_east,
/area/lv624/ground/river/east_river)
@@ -15415,18 +15270,6 @@
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
/turf/open/gm/river,
/area/lv624/ground/river/central_river)
-"hXL" = (
-/obj/item/clothing/suit/redtag,
-/obj/structure/closet/athletic_mixed,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/lv624/lazarus/fitness)
-"hZb" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"hZg" = (
/obj/structure/bed/chair/office/dark{
dir = 4
@@ -15442,6 +15285,10 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/jungle/north_west_jungle)
+"hZX" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/gm/dirtgrassborder/south,
+/area/lv624/ground/jungle/south_central_jungle)
"iab" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/east_jungle)
@@ -15471,25 +15318,15 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/caves/sand_temple)
-"ibr" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8;
- pixel_y = 13
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"ibS" = (
/obj/structure/flora/jungle/vines/light_2,
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
-"idu" = (
-/obj/structure/surface/table/reinforced/prison,
-/turf/open/floor{
- dir = 8;
- icon_state = "whiteblue"
- },
-/area/lv624/lazarus/corporate_dome)
+"icd" = (
+/obj/structure/flora/bush/ausbushes/grassybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"idz" = (
/obj/item/weapon/sword{
pixel_x = 6;
@@ -15518,18 +15355,24 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
+"ieN" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"ifk" = (
/obj/structure/flora/bush/ausbushes/var3/brflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"ifo" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
+"ifr" = (
+/obj/structure/flora/bush/ausbushes/pointybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"ifF" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
/area/lv624/ground/jungle/south_east_jungle)
@@ -15540,6 +15383,11 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
+"igN" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"ihS" = (
/obj/structure/surface/table,
/obj/item/reagent_container/food/drinks/cans/lemon_lime{
@@ -15556,6 +15404,10 @@
/obj/effect/landmark/queen_spawn,
/turf/open/gm/dirt,
/area/lv624/ground/caves/east_caves)
+"ikA" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"ilf" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/flora/jungle/vines/heavy,
@@ -15563,6 +15415,13 @@
/obj/structure/flora/jungle/planttop1,
/turf/open/floor/plating,
/area/lv624/lazarus/corporate_dome)
+"ilF" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8
+ },
+/obj/structure/flora/bush/ausbushes/ppflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"ilO" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/device/flashlight/lantern{
@@ -15576,24 +15435,12 @@
"ioC" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
/area/lv624/ground/jungle/east_jungle)
-"irH" = (
-/obj/structure/flora/bush/ausbushes/lavendergrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
-"irS" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/folder/white{
- pixel_y = 8
- },
-/obj/item/folder/yellow{
- pixel_y = 4
- },
-/obj/item/folder/red,
+"iqN" = (
+/obj/structure/closet,
/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellow"
+ icon_state = "bluecorner"
},
-/area/lv624/lazarus/corporate_dome)
+/area/lv624/lazarus/sleep_male)
"isF" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/dirt,
@@ -15605,22 +15452,26 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/jungle/east_jungle)
+"isL" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/obj/structure/flora/bush/ausbushes/palebush,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"itE" = (
/turf/open/floor/plating{
dir = 6;
icon_state = "asteroidwarning"
},
/area/lv624/lazarus/landing_zones/lz2)
-"itW" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
+"iuf" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"iuO" = (
/turf/open/gm/dirtgrassborder{
icon_state = "desert3"
@@ -15652,12 +15503,12 @@
icon_state = "multi_tiles"
},
/area/lv624/ground/caves/sand_temple)
-"ixc" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
+"iye" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/caves/east_caves)
"iyr" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
@@ -15710,12 +15561,11 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/colony/west_nexus_road)
-"iCW" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+"iDX" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"iFp" = (
/obj/structure/flora/jungle/vines/light_1,
/obj/structure/barricade/wooden{
@@ -15726,10 +15576,19 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz1)
+"iGf" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"iGn" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
+"iGx" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"iHQ" = (
/obj/structure/xenoautopsy/tank/broken,
/turf/open/gm/dirt,
@@ -15754,19 +15613,35 @@
"iJJ" = (
/turf/open/gm/grass/grass2,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"iKf" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
"iKp" = (
/obj/structure/surface/rack,
/turf/open/shuttle{
icon_state = "floor4"
},
/area/lv624/lazarus/crashed_ship_containers)
+"iKz" = (
+/obj/structure/surface/rack,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/lv624/lazarus/fitness)
+"iKD" = (
+/obj/structure/surface/table,
+/obj/structure/mirror{
+ icon_state = "mirror_broke";
+ pixel_x = 30
+ },
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ frequency = 1469;
+ name = "General Listening Channel";
+ pixel_y = 30
+ },
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/lv624/lazarus/toilet)
"iLL" = (
/obj/effect/decal/remains/human,
/turf/open/gm/dirt,
@@ -15781,26 +15656,21 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
+"iLU" = (
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whiteblue"
+ },
+/area/lv624/lazarus/corporate_dome)
"iNB" = (
/obj/structure/ore_box,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_west_barrens)
-"iNP" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/trash/chips,
-/obj/structure/phone_base/colony_net/rotary{
- phone_category = "Lazarus Landing";
- phone_color = "blue";
- phone_id = "Director's Office"
- },
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/lv624/lazarus/hop)
-"iOi" = (
-/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+"iNJ" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+/area/lv624/ground/caves/north_west_caves)
"iOz" = (
/obj/structure/barricade/handrail/strata{
dir = 4
@@ -15842,14 +15712,34 @@
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
+"iSQ" = (
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = -8;
+ pixel_y = 16
+ },
+/obj/structure/filingcabinet{
+ density = 0;
+ pixel_x = 8;
+ pixel_y = 16
+ },
+/turf/open/floor{
+ dir = 9;
+ icon_state = "whiteblue"
+ },
+/area/lv624/lazarus/corporate_dome)
+"iTQ" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"iUm" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
-"iUn" = (
-/obj/structure/flora/bush/ausbushes/lavendergrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"iUF" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/south_central_jungle)
@@ -15862,12 +15752,6 @@
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
-"iWG" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"iXj" = (
/turf/closed/wall,
/area/lv624/ground/barrens/east_barrens/ceiling)
@@ -15878,13 +15762,26 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/colony/west_nexus_road)
-"iXL" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
+"iXX" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
+"iYo" = (
+/obj/structure/surface/table,
+/obj/item/stack/medical/bruise_pack{
+ pixel_x = 3;
+ pixel_y = 3
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/obj/item/clothing/mask/surgical,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/item/storage/belt/medical/full,
+/turf/open/floor{
+ dir = 1;
+ icon_state = "whiteblue"
+ },
+/area/lv624/lazarus/medbay)
"iYJ" = (
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/gm/grass/grass1,
@@ -15917,6 +15814,12 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
+"jcn" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"jdi" = (
/obj/structure/flora/jungle/vines/heavy,
/obj/structure/flora/jungle/vines/light_3,
@@ -15926,20 +15829,43 @@
"jeL" = (
/turf/closed/wall/r_wall,
/area/lv624/ground/caves/north_central_caves)
-"jfe" = (
-/obj/structure/filingcabinet,
-/turf/open/floor{
- dir = 10;
- icon_state = "whiteyellow"
- },
-/area/lv624/lazarus/corporate_dome)
"jga" = (
/turf/open/gm/river,
/area/lv624/ground/jungle/west_jungle)
+"jgj" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
+"jgy" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"jgJ" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/colony/south_nexus_road)
+"jhe" = (
+/obj/item/storage/toolbox/syndicate,
+/obj/structure/surface/rack,
+/obj/effect/landmark/crap_item,
+/obj/effect/landmark/crap_item,
+/obj/item/clothing/suit/armor/vest/security,
+/turf/open/floor{
+ icon_state = "cult"
+ },
+/area/lv624/lazarus/armory)
+"jhj" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"jhG" = (
/obj/structure/barricade/handrail/strata{
dir = 8
@@ -15959,20 +15885,16 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
-"jjU" = (
-/obj/structure/flora/bush/ausbushes/var3/ywflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
-"jkL" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"jlh" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/dirt,
/area/lv624/ground/colony/north_tcomms_road)
+"jlt" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"jnG" = (
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
dir = 1;
@@ -15986,10 +15908,6 @@
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
-"joy" = (
-/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
"joz" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/paper_bin/wy{
@@ -16000,6 +15918,21 @@
icon_state = "whitebluecorner"
},
/area/lv624/lazarus/corporate_dome)
+"jpX" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
+"jqr" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"jrC" = (
/obj/structure/curtain/red,
/turf/open/shuttle{
@@ -16014,6 +15947,13 @@
/obj/structure/flora/bush/ausbushes/var3/leafybush,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
+"jtM" = (
+/obj/structure/surface/table,
+/turf/open/floor{
+ dir = 9;
+ icon_state = "brown"
+ },
+/area/lv624/lazarus/comms)
"jum" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/dirt{
@@ -16024,19 +15964,12 @@
/obj/structure/cargo_container/lockmart/mid,
/turf/open/floor,
/area/lv624/ground/barrens/containers)
-"jvy" = (
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_color = "red";
- phone_id = "Secure Storage";
- pixel_y = 24
+"jvQ" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
},
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/secure_storage)
-"jwA" = (
-/obj/structure/flora/bush/ausbushes/var3/stalkybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"jwW" = (
/turf/open/floor/plating{
dir = 6;
@@ -16093,10 +16026,6 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"jAn" = (
-/obj/structure/flora/bush/ausbushes/ausbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"jAo" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
@@ -16116,6 +16045,19 @@
icon_state = "floor6"
},
/area/lv624/ground/caves/sand_temple)
+"jBl" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
+"jCO" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8;
+ pixel_y = 13
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"jDY" = (
/obj/effect/decal/cleanable/blood/gibs/xeno/limb,
/turf/open/gm/dirt,
@@ -16140,6 +16082,12 @@
/obj/structure/flora/bush/ausbushes/var3/brflowers,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/south_west_jungle/ceiling)
+"jGU" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"jGW" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/central_jungle)
@@ -16163,6 +16111,16 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
+"jJg" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
+"jKc" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"jKu" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/obj/structure/flora/jungle/vines/heavy,
@@ -16185,15 +16143,12 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/west_central_jungle)
-"jMg" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
-/obj/effect/landmark/corpsespawner/wygoon,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
+"jLY" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
+/area/lv624/ground/caves/north_west_caves)
"jMk" = (
/obj/structure/lattice{
layer = 2.9
@@ -16209,13 +16164,12 @@
icon_state = "warnplate"
},
/area/lv624/lazarus/engineering)
-"jMG" = (
-/mob/living/simple_animal/bat,
+"jMD" = (
/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
+ dir = 6
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
+/area/lv624/ground/caves/south_east_caves)
"jMH" = (
/obj/structure/stairs/perspective{
color = "#6b675e";
@@ -16272,6 +16226,16 @@
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/north_west_jungle)
+"jRL" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"jRM" = (
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/obj/effect/landmark/lv624/fog_blocker,
@@ -16299,16 +16263,6 @@
},
/turf/open/floor/sandstone/runed,
/area/lv624/ground/barrens/south_eastern_barrens)
-"jSX" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"jTj" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"jTm" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
@@ -16317,63 +16271,15 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/west_barrens)
-"jVr" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
-"jVW" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -5;
- pixel_y = -5;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"jWM" = (
/obj/structure/girder,
/turf/closed/shuttle{
icon_state = "wall3"
},
/area/lv624/lazarus/crashed_ship_containers)
-"jXd" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
-"jXt" = (
-/obj/structure/flora/bush/ausbushes/reedbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
-"jXx" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"jXT" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/north_east_jungle)
-"jYD" = (
-/obj/effect/landmark/hunter_primary,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
-"jYL" = (
-/obj/effect/landmark/crap_item,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"jYM" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/paper_bin/wy{
@@ -16392,6 +16298,20 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
+"jZX" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
+"kae" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"kbn" = (
/obj/structure/machinery/sensortower,
/turf/open/floor{
@@ -16410,27 +16330,20 @@
icon_state = "squareswood"
},
/area/lv624/ground/caves/sand_temple)
-"kbE" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"kcP" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/closed/wall/rock/brown,
/area/lv624/ground/river/west_river)
-"kel" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
+"kdj" = (
+/obj/structure/flora/bush/ausbushes/pointybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
+"kdR" = (
+/turf/open/floor{
+ dir = 8;
+ icon_state = "whitebluecorner"
},
-/obj/structure/flora/bush/ausbushes/genericbush,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/lazarus/corporate_dome)
"keS" = (
/turf/open/floor/plating,
/area/lv624/ground/barrens/east_barrens/ceiling)
@@ -16442,10 +16355,6 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/river,
/area/lv624/ground/river/central_river)
-"khV" = (
-/obj/structure/flora/bush/ausbushes/var3/brflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"kip" = (
/obj/structure/flora/grass/tallgrass/jungle,
/turf/open/gm/grass/grass1,
@@ -16461,12 +16370,18 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/east_jungle)
-"kkX" = (
+"klD" = (
/obj/effect/decal/grass_overlay/grass1{
- dir = 9
+ dir = 6
},
/turf/open/gm/dirt,
/area/lv624/ground/caves/north_west_caves)
+"kmH" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"kmP" = (
/obj/item/stool,
/turf/open/gm/dirt,
@@ -16486,19 +16401,18 @@
/obj/structure/flora/bush/ausbushes/var3/sunnybush,
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"kqt" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
+"koW" = (
+/obj/item/bedsheet/medical,
+/turf/open/floor{
+ icon_state = "white"
},
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
+/area/lv624/lazarus/medbay)
+"kpx" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/barrens/north_east_barrens)
"kqx" = (
/obj/structure/flora/jungle/plantbot1,
/obj/structure/flora/jungle/vines/light_3,
@@ -16508,6 +16422,18 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirt,
/area/lv624/ground/caves/sand_temple)
+"krs" = (
+/turf/open/gm/dirt{
+ icon_state = "desert2"
+ },
+/area/lv624/ground/caves/south_west_caves)
+"ksc" = (
+/obj/structure/flora/bush/ausbushes/var3/sunnybush{
+ icon_state = "fernybush_2";
+ pixel_y = 10
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"ksB" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
@@ -16534,15 +16460,11 @@
},
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
/area/lv624/ground/barrens/south_eastern_barrens)
-"kub" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -5;
- pixel_y = -5;
- light_on = 1;
- light_range = 1;
- light_system = 1
+"ktr" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
},
-/turf/open/auto_turf/strata_grass/layer1,
+/turf/open/gm/dirt,
/area/lv624/ground/caves/north_east_caves)
"kuP" = (
/obj/item/tool/hatchet{
@@ -16561,16 +16483,6 @@
"kvo" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/jungle/east_central_jungle)
-"kvp" = (
-/obj/structure/closet/athletic_mixed,
-/obj/structure/machinery/light{
- dir = 1
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/lv624/lazarus/fitness)
"kvE" = (
/obj/structure/machinery/landinglight/ds2/delaythree,
/turf/open/floor/plating,
@@ -16584,12 +16496,25 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz2)
+"kxv" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"kxI" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
"kyc" = (
/turf/open/gm/coast/beachcorner/north_east,
/area/lv624/ground/river/central_river)
+"kyt" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"kyN" = (
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
/turf/open/gm/grass/grass1,
@@ -16599,6 +16524,12 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"kzn" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"kzu" = (
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/grass/grass1,
@@ -16607,6 +16538,10 @@
/obj/structure/flora/bush/ausbushes/var3/sunnybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
+"kzw" = (
+/obj/structure/flora/bush/ausbushes/var3/sunnybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"kzE" = (
/obj/structure/cargo_container/lockmart/right,
/turf/open/floor,
@@ -16638,6 +16573,10 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
+"kCD" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"kFx" = (
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
@@ -16660,30 +16599,10 @@
"kHU" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/caves/sand_temple)
-"kIO" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 4;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
+"kIM" = (
+/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
-"kIP" = (
-/obj/structure/surface/rack,
-/obj/item/stack/sheet/metal{
- amount = 50;
- pixel_x = 4;
- pixel_y = 4
- },
-/obj/item/stack/sheet/metal{
- amount = 30
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/lv624/ground/barrens/north_east_barrens/ceiling)
+/area/lv624/ground/caves/central_caves)
"kJm" = (
/turf/open/gm/coast/beachcorner2/north_east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
@@ -16691,13 +16610,25 @@
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/barrens/south_eastern_barrens)
+"kJt" = (
+/obj/structure/surface/table,
+/turf/open/floor{
+ icon_state = "vault"
+ },
+/area/lv624/lazarus/robotics)
"kJu" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"kLI" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/decal/grass_overlay/grass1{
+"kKa" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
+"kLl" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
dir = 8
},
/turf/open/gm/dirt,
@@ -16707,14 +16638,17 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"kML" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"kNm" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
-"kNE" = (
-/obj/structure/flora/jungle/plantbot1,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"kPL" = (
/obj/structure/fence,
/turf/open/floor{
@@ -16769,6 +16703,14 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/caves/sand_temple)
+"kSK" = (
+/obj/structure/surface/table,
+/obj/structure/prop/mech/drill,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "vault"
+ },
+/area/lv624/lazarus/robotics)
"kSR" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west,
@@ -16777,23 +16719,33 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/colony/north_tcomms_road)
-"kUO" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
+"kVj" = (
+/obj/structure/surface/table/reinforced/prison{
+ color = "#6b675e"
},
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellowfull"
+ },
+/area/lv624/ground/caves/sand_temple)
+"kVG" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
+/obj/effect/decal/grass_overlay/grass1,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/caves/west_caves)
"kVP" = (
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"kWh" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"kWH" = (
/turf/open/floor{
icon_state = "dark"
@@ -16805,6 +16757,10 @@
},
/turf/open/floor/plating,
/area/lv624/lazarus/landing_zones/lz2)
+"kWV" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"kWX" = (
/turf/open/floor{
dir = 8;
@@ -16840,6 +16796,17 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
+"lav" = (
+/turf/open/gm/dirt{
+ icon_state = "desert_dug"
+ },
+/area/lv624/ground/caves/west_caves)
+"laM" = (
+/obj/structure/computerframe{
+ anchored = 1
+ },
+/turf/open/floor/plating,
+/area/lv624/lazarus/secure_storage)
"laY" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/closed/wall/strata_ice/jungle,
@@ -16847,30 +16814,23 @@
"lbd" = (
/turf/open/gm/coast/beachcorner/north_west,
/area/lv624/ground/barrens/west_barrens)
+"lbt" = (
+/obj/effect/landmark/hunter_primary,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"lbX" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 10
},
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/east_jungle)
-"lcu" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
-"lcP" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 6;
- pixel_y = -8;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
+"ldi" = (
+/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
+/area/lv624/ground/caves/south_east_caves)
"ldB" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 4
@@ -16880,41 +16840,32 @@
"ldZ" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/north_jungle)
-"leZ" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8
- },
-/obj/structure/flora/bush/ausbushes/ppflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
-"lfq" = (
-/obj/structure/surface/table,
-/obj/item/tool/crowbar,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
-"lft" = (
-/obj/structure/flora/bush/ausbushes/ppflowers,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"lfy" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/colony/south_nexus_road)
-"lgq" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"lgu" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"lhE" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
+"lhH" = (
+/obj/structure/flora/bush/ausbushes/var3/stalkybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
+"liI" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"lju" = (
/turf/open/gm/coast/beachcorner2/south_east,
/area/lv624/ground/river/central_river)
@@ -16926,6 +16877,11 @@
/obj/structure/inflatable/popped/door,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
+"lkq" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"lkF" = (
/obj/item/stack/sheet/wood{
amount = 2
@@ -16937,32 +16893,10 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz1)
-"lkX" = (
+"lnr" = (
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"llc" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
/area/lv624/ground/caves/south_central_caves)
-"llh" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"llO" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"lmM" = (
-/obj/structure/flora/bush/ausbushes/ppflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"lnK" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/obj/effect/landmark/nightmare{
@@ -16978,6 +16912,16 @@
/obj/effect/landmark/hunter_primary,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/jungle/south_east_jungle)
+"loP" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/obj/structure/flora/bush/ausbushes/genericbush,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"lpV" = (
/turf/open/floor/plating{
icon_state = "platebotc"
@@ -16991,10 +16935,6 @@
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
-"lrk" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"lse" = (
/obj/structure/stairs/perspective{
color = "#6b675e";
@@ -17011,12 +16951,6 @@
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"lsD" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"lsK" = (
/turf/open/gm/coast/beachcorner2/north_west,
/area/lv624/ground/barrens/west_barrens)
@@ -17029,16 +16963,6 @@
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/colony/north_tcomms_road)
-"lvy" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 11;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"lxr" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/dirtgrassborder/south,
@@ -17061,23 +16985,34 @@
"lyS" = (
/turf/closed/wall/r_wall/unmeltable,
/area/lv624/lazarus/quartstorage)
+"lyZ" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
+"lzf" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/obj/structure/flora/bush/ausbushes/grassybush,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"lzE" = (
/turf/open/gm/dirt{
icon_state = "desert0"
},
/area/lv624/ground/barrens/west_barrens)
-"lAx" = (
-/obj/structure/flora/bush/ausbushes/var3/fullgrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
-"lAT" = (
-/obj/structure/flora/bush/ausbushes/var3/fullgrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/barrens/north_east_barrens)
"lAX" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
+"lBl" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"lBq" = (
/obj/structure/barricade/handrail/strata,
/obj/structure/barricade/handrail/strata{
@@ -17098,10 +17033,6 @@
"lBw" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/south_east_jungle)
-"lCa" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"lCG" = (
/obj/effect/decal/cleanable/blood/oil,
/obj/effect/decal/cleanable/blood/gibs/robot/down,
@@ -17147,6 +17078,22 @@
icon_state = "warnplate"
},
/area/lv624/lazarus/engineering)
+"lHv" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/device/flashlight/lamp{
+ pixel_x = 6;
+ pixel_y = 14
+ },
+/obj/structure/phone_base/colony_net/rotary{
+ phone_category = "Lazarus Landing";
+ phone_color = "red";
+ phone_id = "Marshal Office"
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "redcorner"
+ },
+/area/lv624/lazarus/security)
"lHL" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/grass/grass1,
@@ -17155,7 +17102,7 @@
/obj/structure/fence,
/turf/open/gm/dirt,
/area/lv624/ground/colony/north_tcomms_road)
-"lIq" = (
+"lIL" = (
/obj/structure/blocker/forcefield/multitile_vehicles,
/obj/effect/decal/grass_overlay/grass1{
dir = 4
@@ -17201,6 +17148,16 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz2)
+"lKl" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 6;
+ pixel_y = -8;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"lKF" = (
/turf/closed/wall/rock/brown,
/area/lv624/ground/barrens/containers)
@@ -17208,12 +17165,23 @@
/obj/structure/shuttle/engine/propulsion,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/north_east_barrens)
+"lLK" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"lLO" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 10
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
+"lLU" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/obj/structure/flora/bush/ausbushes/genericbush,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"lNe" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
@@ -17221,24 +17189,21 @@
icon_state = "whitebluecorner"
},
/area/lv624/lazarus/corporate_dome)
+"lNG" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"lPJ" = (
/turf/open/gm/dirtgrassborder{
icon_state = "desert"
},
/area/lv624/ground/barrens/south_eastern_barrens)
-"lPU" = (
-/obj/structure/surface/rack,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/lv624/lazarus/fitness)
-"lQx" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"lQC" = (
/turf/open/gm/dirt,
/area/lv624/ground/barrens/east_barrens)
@@ -17256,10 +17221,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/wood,
/area/lv624/ground/caves/north_central_caves)
-"lRR" = (
-/obj/structure/flora/bush/ausbushes/grassybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
"lSs" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/closed/wall/strata_ice/jungle,
@@ -17275,6 +17236,23 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
+"lSA" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
+"lSN" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
+"lTv" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"lTZ" = (
/obj/item/tool/shovel,
/turf/open/gm/dirt,
@@ -17296,6 +17274,25 @@
/obj/structure/prop/brazier/torch,
/turf/closed/wall/rock/brown,
/area/lv624/ground/caves/sand_temple)
+"lUQ" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
+"lWh" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
+"lWl" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"lWw" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -17308,6 +17305,12 @@
"lWO" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/south_west_jungle)
+"lYt" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"lYB" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
@@ -17328,27 +17331,6 @@
icon_state = "bot"
},
/area/lv624/lazarus/landing_zones/lz1)
-"lZt" = (
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_id = "Cargo";
- pixel_y = 24
- },
-/turf/open/floor/vault,
-/area/lv624/lazarus/quartstorage)
-"lZU" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
-"max" = (
-/obj/structure/surface/table,
-/obj/item/trash/plate,
-/turf/open/floor{
- icon_state = "bar"
- },
-/area/lv624/lazarus/canteen)
"mbp" = (
/obj/structure/flora/jungle/alienplant1{
layer = 4.13;
@@ -17366,28 +17348,39 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/east_jungle)
-"mdj" = (
-/obj/structure/surface/table,
-/obj/item/handset,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- dir = 9;
- icon_state = "purple"
+"mca" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/area/lv624/lazarus/sleep_female)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
+"mdG" = (
+/obj/effect/decal/cleanable/blood/drip,
+/turf/open/shuttle{
+ icon_state = "floor4"
+ },
+/area/lv624/lazarus/crashed_ship_containers)
"mdQ" = (
/turf/closed/wall/rock/brown,
/area/lv624/ground/caves/west_caves)
-"mee" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"meP" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
+"mfn" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"mfu" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 8
@@ -17402,6 +17395,12 @@
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
+"mgi" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"mgs" = (
/obj/structure/machinery/door/poddoor/almayer{
dir = 8;
@@ -17412,11 +17411,6 @@
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
-"mhy" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"mhZ" = (
/turf/open/shuttle{
icon_state = "floor6"
@@ -17433,15 +17427,6 @@
icon_state = "desert3"
},
/area/lv624/ground/river/east_river)
-"mjW" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"mjY" = (
/obj/structure/barricade/handrail/strata{
dir = 1
@@ -17450,19 +17435,6 @@
icon_state = "grass1"
},
/area/lv624/ground/barrens/south_eastern_barrens)
-"mkl" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light{
- dir = 4
- },
-/obj/structure/phone_base/colony_net/rotary{
- phone_category = "Lazarus Landing";
- phone_id = "Medbay"
- },
-/turf/open/floor{
- icon_state = "white"
- },
-/area/lv624/lazarus/medbay)
"mko" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/north,
@@ -17493,9 +17465,13 @@
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_tcomms_road)
-"mmU" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
+"mnh" = (
+/obj/structure/closet/lasertag/blue,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/lv624/lazarus/fitness)
"mnr" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/jungle/east_jungle)
@@ -17532,17 +17508,15 @@
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
-"mqI" = (
-/obj/structure/closet/lasertag/blue,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/lv624/lazarus/fitness)
"mqJ" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/dirt,
/area/lv624/ground/river/east_river)
+"mrg" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"mrQ" = (
/obj/structure/bed/chair/comfy/black{
dir = 4
@@ -17552,15 +17526,11 @@
"msd" = (
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/caves/sand_temple)
-"msv" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
+"msU" = (
+/turf/open/floor/plating{
+ icon_state = "platingdmg1"
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/lazarus/secure_storage)
"msV" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/dirt,
@@ -17644,34 +17614,36 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
-"mDq" = (
+"mEo" = (
/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
+ dir = 10
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"mEw" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/north_jungle)
-"mEY" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
"mFu" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
/area/lv624/ground/colony/north_nexus_road)
+"mFZ" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"mGG" = (
/obj/structure/window_frame/colony/reinforced,
/turf/open/floor/plating,
/area/lv624/lazarus/corporate_dome)
-"mHv" = (
-/obj/structure/flora/bush/ausbushes/var3/ywflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+"mHk" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"mHM" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/colony/south_medbay_road)
@@ -17680,45 +17652,42 @@
/obj/structure/fence,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz2)
-"mIt" = (
-/obj/structure/flora/bush/ausbushes/var3/sunnybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
-"mIS" = (
-/obj/structure/surface/rack,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_color = "yellow";
- phone_id = "Engineering";
- pixel_y = 24
- },
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/lv624/lazarus/engineering)
"mJB" = (
/turf/open/floor{
dir = 1;
icon_state = "whiteyellowcorner"
},
/area/lv624/lazarus/corporate_dome)
+"mJF" = (
+/obj/structure/flora/bush/ausbushes/palebush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"mKf" = (
/turf/open/gm/dirt,
/area/lv624/ground/colony/west_nexus_road)
-"mKA" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/light/small,
-/turf/open/floor{
- icon_state = "grimy"
- },
-/area/lv624/lazarus/captain)
"mKM" = (
/obj/structure/machinery/door/airlock/sandstone/runed/destroyable{
name = "\improper Strange Temple"
},
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
+"mLq" = (
+/obj/structure/filingcabinet/security{
+ desc = "A large cabinet with hard copy security records.";
+ name = "Security Records"
+ },
+/obj/structure/machinery/light/small{
+ dir = 4
+ },
+/turf/open/floor{
+ dir = 1;
+ icon_state = "redcorner"
+ },
+/area/lv624/lazarus/security)
+"mLv" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"mMq" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
@@ -17738,6 +17707,26 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
+"mMA" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/folder/white{
+ pixel_y = 8
+ },
+/obj/item/folder/yellow{
+ pixel_y = 4
+ },
+/obj/item/folder/red,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellow"
+ },
+/area/lv624/lazarus/corporate_dome)
+"mNl" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"mNz" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/gm/grass/grass1,
@@ -17750,14 +17739,14 @@
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/jungle/east_central_jungle)
-"mOl" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
"mOA" = (
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
+"mOL" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"mPt" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
@@ -17765,12 +17754,6 @@
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/west_barrens)
-"mQI" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"mRh" = (
/obj/item/stack/sheet/wood{
amount = 2
@@ -17796,14 +17779,6 @@
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"mTH" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"mUH" = (
/turf/open/gm/dirtgrassborder{
icon_state = "desert0"
@@ -17848,6 +17823,10 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
+"mVr" = (
+/obj/structure/flora/bush/ausbushes/palebush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"mVK" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
@@ -17858,11 +17837,10 @@
"mWe" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
/area/lv624/ground/jungle/south_west_jungle)
-"mWs" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+"mWA" = (
+/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/caves/north_east_caves)
"mXR" = (
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/colony/north_nexus_road)
@@ -17872,13 +17850,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"mZV" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"naR" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/east,
@@ -17886,23 +17857,6 @@
"nbw" = (
/turf/closed/wall/rock/brown,
/area/lv624/ground/barrens/north_east_barrens)
-"nbL" = (
-/obj/structure/safe{
- spawnkey = 0
- },
-/obj/item/coin/diamond,
-/obj/item/m_gift,
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/item/clothing/head/helmet/marine/veteran/pmc,
-/obj/item/clothing/under/marine/veteran/pmc,
-/obj/item/storage/fancy/cigar,
-/turf/open/floor{
- dir = 5;
- icon_state = "whiteyellow"
- },
-/area/lv624/lazarus/corporate_dome)
"ncq" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/closed/wall/r_wall,
@@ -17917,15 +17871,22 @@
icon_state = "asteroidwarning"
},
/area/lv624/lazarus/landing_zones/lz2)
-"nde" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
+"ndk" = (
+/obj/structure/flora/bush/ausbushes/ppflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"ndK" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/closed/wall/r_wall,
/area/lv624/lazarus/corporate_dome)
+"ner" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"nfD" = (
/obj/effect/landmark/survivor_spawner,
/turf/open/gm/dirt,
@@ -17940,6 +17901,14 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
+"nha" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"nhi" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass1,
@@ -17958,6 +17927,19 @@
/obj/effect/decal/cleanable/blood/oil,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/north_west_jungle)
+"njs" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/structure/phone_base/colony_net/rotary{
+ phone_category = "Lazarus Landing";
+ phone_id = "Medbay"
+ },
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/lv624/lazarus/medbay)
"njC" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
@@ -17988,12 +17970,6 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz2)
-"nmQ" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"nnq" = (
/obj/structure/prop/brazier,
/turf/open/floor/sandstone/runed,
@@ -18001,12 +17977,6 @@
"nnL" = (
/turf/open/gm/coast/beachcorner2/south_east,
/area/lv624/ground/barrens/east_barrens)
-"noz" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/floor/sandstone/runed,
-/area/lv624/ground/caves/south_east_caves)
"npf" = (
/turf/open/gm/coast/beachcorner/north_east,
/area/lv624/ground/jungle/west_jungle)
@@ -18040,6 +18010,15 @@
icon_state = "desert3"
},
/area/lv624/ground/barrens/west_barrens)
+"nrR" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -10;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"nsk" = (
/turf/open/gm/dirt,
/area/lv624/ground/river/west_river)
@@ -18063,25 +18042,6 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/barrens/south_eastern_barrens)
-"nsX" = (
-/obj/structure/filingcabinet/security{
- desc = "A large cabinet with hard copy security records.";
- name = "Security Records"
- },
-/obj/structure/machinery/light/small{
- dir = 4
- },
-/turf/open/floor{
- dir = 1;
- icon_state = "redcorner"
- },
-/area/lv624/lazarus/security)
-"nti" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"ntr" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/barrens/north_east_barrens)
@@ -18156,17 +18116,21 @@
icon_state = "whiteyellowcorner"
},
/area/lv624/lazarus/corporate_dome)
+"nys" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"nzw" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/turf/open/gm/dirt,
/area/lv624/ground/caves/east_caves)
-"nzC" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
+"nAD" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/ground/jungle/south_central_jungle)
"nAR" = (
/obj/item/stack/sheet/wood{
amount = 2
@@ -18190,25 +18154,6 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"nBX" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 4;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
-"nCr" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -5;
- pixel_y = -5;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"nEd" = (
/turf/closed/wall/r_wall,
/area/lv624/lazarus/robotics)
@@ -18321,13 +18266,6 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/colony/west_nexus_road)
-"nJL" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
"nLf" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirtgrassborder/west,
@@ -18336,6 +18274,12 @@
/obj/structure/flora/grass/tallgrass/jungle,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
+"nLF" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"nLH" = (
/obj/structure/prop/tower,
/turf/open/floor{
@@ -18351,16 +18295,20 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/closed/wall/r_wall,
/area/lv624/lazarus/corporate_dome)
+"nNu" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 6;
+ pixel_y = -8;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/barrens/north_east_barrens)
"nNw" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west,
/area/lv624/ground/colony/west_nexus_road)
-"nOn" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"nOX" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
@@ -18379,6 +18327,26 @@
icon_state = "squareswood"
},
/area/lv624/ground/caves/sand_temple)
+"nQH" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 6;
+ pixel_y = -8;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
+"nQJ" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/machinery/light/small{
+ dir = 8
+ },
+/turf/open/floor/plating{
+ dir = 1;
+ icon_state = "asteroidfloor"
+ },
+/area/lv624/lazarus/corporate_dome)
"nRb" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -18390,36 +18358,25 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/caves/sand_temple)
+"nRA" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8;
+ pixel_y = 13
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"nSg" = (
/obj/structure/window/framed/colony,
/turf/open/floor{
icon_state = "white"
},
/area/lv624/lazarus/medbay)
-"nSy" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
-"nSO" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
"nSR" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 5
},
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
-"nTz" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"nTE" = (
/obj/structure/curtain/red,
/turf/open/floor/strata{
@@ -18427,15 +18384,6 @@
icon_state = "multi_tiles"
},
/area/lv624/ground/caves/sand_temple)
-"nUp" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"nUs" = (
/obj/structure/stairs/perspective{
color = "#6b675e";
@@ -18466,12 +18414,10 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
-"nVx" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
+"nUZ" = (
+/obj/effect/decal/grass_overlay/grass1,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/ground/caves/central_caves)
"nVC" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 6
@@ -18512,23 +18458,10 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/barrens/south_eastern_barrens)
-"nWB" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"nWJ" = (
/obj/structure/flora/bush/ausbushes/var3/stalkybush,
/turf/open/gm/river,
/area/lv624/ground/jungle/west_jungle)
-"nWZ" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
-"nYm" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"nYx" = (
/obj/structure/flora/jungle/planttop1,
/obj/structure/flora/jungle/vines/light_3,
@@ -18548,17 +18481,13 @@
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/grass/grass2,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"oaf" = (
-/obj/structure/flora/bush/ausbushes/palebush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
-"oau" = (
-/obj/structure/surface/table,
+"oae" = (
+/obj/structure/closet/crate/hydroponics/prespawned,
/turf/open/floor{
dir = 9;
- icon_state = "brown"
+ icon_state = "green"
},
-/area/lv624/lazarus/comms)
+/area/lv624/lazarus/hydroponics)
"oaL" = (
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/grass/grass1,
@@ -18599,6 +18528,13 @@
},
/turf/open/floor/plating,
/area/lv624/lazarus/landing_zones/lz2)
+"odD" = (
+/obj/structure/surface/table/holotable,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"odE" = (
/obj/structure/fence,
/obj/effect/landmark/nightmare{
@@ -18626,10 +18562,33 @@
icon_state = "squareswood"
},
/area/lv624/ground/caves/sand_temple)
+"ofg" = (
+/turf/open/gm/dirt{
+ icon_state = "desert1"
+ },
+/area/lv624/ground/caves/west_caves)
"ofv" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/south_medbay_road)
+"ofO" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/door/window/westright{
+ layer = 2.9
+ },
+/obj/item/paper_bin,
+/obj/item/tool/pen,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellowfull"
+ },
+/area/lv624/lazarus/quart)
+"ogJ" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"ogM" = (
/turf/open/gm/dirt,
/area/lv624/ground/river/east_river)
@@ -18643,6 +18602,21 @@
/obj/structure/flora/bush/ausbushes/var3/stalkybush,
/turf/open/gm/dirt,
/area/lv624/ground/river/central_river)
+"oha" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
+"ohf" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8;
+ pixel_y = 13
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"ohE" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/reagent_container/food/snacks/tomatomeat,
@@ -18654,41 +18628,6 @@
},
/turf/open/floor/wood,
/area/lv624/ground/caves/north_central_caves)
-"ohM" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -10;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"ojS" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 4;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
-"okr" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
-"olB" = (
-/obj/effect/landmark/hunter_primary,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
-"olP" = (
-/turf/open/gm/dirt{
- icon_state = "desert0"
- },
-/area/lv624/ground/caves/south_west_caves)
"omu" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/dirt,
@@ -18696,18 +18635,10 @@
"omK" = (
/turf/open/gm/coast/beachcorner/south_east,
/area/lv624/ground/barrens/west_barrens)
-"omU" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
-"omY" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/firstaid/adv{
- pixel_x = 6;
- pixel_y = 6
- },
-/obj/item/storage/firstaid/adv,
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/corporate_dome)
+"onP" = (
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"onU" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/caves/west_caves)
@@ -18744,20 +18675,20 @@
icon_state = "asteroidwarning"
},
/area/lv624/ground/colony/telecomm/cargo)
-"oso" = (
-/obj/structure/flora/bush/ausbushes/var3/brflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"otF" = (
-/obj/structure/closet/secure_closet/engineering_personal,
-/obj/structure/machinery/light/small{
- dir = 8
- },
-/turf/open/floor/plating{
- dir = 1;
- icon_state = "asteroidfloor"
+"osf" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 11;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/area/lv624/lazarus/corporate_dome)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
+"otl" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"oua" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
@@ -18777,19 +18708,21 @@
/obj/item/stack/sheet/wood,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
+"owe" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"owQ" = (
/turf/open/gm/coast/east,
/area/lv624/ground/barrens/east_barrens)
-"oxz" = (
-/obj/structure/surface/table,
-/obj/item/book/manual/research_and_development,
-/obj/item/cell/hyper,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
+"owZ" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
},
-/area/lv624/lazarus/research)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"oxY" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 6
@@ -18828,10 +18761,6 @@
icon_state = "asteroidfloor"
},
/area/lv624/lazarus/corporate_dome)
-"oAt" = (
-/obj/structure/flora/bush/ausbushes/ausbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"oAD" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 1
@@ -18855,13 +18784,22 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"oCR" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
+"oCr" = (
+/obj/structure/closet/secure_closet/engineering_personal,
+/turf/open/floor{
+ icon_state = "dark"
},
-/obj/structure/flora/bush/ausbushes/grassybush,
+/area/lv624/lazarus/engineering)
+"oCP" = (
+/obj/structure/surface/table,
+/turf/open/floor{
+ icon_state = "whiteblue"
+ },
+/area/lv624/lazarus/medbay)
+"oDE" = (
+/obj/effect/decal/grass_overlay/grass1,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
+/area/lv624/ground/caves/east_caves)
"oDY" = (
/obj/structure/platform_decoration/mineral/sandstone/runed{
dir = 4
@@ -18902,6 +18840,14 @@
"oFf" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/river/east_river)
+"oFJ" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"oFO" = (
/obj/structure/platform_decoration/mineral/sandstone/runed{
dir = 1
@@ -18928,12 +18874,6 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/colony/north_tcomms_road)
-"oGw" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"oHu" = (
/turf/open/gm/coast/north,
/area/lv624/ground/river/east_river)
@@ -18947,12 +18887,6 @@
icon_state = "asteroidplating"
},
/area/lv624/ground/caves/north_central_caves)
-"oJx" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"oJL" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
@@ -18968,15 +18902,6 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/colony/west_nexus_road)
-"oLD" = (
-/obj/structure/machinery/power/terminal{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/oil,
-/turf/open/floor{
- icon_state = "platebot"
- },
-/area/lv624/lazarus/engineering)
"oMZ" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
/turf/open/gm/dirt,
@@ -19002,29 +18927,16 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz2)
-"oPq" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
-"oPL" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/item/storage/surgical_tray,
-/obj/item/reagent_container/spray/cleaner{
- desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
- name = "Surgery Cleaner"
- },
-/turf/open/floor{
- icon_state = "whitebluefull"
- },
-/area/lv624/lazarus/medbay)
"oPT" = (
/turf/open/floor{
dir = 1;
icon_state = "loadingarea"
},
/area/lv624/lazarus/landing_zones/lz1)
+"oQm" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"oRH" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/north_east_jungle)
@@ -19090,38 +19002,12 @@
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
-"oVE" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 11;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"oVM" = (
/turf/open/floor/plating{
dir = 1;
icon_state = "warnplate"
},
/area/lv624/ground/barrens/east_barrens/ceiling)
-"oVQ" = (
-/obj/structure/flora/bush/ausbushes/var3/fernybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
-"oVX" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
-"oWF" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"oWN" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass2,
@@ -19143,10 +19029,6 @@
"oYM" = (
/turf/open/gm/coast/south,
/area/lv624/ground/barrens/west_barrens)
-"oZw" = (
-/obj/structure/flora/bush/ausbushes/reedbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"pab" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
@@ -19175,12 +19057,6 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/colony/south_nexus_road)
-"pbT" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"pca" = (
/obj/effect/landmark/nightmare{
insert_tag = "nexuscenter"
@@ -19216,6 +19092,10 @@
},
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east,
/area/lv624/ground/barrens/south_eastern_barrens)
+"pgc" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/barrens/north_east_barrens)
"pgf" = (
/obj/structure/machinery/power/apc{
dir = 1;
@@ -19228,12 +19108,6 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/medbay)
-"pgo" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
"pgD" = (
/obj/structure/machinery/vending/coffee,
/turf/open/floor{
@@ -19241,55 +19115,33 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
-"phM" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
"phU" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
+"pig" = (
+/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
+/turf/open/gm/dirtgrassborder/south,
+/area/lv624/ground/jungle/south_west_jungle)
"pim" = (
/turf/open/floor,
/area/lv624/ground/barrens/east_barrens)
-"pin" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
-"piS" = (
-/obj/structure/bed,
-/obj/item/bedsheet/purple,
-/obj/structure/pipes/standard/simple/hidden/cyan,
-/turf/open/floor{
- dir = 9;
- icon_state = "purple"
- },
-/area/lv624/lazarus/sleep_female)
-"piZ" = (
-/obj/structure/flora/bush/ausbushes/grassybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"pjk" = (
/turf/open/gm/coast/beachcorner2/north_east,
/area/lv624/ground/river/east_river)
-"pjw" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
"pjY" = (
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/central_jungle)
+"pkU" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"plf" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
@@ -19305,24 +19157,10 @@
icon_state = "desert2"
},
/area/lv624/ground/river/east_river)
-"pmT" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"pnl" = (
/obj/structure/largecrate/random,
/turf/open/floor/greengrid,
/area/lv624/lazarus/corporate_dome)
-"pom" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"por" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 3
@@ -19338,15 +19176,23 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
+"poL" = (
+/obj/structure/surface/rack,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whiteyellowfull"
+ },
+/area/lv624/lazarus/quart)
+"poX" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"ppR" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/colony/north_nexus_road)
-"ppY" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"ppZ" = (
/obj/effect/landmark/nightmare{
insert_tag = "armory"
@@ -19387,37 +19233,18 @@
icon_state = "floor4"
},
/area/lv624/lazarus/crashed_ship_containers)
+"ptm" = (
+/turf/open/gm/dirt{
+ icon_state = "desert0"
+ },
+/area/lv624/ground/caves/west_caves)
"ptr" = (
/obj/structure/flora/bush/ausbushes/palebush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
-"ptZ" = (
-/obj/structure/surface/table,
-/obj/item/alien_embryo{
- pixel_y = 4
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"puo" = (
/turf/open/floor/greengrid,
/area/lv624/lazarus/corporate_dome)
-"puM" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
-"pve" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"pwq" = (
/turf/open/floor{
icon_state = "white"
@@ -19430,14 +19257,6 @@
icon_state = "squareswood"
},
/area/lv624/ground/caves/sand_temple)
-"pwE" = (
-/obj/structure/flora/bush/ausbushes/genericbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
-"pwG" = (
-/obj/structure/flora/bush/ausbushes/lavendergrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
"pxc" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/coast/beachcorner/south_west,
@@ -19446,12 +19265,6 @@
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"pxO" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"pyG" = (
/turf/open/floor{
icon_state = "whiteyellowcorner"
@@ -19461,14 +19274,28 @@
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"pyV" = (
-/obj/structure/flora/bush/ausbushes/var3/fullgrass,
+"pAE" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/ground/caves/central_caves)
+"pAU" = (
+/obj/structure/surface/rack,
+/obj/item/stack/sheet/mineral/diamond{
+ amount = 2
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
+ },
+/area/lv624/ground/barrens/north_east_barrens/ceiling)
"pBk" = (
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
+"pBH" = (
+/obj/structure/flora/jungle/plantbot1,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"pDh" = (
/obj/structure/surface/table/reinforced/prison{
color = "#6b675e"
@@ -19507,6 +19334,12 @@
/obj/effect/landmark/hunter_primary,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
+"pET" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"pEV" = (
/turf/open/floor/strata{
color = "#5e5d5d";
@@ -19516,16 +19349,24 @@
"pFe" = (
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/jungle/south_east_jungle)
+"pFB" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"pGD" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"pHe" = (
+"pGL" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/obj/effect/decal/grass_overlay/grass1/inner{
dir = 10
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/ground/caves/south_east_caves)
"pHn" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/gm/dirt,
@@ -19541,15 +19382,12 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
-"pHF" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 4;
- light_on = 1;
- light_range = 1;
- light_system = 1
+"pIl" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 5
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"pIy" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/north,
@@ -19558,6 +19396,10 @@
/obj/structure/platform_decoration/mineral/sandstone/runed,
/turf/open/floor/sandstone/runed,
/area/lv624/ground/barrens/south_eastern_barrens)
+"pIB" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"pIC" = (
/obj/effect/landmark/hunter_secondary,
/turf/open/gm/grass/grass1,
@@ -19591,11 +19433,14 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/colony/west_nexus_road)
-"pME" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
+"pLv" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 4;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/turf/open/gm/dirt,
+/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/caves/north_west_caves)
"pMM" = (
/obj/structure/flora/bush/ausbushes/ppflowers,
@@ -19638,6 +19483,10 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
+"pQV" = (
+/obj/structure/flora/bush/ausbushes/palebush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"pRh" = (
/turf/open/floor/plating{
dir = 5;
@@ -19665,9 +19514,21 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
+"pRD" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"pRT" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/caves/sand_temple)
+"pSe" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"pSt" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
@@ -19675,6 +19536,15 @@
"pUm" = (
/turf/closed/wall/rock/brown,
/area/lv624/ground/caves/east_caves)
+"pVZ" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -10;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"pXI" = (
/obj/structure/flora/grass/tallgrass/jungle,
/turf/open/gm/grass/grass1,
@@ -19689,16 +19559,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"pYx" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
-"pYE" = (
-/obj/structure/flora/bush/ausbushes/lavendergrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"pYJ" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/closed/wall/strata_ice/jungle,
@@ -19706,46 +19566,29 @@
"pZb" = (
/turf/closed/wall/rock/brown,
/area/lv624/ground/caves/north_east_caves)
-"pZI" = (
-/obj/item/storage/firstaid/adv/empty,
-/obj/structure/machinery/door_control{
- id = "secure_outer_blast";
- name = "Secure Outer Doors";
- pixel_x = 25;
- pixel_y = -5
- },
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_color = "blue";
- phone_id = "Corporate Office";
- pixel_y = 24
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whiteyellow"
- },
-/area/lv624/lazarus/corporate_dome)
"pZM" = (
/obj/structure/surface/rack,
/obj/item/clothing/mask/gas,
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
-"pZR" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"qaE" = (
/obj/effect/landmark/hunter_primary,
/obj/effect/landmark/queen_spawn,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
/area/lv624/ground/caves/west_caves)
+"qbF" = (
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_color = "yellow";
+ phone_id = "Communications";
+ pixel_y = 24
+ },
+/turf/open/floor{
+ dir = 9;
+ icon_state = "brown"
+ },
+/area/lv624/lazarus/comms)
"qcz" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/river,
@@ -19754,6 +19597,12 @@
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
+"qdx" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"qdQ" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
@@ -19786,25 +19635,28 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/floor,
/area/lv624/lazarus/landing_zones/lz2)
+"qfK" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"qgA" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/jungle/south_east_jungle)
-"qhr" = (
-/obj/structure/surface/table/reinforced,
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/secure_storage)
-"qhU" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+"qhl" = (
/obj/effect/decal/grass_overlay/grass1{
- dir = 6
+ dir = 4
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
-"qhW" = (
-/obj/structure/flora/bush/ausbushes/ppflowers,
+/area/lv624/ground/caves/west_caves)
+"qhn" = (
+/turf/open/floor/plating,
+/area/lv624/lazarus/secure_storage)
+"qiL" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/amanita,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/caves/north_west_caves)
"qjf" = (
/turf/open/floor,
/area/lv624/ground/barrens/containers)
@@ -19812,17 +19664,16 @@
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"qjK" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8;
- pixel_y = 13
+"qld" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/tool/shovel,
+/obj/item/stack/sheet/wood{
+ amount = 16
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
-"qkN" = (
-/obj/structure/flora/bush/ausbushes/grassybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
+/turf/open/shuttle{
+ icon_state = "floor4"
+ },
+/area/lv624/lazarus/crashed_ship_containers)
"qns" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/dirt,
@@ -19831,10 +19682,6 @@
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_east_jungle)
-"qpj" = (
-/obj/structure/flora/bush/ausbushes/palebush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"qpX" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -19846,15 +19693,17 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/barrens/south_eastern_barrens)
-"qpZ" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"qqJ" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/caves/sand_temple)
+"qrH" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"qsM" = (
/obj/structure/platform/mineral/sandstone/runed{
dir = 1
@@ -19864,16 +19713,18 @@
"qtj" = (
/turf/open/gm/dirt,
/area/lv624/ground/jungle/south_central_jungle)
+"qtK" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"qtS" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"quw" = (
-/turf/open/floor{
- dir = 8;
- icon_state = "whitebluecorner"
- },
-/area/lv624/lazarus/corporate_dome)
"quK" = (
/obj/structure/showcase{
color = "#95948B";
@@ -19906,10 +19757,13 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/colony/west_nexus_road)
-"qxX" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
+"qwC" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/lv624/lazarus/research)
"qxZ" = (
/obj/structure/surface/table/woodentable/poor,
/obj/item/stack/sheet/metal{
@@ -19919,14 +19773,6 @@
},
/turf/open/floor/wood,
/area/lv624/ground/caves/north_central_caves)
-"qzQ" = (
-/obj/item/device/flashlight,
-/obj/structure/surface/table/reinforced/prison,
-/turf/open/floor{
- dir = 4;
- icon_state = "red"
- },
-/area/lv624/lazarus/security)
"qAc" = (
/obj/structure/platform/mineral/sandstone/runed,
/turf/open/floor/sandstone/runed,
@@ -19952,10 +19798,6 @@
/obj/structure/flora/bush/ausbushes/var3/brflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
-"qBG" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"qBQ" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -20010,16 +19852,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_tcomms_road)
-"qGm" = (
-/obj/structure/surface/rack,
-/obj/item/stack/sheet/mineral/tritium{
- pixel_x = -4
- },
-/turf/open/floor{
- dir = 8;
- icon_state = "vault"
- },
-/area/lv624/ground/barrens/north_east_barrens/ceiling)
"qGH" = (
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
/turf/open/gm/grass/grass2,
@@ -20033,12 +19865,6 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/floor/plating,
/area/lv624/lazarus/engineering)
-"qHa" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"qHC" = (
/obj/structure/largecrate/random/barrel/red,
/turf/open/gm/dirt,
@@ -20064,6 +19890,12 @@
/obj/structure/flora/bush/ausbushes/var3/leafybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
+"qJE" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"qKl" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/colony/north_nexus_road)
@@ -20106,6 +19938,14 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/caves/sand_temple)
+"qPY" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"qRj" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
@@ -20116,6 +19956,16 @@
},
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
+"qSG" = (
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
+"qSS" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"qSZ" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 10
@@ -20135,35 +19985,35 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/corporate_dome)
-"qUj" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
"qUM" = (
/turf/open/gm/dirtgrassborder/north,
/area/lv624/ground/jungle/west_central_jungle)
+"qVh" = (
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
+"qVi" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -10;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
+"qVN" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"qWf" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/colony/west_nexus_road)
-"qWM" = (
-/obj/item/handset{
- desc = "A model of an ancient Earth communication device.";
- force = 8
- },
-/obj/structure/surface/rack,
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/lv624/lazarus/main_hall)
+"qWI" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"qXo" = (
/obj/structure/surface/rack,
/obj/item/explosive/grenade/incendiary/molotov,
@@ -20172,14 +20022,6 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
-"qXG" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"qYF" = (
/obj/structure/flora/bush/ausbushes/var3/sunnybush,
/turf/open/gm/dirt,
@@ -20188,6 +20030,10 @@
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/south_west_jungle)
+"qYS" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"qZv" = (
/obj/structure/flora/grass/tallgrass/jungle,
/turf/open/gm/grass/grass1,
@@ -20210,40 +20056,33 @@
icon_state = "desert1"
},
/area/lv624/ground/barrens/west_barrens)
+"rbs" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
+"rby" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"rck" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 5
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"rcs" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
-"rcx" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
+"rcq" = (
+/obj/structure/filingcabinet,
+/turf/open/floor/plating{
+ dir = 1;
+ icon_state = "warnplate"
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/barrens/east_barrens/ceiling)
"rcy" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/jungle/east_jungle)
-"rcN" = (
-/obj/structure/bookcase,
-/obj/item/book/manual/research_and_development,
-/obj/item/book/manual/medical_diagnostics_manual,
-/obj/item/book/manual/security_space_law,
-/turf/open/floor{
- dir = 5;
- icon_state = "whiteblue"
- },
-/area/lv624/lazarus/corporate_dome)
"rcR" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/dirt,
@@ -20279,24 +20118,31 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
-"rfj" = (
-/obj/structure/flora/bush/ausbushes/ausbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"rfH" = (
/obj/structure/flora/jungle/vines/light_2,
/obj/structure/flora/jungle/vines/heavy,
/turf/closed/wall/r_wall,
/area/lv624/lazarus/corporate_dome)
-"rgp" = (
-/turf/open/gm/dirt{
- icon_state = "desert1"
+"rgj" = (
+/obj/effect/decal/remains/xeno,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
},
-/area/lv624/ground/caves/south_west_caves)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"rgQ" = (
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"rhi" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 4;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"rit" = (
/turf/open/gm/coast/south,
/area/lv624/ground/river/central_river)
@@ -20317,38 +20163,45 @@
icon_state = "dark"
},
/area/lv624/lazarus/engineering)
-"rmk" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
+"rmt" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 4;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
-"rms" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
-"rne" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 9
- },
-/turf/open/gm/dirt,
/area/lv624/ground/caves/south_central_caves)
-"rnz" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
+"rmB" = (
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_id = "Lakeside Bar";
+ pixel_y = 32
},
-/obj/structure/flora/bush/ausbushes/genericbush,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
+/turf/open/floor/wood,
+/area/lv624/ground/caves/north_central_caves)
+"rmW" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 11;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"rox" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
-"rpF" = (
+"roQ" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/caves/central_caves)
+"rpx" = (
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"rpR" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/floor{
@@ -20356,15 +20209,6 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz1)
-"rpZ" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"rqf" = (
/obj/structure/flora/bush/ausbushes/palebush,
/turf/open/gm/grass/grass1,
@@ -20374,10 +20218,6 @@
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/wood,
/area/lv624/ground/caves/north_central_caves)
-"rrX" = (
-/obj/structure/flora/bush/ausbushes/ausbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"rtD" = (
/obj/structure/flora/jungle/planttop1,
/obj/structure/flora/jungle/vines/heavy,
@@ -20396,31 +20236,6 @@
},
/turf/closed/wall/rock/brown,
/area/lv624/ground/caves/south_west_caves)
-"ruL" = (
-/obj/structure/filingcabinet{
- density = 0;
- pixel_x = -8;
- pixel_y = 16
- },
-/obj/structure/filingcabinet{
- density = 0;
- pixel_x = 8;
- pixel_y = 16
- },
-/turf/open/floor{
- dir = 9;
- icon_state = "whiteblue"
- },
-/area/lv624/lazarus/corporate_dome)
-"rvm" = (
-/obj/structure/closet/cabinet,
-/obj/item/reagent_container/food/snacks/syndicake{
- layer = 2.6
- },
-/turf/open/floor{
- icon_state = "grimy"
- },
-/area/lv624/lazarus/captain)
"rvL" = (
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/grass/grass2,
@@ -20433,24 +20248,41 @@
/obj/structure/flora/jungle/vines/light_1,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
+"rwx" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
+/obj/effect/landmark/corpsespawner/wygoon,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"rwB" = (
/obj/structure/bed/chair/comfy/black{
dir = 1
},
/turf/open/gm/dirt,
/area/lv624/ground/caves/sand_temple)
-"rxr" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
+"rxk" = (
+/obj/structure/safe{
+ spawnkey = 0
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/item/cell/high,
+/turf/open/floor/greengrid,
+/area/lv624/lazarus/secure_storage)
"rxV" = (
/turf/open/gm/dirtgrassborder{
icon_state = "desert_dug"
},
/area/lv624/ground/barrens/south_eastern_barrens)
+"ryp" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"ryJ" = (
/obj/structure/surface/table,
/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
@@ -20465,6 +20297,12 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
+"rze" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"rzT" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/item/stack/sheet/wood{
@@ -20475,11 +20313,6 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz1)
-"rAm" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/obj/structure/flora/bush/ausbushes/ausbush,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"rAo" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/tool/shovel/etool/folded,
@@ -20492,34 +20325,20 @@
icon_state = "asteroidfloor"
},
/area/lv624/lazarus/corporate_dome)
-"rBa" = (
-/obj/structure/surface/table/reinforced/prison{
- color = "#6b675e"
- },
-/obj/structure/window/reinforced{
- dir = 8;
- health = 80
- },
-/obj/structure/window/reinforced{
- dir = 4;
- health = 80
+"rAU" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 6;
+ pixel_y = -8;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/sand_temple)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"rBF" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"rCk" = (
-/obj/structure/surface/table,
-/turf/open/floor{
- icon_state = "whiteblue"
- },
-/area/lv624/lazarus/medbay)
-"rCC" = (
-/obj/structure/flora/bush/ausbushes/pointybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"rCK" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -20534,28 +20353,13 @@
"rCV" = (
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/south_central_jungle)
-"rDN" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
-"rDR" = (
+"rER" = (
/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 5
+ dir = 6
},
+/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
-"rEI" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
-"rFu" = (
-/obj/structure/flora/bush/ausbushes/var3/fullgrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/caves/east_caves)
"rGd" = (
/obj/structure/girder/displaced,
/obj/structure/shuttle/engine/propulsion,
@@ -20574,6 +20378,16 @@
},
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
+"rGE" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 6;
+ pixel_y = -8;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"rGW" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirtgrassborder/south,
@@ -20587,19 +20401,34 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
-"rHB" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet,
-/turf/open/auto_turf/strata_grass/layer1,
+"rHV" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
+"rIc" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
/area/lv624/ground/caves/central_caves)
-"rHP" = (
-/obj/structure/surface/table,
-/turf/open/floor/plating,
-/area/lv624/ground/barrens/central_barrens)
+"rIm" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"rIq" = (
/obj/structure/flora/jungle/vines/light_1,
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
+"rID" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"rJd" = (
/obj/structure/bed/alien{
color = "#aba9a9"
@@ -20610,6 +20439,14 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/closed/wall/r_wall,
/area/lv624/lazarus/landing_zones/lz2)
+"rKj" = (
+/obj/structure/surface/rack,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/lv624/lazarus/quartstorage)
"rKQ" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 9
@@ -20621,14 +20458,6 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"rMD" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"rMR" = (
/obj/structure/surface/table/woodentable/fancy,
/obj/item/device/flashlight/lamp/green{
@@ -20646,22 +20475,11 @@
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
-"rNO" = (
-/obj/structure/flora/bush/ausbushes/genericbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
"rON" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
-"rPw" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"rPK" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
@@ -20711,27 +20529,55 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/colony/north_tcomms_road)
-"rWr" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
+"rTT" = (
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
+"rUX" = (
+/obj/structure/flora/bush/ausbushes/genericbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
+"rWs" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
+/area/lv624/ground/caves/central_caves)
"rWW" = (
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/river,
/area/lv624/ground/jungle/west_jungle)
+"rXs" = (
+/obj/item/device/flashlight,
+/obj/structure/surface/table/reinforced/prison,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "red"
+ },
+/area/lv624/lazarus/security)
+"rXt" = (
+/obj/structure/surface/table/reinforced/prison{
+ color = "#6b675e"
+ },
+/obj/structure/window/reinforced{
+ dir = 8;
+ health = 80
+ },
+/obj/structure/window/reinforced{
+ dir = 4;
+ health = 80
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/sand_temple)
"rXW" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"rYp" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
+"rYe" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"rYA" = (
/obj/structure/platform/mineral/sandstone/runed{
dir = 1
@@ -20751,10 +20597,22 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
-"sby" = (
-/obj/structure/flora/bush/ausbushes/ppflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
+"scs" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
+"scS" = (
+/obj/structure/surface/rack,
+/obj/item/stack/sheet/mineral/tritium{
+ pixel_x = -4
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
+ },
+/area/lv624/ground/barrens/north_east_barrens/ceiling)
"sdh" = (
/obj/structure/barricade/sandbags/wired,
/turf/open/floor/wood,
@@ -20788,6 +20646,16 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner/north_west,
/area/lv624/ground/colony/north_nexus_road)
+"sgU" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
+"shb" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"shq" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 10
@@ -20800,10 +20668,20 @@
icon_state = "grass1"
},
/area/lv624/ground/barrens/south_eastern_barrens)
-"siO" = (
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/central_caves)
+"sjx" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/explosive/grenade/high_explosive/stick,
+/obj/item/explosive/grenade/high_explosive/stick{
+ pixel_x = 6
+ },
+/obj/item/explosive/grenade/high_explosive/stick{
+ pixel_x = -6
+ },
+/turf/open/floor{
+ dir = 8;
+ icon_state = "vault"
+ },
+/area/lv624/ground/barrens/north_east_barrens/ceiling)
"slW" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/closed/wall/mineral/sandstone/runed/decor,
@@ -20817,6 +20695,15 @@
},
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
+"snc" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 4;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"sne" = (
/obj/item/ammo_casing/bullet{
icon_state = "cartridge_10_1"
@@ -20832,36 +20719,33 @@
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_tcomms_road)
-"snW" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
-"soX" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
+"snH" = (
+/obj/structure/surface/table,
+/obj/item/trash/plate,
+/turf/open/floor{
+ icon_state = "bar"
},
+/area/lv624/lazarus/canteen)
+"soz" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
+/area/lv624/ground/caves/west_caves)
"soY" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/ground/caves/west_caves)
"spm" = (
/obj/structure/flora/jungle/alienplant1,
/turf/open/gm/river,
/area/lv624/ground/barrens/east_barrens)
-"spX" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 5
- },
+"spK" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
+/area/lv624/ground/caves/central_caves)
"sqj" = (
/turf/open/gm/river,
/area/lv624/ground/river/central_river)
@@ -20891,6 +20775,12 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/caves/sand_temple)
+"srn" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"ssc" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
/area/lv624/ground/jungle/east_central_jungle)
@@ -20898,11 +20788,11 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/closed/wall/mineral/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"sug" = (
+"stt" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/caves/north_west_caves)
"suv" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass2,
@@ -20911,37 +20801,44 @@
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz2)
-"swL" = (
-/obj/structure/closet/cabinet,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/lv624/lazarus/fitness)
-"swN" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"swR" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"swT" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
"sxa" = (
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
+"sxl" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
+"sxm" = (
+/obj/structure/closet/crate/secure/hydrosec,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/lv624/lazarus/fitness)
"sxn" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/barrens/south_eastern_barrens)
+"sxo" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
+"sxN" = (
+/obj/structure/filingcabinet,
+/turf/open/floor{
+ dir = 10;
+ icon_state = "whiteyellow"
+ },
+/area/lv624/lazarus/corporate_dome)
"sxY" = (
/obj/structure/surface/rack,
/obj/item/moneybag,
@@ -20955,13 +20852,20 @@
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/gm/river,
/area/lv624/ground/barrens/east_barrens)
-"syY" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"szy" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/north,
/area/lv624/ground/colony/south_medbay_road)
+"sAh" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
+"sAI" = (
+/obj/structure/flora/jungle/planttop1,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"sBg" = (
/obj/structure/machinery/vending/cigarette,
/obj/structure/machinery/light{
@@ -20980,6 +20884,9 @@
/obj/structure/flora/bush/ausbushes/var3/leafybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
+"sBY" = (
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"sCg" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -21009,26 +20916,23 @@
/obj/structure/flora/bush/ausbushes/var3/brflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
-"sEu" = (
-/obj/structure/surface/table,
-/obj/structure/mirror{
- icon_state = "mirror_broke";
- pixel_x = 30
- },
-/obj/item/device/radio/intercom{
- freerange = 1;
- frequency = 1469;
- name = "General Listening Channel";
- pixel_y = 30
- },
-/turf/open/floor{
- icon_state = "freezerfloor"
+"sET" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
},
-/area/lv624/lazarus/toilet)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"sFc" = (
/obj/structure/flora/bush/ausbushes/var3/stalkybush,
/turf/open/gm/river,
/area/lv624/ground/river/west_river)
+"sFD" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"sFY" = (
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
name = "\improper Workshop Storage";
@@ -21046,12 +20950,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"sHv" = (
-/obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor{
- icon_state = "grimy"
- },
-/area/lv624/lazarus/hop)
"sHT" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/grass/grass1,
@@ -21088,22 +20986,29 @@
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core,
/turf/open/gm/dirt,
/area/lv624/ground/caves/central_caves)
-"sKp" = (
-/obj/structure/closet/wardrobe,
-/obj/structure/machinery/light{
- dir = 8
+"sJN" = (
+/obj/structure/closet{
+ density = 0;
+ icon_state = "open";
+ opened = 1
},
/turf/open/floor{
- dir = 8;
- icon_state = "whiteblue"
+ icon_state = "bluecorner"
},
-/area/lv624/lazarus/medbay)
-"sLm" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
+/area/lv624/lazarus/sleep_male)
+"sLT" = (
+/obj/structure/flora/bush/ausbushes/palebush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
+"sLU" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1{
dir = 10
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"sLX" = (
/obj/structure/bed/chair/comfy/black{
dir = 8
@@ -21121,6 +21026,19 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"sNq" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
+"sNX" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor/plating{
+ icon_state = "platebot"
+ },
+/area/lv624/lazarus/robotics)
"sOp" = (
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
@@ -21144,13 +21062,14 @@
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"sQh" = (
-/obj/structure/surface/table/woodentable/poor,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor/wood{
- icon_state = "wood-broken6"
- },
-/area/lv624/ground/jungle/west_jungle/ceiling)
+"sPK" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
+"sRg" = (
+/obj/structure/surface/table/reinforced,
+/turf/open/floor/greengrid,
+/area/lv624/lazarus/secure_storage)
"sRH" = (
/obj/structure/flora/bush/ausbushes/palebush,
/turf/open/gm/grass/grass1,
@@ -21185,10 +21104,20 @@
/obj/structure/window/framed/colony/reinforced,
/turf/open/floor,
/area/lv624/lazarus/hydroponics)
-"sVl" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+"sVx" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
+"sVZ" = (
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor{
+ icon_state = "grimy"
+ },
+/area/lv624/lazarus/hop)
"sWy" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/grass/grass1,
@@ -21220,10 +21149,16 @@
icon_state = "squareswood"
},
/area/lv624/ground/caves/sand_temple)
-"sXd" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
+"sXg" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -10;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"sXi" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 1
@@ -21235,24 +21170,6 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"sZh" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
-"sZK" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/door/window/westright{
- layer = 2.9
- },
-/obj/item/paper_bin,
-/obj/item/tool/pen,
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/lv624/lazarus/quart)
"taa" = (
/obj/structure/barricade/wooden,
/obj/structure/flora/jungle/vines/light_3,
@@ -21266,27 +21183,21 @@
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/colony/north_tcomms_road)
-"tbw" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"tbV" = (
/obj/structure/flora/jungle/vines/heavy,
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"tbZ" = (
-/obj/effect/decal/grass_overlay/grass1{
+"tcF" = (
+/obj/structure/flora/bush/ausbushes/var3/brflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
+"tde" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
dir = 6
},
/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
-"tcj" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
+/area/lv624/ground/caves/south_central_caves)
"tdX" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -21305,12 +21216,6 @@
icon_state = "warnplate"
},
/area/lv624/lazarus/engineering)
-"tes" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"teJ" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/closed/wall/strata_ice/jungle,
@@ -21345,6 +21250,16 @@
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/coast/north,
/area/lv624/ground/river/west_river)
+"thk" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -5;
+ pixel_y = -5;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"thn" = (
/obj/item/weapon/sword{
pixel_x = -6;
@@ -21373,6 +21288,22 @@
icon_state = "multi_tiles"
},
/area/lv624/ground/caves/sand_temple)
+"thG" = (
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_color = "red";
+ phone_id = "Secure Storage";
+ pixel_y = 24
+ },
+/turf/open/floor/greengrid,
+/area/lv624/lazarus/secure_storage)
+"thI" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"thS" = (
/obj/structure/barricade/handrail/strata{
dir = 8
@@ -21380,10 +21311,6 @@
/obj/structure/barricade/handrail/strata,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/barrens/south_eastern_barrens)
-"tjg" = (
-/obj/structure/flora/bush/ausbushes/var3/fullgrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"tka" = (
/obj/item/ammo_casing/bullet{
icon_state = "casing_9_1"
@@ -21396,6 +21323,10 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/jungle/north_west_jungle)
+"tlk" = (
+/obj/structure/flora/bush/ausbushes/reedbush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"tlD" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/gm/river,
@@ -21419,6 +21350,11 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
+"tnY" = (
+/turf/open/gm/dirt{
+ icon_state = "desert3"
+ },
+/area/lv624/ground/caves/west_caves)
"toz" = (
/obj/structure/flora/bush/ausbushes/pointybush,
/turf/open/gm/grass/grass1,
@@ -21432,6 +21368,16 @@
},
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_jungle)
+"toM" = (
+/obj/structure/closet/athletic_mixed,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/lv624/lazarus/fitness)
"toT" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/obj/item/tool/hatchet{
@@ -21440,12 +21386,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"tqa" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"tqe" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
@@ -21454,6 +21394,10 @@
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
+"tqQ" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"trs" = (
/obj/item/tool/shovel,
/turf/open/gm/dirt,
@@ -21476,6 +21420,13 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/colony/north_nexus_road)
+"tti" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
+ pixel_x = 8;
+ pixel_y = 13
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"ttu" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
@@ -21484,10 +21435,6 @@
/obj/structure/flora/jungle/planttop1,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
-"ttW" = (
-/obj/structure/flora/bush/ausbushes/var3/brflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"ttZ" = (
/obj/structure/barricade/handrail/strata{
dir = 4
@@ -21495,6 +21442,16 @@
/obj/structure/barricade/handrail/strata,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/barrens/south_eastern_barrens)
+"tuJ" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -5;
+ pixel_y = -5;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"tuX" = (
/obj/effect/landmark/crap_item,
/turf/open/floor/wood{
@@ -21505,12 +21462,6 @@
/obj/structure/flora/bush/ausbushes/palebush,
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/jungle/south_east_jungle)
-"tvV" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"twg" = (
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/grass/grass1,
@@ -21539,12 +21490,6 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/medbay)
-"txZ" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"tyG" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
@@ -21563,11 +21508,10 @@
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
-"tAs" = (
-/turf/open/gm/dirt{
- icon_state = "desert2"
- },
-/area/lv624/ground/caves/west_caves)
+"tBx" = (
+/obj/structure/filingcabinet/medical,
+/turf/open/floor,
+/area/lv624/lazarus/fitness)
"tBB" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
@@ -21576,13 +21520,6 @@
/obj/structure/flora/bush/ausbushes/var3/sparsegrass,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
-"tCW" = (
-/obj/structure/surface/table/holotable,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"tDa" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -21594,47 +21531,26 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
+"tEm" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"tEn" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/floor{
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz2)
-"tEJ" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"tES" = (
/obj/effect/decal/cleanable/blood,
/turf/open/floor{
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
-"tFD" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
-"tGt" = (
-/obj/structure/safe{
- spawnkey = 0
- },
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/item/cell/high,
-/turf/open/floor/greengrid,
-/area/lv624/lazarus/secure_storage)
-"tGH" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"tHc" = (
/obj/structure/flora/grass/tallgrass/jungle/corner,
/turf/open/gm/grass/grass1,
@@ -21647,11 +21563,6 @@
icon_state = "whiteblue"
},
/area/lv624/lazarus/medbay)
-"tIS" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"tIZ" = (
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/gm/grass/grass1,
@@ -21684,22 +21595,12 @@
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"tJU" = (
-/obj/structure/flora/bush/ausbushes/var3/fernybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"tKI" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 1
},
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
-"tKZ" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"tLQ" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass1,
@@ -21737,25 +21638,47 @@
icon_state = "whiteyellowfull"
},
/area/lv624/ground/barrens/south_eastern_barrens)
-"tNC" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+"tMQ" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
+"tNV" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/firstaid/adv{
pixel_x = 6;
- pixel_y = -8;
- light_on = 1;
- light_range = 1;
- light_system = 1
+ pixel_y = 6
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/barrens/north_east_barrens)
+/obj/item/storage/firstaid/adv,
+/turf/open/floor/greengrid,
+/area/lv624/lazarus/corporate_dome)
"tOS" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
/area/lv624/ground/caves/west_caves)
-"tOU" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+"tOV" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+/area/lv624/ground/caves/south_west_caves)
+"tPH" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
+"tQU" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"tRu" = (
/obj/effect/landmark/hunter_primary,
/obj/structure/flora/jungle/vines/heavy,
@@ -21765,9 +21688,20 @@
/obj/effect/decal/cleanable/blood/gibs/xeno,
/turf/open/gm/dirt,
/area/lv624/ground/jungle/north_west_jungle)
+"tRM" = (
+/obj/structure/flora/bush/ausbushes/palebush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"tSd" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/lazarus/quartstorage/outdoors)
+"tSi" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"tSN" = (
/obj/structure/flora/bush/ausbushes/var3/ywflowers,
/turf/open/gm/grass/grass1,
@@ -21782,19 +21716,19 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
-"tUv" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
-/obj/effect/landmark/corpsespawner/scientist,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
-"tWt" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
+"tUO" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/light/small,
+/turf/open/floor{
+ icon_state = "grimy"
+ },
+/area/lv624/lazarus/captain)
+"tVw" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
},
-/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
+/area/lv624/ground/caves/north_east_caves)
"tWw" = (
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor{
@@ -21816,6 +21750,12 @@
icon_state = "floor4"
},
/area/lv624/lazarus/crashed_ship_containers)
+"tYW" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"tZa" = (
/obj/structure/flora/bush/ausbushes/var3/stalkybush,
/turf/open/gm/coast/beachcorner/south_east,
@@ -21827,16 +21767,10 @@
"tZD" = (
/turf/closed/wall/r_wall,
/area/lv624/lazarus/landing_zones/lz2)
-"tZE" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 6;
- pixel_y = -8;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
+"uaL" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/caves/west_caves)
"uaP" = (
/obj/structure/flora/bush/ausbushes/var3/fernybush,
/turf/open/gm/grass/grass1,
@@ -21845,14 +21779,6 @@
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/river,
/area/lv624/ground/river/central_river)
-"ubj" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"ubJ" = (
/obj/structure/stairs/perspective{
color = "#6b675e";
@@ -21889,10 +21815,6 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"ufe" = (
-/obj/effect/landmark/monkey_spawn,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"ufG" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -21973,6 +21895,14 @@
icon_state = "desert1"
},
/area/lv624/ground/barrens/south_eastern_barrens)
+"ukY" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"ukZ" = (
/turf/open/floor{
dir = 1;
@@ -22001,21 +21931,10 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/east_jungle)
-"uos" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
+"uop" = (
+/obj/structure/flora/bush/ausbushes/reedbush,
+/turf/open/auto_turf/strata_grass/layer1,
/area/lv624/ground/caves/east_caves)
-"uot" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"upM" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
@@ -22033,11 +21952,18 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/jungle/east_jungle)
-"uqx" = (
-/obj/effect/landmark/crap_item,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+"uqm" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_east_caves)
+/area/lv624/ground/caves/south_west_caves)
+"urO" = (
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_id = "Cargo";
+ pixel_y = 24
+ },
+/turf/open/floor/vault,
+/area/lv624/lazarus/quartstorage)
"urR" = (
/turf/open/floor/corsat{
dir = 1;
@@ -22050,13 +21976,6 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/caves/north_central_caves)
-"ust" = (
-/obj/structure/closet/crate/secure/hydrosec,
-/turf/open/floor{
- dir = 4;
- icon_state = "whitepurplecorner"
- },
-/area/lv624/lazarus/fitness)
"usE" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/dirt,
@@ -22075,6 +21994,12 @@
"uvh" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/barrens/south_eastern_barrens)
+"uwG" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"uxh" = (
/obj/structure/flora/bush/ausbushes/var3/brflowers,
/turf/open/gm/grass/grass1,
@@ -22084,13 +22009,16 @@
/obj/effect/landmark/corpsespawner/security/liaison,
/turf/open/floor/wood,
/area/lv624/ground/caves/north_central_caves)
-"uxM" = (
-/obj/effect/decal/remains/xeno,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
+"uxL" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 11;
+ pixel_y = -2;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"uxT" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/coast/east,
@@ -22101,6 +22029,12 @@
"uya" = (
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
+"uyn" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"uzH" = (
/turf/open/floor/plating{
dir = 8;
@@ -22110,6 +22044,11 @@
"uAp" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/barrens/south_eastern_barrens)
+"uBR" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
"uDd" = (
/obj/structure/showcase{
desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it.";
@@ -22171,40 +22110,22 @@
icon_state = "whitebluecorner"
},
/area/lv624/lazarus/corporate_dome)
-"uHI" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
-/turf/open/gm/grass/grass2,
-/area/lv624/ground/jungle/north_east_jungle)
-"uHU" = (
+"uHc" = (
/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
+ dir = 9
},
-/obj/structure/flora/bush/ausbushes/palebush,
/turf/open/gm/dirt,
/area/lv624/ground/caves/north_east_caves)
+"uHI" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
+/turf/open/gm/grass/grass2,
+/area/lv624/ground/jungle/north_east_jungle)
"uIF" = (
/obj/structure/barricade/sandbags/wired,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
/area/lv624/ground/caves/north_central_caves)
-"uJi" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
-"uJr" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/structure/blocker/forcefield/multitile_vehicles,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
-"uJU" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/gm/grass/grass1/weedable,
-/area/lv624/ground/caves/north_east_caves)
"uKT" = (
/obj/structure/bed/chair/comfy/black{
dir = 8
@@ -22217,23 +22138,49 @@
},
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_jungle)
+"uMd" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
+"uMz" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"uMD" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/blocker/forcefield/multitile_vehicles,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
/area/lv624/ground/caves/sand_temple)
-"uMU" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"uOi" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/caves/sand_temple)
+"uOl" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
+"uOu" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/libertycap,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
+"uOD" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"uRb" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
/area/lv624/ground/colony/west_tcomms_road)
+"uRe" = (
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"uRE" = (
/turf/open/gm/dirtgrassborder/west,
/area/lv624/lazarus/landing_zones/lz2)
@@ -22260,19 +22207,6 @@
icon_state = "wood-broken6"
},
/area/lv624/ground/caves/north_central_caves)
-"uSX" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
-"uTc" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"uTe" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 10
@@ -22301,23 +22235,11 @@
name = "Shuttle Landing Lights"
},
/area/lv624/lazarus/landing_zones/lz1)
-"uVQ" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 1
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"uVU" = (
/obj/effect/landmark/lv624/xeno_tunnel,
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
-"uVW" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"uWr" = (
/obj/effect/decal/cleanable/blood/oil/streak,
/turf/open/floor{
@@ -22327,22 +22249,15 @@
"uWJ" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/caves/south_west_caves)
-"uXP" = (
-/obj/structure/closet,
-/turf/open/floor{
- icon_state = "bluecorner"
- },
-/area/lv624/lazarus/sleep_male)
"uXW" = (
/obj/structure/barricade/sandbags/wired,
/turf/open/floor/wood{
icon_state = "wood-broken"
},
/area/lv624/ground/caves/north_central_caves)
-"uYx" = (
-/obj/structure/flora/bush/ausbushes/pointybush,
+"uYj" = (
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
+/area/lv624/ground/caves/north_east_caves)
"uYC" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 6
@@ -22379,10 +22294,22 @@
},
/turf/open/gm/dirt,
/area/lv624/ground/jungle/east_jungle)
+"vbK" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"vcY" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz2)
+"vdt" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"vdy" = (
/obj/structure/machinery/door/airlock/almayer/engineering/colony{
dir = 1;
@@ -22394,11 +22321,6 @@
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
-"veh" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"veo" = (
/obj/item/ammo_casing/bullet{
icon_state = "cartridge_3_1"
@@ -22413,10 +22335,13 @@
},
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/caves/sand_temple)
-"vfk" = (
-/obj/structure/flora/bush/ausbushes/var3/leafybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
+"vev" = (
+/obj/structure/surface/table,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"vft" = (
/obj/structure/platform_decoration/mineral/sandstone/runed{
dir = 4
@@ -22442,24 +22367,27 @@
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
-"vhq" = (
-/obj/structure/surface/rack,
-/obj/item/ammo_magazine/rifle/mar40,
-/obj/item/ammo_magazine/rifle/mar40,
-/turf/open/floor{
- icon_state = "dark"
- },
-/area/lv624/lazarus/quartstorage)
"vhx" = (
/obj/structure/girder,
/turf/open/gm/dirt,
/area/lv624/lazarus/crashed_ship_containers)
-"vhP" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
+"vhz" = (
+/obj/structure/flora/bush/ausbushes/ausbush,
+/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
+/area/lv624/ground/jungle/south_west_jungle)
+"vih" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
dir = 8
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
+/area/lv624/ground/caves/south_central_caves)
+"viC" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"vjH" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
@@ -22483,6 +22411,25 @@
icon_state = "squareswood"
},
/area/lv624/ground/caves/sand_temple)
+"vkS" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
+"vle" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"vly" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -22505,10 +22452,25 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"voJ" = (
-/obj/effect/decal/grass_overlay/grass1,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_west_caves)
+"voy" = (
+/obj/structure/closet{
+ density = 0;
+ icon_state = "open";
+ opened = 1
+ },
+/obj/item/device/flashlight,
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ frequency = 1469;
+ name = "General Listening Channel";
+ pixel_x = -30
+ },
+/obj/item/clothing/under/colonist,
+/turf/open/floor{
+ dir = 9;
+ icon_state = "purple"
+ },
+/area/lv624/lazarus/sleep_female)
"vpu" = (
/obj/structure/stairs/perspective{
color = "#b29082";
@@ -22521,22 +22483,18 @@
"vqT" = (
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/north_jungle)
-"vrf" = (
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/shuttle{
- icon_state = "floor4"
- },
-/area/lv624/lazarus/crashed_ship_containers)
-"vsq" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"vsT" = (
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_barrens)
+"vtk" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_central_caves)
"vtt" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
@@ -22544,10 +22502,9 @@
"vty" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
-"vus" = (
-/obj/structure/flora/bush/ausbushes/lavendergrass,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
+"vuv" = (
+/turf/open/gm/dirtgrassborder/east,
+/area/lv624/ground/jungle/south_central_jungle)
"vuy" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/dirt,
@@ -22575,6 +22532,13 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz2)
+"vxj" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"vxU" = (
/obj/structure/flora/bush/ausbushes/lavendergrass,
/turf/open/gm/grass/grass1,
@@ -22586,11 +22550,35 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
-"vAw" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{
- pixel_x = 8
+"vzT" = (
+/obj/structure/surface/table,
+/obj/effect/landmark/crap_item,
+/obj/structure/machinery/light{
+ dir = 4
},
+/turf/open/floor{
+ dir = 9;
+ icon_state = "green"
+ },
+/area/lv624/lazarus/hydroponics)
+"vAg" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
+"vAB" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
+"vAT" = (
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
+"vBd" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 4
+ },
+/turf/open/gm/dirt,
/area/lv624/ground/caves/central_caves)
"vBe" = (
/turf/open/gm/dirtgrassborder/east,
@@ -22625,18 +22613,25 @@
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"vFl" = (
-/obj/structure/filingcabinet,
-/turf/open/floor{
- icon_state = "grimy"
- },
-/area/lv624/lazarus/hop)
"vGg" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 6
},
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/landing_zones/lz1)
+"vGj" = (
+/obj/structure/flora/bush/ausbushes/ppflowers,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
+"vGy" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"vHe" = (
/obj/structure/surface/rack,
/obj/item/stack/sheet/plasteel{
@@ -22669,23 +22664,6 @@
/obj/item/bananapeel,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_jungle)
-"vJV" = (
-/obj/structure/surface/table/reinforced/prison{
- color = "#6b675e"
- },
-/obj/structure/window/reinforced{
- dir = 4;
- health = 80
- },
-/obj/structure/window/reinforced{
- dir = 8;
- health = 80
- },
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/lv624/ground/caves/sand_temple)
"vKc" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
@@ -22694,18 +22672,6 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
-"vKP" = (
-/obj/structure/surface/rack,
-/turf/open/floor{
- dir = 4;
- icon_state = "whiteyellowfull"
- },
-/area/lv624/lazarus/quart)
-"vLh" = (
-/turf/open/gm/dirt{
- icon_state = "desert3"
- },
-/area/lv624/ground/caves/west_caves)
"vLO" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/lazarus/quartstorage/outdoors)
@@ -22715,18 +22681,27 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_west_caves)
+"vNs" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
"vNP" = (
/obj/effect/landmark/monkey_spawn,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
+"vNT" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"vNW" = (
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
-"vOe" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/angel,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
"vOD" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/dirt,
@@ -22734,21 +22709,25 @@
"vOF" = (
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/jungle/south_central_jungle)
-"vPU" = (
-/obj/structure/flora/bush/ausbushes/var3/stalkybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
+"vPo" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"vPV" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/jungle/east_jungle)
+"vQR" = (
+/obj/structure/flora/bush/ausbushes/var3/sunnybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"vSG" = (
/obj/structure/flora/jungle/vines/light_1,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"vSX" = (
-/obj/vehicle/train/cargo/trolley,
-/turf/open/floor,
-/area/lv624/ground/barrens/containers)
"vUw" = (
/obj/structure/flora/bush/ausbushes/var3/fullgrass,
/turf/open/gm/dirt,
@@ -22777,48 +22756,46 @@
icon_state = "vault"
},
/area/lv624/lazarus/quartstorage)
-"vVU" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 2;
- pixel_y = 7;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
"vWs" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/east_jungle)
+"vXP" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"vXW" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"vYu" = (
-/obj/structure/flora/bush/ausbushes/var3/brflowers,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_west_caves)
-"vYC" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"wad" = (
-/obj/effect/landmark/good_item,
+"waw" = (
/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
+ dir = 9
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
-"waS" = (
+/area/lv624/ground/caves/north_west_caves)
+"wbg" = (
/obj/effect/decal/grass_overlay/grass1{
- dir = 8
+ dir = 1
},
/turf/open/gm/dirt,
/area/lv624/ground/caves/south_central_caves)
+"wbu" = (
+/obj/structure/closet/crate,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40,
+/obj/item/ammo_magazine/rifle/mar40/extended,
+/obj/item/ammo_magazine/rifle/mar40/extended,
+/turf/open/floor{
+ icon_state = "dark"
+ },
+/area/lv624/ground/barrens/north_east_barrens/ceiling)
"wbK" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
@@ -22830,13 +22807,6 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/floor/sandstone/runed,
/area/lv624/ground/caves/sand_temple)
-"wbV" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
"wca" = (
/obj/structure/barricade/handrail/strata,
/obj/structure/barricade/handrail/strata{
@@ -22863,6 +22833,17 @@
/obj/structure/flora/bush/ausbushes/ausbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
+"wcT" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/item/storage/surgical_tray,
+/obj/item/reagent_container/spray/cleaner{
+ desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
+ name = "Surgery Cleaner"
+ },
+/turf/open/floor{
+ icon_state = "whitebluefull"
+ },
+/area/lv624/lazarus/medbay)
"wcW" = (
/obj/structure/flora/jungle/vines/heavy,
/obj/structure/platform/mineral/sandstone/runed{
@@ -22870,10 +22851,6 @@
},
/turf/open/gm/coast/beachcorner2/south_east,
/area/lv624/ground/caves/sand_temple)
-"wdp" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"weH" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass2,
@@ -22885,6 +22862,27 @@
},
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/caves/sand_temple)
+"wgs" = (
+/obj/structure/surface/table/woodentable/poor,
+/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
+/turf/open/floor/wood{
+ icon_state = "wood-broken6"
+ },
+/area/lv624/ground/jungle/west_jungle/ceiling)
+"wgR" = (
+/obj/structure/flora/bush/ausbushes/var3/fernybush,
+/turf/open/gm/grass/grass2,
+/area/lv624/lazarus/yggdrasil)
+"whk" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
+ },
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_west_caves)
"whr" = (
/obj/item/ammo_magazine/smg/mp5,
/obj/item/ammo_magazine/smg/mp5,
@@ -22901,6 +22899,10 @@
icon_state = "desert2"
},
/area/lv624/ground/barrens/south_eastern_barrens)
+"whx" = (
+/obj/structure/flora/bush/ausbushes/lavendergrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"whQ" = (
/obj/structure/flora/bush/ausbushes/var3/sunnybush{
desc = "The oranges aren't done yet... this sucks.";
@@ -22918,16 +22920,6 @@
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/containers)
-"wjj" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -10;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
"wjT" = (
/obj/structure/sign/safety/analysis_lab{
pixel_x = 40
@@ -23005,9 +22997,19 @@
icon_state = "multi_tiles"
},
/area/lv624/ground/caves/sand_temple)
+"woT" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"wpw" = (
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
+"wpY" = (
+/obj/structure/flora/bush/ausbushes/var3/leafybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/barrens/north_east_barrens)
"wqy" = (
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/dirt,
@@ -23025,16 +23027,14 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/dirt,
/area/lv624/ground/caves/north_central_caves)
-"wsU" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
"wsZ" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/north_east_jungle)
+"wty" = (
+/obj/structure/flora/bush/ausbushes/ppflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"wtK" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/fancy/cigarettes/wypacket{
@@ -23047,10 +23047,6 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/corporate_dome)
-"wux" = (
-/obj/structure/flora/bush/ausbushes/reedbush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/east_caves)
"wvO" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass1,
@@ -23064,12 +23060,6 @@
icon_state = "asteroidplating"
},
/area/lv624/ground/caves/north_central_caves)
-"wxa" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"wxP" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/north_jungle)
@@ -23078,18 +23068,16 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
-"wAe" = (
-/obj/effect/decal/cleanable/blood/splatter,
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = -25;
- pixel_y = 5
- },
-/turf/open/floor{
- icon_state = "white"
+"wzI" = (
+/obj/structure/flora/bush/ausbushes/var3/ywflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
+"wAF" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
},
-/area/lv624/lazarus/research)
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"wAI" = (
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/dirtgrassborder/south,
@@ -23102,10 +23090,19 @@
/obj/item/clothing/suit/armor/yautja_flavor,
/turf/open/floor/sandstone/runed,
/area/lv624/ground/barrens/south_eastern_barrens)
-"wDE" = (
-/obj/effect/landmark/crap_item,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
+"wCs" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 6
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
+"wDA" = (
+/obj/structure/closet/cabinet,
+/turf/open/floor{
+ dir = 4;
+ icon_state = "whitepurplecorner"
+ },
+/area/lv624/lazarus/fitness)
"wEO" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
@@ -23127,10 +23124,9 @@
icon_state = "wood-broken3"
},
/area/lv624/ground/caves/north_central_caves)
-"wGg" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
+"wHh" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
},
/turf/open/gm/dirt,
/area/lv624/ground/caves/west_caves)
@@ -23140,14 +23136,33 @@
icon_state = "asteroidfloor"
},
/area/lv624/lazarus/landing_zones/lz2)
-"wIe" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
+"wHE" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = -1;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
+"wIw" = (
+/obj/structure/safe{
+ spawnkey = 0
+ },
+/obj/item/coin/diamond,
+/obj/item/m_gift,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/item/clothing/head/helmet/marine/veteran/pmc,
+/obj/item/clothing/under/marine/veteran/pmc,
+/obj/item/storage/fancy/cigar,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whiteyellow"
+ },
+/area/lv624/lazarus/corporate_dome)
"wJA" = (
/obj/structure/flora/jungle/vines/light_3,
/obj/structure/window/framed/colony/reinforced,
@@ -23182,18 +23197,24 @@
icon_state = "asteroidwarning"
},
/area/lv624/lazarus/landing_zones/lz2)
+"wLT" = (
+/obj/structure/flora/bush/ausbushes/var3/fullgrass,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_east_caves)
"wMk" = (
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/west_central_jungle)
-"wMv" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
+"wMr" = (
+/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
+ pixel_x = 2;
+ pixel_y = 7;
+ light_on = 1;
+ light_range = 1;
+ light_system = 1
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"wNB" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/floor{
@@ -23219,14 +23240,6 @@
"wPN" = (
/turf/open/gm/coast/beachcorner2/south_east,
/area/lv624/ground/caves/sand_temple)
-"wPP" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"wQj" = (
/obj/structure/surface/rack,
/obj/item/ammo_magazine/rifle/mar40,
@@ -23240,12 +23253,18 @@
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/grass/grass2,
/area/lv624/ground/jungle/south_west_jungle)
-"wRy" = (
+"wQK" = (
/obj/effect/decal/grass_overlay/grass1{
- dir = 10
+ dir = 1
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_central_caves)
+/area/lv624/ground/caves/west_caves)
+"wRb" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"wSg" = (
/obj/structure/inflatable/popped,
/turf/open/gm/dirt,
@@ -23339,11 +23358,6 @@
"wWm" = (
/turf/open/gm/dirtgrassborder/west,
/area/lv624/ground/jungle/north_east_jungle)
-"wWn" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"wWs" = (
/obj/structure/surface/rack,
/turf/open/floor/vault,
@@ -23384,6 +23398,18 @@
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
+"wYz" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
+"wYB" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 5
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_east_caves)
"wZc" = (
/obj/structure/flora/bush/ausbushes/var3/brflowers,
/turf/open/gm/grass/grass1,
@@ -23395,22 +23421,16 @@
"wZW" = (
/turf/open/floor/sandstone/runed,
/area/lv624/ground/barrens/south_eastern_barrens)
-"xac" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -10;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"xak" = (
/obj/structure/platform/mineral/sandstone/runed{
dir = 8
},
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
+"xar" = (
+/obj/effect/decal/grass_overlay/grass1/inner,
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"xbu" = (
/obj/item/shard,
/turf/open/floor{
@@ -23418,12 +23438,6 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/corporate_dome)
-"xbP" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 8
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"xch" = (
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
@@ -23431,6 +23445,10 @@
/obj/structure/flora/bush/ausbushes/pointybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_east_jungle)
+"xdb" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_central_caves)
"xdO" = (
/turf/open/gm/dirtgrassborder/south,
/area/lv624/ground/jungle/south_west_jungle)
@@ -23464,31 +23482,23 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/corporate_dome)
-"xgx" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_door,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"xgE" = (
/turf/closed/wall/r_wall,
/area/lv624/lazarus/corporate_dome)
+"xhc" = (
+/mob/living/simple_animal/bat,
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/north_west_caves)
+"xhv" = (
+/obj/effect/decal/grass_overlay/grass1,
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/north_east_barrens)
"xhC" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east,
/area/lv624/ground/barrens/south_eastern_barrens)
-"xju" = (
-/obj/structure/closet{
- density = 0;
- icon_state = "open";
- opened = 1
- },
-/turf/open/floor{
- icon_state = "bluecorner"
- },
-/area/lv624/lazarus/sleep_male)
"xkU" = (
/obj/structure/bed/sofa/vert/grey/top,
/turf/open/floor{
@@ -23496,12 +23506,16 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/corporate_dome)
-"xlX" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 4
+"xmK" = (
+/obj/structure/flora/bush/ausbushes/grassybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/east_caves)
+"xnt" = (
+/obj/structure/filingcabinet,
+/turf/open/floor{
+ icon_state = "grimy"
},
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/lazarus/hop)
"xov" = (
/obj/effect/landmark/hunter_primary,
/turf/open/gm/dirt,
@@ -23519,19 +23533,9 @@
/obj/structure/platform_decoration/mineral/sandstone/runed,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/caves/sand_temple)
-"xpC" = (
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/west_caves)
"xpR" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/caves/north_east_caves)
-"xqa" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 4
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_west_caves)
"xrI" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/floor{
@@ -23539,25 +23543,11 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz2)
-"xsh" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"xsN" = (
/obj/structure/flora/jungle/vines/light_1,
/obj/structure/flora/bush/ausbushes/ppflowers,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_west_jungle)
-"xtU" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 10
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/south_east_caves)
"xuk" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west,
/area/lv624/ground/jungle/east_central_jungle)
@@ -23586,17 +23576,10 @@
"xwr" = (
/turf/open/gm/dirt,
/area/lv624/ground/barrens/west_barrens)
-"xwG" = (
-/obj/structure/flora/bush/ausbushes/var3/stalkybush,
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 11;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
+"xwN" = (
+/obj/structure/flora/bush/ausbushes/var3/brflowers,
/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
+/area/lv624/ground/caves/east_caves)
"xwQ" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/handcuffs/cable/white{
@@ -23616,10 +23599,14 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/corporate_dome)
-"xxC" = (
-/obj/structure/flora/bush/ausbushes/var3/sunnybush,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/north_east_caves)
+"xyH" = (
+/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"xyI" = (
/obj/item/ammo_magazine/rifle/nsg23{
current_rounds = 0
@@ -23632,12 +23619,6 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_jungle)
-"xzw" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"xzD" = (
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/north_jungle)
@@ -23649,6 +23630,10 @@
"xBm" = (
/turf/open/gm/river,
/area/lv624/ground/barrens/west_barrens)
+"xBO" = (
+/obj/structure/flora/bush/ausbushes/palebush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/south_west_caves)
"xCF" = (
/obj/item/ammo_magazine/smg/mp5,
/obj/item/weapon/gun/smg/mp5,
@@ -23656,11 +23641,6 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
-"xCW" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/west_caves)
"xDl" = (
/obj/structure/machinery/colony_floodlight,
/turf/open/gm/dirtgrassborder/west,
@@ -23672,12 +23652,6 @@
/obj/structure/flora/grass/tallgrass/jungle/corner,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
-"xDW" = (
-/obj/effect/decal/grass_overlay/grass1{
- dir = 5
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
"xEt" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/west_central_jungle)
@@ -23691,20 +23665,23 @@
/obj/structure/flora/jungle/vines/heavy,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
-"xGO" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = -10;
- pixel_y = -2;
- light_on = 1;
- light_range = 1;
- light_system = 1
+"xGL" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 6
},
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/east_caves)
"xHa" = (
/obj/effect/landmark/crap_item,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_west_jungle)
+"xHW" = (
+/obj/structure/flora/bush/ausbushes/var3/brflowers,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/west_caves)
"xJA" = (
/obj/effect/landmark/lv624/fog_blocker,
/turf/open/gm/river,
@@ -23715,39 +23692,49 @@
},
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/caves/north_central_caves)
-"xKb" = (
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/north_east_caves)
"xKu" = (
/obj/structure/flora/jungle/plantbot1,
/turf/open/gm/grass/grass1,
/area/lv624/lazarus/quartstorage/outdoors)
-"xKB" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/chanterelle,
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"xKE" = (
/obj/structure/flora/jungle/vines/light_3,
/turf/open/gm/dirtgrassborder/east,
/area/lv624/ground/jungle/west_jungle)
+"xKL" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/west_caves)
"xLi" = (
/obj/structure/surface/rack,
/obj/item/storage/box/lights/mixed,
/turf/open/floor/vault,
/area/lv624/lazarus/quartstorage)
-"xNK" = (
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/containers)
-"xOu" = (
+"xMj" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_id = "Research Dome";
+ pixel_y = 24
+ },
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
+"xNi" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1/inner{
- dir = 9
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 4
},
/turf/open/gm/dirt,
-/area/lv624/ground/caves/central_caves)
+/area/lv624/ground/barrens/north_east_barrens)
+"xNK" = (
+/turf/open/gm/dirt,
+/area/lv624/ground/barrens/containers)
"xPk" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west,
/area/lv624/ground/colony/south_medbay_road)
@@ -23776,12 +23763,22 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
+"xRe" = (
+/obj/effect/decal/grass_overlay/grass1/inner{
+ dir = 10
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"xRo" = (
/obj/structure/flora/grass/tallgrass/jungle/corner{
dir = 1
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/south_central_jungle)
+"xSk" = (
+/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/north_east_caves)
"xSA" = (
/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
@@ -23795,11 +23792,6 @@
"xTT" = (
/turf/open/gm/dirt,
/area/lv624/ground/jungle/south_west_jungle)
-"xUk" = (
-/turf/open/gm/dirt{
- icon_state = "desert0"
- },
-/area/lv624/ground/caves/west_caves)
"xVb" = (
/turf/open/gm/coast/north,
/area/lv624/ground/barrens/east_barrens)
@@ -23813,12 +23805,15 @@
},
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/north_east_jungle)
-"xVM" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_central_caves)
"xVN" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
/area/lv624/ground/jungle/south_central_jungle)
+"xWy" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 1
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/central_caves)
"xXB" = (
/obj/structure/flora/bush/ausbushes/var3/sunnybush,
/turf/open/gm/grass/grass1,
@@ -23830,6 +23825,12 @@
/obj/structure/flora/jungle/vines/light_2,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_central_jungle)
+"xYD" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 9
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_west_caves)
"xZE" = (
/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall,
/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall,
@@ -23852,33 +23853,20 @@
icon_state = "white"
},
/area/lv624/lazarus/corporate_dome)
-"yck" = (
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/decal/grass_overlay/grass1{
- dir = 6
- },
-/turf/open/gm/dirt,
-/area/lv624/ground/barrens/north_east_barrens)
-"ycX" = (
-/obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{
- pixel_x = 4;
- light_on = 1;
- light_range = 1;
- light_system = 1
- },
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/barrens/north_east_barrens)
-"ydo" = (
-/obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node,
-/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest,
-/obj/effect/decal/grass_overlay/grass1/inner,
-/turf/open/gm/dirt,
-/area/lv624/ground/caves/east_caves)
"ydp" = (
/obj/structure/flora/bush/ausbushes/pointybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/barrens/south_eastern_jungle_barrens)
+"ydz" = (
+/obj/structure/blocker/forcefield/multitile_vehicles,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
+"yfe" = (
+/obj/effect/decal/grass_overlay/grass1{
+ dir = 8
+ },
+/turf/open/gm/dirt,
+/area/lv624/ground/caves/south_east_caves)
"yfH" = (
/turf/open/shuttle{
icon_state = "floor4"
@@ -23895,19 +23883,9 @@
/obj/structure/surface/rack,
/turf/open/floor/greengrid,
/area/lv624/lazarus/secure_storage)
-"ygB" = (
-/obj/structure/surface/table,
-/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/lv624/lazarus/research)
"yhd" = (
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
/area/lv624/ground/caves/sand_temple)
-"yhj" = (
-/turf/open/auto_turf/strata_grass/layer1,
-/area/lv624/ground/caves/south_west_caves)
"yhH" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -23918,6 +23896,11 @@
icon_state = "warning"
},
/area/lv624/lazarus/landing_zones/lz2)
+"yhT" = (
+/turf/open/gm/dirt{
+ icon_state = "desert2"
+ },
+/area/lv624/ground/caves/west_caves)
"yhY" = (
/obj/structure/inflatable/door,
/turf/open/gm/dirt,
@@ -23940,6 +23923,10 @@
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east,
/area/lv624/ground/colony/west_tcomms_road)
+"yjs" = (
+/obj/structure/flora/bush/ausbushes/pointybush,
+/turf/open/auto_turf/strata_grass/layer1,
+/area/lv624/ground/caves/central_caves)
"yjN" = (
/obj/structure/flora/jungle/vines/heavy,
/obj/structure/machinery/door/airlock/sandstone/runed/destroyable{
@@ -25203,7 +25190,7 @@ mdQ
mdQ
gwP
gwP
-tAs
+yhT
mdQ
mdQ
mdQ
@@ -25655,10 +25642,10 @@ gwP
gwP
gwP
tOS
-bac
-pbT
-pbT
-rxr
+vle
+qdx
+qdx
+hyF
gwP
gwP
gwP
@@ -25881,18 +25868,18 @@ gwP
gwP
gwP
gwP
-bac
-pbT
-hVr
-piZ
-syY
-vYC
-epJ
+vle
+qdx
+cHW
+dOA
+dmT
+grW
+xKL
gwP
-tAs
+yhT
tOS
gwP
-xUk
+ptm
gwP
gwP
gwP
@@ -26104,19 +26091,19 @@ mdQ
mdQ
mdQ
gwP
-xUk
+ptm
gwP
-vLh
+tnY
tOS
gwP
-gzz
-cGg
-syY
-syY
-oVE
-dUm
-vYC
-epJ
+wQK
+cQB
+dmT
+dmT
+rmW
+ndk
+grW
+xKL
gwP
gwP
gwP
@@ -26152,7 +26139,7 @@ amy
ane
ane
ane
-fFq
+krs
ahF
ane
ane
@@ -26337,14 +26324,14 @@ gwP
gwP
gwP
gwP
-gzz
+wQK
mdQ
mdQ
onU
onU
-swN
-syY
-hIn
+owe
+dmT
+uRe
gwP
gwP
gwP
@@ -26372,7 +26359,7 @@ nBh
afV
ahF
ahF
-olP
+aYI
ahF
ahF
ahF
@@ -26562,23 +26549,23 @@ gwP
gwP
gwP
gwP
-bac
-pbT
-pbT
+vle
+qdx
+qdx
mdQ
mdQ
mdQ
onU
onU
mdQ
-syY
-tGH
+dmT
+igN
gwP
gwP
mdQ
gwP
gwP
-tAs
+yhT
gwP
gwP
gwP
@@ -26789,9 +26776,9 @@ mdQ
gwP
gwP
tOS
-bac
-dyk
-syY
+vle
+amI
+dmT
mdQ
mdQ
onU
@@ -26799,8 +26786,8 @@ onU
onU
mdQ
mdQ
-tWt
-dtc
+bcb
+wHh
gwP
gwP
mdQ
@@ -26837,7 +26824,7 @@ ahF
ahF
ahF
ahF
-rgp
+cCP
ahF
ane
ane
@@ -27017,8 +27004,8 @@ gwP
gwP
gwP
gwP
-gzz
-syY
+wQK
+dmT
mdQ
mdQ
onU
@@ -27241,13 +27228,13 @@ mdQ
mdQ
mdQ
mdQ
-dDK
+ofg
gwP
gwP
gwP
-gzz
-syY
-pwE
+wQK
+dmT
+fRU
onU
onU
onU
@@ -27256,7 +27243,7 @@ mdQ
gwP
gwP
gwP
-xUk
+ptm
gwP
gwP
mdQ
@@ -27275,8 +27262,8 @@ afV
afV
afV
afV
-heL
-olP
+hRy
+aYI
ahF
afV
afV
@@ -27469,18 +27456,18 @@ gwP
mdQ
mdQ
gwP
-xUk
+ptm
gwP
gwP
gwP
-gzz
-syY
-syY
-fwa
-ewQ
+wQK
+dmT
+dmT
+nRA
+htV
onU
mdQ
-hIn
+uRe
gwP
gwP
gwP
@@ -27501,7 +27488,7 @@ ahF
ahF
ahF
ahF
-olP
+aYI
ahF
ahF
ahF
@@ -27512,7 +27499,7 @@ ahF
ahF
ahF
ahF
-fFq
+krs
ahF
ane
ane
@@ -27696,19 +27683,19 @@ gwP
gwP
mdQ
mdQ
-csJ
+lav
gwP
gwP
-dDK
+ofg
gwP
-iWG
-adb
-elz
-syY
-syY
-syY
-qxX
-hIn
+hjo
+gvm
+qJE
+dmT
+dmT
+dmT
+fLh
+uRe
gwP
tOS
gwP
@@ -27735,7 +27722,7 @@ ahF
ahF
ahF
ahF
-ckm
+fDT
ahF
ahF
ahF
@@ -27931,12 +27918,12 @@ gwP
gwP
gwP
gwP
-iWG
-elz
-oZw
-lgq
-hzV
-dtc
+hjo
+qJE
+tlk
+gRk
+owZ
+wHh
gwP
gwP
gwP
@@ -27961,7 +27948,7 @@ ahF
ahF
ahF
ahF
-fFq
+krs
ahF
ahF
ahH
@@ -27969,14 +27956,14 @@ ahF
ahF
ahF
ahF
-rgp
+cCP
ahF
ane
-ckm
+fDT
ahF
ahF
ahF
-olP
+aYI
ahF
ahF
ane
@@ -28152,7 +28139,7 @@ gwP
gwP
gwP
aca
-xUk
+ptm
gwP
gwP
gwP
@@ -28160,13 +28147,13 @@ gwP
gwP
gwP
gwP
-iWG
-oGw
-oGw
-dtc
+hjo
+qhl
+qhl
+wHh
gwP
-xUk
-tAs
+ptm
+yhT
gwP
mdQ
mdQ
@@ -28185,10 +28172,10 @@ ahF
ahF
ahV
ahF
-nzC
-wxa
-wxa
-jXx
+xYD
+gTj
+gTj
+nys
ahF
ahF
ahF
@@ -28411,13 +28398,13 @@ ane
ane
ahF
ahF
-nzC
-bUA
-vsq
-xac
-yhj
-pHe
-jXx
+xYD
+hmq
+lYt
+chi
+fmW
+rHV
+nys
ePu
ahF
ahF
@@ -28432,9 +28419,9 @@ ane
ahF
ahF
ahF
-heL
-heL
-ckm
+hRy
+hRy
+fDT
afV
ane
ane
@@ -28579,7 +28566,7 @@ mdQ
mdQ
mdQ
mdQ
-hIn
+uRe
gwP
gwP
gwP
@@ -28638,19 +28625,19 @@ ane
ane
ane
ane
-nzC
-vsq
-yhj
-yhj
+xYD
+lYt
+fmW
+fmW
uWJ
-leZ
-yhj
-pHe
-jXx
+ilF
+fmW
+rHV
+nys
ahF
ahF
ahF
-olP
+aYI
ahF
ahH
ahF
@@ -28766,9 +28753,9 @@ abB
abB
abB
abN
-phM
-spX
-vYu
+pSe
+kzn
+tcF
amk
amk
amk
@@ -28777,7 +28764,7 @@ abM
abM
abM
abM
-voJ
+qVh
abN
abN
abN
@@ -28805,9 +28792,9 @@ amk
onU
onU
mdQ
-lgq
-syY
-hIn
+gRk
+dmT
+uRe
gwP
gwP
gwP
@@ -28866,16 +28853,16 @@ ane
ane
ane
ahF
-pYx
-xwG
-yhj
+wAF
+aIE
+fmW
uWJ
uWJ
uWJ
-yhj
-yhj
-lft
-jXx
+fmW
+fmW
+vGj
+nys
ahF
ahF
ahF
@@ -28995,17 +28982,17 @@ abB
tgL
abN
abN
-qUj
-kIO
-mmU
+lTv
+pLv
+sBY
amk
amk
amk
amk
amk
abM
-bWe
-voJ
+qiL
+qVh
abQ
abN
abN
@@ -29026,16 +29013,16 @@ abN
abN
abN
abN
-kkX
-mDq
-hlu
-mmU
+cMG
+waw
+cWs
+sBY
onU
onU
onU
-eGm
-bQZ
-hIn
+lKl
+tRM
+uRe
gwP
gwP
gwP
@@ -29050,11 +29037,11 @@ gwP
gwP
gwP
gwP
-bac
-llO
-llO
-llO
-epJ
+vle
+jvQ
+jvQ
+jvQ
+xKL
gwP
gwP
gwP
@@ -29094,20 +29081,20 @@ ane
ane
ahF
ahF
-pYx
-yhj
+wAF
+fmW
uWJ
uWJ
uWJ
-rCC
-yhj
-yhj
-yhj
-pHe
-nVx
-jXx
+eoW
+fmW
+fmW
+fmW
+rHV
+vXP
+nys
ahF
-olP
+aYI
ahF
ahF
ahF
@@ -29223,17 +29210,17 @@ abN
abN
abN
abN
-phM
-spX
-mmU
-mmU
-mmU
+pSe
+kzn
+sBY
+sBY
+sBY
amk
amk
-nCr
-rfj
-mmU
-voJ
+gnt
+qVN
+sBY
+qVh
abN
abN
abN
@@ -29253,17 +29240,17 @@ abN
abN
abN
abQ
-kkX
-mDq
-mmU
-mmU
-mmU
-tIS
-tjg
-syY
-syY
-hzV
-dtc
+cMG
+waw
+sBY
+sBY
+sBY
+iGf
+dKl
+dmT
+dmT
+owZ
+wHh
gwP
gwP
gwP
@@ -29276,14 +29263,14 @@ gwP
aYC
gwP
gwP
-bac
-llO
-mjW
-lgq
-rrX
-syY
-vYC
-epJ
+vle
+jvQ
+pkU
+gRk
+lLK
+dmT
+grW
+xKL
gwP
gwP
gwP
@@ -29322,18 +29309,18 @@ ane
ahF
ahF
ahF
-soY
-tes
-nWB
-yhj
-yhj
-yhj
-yhj
-yhj
-yhj
-yhj
-yhj
-pHe
+doe
+pIl
+eZg
+fmW
+fmW
+fmW
+fmW
+fmW
+fmW
+fmW
+fmW
+rHV
ahF
ahF
ane
@@ -29452,16 +29439,16 @@ abN
abN
abN
abN
-daN
-spX
-vOe
-mmU
-mmU
-bqV
-mmU
-mmU
-pME
-swT
+bak
+kzn
+iXX
+sBY
+sBY
+iNJ
+sBY
+sBY
+frV
+klD
abN
abN
abN
@@ -29480,17 +29467,17 @@ abN
abN
abN
abN
-kkX
-mDq
-mmU
-mmU
-uMU
-mmU
-tIS
-syY
-lgq
-hzV
-dtc
+cMG
+waw
+sBY
+sBY
+fTN
+sBY
+iGf
+dmT
+gRk
+owZ
+wHh
gwP
gwP
gwP
@@ -29504,15 +29491,15 @@ gwP
aca
gwP
gwP
-nOn
-xCW
-xCW
-xCW
-ewQ
-piZ
-pwE
-vYC
-epJ
+jGU
+hhs
+hhs
+hhs
+htV
+dOA
+fRU
+grW
+xKL
gwP
gwP
gwP
@@ -29548,20 +29535,20 @@ ane
ane
ane
ahF
-olP
+aYI
ahF
ahF
-soY
-tes
-pyV
-yhj
-yhj
-yhj
-xKB
-yhj
-yhj
-sby
-xac
+doe
+pIl
+uqm
+fmW
+fmW
+fmW
+ikA
+fmW
+fmW
+wty
+chi
ane
ane
ane
@@ -29574,7 +29561,7 @@ ane
ahF
ahF
ahH
-rgp
+cCP
ahF
ane
ane
@@ -29596,7 +29583,7 @@ aqS
aFm
auf
auf
-sQh
+wgs
aFm
aAl
omu
@@ -29676,19 +29663,19 @@ abN
abN
abN
abN
-fOf
-vhP
-vhP
-vhP
-arm
-phM
-nSy
-nSy
-nSy
-nSy
-nSy
-nJL
-swT
+vNs
+bdu
+bdu
+bdu
+jKc
+pSe
+jLY
+jLY
+jLY
+jLY
+jLY
+kKa
+klD
abN
abN
abN
@@ -29707,17 +29694,17 @@ abM
abB
abN
abN
-kkX
-mDq
-gUd
-fjj
-mmU
-bqV
-mmU
-tIS
-hzV
-oGw
-dtc
+cMG
+waw
+gvr
+uOu
+sBY
+iNJ
+sBY
+iGf
+owZ
+qhl
+wHh
gwP
qaE
gwP
@@ -29737,11 +29724,11 @@ mdQ
onU
onU
onU
-xCW
-xCW
-xCW
-vYC
-llO
+hhs
+hhs
+hhs
+grW
+jvQ
gwP
gwP
tOS
@@ -29780,22 +29767,22 @@ ahF
ahF
ahF
ahF
-soY
-xqa
-tes
-ufe
-yhj
-yhj
-yhj
-yhj
-bow
-kNE
+doe
+qSS
+pIl
+dWM
+fmW
+fmW
+fmW
+fmW
+sAI
+pBH
ane
ane
afV
afV
-heL
-fFq
+hRy
+krs
afV
afV
ane
@@ -29901,16 +29888,16 @@ abN
abN
abN
abN
-kkX
-vhP
-vhP
-mDq
-vYu
-mmU
-mmU
-dHg
-vhP
-arm
+cMG
+bdu
+bdu
+waw
+tcF
+sBY
+sBY
+mgi
+bdu
+jKc
abQ
abN
abN
@@ -29934,11 +29921,11 @@ abN
abN
dhD
abN
-fOf
-mDq
-mmU
-mmU
-mmU
+vNs
+waw
+sBY
+sBY
+sBY
amk
abM
abM
@@ -29967,11 +29954,11 @@ onU
onU
onU
onU
-xCW
-xCW
-xCW
-vYC
-epJ
+hhs
+hhs
+hhs
+grW
+xKL
gwP
gwP
gwP
@@ -30008,13 +29995,13 @@ ane
ane
ane
ahF
-ckm
+fDT
ahF
-pYx
-yhj
-yhj
-ojS
-yhj
+wAF
+fmW
+fmW
+snc
+fmW
uWJ
uWJ
uWJ
@@ -30022,7 +30009,7 @@ ane
ane
afV
ahF
-olP
+aYI
ahF
ahF
afV
@@ -30128,17 +30115,17 @@ abM
abN
abN
abN
-fOf
-mDq
-jXt
-mmU
-mmU
-mmU
-mmU
-kIO
-mmU
-mmU
-aHy
+vNs
+waw
+dIj
+sBY
+sBY
+sBY
+sBY
+pLv
+sBY
+sBY
+hKP
abN
abN
abN
@@ -30161,12 +30148,12 @@ abN
abN
abQ
dhD
-kkX
-mDq
-mmU
-mmU
-mmU
-mmU
+cMG
+waw
+sBY
+sBY
+sBY
+sBY
amk
amk
abM
@@ -30197,9 +30184,9 @@ onU
onU
onU
onU
-xCW
-xCW
-hIn
+hhs
+hhs
+uRe
gwP
gwP
gwP
@@ -30237,12 +30224,12 @@ afV
afV
afV
ahF
-rgp
-pYx
-yhj
-yhj
-qjK
-pyV
+cCP
+wAF
+fmW
+fmW
+jCO
+uqm
uWJ
ane
ane
@@ -30356,17 +30343,17 @@ abM
abN
abN
abN
-jXd
-mmU
-ePP
-mmU
+vGy
+sBY
+whk
+sBY
amk
amk
amk
amk
-mmU
-mmU
-aHy
+sBY
+sBY
+hKP
abN
abN
abN
@@ -30389,11 +30376,11 @@ abN
abN
abN
dhD
-jXd
-mmU
-mmU
-nCr
-mmU
+vGy
+sBY
+sBY
+gnt
+sBY
amk
amk
amk
@@ -30461,14 +30448,14 @@ ahF
ahF
ahF
ahF
-rgp
+cCP
ahF
afJ
-nzC
-nVx
-vsq
-cNK
-yhj
+xYD
+vXP
+lYt
+dIu
+fmW
ane
ane
ane
@@ -30481,7 +30468,7 @@ ahF
ahF
ahF
ahF
-rgp
+cCP
ahF
ahF
ahF
@@ -30584,7 +30571,7 @@ abN
abN
abN
abN
-jXd
+vGy
abM
abM
amk
@@ -30617,10 +30604,10 @@ abN
abN
abN
dhD
-jXd
-rfj
-mmU
-eqe
+vGy
+qVN
+sBY
+ksc
amk
amk
amk
@@ -30683,7 +30670,7 @@ acp
ane
ane
ahF
-ckm
+fDT
ahF
ahF
ahH
@@ -30692,10 +30679,10 @@ ahF
ahF
ahF
afJ
-pYx
-yhj
-yhj
-yhj
+wAF
+fmW
+fmW
+fmW
ane
ane
ane
@@ -30811,8 +30798,8 @@ abM
abN
abN
abN
-kkX
-mDq
+cMG
+waw
abM
abM
abM
@@ -30915,13 +30902,13 @@ ahF
ahF
ahF
ahF
-wxa
-wxa
-wxa
-jXx
+gTj
+gTj
+gTj
+nys
afV
-pYx
-dou
+wAF
+tQU
uWJ
uWJ
ane
@@ -30938,7 +30925,7 @@ ahF
ahF
ahF
ahF
-fFq
+krs
ahF
ahF
ahF
@@ -31010,8 +30997,8 @@ aTf
aTf
aTf
aTf
-qhr
-tGt
+sRg
+rxk
aUj
aTf
aTf
@@ -31038,9 +31025,9 @@ abM
abN
abN
abQ
-kkX
-mDq
-vYu
+cMG
+waw
+tcF
abM
abM
abM
@@ -31142,11 +31129,11 @@ afV
ahF
isF
ahF
-vsq
-yhj
-tJU
-yhj
-hkW
+lYt
+fmW
+gos
+fmW
+lWl
afV
afV
uWJ
@@ -31266,8 +31253,8 @@ abM
abN
abN
abN
-jXd
-mmU
+vGy
+sBY
abM
abM
abM
@@ -31369,13 +31356,13 @@ ane
vUx
vMV
vMV
-msv
-uJr
+lUQ
+bJQ
uWJ
-fvi
-yhj
-hkW
-fFq
+nQH
+fmW
+lWl
+krs
afV
ane
ane
@@ -31389,7 +31376,7 @@ ahF
ahF
ahF
ahF
-fFq
+krs
ahF
ahV
ahF
@@ -31493,9 +31480,9 @@ abM
abM
abN
abN
-kkX
-mDq
-kIO
+cMG
+waw
+pLv
abM
abM
abM
@@ -31597,12 +31584,12 @@ ane
afV
ahF
ahF
-pYx
-yhj
+wAF
+fmW
uWJ
-cNK
-yhj
-hkW
+dIu
+fmW
+lWl
ahF
afV
afV
@@ -31613,7 +31600,7 @@ afV
ahF
ahF
ahF
-ckm
+fDT
ahF
ahH
ahF
@@ -31623,7 +31610,7 @@ ahF
ahF
ahF
ahF
-olP
+aYI
ahF
ane
ane
@@ -31720,9 +31707,9 @@ abM
abM
abN
abN
-kkX
-mDq
-mmU
+cMG
+waw
+sBY
amk
abM
abM
@@ -31825,16 +31812,16 @@ ane
ane
ahF
ahF
-rPw
-yhj
+thI
+fmW
uWJ
uWJ
-aok
-hkW
-olP
+dOb
+lWl
+aYI
ahF
ahF
-fFq
+krs
ahF
ahF
ahF
@@ -31948,9 +31935,9 @@ abM
abM
abN
abN
-jXd
-uMU
-cfR
+vGy
+fTN
+sLT
amk
amk
abM
@@ -32051,20 +32038,20 @@ acp
ane
ane
ane
-fFq
+krs
ahF
-pYx
-yhj
+wAF
+fmW
uWJ
uWJ
-ghC
-nTz
-jXx
+kzw
+kyt
+nys
ahF
ahF
ahF
ahF
-fFq
+krs
ahF
ahF
ahF
@@ -32149,7 +32136,7 @@ aTf
aUj
aUQ
aUQ
-dSH
+cuu
aUQ
aWU
aUQ
@@ -32176,8 +32163,8 @@ abM
abN
abN
abN
-jMG
-mmU
+xhc
+sBY
amk
amk
amk
@@ -32281,14 +32268,14 @@ ane
ane
ahF
ahF
-pYx
-fpk
-oAt
+wAF
+tOV
+fKc
uWJ
-qjK
-yhj
-pHe
-jXx
+jCO
+fmW
+rHV
+nys
ahF
ahF
ahF
@@ -32296,7 +32283,7 @@ ahF
ahF
ahF
ahF
-fFq
+krs
ahF
ahF
ahF
@@ -32404,8 +32391,8 @@ abM
abN
abN
abN
-jXd
-mmU
+vGy
+sBY
amk
amk
abM
@@ -32509,17 +32496,17 @@ afV
afV
ahF
ahF
-soY
-tes
-yhj
+doe
+pIl
+fmW
uWJ
ane
uWJ
-yhj
-eII
+fmW
+qSG
ahF
ahF
-rgp
+cCP
ahF
ahH
ahF
@@ -32603,7 +32590,7 @@ aXh
aTf
aTf
aTf
-jvy
+thG
aUQ
aWa
aUQ
@@ -32632,9 +32619,9 @@ abM
abN
abN
abN
-jXd
-mmU
-uYx
+vGy
+sBY
+bPE
amk
abM
abM
@@ -32734,18 +32721,18 @@ acp
ane
ane
ahF
-rgp
+cCP
ahF
ahF
ahF
-gFC
-xac
+wYz
+chi
uWJ
ane
uWJ
-yhj
-pHe
-jXx
+fmW
+rHV
+nys
ahF
ahF
ahF
@@ -32860,11 +32847,11 @@ abM
abN
abN
abN
-phM
-spX
-mmU
-afT
-fRt
+pSe
+kzn
+sBY
+dBS
+stt
abM
abM
abM
@@ -32935,8 +32922,8 @@ mdQ
mdQ
mdQ
mdQ
-pbT
-epJ
+qdx
+xKL
gwP
gwP
gwP
@@ -32967,14 +32954,14 @@ ane
ane
ahF
ahF
-tes
+pIl
ane
ane
uWJ
-fpk
-yhj
-pHe
-jXx
+tOV
+fmW
+rHV
+nys
ahF
ahF
ahF
@@ -33061,10 +33048,10 @@ aTf
aTf
aTf
aUQ
-aWb
aUQ
aUQ
aUQ
+eCY
aUQ
aUQ
aTf
@@ -33089,12 +33076,12 @@ abM
abN
abN
abN
-daN
-spX
-vus
-fRt
-fRt
-fRt
+bak
+kzn
+qYS
+stt
+stt
+stt
abM
abM
abM
@@ -33162,9 +33149,9 @@ mdQ
mdQ
mdQ
mdQ
-oZw
-syY
-hIn
+tlk
+dmT
+uRe
gwP
gwP
acS
@@ -33195,16 +33182,16 @@ ane
ane
ane
ahF
-soY
-tes
-yhj
+doe
+pIl
+fmW
uWJ
uWJ
ane
-nWB
-pHe
-wxa
-jXx
+eZg
+rHV
+gTj
+nys
isF
ahF
ahF
@@ -33290,11 +33277,11 @@ aTf
aTf
aTf
aTf
-aWu
-aWu
-aWu
-aTf
-aTf
+qhn
+msU
+qhn
+msU
+eCY
aTf
aTf
aXh
@@ -33318,12 +33305,12 @@ abM
abN
abN
abN
-phM
-nSy
-nSy
-nSy
-nSy
-pjw
+pSe
+jLY
+jLY
+jLY
+jLY
+qrH
abM
abM
abM
@@ -33391,8 +33378,8 @@ mdQ
mdQ
mdQ
mdQ
-syY
-tGH
+dmT
+igN
gwP
gwP
gwP
@@ -33424,20 +33411,20 @@ ane
ane
ahF
ahF
-soY
-tes
-jVW
+doe
+pIl
+fcQ
uWJ
ane
ane
-yhj
-yhj
-hkW
+fmW
+fmW
+lWl
ahF
ahF
ahF
ahF
-fFq
+krs
ahF
ahF
ahF
@@ -33517,14 +33504,14 @@ aXh
efp
aTf
aTf
-aWc
-aUQ
-aUQ
-aUQ
-aTf
-aTf
-aTf
-cWm
+laM
+qhn
+qhn
+eCY
+qhn
+qhn
+msU
+vhz
aXh
aXh
aKb
@@ -33618,9 +33605,9 @@ mdQ
mdQ
mdQ
onU
-syY
-syY
-hIn
+dmT
+dmT
+uRe
gwP
gwP
gwP
@@ -33646,26 +33633,26 @@ mdQ
ane
afV
ahF
-olP
-fFq
+aYI
+krs
ahF
ahF
ahF
ahF
ahF
-gFC
-yhj
-yhj
+wYz
+fmW
+fmW
uWJ
uWJ
uWJ
-yhj
-hkW
+fmW
+lWl
ahF
-heL
-heL
-heL
-heL
+hRy
+hRy
+hRy
+hRy
ahF
ahF
ahF
@@ -33746,13 +33733,13 @@ efp
efp
aTf
aTf
-aWv
-aWv
-aWv
-aTf
-aXh
-aXh
-aXh
+msU
+dpl
+dpl
+msU
+xTT
+xTT
+pig
qGH
aLj
aXk
@@ -33846,9 +33833,9 @@ mdQ
mdQ
onU
onU
-syY
-syY
-pxO
+dmT
+dmT
+kVG
sMx
gwP
gwP
@@ -33879,16 +33866,16 @@ ahF
ahF
ahF
ahF
-ckm
+fDT
ahF
ahF
-tes
-yhj
+pIl
+fmW
uWJ
uWJ
-ftW
-yhj
-hkW
+wHE
+fmW
+lWl
ahF
ahF
ahF
@@ -33977,10 +33964,10 @@ uSq
qIO
qIO
qIO
-ntL
-mnK
-kxI
-wkP
+qIO
+nAD
+qtj
+bRk
knp
iIU
kZw
@@ -34074,9 +34061,9 @@ mdQ
mdQ
onU
onU
-syY
-oso
-pxO
+dmT
+xHW
+kVG
sMx
gwP
gwP
@@ -34110,13 +34097,13 @@ ahF
ahF
ahF
ahF
-gFC
-gBz
+wYz
+sgU
uWJ
ane
-fOA
-bRP
-lQx
+xBO
+lWh
+dYx
ahF
ahH
ahF
@@ -34205,10 +34192,10 @@ uSq
njC
qIO
qIO
-ntL
-kxI
-tsa
-kxI
+qIO
+qtj
+qtj
+hZX
rox
wqz
kZw
@@ -34301,10 +34288,10 @@ mdQ
mdQ
mdQ
onU
-eGm
-syY
-syY
-hIn
+lKl
+dmT
+dmT
+uRe
gwP
gwP
gwP
@@ -34333,17 +34320,17 @@ ahF
ane
ane
ane
-heL
-heL
-heL
+hRy
+hRy
+hRy
ahF
ahF
-soY
-tes
+doe
+pIl
ane
ane
-bRP
-lQx
+lWh
+dYx
ahH
ahF
ahF
@@ -34434,9 +34421,9 @@ hDX
qIO
qIO
aXH
-kxI
-gGd
-kxI
+vuv
+gKw
+hGN
kxI
wbK
rHp
@@ -34524,15 +34511,15 @@ mdQ
mdQ
onU
onU
-pZR
-xpC
+ieN
+kWV
xZE
-cCn
-xCW
-dUm
-syY
-syY
-hIn
+xyH
+hhs
+ndk
+dmT
+dmT
+uRe
tOS
gwP
sMx
@@ -34561,7 +34548,7 @@ ahF
ahF
ane
ane
-fFq
+krs
afV
afV
afV
@@ -34748,19 +34735,19 @@ mdQ
mdQ
mdQ
mdQ
-nOn
-dUm
+jGU
+ndk
onU
-syY
-syY
-xpC
+dmT
+dmT
+kWV
gwP
-iWG
-cJS
-oGw
-jYL
-oGw
-dtc
+hjo
+qtK
+qhl
+clO
+qhl
+wHh
gwP
gwP
sMx
@@ -34789,20 +34776,20 @@ ahF
ahF
ane
ane
-rgp
+cCP
afV
ahF
ahF
ahF
ahF
ane
-olP
+aYI
ahF
ahF
ane
ahF
-olP
-ckm
+aYI
+fDT
ahF
ane
ane
@@ -34976,20 +34963,20 @@ gwP
mdQ
gwP
gwP
-nOn
-syY
-tIS
-syY
-hzV
-dtc
+jGU
+dmT
+iGf
+dmT
+owZ
+wHh
tOS
gwP
aca
gwP
gwP
-bac
-pbT
-epJ
+vle
+qdx
+xKL
gwP
gwP
gwP
@@ -35104,7 +35091,7 @@ kWH
kWH
xgE
oyT
-otF
+nQJ
bzD
xgE
efp
@@ -35204,22 +35191,22 @@ gwP
gwP
gwP
gwP
-iWG
-afc
-dxH
-rYp
-dtc
+hjo
+kML
+ukY
+soY
+wHh
gwP
gwP
gwP
aca
-bac
-pbT
-hVr
-syY
-vYC
-pbT
-epJ
+vle
+qdx
+cHW
+dmT
+grW
+qdx
+xKL
gwP
gwP
gwP
@@ -35304,11 +35291,11 @@ axe
aCZ
ayg
avH
-gXm
+kJt
axi
axj
avH
-eJW
+bbA
aBR
aCk
ado
@@ -35442,15 +35429,15 @@ gwP
gwP
mdQ
mdQ
-xCW
-xCW
-xCW
-qxX
-syY
-vYC
+hhs
+hhs
+hhs
+fLh
+dmT
+grW
acp
acp
-epJ
+xKL
gwP
gwP
abO
@@ -35672,14 +35659,14 @@ mdQ
mdQ
onU
onU
-xCW
-xCW
-xCW
-syY
-syY
-xCW
-ifo
-epJ
+hhs
+hhs
+hhs
+dmT
+dmT
+hhs
+eft
+xKL
gwP
oMZ
oMZ
@@ -35901,15 +35888,15 @@ mdQ
mdQ
onU
onU
-eZU
-syY
-syY
-vfk
-syY
-xCW
-txZ
-wPP
-gBA
+acK
+dmT
+dmT
+kCD
+dmT
+hhs
+soz
+jqr
+dFz
oMZ
aca
aca
@@ -36006,14 +35993,14 @@ aDv
aDv
xgE
vvE
-idu
+iLU
qTM
nIs
xgE
epG
nrb
wKv
-quw
+kdR
mBN
xgE
mwB
@@ -36130,15 +36117,15 @@ mdQ
mdQ
onU
onU
-ewQ
-syY
-syY
-syY
-llh
-xVM
-xVM
-lZU
-wRy
+htV
+dmT
+dmT
+dmT
+sNq
+rTT
+rTT
+nLF
+rbs
eGD
eGD
eGD
@@ -36362,11 +36349,11 @@ onU
onU
onU
onU
-xCW
-xVM
-gUm
-vPU
-nde
+hhs
+rTT
+aIA
+lhH
+lkq
eGD
eGD
eGD
@@ -36592,10 +36579,10 @@ iIB
iIB
iIB
iIB
-xVM
-xVM
-lZU
-jVr
+rTT
+rTT
+nLF
+liI
eGD
eGD
ufG
@@ -36820,10 +36807,10 @@ abS
iIB
iIB
iIB
-xVM
-wDE
-fKj
-fwF
+rTT
+dAu
+hkT
+shb
eGD
eGD
eGD
@@ -37011,8 +36998,8 @@ mdQ
mdQ
mdQ
mdQ
-wPP
-emk
+jqr
+sxl
xZE
acp
acu
@@ -37048,10 +37035,10 @@ abS
abS
iIB
iIB
-pHF
-xVM
-oWF
-cxT
+rmt
+rTT
+tde
+vtk
eGD
acq
eGD
@@ -37148,7 +37135,7 @@ laY
xEt
xgE
xgE
-ruL
+iSQ
hhv
mVn
paJ
@@ -37239,8 +37226,8 @@ mdQ
mdQ
mdQ
mdQ
-qxX
-hIn
+fLh
+uRe
acp
acu
acu
@@ -37276,9 +37263,9 @@ abS
abS
abS
iIB
-xVM
-xVM
-sXd
+rTT
+rTT
+onP
ufG
eGD
eGD
@@ -37467,8 +37454,8 @@ mdQ
mdQ
mdQ
onU
-lgq
-hIn
+gRk
+uRe
acu
acu
acu
@@ -37504,9 +37491,9 @@ abS
abS
abS
abS
-jjU
-oWF
-nYm
+wzI
+tde
+uwG
eGD
eGD
eGD
@@ -37582,11 +37569,11 @@ psh
ado
axe
axf
-fBW
+sNX
avH
aze
azI
-baF
+kSK
avH
aHc
axf
@@ -37612,7 +37599,7 @@ gnx
tWw
xeq
xgE
-omY
+tNV
pnl
xgE
cPV
@@ -37695,8 +37682,8 @@ mdQ
mdQ
onU
onU
-syY
-hIn
+dmT
+uRe
acp
acu
acy
@@ -37732,8 +37719,8 @@ abS
ady
ady
ady
-oWF
-nYm
+tde
+uwG
ufG
hzR
eGD
@@ -37830,7 +37817,7 @@ wMk
qGK
xEt
xgE
-rcN
+dSx
uGM
gnx
joz
@@ -37923,8 +37910,8 @@ acf
onU
onU
onU
-syY
-vYC
+dmT
+grW
xZE
acp
acu
@@ -37959,8 +37946,8 @@ abS
abS
ady
eGD
-tvV
-nYm
+fqi
+uwG
eGD
ufG
hzR
@@ -38068,7 +38055,7 @@ pox
tWw
anJ
cen
-jfe
+sxN
oYx
wMk
wMk
@@ -38151,8 +38138,8 @@ acf
onU
onU
onU
-piZ
-syY
+dOA
+dmT
xZE
xZE
acp
@@ -38379,10 +38366,10 @@ acf
mdQ
onU
mdQ
-ewQ
-syY
-vYC
-epJ
+htV
+dmT
+grW
+xKL
xZE
xZE
xZE
@@ -38420,11 +38407,11 @@ adP
eGD
acq
eGD
-rne
-waS
-wbV
-waS
-wRy
+bje
+gVw
+vih
+gVw
+rbs
eGD
eGD
eGD
@@ -38514,7 +38501,7 @@ xEt
bbU
mfI
xgE
-nbL
+wIw
cLD
ocG
rMR
@@ -38607,10 +38594,10 @@ acf
mdQ
mdQ
mdQ
-jSX
-syY
-cGg
-hIn
+iGx
+dmT
+cQB
+uRe
gwP
gwP
gwP
@@ -38646,14 +38633,14 @@ eGD
adP
adP
adP
-rne
-waS
-llc
-xVM
-qpj
-xVM
-lZU
-wRy
+bje
+gVw
+tMQ
+rTT
+mJF
+rTT
+nLF
+rbs
eGD
ady
ady
@@ -38743,7 +38730,7 @@ wMk
laY
xgE
xgE
-pZI
+cZN
cOz
ybQ
gnx
@@ -38835,14 +38822,14 @@ acf
acf
mdQ
mdQ
-xCW
-xCW
-lkX
-wGg
-llO
-wad
-llO
-epJ
+hhs
+hhs
+uaL
+iuf
+jvQ
+abH
+jvQ
+xKL
gwP
gwP
gwP
@@ -38873,15 +38860,15 @@ eGD
eGD
eGD
adP
-lcu
-wIe
-xVM
-eHW
-xVM
-xGO
-xVM
-cHU
-sXd
+daY
+tPH
+rTT
+pIB
+rTT
+hpK
+rTT
+ohf
+onP
eGD
ady
abS
@@ -38973,7 +38960,7 @@ xEt
xgE
xgE
jYM
-irS
+mMA
xfP
paJ
xkU
@@ -39064,15 +39051,15 @@ acf
acf
mdQ
mdQ
-xCW
-xCW
-xCW
-xCW
-syY
-syY
-vYC
-llO
-epJ
+hhs
+hhs
+hhs
+hhs
+dmT
+dmT
+grW
+jvQ
+xKL
gwP
gwP
gwP
@@ -39101,15 +39088,15 @@ acq
eGD
eGD
eGD
-tEJ
-veh
-gTE
-xVM
+sVx
+iDX
+kdj
+rTT
iIB
iIB
iIB
-lAx
-sXd
+uOD
+onP
abS
abS
abS
@@ -39297,10 +39284,10 @@ mdQ
onU
onU
onU
-ohM
-syY
-oZw
-hIn
+sXg
+dmT
+tlk
+uRe
gwP
acf
acf
@@ -39328,10 +39315,10 @@ eGD
eGD
eGD
eGD
-rne
-llc
-xVM
-xVM
+bje
+tMQ
+rTT
+rTT
iIB
iIB
abS
@@ -39527,8 +39514,8 @@ uxU
uxU
uxU
uxU
-fEG
-eUS
+ryp
+vbK
dGQ
acf
acf
@@ -39556,7 +39543,7 @@ eGD
adc
eGD
eGD
-tvV
+fqi
abS
iIB
iIB
@@ -39751,12 +39738,12 @@ acf
acf
acf
acf
-rpF
-okr
-rpF
-bjA
-rpF
-fRD
+fDE
+pAE
+fDE
+vAB
+fDE
+nUZ
abl
acf
acf
@@ -39976,15 +39963,15 @@ acf
acf
acf
acf
-okr
-rpF
-rpF
-hZb
-ixc
-xlX
-xlX
-xlX
-gVL
+pAE
+fDE
+fDE
+sPK
+ogJ
+scs
+scs
+scs
+jgy
abl
abl
abl
@@ -40203,12 +40190,12 @@ acf
izh
izh
izh
-pin
-xlX
-cmR
-xlX
-xlX
-gVL
+ejp
+scs
+rIc
+scs
+scs
+jgy
abl
abl
abl
@@ -40309,7 +40296,7 @@ psh
oBi
bnE
atn
-ptZ
+gEX
aum
azS
atU
@@ -40317,7 +40304,7 @@ avD
awk
auX
atU
-ygB
+qwC
ayp
axF
asU
@@ -40457,10 +40444,10 @@ abS
abS
eGD
eGD
-rne
-waS
-waS
-wRy
+bje
+gVw
+gVw
+rbs
eGD
acO
eGD
@@ -40683,13 +40670,13 @@ abl
abl
abl
dGQ
-rne
-waS
-olB
-xVM
-xVM
-lZU
-wRy
+bje
+gVw
+lbt
+rTT
+rTT
+nLF
+rbs
acO
eGD
acq
@@ -40812,7 +40799,7 @@ aQn
aQn
aQn
aTg
-bjM
+qbF
aQn
aQn
aON
@@ -40911,13 +40898,13 @@ abl
abl
abl
dGQ
-uVQ
-bQh
-xVM
-eFL
-xVM
-xVM
-sXd
+wbg
+xdb
+rTT
+mca
+rTT
+rTT
+onP
acO
eGD
eGD
@@ -41139,13 +41126,13 @@ abl
abl
abl
dGQ
-uVQ
-xVM
-xVM
+wbg
+rTT
+rTT
iIB
iIB
abS
-sXd
+onP
acO
eGD
eGD
@@ -41210,9 +41197,9 @@ oSJ
anF
anF
apx
-chb
+koW
nYZ
-sKp
+bzv
txL
tIg
nSg
@@ -41220,14 +41207,14 @@ opP
udP
udP
asU
-bAc
-bAc
+vev
+vev
aum
auV
atU
avE
atp
-wAe
+awr
atU
axH
aum
@@ -41433,7 +41420,7 @@ tyG
tyG
tyG
anS
-aQW
+iYo
aoE
pOW
anF
@@ -41728,7 +41715,7 @@ aQn
aQn
aQn
aQn
-oau
+jtM
aPT
kxI
kxI
@@ -42063,8 +42050,8 @@ abS
abS
abS
abS
-waS
-kbE
+gVw
+jpX
eGD
abS
abS
@@ -42133,7 +42120,7 @@ udP
udP
udP
atn
-bAc
+vev
aum
auX
asT
@@ -42141,7 +42128,7 @@ aum
atp
aum
asT
-cwE
+xMj
aum
aFV
asU
@@ -42204,7 +42191,7 @@ aaa
aac
abm
abk
-dPs
+rmB
abZ
avm
aEI
@@ -42291,8 +42278,8 @@ abS
abS
abS
abS
-eNl
-gnr
+bBT
+rze
acO
abS
abS
@@ -42519,9 +42506,9 @@ abS
abS
abS
abS
-xVM
-lZU
-wRy
+rTT
+nLF
+rbs
eGD
eGD
abS
@@ -42589,7 +42576,7 @@ udP
udP
udP
asU
-tCW
+odD
aum
auY
asT
@@ -42597,8 +42584,8 @@ aAR
awq
atq
asT
-oxz
-bAc
+cPL
+vev
ryJ
asU
aJr
@@ -42746,10 +42733,10 @@ abS
abS
abS
iIB
-xVM
-gTE
-xVM
-sXd
+rTT
+kdj
+rTT
+onP
eGD
eGD
abS
@@ -42821,7 +42808,7 @@ atO
atO
atO
asT
-lfq
+aSR
awr
auX
asT
@@ -42974,10 +42961,10 @@ abS
abS
iIB
iIB
-xVM
-xVM
-xVM
-sXd
+rTT
+rTT
+rTT
+onP
eGD
eGD
abS
@@ -43038,7 +43025,7 @@ pwq
pwq
aoI
hZg
-rCk
+oCP
nSg
opP
udP
@@ -43202,10 +43189,10 @@ abS
iIB
iIB
iIB
-eFL
-xVM
-oWF
-nYm
+mca
+rTT
+tde
+uwG
eGD
eGD
abS
@@ -43257,14 +43244,14 @@ tyG
tyG
tyG
anS
-oPL
+wcT
aoL
anF
anF
apx
pwq
aou
-mkl
+njs
aqQ
atV
nSg
@@ -43323,7 +43310,7 @@ tem
aVd
aTM
aTq
-dQy
+dlq
aSX
aZI
aXJ
@@ -43428,11 +43415,11 @@ abS
abS
abS
iIB
-xVM
-xVM
-xVM
-xVM
-sXd
+rTT
+rTT
+rTT
+rTT
+onP
acq
eGD
eGD
@@ -43507,7 +43494,7 @@ jHN
jHN
adp
awu
-eMt
+tBx
adp
aJr
uTe
@@ -43537,7 +43524,7 @@ aKF
aLe
aLe
aMS
-dQR
+wgR
aNG
aPh
aPS
@@ -43657,11 +43644,11 @@ abS
abS
abS
abS
-xVM
-bQh
-xVM
-jYD
-wRy
+rTT
+xdb
+rTT
+acY
+rbs
eGD
eGD
abS
@@ -43884,12 +43871,12 @@ abS
abS
abS
abS
-jjU
-gUm
-xVM
-xVM
-xVM
-sXd
+wzI
+aIA
+rTT
+rTT
+rTT
+onP
eGD
eGD
abS
@@ -44114,10 +44101,10 @@ abS
abS
abS
iIB
-xVM
-xVM
-xVM
-sXd
+rTT
+rTT
+rTT
+onP
eGD
eGD
abS
@@ -44136,7 +44123,7 @@ agf
ajW
agi
ajW
-rHP
+eAu
agF
agT
ahh
@@ -44189,13 +44176,13 @@ adp
auz
atX
avu
-mqI
+mnh
atX
awR
atX
axN
auz
-lPU
+iKz
azi
atY
aLv
@@ -44343,9 +44330,9 @@ abS
abS
iIB
iIB
-xVM
-eSm
-sXd
+rTT
+uxL
+onP
eGD
abS
abS
@@ -44571,9 +44558,9 @@ abS
abS
abS
iIB
-xVM
-xVM
-sXd
+rTT
+rTT
+onP
eGD
abS
abS
@@ -44642,7 +44629,7 @@ udP
udP
udP
atw
-kvp
+toM
atX
atX
avN
@@ -44799,9 +44786,9 @@ abS
abS
abS
iIB
-xVM
-ttW
-sXd
+rTT
+cxi
+onP
eGD
abS
abS
@@ -44870,7 +44857,7 @@ udP
udP
atw
atw
-hXL
+gox
atX
atX
atX
@@ -44914,7 +44901,7 @@ aJz
aJz
aSL
aTs
-oLD
+hEc
aUt
aSX
aVF
@@ -45027,10 +45014,10 @@ abS
abS
abS
abS
-xVM
-xVM
-lZU
-wRy
+rTT
+rTT
+nLF
+rbs
eGD
abS
abS
@@ -45109,7 +45096,7 @@ atX
atX
atX
atX
-swL
+wDA
adp
mKf
mKf
@@ -45149,7 +45136,7 @@ aVG
aTM
aWG
aSX
-mIS
+fqP
aWi
aYc
aVB
@@ -45254,11 +45241,11 @@ abS
abS
abS
abS
-xVM
-xVM
-xGO
-bQh
-sXd
+rTT
+rTT
+hpK
+xdb
+onP
eGD
abS
abS
@@ -45317,7 +45304,7 @@ aoA
aoA
aoA
eBN
-fTq
+oae
arp
anT
xPk
@@ -45481,12 +45468,12 @@ abS
abS
abS
abS
-xVM
-xVM
-xVM
-xVM
-xVM
-sXd
+rTT
+rTT
+rTT
+rTT
+rTT
+onP
eGD
abS
abS
@@ -45606,7 +45593,7 @@ aTq
aWI
aSX
aXw
-feu
+oCr
aYd
aWz
kxI
@@ -45677,12 +45664,12 @@ abl
abl
abl
abl
-kWh
-iCW
-iCW
-iCW
-iCW
-iCW
+gPu
+jcn
+jcn
+jcn
+jcn
+jcn
acf
acf
acf
@@ -45709,12 +45696,12 @@ abS
abS
abS
abS
-xVM
-xVM
-bQh
-xVM
-iUn
-sXd
+rTT
+rTT
+xdb
+rTT
+lnr
+onP
eGD
abS
abS
@@ -45905,12 +45892,12 @@ abv
abl
abl
abl
-jkL
-eEp
-rpF
-qhW
-rpF
-rpF
+xWy
+cqH
+fDE
+bvX
+fDE
+fDE
acf
acf
acf
@@ -45938,11 +45925,11 @@ abS
abS
abS
abS
-xVM
-lCa
-xVM
-oWF
-nYm
+rTT
+mOL
+rTT
+tde
+uwG
eGD
abS
abS
@@ -46136,9 +46123,9 @@ abl
acf
acf
uxU
-fEG
-oJx
-fEG
+ryp
+uMz
+ryp
acf
acf
acf
@@ -46166,10 +46153,10 @@ abS
abS
abS
abS
-cHU
-xVM
-xVM
-sXd
+ohf
+rTT
+rTT
+onP
eGD
abS
abS
@@ -46365,9 +46352,9 @@ acf
acf
uxU
uxU
-rpF
-htR
-rpF
+fDE
+gcB
+fDE
acf
acf
acf
@@ -46394,10 +46381,10 @@ abS
abS
abS
iIB
-xVM
-xVM
-bQh
-sXd
+rTT
+rTT
+xdb
+onP
eGD
abS
abS
@@ -46466,7 +46453,7 @@ jRm
ppR
oqO
adp
-ust
+sxm
atX
atX
atX
@@ -46475,7 +46462,7 @@ awT
atX
axS
ayz
-bgD
+bRf
auz
adp
oUy
@@ -46593,9 +46580,9 @@ acf
acf
acf
uxU
-rpF
-ibr
-rpF
+fDE
+tti
+fDE
acf
acf
acf
@@ -46622,10 +46609,10 @@ abS
abS
iIB
iIB
-xVM
-pHF
-xVM
-sXd
+rTT
+rmt
+rTT
+onP
abS
abS
abS
@@ -46821,14 +46808,14 @@ acf
acf
acf
uxU
-rpF
-fHU
-rpF
-rpF
+fDE
+otl
+fDE
+fDE
acf
acf
uxU
-rpF
+fDE
acf
acf
acf
@@ -46838,7 +46825,7 @@ abl
abl
abv
abl
-kWh
+gPu
abS
abS
abS
@@ -46850,10 +46837,10 @@ abS
iIB
iIB
iIB
-xVM
-xVM
-xVM
-sXd
+rTT
+rTT
+rTT
+onP
abS
abS
abS
@@ -47049,16 +47036,16 @@ acf
acf
acf
acf
-rpF
-rpF
-rpF
-rpF
+fDE
+fDE
+fDE
+fDE
uxU
uxU
uxU
-pmT
-rpF
-wdp
+hez
+fDE
+spK
acf
acf
acf
@@ -47066,7 +47053,7 @@ acf
abl
abl
abl
-dve
+kxv
abS
abS
abS
@@ -47078,9 +47065,9 @@ abS
abS
iIB
iIB
-rEI
-rEI
-rpZ
+hav
+hav
+cIU
abS
abS
abS
@@ -47278,15 +47265,15 @@ acf
acf
acf
acf
-rpF
-rpF
-rpF
-rpF
+fDE
+fDE
+fDE
+fDE
uxU
uxU
-rNO
-rpF
-wdp
+rUX
+fDE
+spK
abl
acf
acf
@@ -47294,8 +47281,8 @@ acf
abl
abl
abl
-dve
-pom
+kxv
+han
abS
abS
abS
@@ -47306,9 +47293,9 @@ abS
abS
abS
abS
-uSX
-uSX
-tbZ
+aTy
+aTy
+tYW
abS
pDt
pDt
@@ -47363,7 +47350,7 @@ tyG
anT
aoC
aoR
-eBo
+vzT
aoA
aoA
aoA
@@ -47507,14 +47494,14 @@ acf
acf
acf
acf
-rpF
-rpF
-rpF
+fDE
+fDE
+fDE
uxU
-mWs
-rpF
-iXL
-gVL
+mrg
+fDE
+poX
+jgy
acf
acf
acf
@@ -47522,8 +47509,8 @@ abl
abl
abl
abl
-xzw
-qhW
+uMd
+bvX
iIB
abS
abS
@@ -47642,7 +47629,7 @@ aLk
aLT
aNM
aNM
-aOA
+jhe
aMZ
aLk
aQB
@@ -47735,13 +47722,13 @@ acf
acf
acf
acf
-mWs
-rpF
-rpF
-fHU
-fEG
-ixc
-gVL
+mrg
+fDE
+fDE
+otl
+ryp
+ogJ
+jgy
abl
acf
acf
@@ -47749,8 +47736,8 @@ acf
abl
abl
abl
-dve
-rpF
+kxv
+fDE
iIB
iIB
abS
@@ -47963,12 +47950,12 @@ acf
acf
acf
acf
-mWs
-hZb
-rpF
-rpF
-mWs
-wdp
+mrg
+sPK
+fDE
+fDE
+mrg
+spK
abl
abl
abl
@@ -47978,16 +47965,16 @@ abl
abv
abl
abl
-rDR
-siO
-eNn
-eNn
-eNn
-lAT
+uOl
+ydz
+eQL
+eQL
+eQL
+pgc
iIB
iIB
-ycX
-cnk
+bOm
+xhv
abS
pDt
pDt
@@ -48091,7 +48078,7 @@ aGH
aDy
azt
aJh
-qWM
+gmi
aKv
azt
aLl
@@ -48192,11 +48179,11 @@ acf
acf
acf
acf
-rpF
-rpF
-rpF
-mWs
-wdp
+fDE
+fDE
+fDE
+mrg
+spK
abl
abl
abl
@@ -48206,16 +48193,16 @@ abl
abl
abl
abl
-xDW
-lIq
-uSX
-iKf
-uSX
-mEY
-eNn
-eNn
-eNn
-cnk
+bnM
+lIL
+aTy
+xNi
+aTy
+bxb
+eQL
+eQL
+eQL
+xhv
pDt
pDt
pDt
@@ -48314,7 +48301,7 @@ aEE
aFl
aFP
aDy
-sEu
+iKD
aHb
aDy
aHp
@@ -48329,11 +48316,11 @@ aNc
aOD
aNc
aLl
-rvm
+gnR
aRA
aSs
aSQ
-mKA
+tUO
aQx
oUy
oaL
@@ -48421,29 +48408,29 @@ acf
acf
acf
uxU
-ibr
-rpF
-fEG
-wdp
-abl
-kWh
-iCW
-pve
-iCW
-iCW
-iCW
-iCW
-iCW
-iCW
-kLI
-pgo
+tti
+fDE
+ryp
+spK
+abl
+gPu
+jcn
+ner
+jcn
+jcn
+jcn
+jcn
+jcn
+jcn
+dLm
+kae
pDt
pDt
-oVX
-uSX
-uSX
-uSX
-tbZ
+kpx
+aTy
+aTy
+aTy
+tYW
pDt
pDt
pDt
@@ -48649,29 +48636,29 @@ acf
uxU
uxU
uxU
-rpF
-rpF
-acf
-fvs
-dIr
-xOu
-rpF
-fEG
-rpF
-rpF
-rpF
-rpF
-lvy
-rHB
-siO
-cnk
+fDE
+fDE
+acf
+xRe
+kLl
+cqN
+fDE
+ryp
+fDE
+fDE
+fDE
+fDE
+osf
+hNT
+ydz
+xhv
pDt
pDt
-eUP
-wsU
-wsU
-wsU
-bYT
+dCD
+hmJ
+hmJ
+hmJ
+enn
pDt
pDt
pDt
@@ -48780,7 +48767,7 @@ aKv
aKL
aLl
aMa
-qzQ
+rXs
aNO
aXL
aPq
@@ -48875,31 +48862,31 @@ acf
acf
uxU
uxU
-rpF
-rpF
-rpF
-rpF
+fDE
+fDE
+fDE
+fDE
acf
acf
-rpF
-qkN
-rpF
+fDE
+icd
+fDE
uxU
uxU
-rpF
-rpF
-pom
-fHU
-rpF
+fDE
+fDE
+han
+otl
+fDE
acf
-cnk
+xhv
pDt
-eUP
-fOg
-fWt
-eNn
-eNn
-cnk
+dCD
+cEi
+wpY
+eQL
+eQL
+xhv
pDt
oeN
oeN
@@ -49098,42 +49085,42 @@ abv
abl
abl
acf
-jkL
-rpF
+xWy
+fDE
acf
uxU
-rpF
-rpF
-dKT
-rpF
-rpF
+fDE
+fDE
+yjs
+fDE
+fDE
acf
acf
-rpF
-vAw
-rpF
+fDE
+cSL
+fDE
uxU
acf
acf
-rpF
-oaf
+fDE
+mVr
uxU
uxU
acf
-tbZ
+tYW
pDt
-puM
-eNn
-eNn
+crn
+eQL
+eQL
ntr
-dAv
-cnk
+hEe
+xhv
pDt
oeN
adC
adM
adM
-qGm
+scS
oeN
pDt
pDt
@@ -49220,7 +49207,7 @@ aBA
aAU
aCt
aCT
-uXP
+iqN
azP
aOF
aFo
@@ -49248,7 +49235,7 @@ aQM
aQM
aQM
aUB
-vFl
+xnt
aQM
aXV
oUy
@@ -49326,39 +49313,39 @@ abl
abl
abl
abl
-jkL
-vAw
-fEG
-rpF
-rpF
-aDk
-rpF
-rpF
+xWy
+cSL
+ryp
+fDE
+fDE
+pVZ
+fDE
+fDE
acf
acf
uxU
-rpF
-rpF
-rpF
-rpF
+fDE
+fDE
+fDE
+fDE
acf
acf
-rpF
-rpF
+fDE
+fDE
uxU
acf
acf
nbw
pDt
-puM
+crn
nbw
ntr
ntr
-tNC
-cnk
+nNu
+xhv
pDt
oeN
-adW
+pAU
adM
adM
adT
@@ -49463,7 +49450,7 @@ azt
azt
azt
aKQ
-dIQ
+lHv
aZw
aNQ
aOI
@@ -49476,7 +49463,7 @@ aZB
aSA
aTY
aUD
-sHv
+sVZ
aQM
aQM
oUy
@@ -49554,21 +49541,21 @@ abl
abl
abl
abl
-xDW
-rDR
-fEG
-rpF
-rpF
-rpF
-rpF
-ixc
-gVL
+bnM
+uOl
+ryp
+fDE
+fDE
+fDE
+fDE
+ogJ
+jgy
acf
uxU
uxU
-rpF
-ixc
-bGi
+fDE
+ogJ
+rWs
acf
acf
acf
@@ -49581,12 +49568,12 @@ nbw
nbw
nbw
nbw
-eNn
-eNn
-cnk
+eQL
+eQL
+xhv
pDt
oeN
-kIP
+cXU
adM
adM
aei
@@ -49700,7 +49687,7 @@ aLl
aQK
aYD
aYG
-iNP
+fBC
aTB
aQM
aUE
@@ -49783,19 +49770,19 @@ abl
abl
abv
abl
-xDW
-qXG
-bGi
-bGi
-bGi
-kUO
-gVL
+bnM
+oha
+rWs
+rWs
+rWs
+vBd
+jgy
abl
acf
uxU
-lvy
-rpF
-wWn
+osf
+fDE
+qWI
abl
acf
acf
@@ -49808,10 +49795,10 @@ acf
nbw
nbw
nbw
-uSX
-uSX
-uSX
-yck
+aTy
+aTy
+aTy
+hRB
pDt
oeN
abt
@@ -49897,7 +49884,7 @@ oUy
oUy
oUy
azq
-xju
+sJN
aAx
aAX
aBA
@@ -49923,7 +49910,7 @@ aMe
aKQ
aNS
aOK
-nsX
+mLq
aLl
akh
aRI
@@ -50021,9 +50008,9 @@ abl
abl
acf
acf
-rpF
-ixc
-gVL
+fDE
+ogJ
+jgy
abl
acf
acf
@@ -50044,8 +50031,8 @@ pDt
oeN
adF
adN
-fDw
-fbx
+sjx
+wbu
oeN
pDt
pDt
@@ -50243,14 +50230,14 @@ acf
acf
acf
acf
-dIr
-dIr
-dIr
+kLl
+kLl
+kLl
abl
acf
acf
acf
-gVL
+jgy
abl
abl
acf
@@ -50471,10 +50458,10 @@ acf
acf
acf
uxU
-rpF
-irH
-rpF
-wdp
+fDE
+roQ
+fDE
+spK
abl
acf
abl
@@ -50699,10 +50686,10 @@ acf
acf
uxU
uxU
-mWs
-rpF
-rpF
-wWn
+mrg
+fDE
+fDE
+qWI
abl
abl
abl
@@ -50738,7 +50725,7 @@ xNK
xNK
xNK
qjf
-vSX
+gHt
qjf
qjf
qjf
@@ -50927,10 +50914,10 @@ acf
acf
uxU
uxU
-mWs
-cqH
-ixc
-gVL
+mrg
+thk
+ogJ
+jgy
abl
abl
abl
@@ -50966,7 +50953,7 @@ xNK
xNK
qjf
qjf
-vSX
+gHt
qjf
qjf
qjf
@@ -51155,9 +51142,9 @@ acf
acf
uxU
acf
-mWs
-fIR
-wdp
+mrg
+kIM
+spK
abl
abl
abv
@@ -51194,7 +51181,7 @@ xNK
xNK
qjf
qjf
-vSX
+gHt
qjf
qjf
qjf
@@ -51383,9 +51370,9 @@ acf
acf
acf
acf
-mWs
-rpF
-wdp
+mrg
+fDE
+spK
abl
abl
abl
@@ -51610,10 +51597,10 @@ acf
acf
acf
acf
-mWs
-mWs
-ixc
-gVL
+mrg
+mrg
+ogJ
+jgy
abl
abl
abl
@@ -51629,7 +51616,7 @@ acw
acU
acT
kRr
-htU
+qld
add
yfH
nUC
@@ -51838,9 +51825,9 @@ acf
acf
acf
acf
-hLe
-bGi
-gVL
+iTQ
+rWs
+jgy
abv
abl
abl
@@ -51897,7 +51884,7 @@ lQC
lQC
lQC
bZX
-bpM
+rcq
aiF
aiQ
bZX
@@ -52066,7 +52053,7 @@ acf
acf
acf
acf
-bol
+jZX
abl
abl
abl
@@ -52082,7 +52069,7 @@ acf
acf
ecy
acw
-vrf
+mdG
gcI
acV
tlQ
@@ -52183,7 +52170,7 @@ aBa
aBD
aBD
aCz
-buv
+voy
aDx
aDY
aEU
@@ -52644,7 +52631,7 @@ azR
aDY
aEW
aFx
-sZK
+ofO
aGr
aGO
aHj
@@ -53094,14 +53081,14 @@ azw
aBd
aBE
aBE
-piS
+btY
aDa
aDA
aEa
aEY
aFy
aFv
-vKP
+poL
aFv
aRj
aDY
@@ -53207,8 +53194,8 @@ acf
acf
acf
acf
-gQA
-xgx
+oFJ
+sLU
dGQ
acf
acf
@@ -53319,7 +53306,7 @@ fjM
fjM
azU
azy
-mdj
+bnq
aBC
aBC
azR
@@ -53435,9 +53422,9 @@ pUm
pUm
pUm
vVC
-omU
-fMX
-qpZ
+bvj
+mHk
+egU
pUm
whU
whU
@@ -53654,8 +53641,8 @@ acf
vVC
pUm
pUm
-rWr
-dNn
+iye
+dtr
acg
pUm
pUm
@@ -53663,9 +53650,9 @@ pUm
pUm
vVC
vVC
-wux
-omU
-lrk
+uop
+bvj
+xar
pUm
whU
whU
@@ -53881,19 +53868,19 @@ acf
uxU
vVC
vVC
-lmM
-omU
-fMX
-rWr
+fYG
+bvj
+mHk
+iye
pUm
pUm
pUm
pUm
vVC
vVC
-nBX
-oVQ
-lrk
+rhi
+etU
+xar
pUm
whU
whU
@@ -54109,29 +54096,29 @@ vVC
vVC
vVC
vVC
-omU
-hxv
-omU
-omU
+bvj
+jRL
+bvj
+bvj
pUm
pUm
pUm
pUm
vVC
-omU
-omU
-uTc
-lsD
+bvj
+bvj
+jgj
+dLW
pUm
whU
whU
whU
whU
fTM
-mQI
-qHa
-qHa
-rcx
+lSA
+yfe
+yfe
+uyn
fTM
fTM
fTM
@@ -54336,19 +54323,19 @@ pUm
vVC
vVC
vVC
-omU
-omU
-fGm
-omU
+bvj
+bvj
+pQV
+bvj
pUm
pUm
pUm
pUm
pUm
vVC
-khV
-uJi
-lsD
+xwN
+wCs
+dLW
acg
pUm
whU
@@ -54357,20 +54344,20 @@ whU
whU
whU
whU
-nWZ
-rFu
-cvu
-qHa
-mZV
+vAT
+wLT
+lBl
+yfe
+bQz
fTM
fTM
fTM
fTM
fTM
-mQI
-gZR
-gZR
-rcx
+lSA
+eMe
+eMe
+uyn
vCG
pDt
pDt
@@ -54485,7 +54472,7 @@ aMl
aOQ
aPC
xFf
-max
+snH
aRX
aNo
aNo
@@ -54564,9 +54551,9 @@ pUm
vVC
vVC
vVC
-omU
-fSW
-omU
+bvj
+oQm
+bvj
pUm
pUm
pUm
@@ -54574,8 +54561,8 @@ pUm
pUm
pUm
pUm
-omU
-lrk
+bvj
+xar
acg
pUm
pUm
@@ -54586,19 +54573,19 @@ whU
whU
whU
unp
-nWZ
-itW
-nWZ
-cvu
-rcx
+vAT
+lNG
+vAT
+lBl
+uyn
jMS
jMS
fTM
-mQI
-jTj
-nWZ
-nWZ
-cvu
+lSA
+bkK
+vAT
+vAT
+lBl
vCG
pDt
pDt
@@ -54791,10 +54778,10 @@ pUm
pUm
pUm
vVC
-omU
-beN
-omU
-omU
+bvj
+mfn
+bvj
+bvj
pUm
pUm
pUm
@@ -54802,8 +54789,8 @@ pUm
pUm
pUm
pUm
-rmk
-qhU
+nha
+tEm
gkC
pUm
pUm
@@ -54816,16 +54803,16 @@ whU
unp
unp
unp
-rFu
-nWZ
-cvu
-sug
-xtU
-gOo
-jTj
-nWZ
-joy
-chP
+wLT
+vAT
+lBl
+vAg
+pGL
+tSi
+bkK
+vAT
+jJg
+nrR
whU
whU
pDt
@@ -55003,7 +54990,7 @@ aag
pZb
pZb
pZb
-gkW
+uYj
xpR
xpR
xpR
@@ -55019,10 +55006,10 @@ pUm
pUm
pUm
pUm
-omU
-omU
-omU
-ewU
+bvj
+bvj
+bvj
+ifr
pUm
nzw
nzw
@@ -55045,12 +55032,12 @@ whU
whU
unp
unp
-nWZ
-nWZ
-nWZ
-nWZ
-nWZ
-nWZ
+vAT
+vAT
+vAT
+vAT
+vAT
+vAT
whU
unp
unp
@@ -55220,21 +55207,21 @@ aag
aag
aag
aag
-cSX
-tqa
-tqa
-tqa
-fSw
+tVw
+srn
+srn
+srn
+pRD
aag
aag
aag
pZb
pZb
pZb
-gkW
-hfY
-gkW
-kub
+uYj
+eqS
+uYj
+tuJ
xpR
xpR
xpR
@@ -55246,12 +55233,12 @@ pZb
pUm
pUm
pUm
-tcj
-ppY
-ppY
-ppY
-ppY
-lsD
+rID
+woT
+woT
+woT
+woT
+dLW
acg
acg
acg
@@ -55272,12 +55259,12 @@ whU
whU
whU
whU
-nWZ
-sVl
-mOl
-nWZ
-nWZ
-djY
+vAT
+sxo
+rby
+vAT
+vAT
+jMD
whU
whU
unp
@@ -55448,24 +55435,24 @@ aag
aag
aag
aag
-mee
-gkW
-kub
-rms
-nmQ
-fSw
+dzM
+uYj
+tuJ
+gzH
+qfK
+pRD
aag
aag
aag
pZb
pZb
-gkW
-gkW
-gkW
-fqv
-gkW
-gkW
-gkW
+uYj
+uYj
+uYj
+mWA
+uYj
+uYj
+uYj
pZb
pZb
pZb
@@ -55499,13 +55486,13 @@ whU
whU
whU
whU
-dhn
-dhn
-dhn
-dhn
-dhn
-dhn
-aTr
+jlt
+jlt
+jlt
+jlt
+jlt
+jlt
+pET
whU
whU
whU
@@ -55675,27 +55662,27 @@ aai
aag
aag
aag
-cSX
-ccy
-gkW
-gkW
-jwA
-gkW
-gQj
+tVw
+vxj
+uYj
+uYj
+dHg
+uYj
+rIm
aag
aai
aag
vly
-xsh
-uot
-uot
-tFD
-gkW
-gkW
-gkW
-gTF
-gkW
-gkW
+wYB
+pFB
+pFB
+fsc
+uYj
+uYj
+uYj
+dIv
+uYj
+uYj
pZb
pZb
pZb
@@ -55738,9 +55725,9 @@ whU
whU
whU
whU
-qHa
-qHa
-rcx
+yfe
+yfe
+uyn
fTM
fTM
fTM
@@ -55902,14 +55889,14 @@ aag
aag
aag
aag
-cSX
-tKZ
-gkW
-gkW
+tVw
+uHc
+uYj
+uYj
xpR
-gkW
-gkW
-gQj
+uYj
+uYj
+rIm
aag
aag
aag
@@ -55917,15 +55904,15 @@ vly
aag
aai
aag
-xsh
-uot
-bXm
-uot
-uot
-uot
-uot
-uot
-snW
+wYB
+pFB
+sET
+pFB
+pFB
+pFB
+pFB
+pFB
+mFZ
vly
acg
acg
@@ -55967,8 +55954,8 @@ whU
whU
whU
whU
-nWZ
-qBG
+vAT
+fIW
fTM
fTM
fTM
@@ -56129,15 +56116,15 @@ aag
aag
aag
aag
-cSX
-tKZ
-gkW
-xxC
+tVw
+uHc
+uYj
+eYb
xpR
xpR
-gkW
-gkW
-gQj
+uYj
+uYj
+rIm
aag
aag
aag
@@ -56155,11 +56142,11 @@ aag
aag
aag
vly
-nti
-rWr
-rWr
-rWr
-qpZ
+cop
+iye
+iye
+iye
+egU
acg
acg
acg
@@ -56195,8 +56182,8 @@ whU
whU
whU
whU
-hyo
-qBG
+fUj
+fIW
aeT
fTM
fTM
@@ -56357,15 +56344,15 @@ aag
aag
aag
aag
-mee
-gkW
-tOU
+dzM
+uYj
+rYe
xpR
xpR
xpR
-gkW
-gkW
-gQj
+uYj
+uYj
+rIm
aag
aag
aag
@@ -56381,14 +56368,14 @@ aag
aag
aag
aag
-cSX
-rMD
-sZh
-pYE
-omU
-omU
-uos
-qpZ
+tVw
+cqC
+kmH
+mLv
+bvj
+bvj
+elp
+egU
acg
acg
acg
@@ -56422,9 +56409,9 @@ whU
whU
whU
unp
-nWZ
-nWZ
-qBG
+vAT
+vAT
+fIW
fTM
sIH
fTM
@@ -56585,15 +56572,15 @@ aag
aag
aag
aai
-mee
-tOU
-tOU
+dzM
+rYe
+rYe
xpR
xpR
-tOU
-gkW
-iOi
-gQj
+rYe
+uYj
+anM
+rIm
aag
aag
aag
@@ -56609,15 +56596,15 @@ aag
aag
aai
aag
-hFR
-bQp
-omU
-omU
-fSW
-omU
-beN
-fMX
-qpZ
+jBl
+vdt
+bvj
+bvj
+oQm
+bvj
+mfn
+mHk
+egU
acg
acg
acg
@@ -56651,8 +56638,8 @@ whU
whU
unp
unp
-nWZ
-qBG
+vAT
+fIW
fTM
agd
afE
@@ -56813,15 +56800,15 @@ aag
aag
aag
aag
-ubj
-tOU
+eaI
+rYe
pZb
xpR
pZb
-tOU
-kub
-gkW
-gQj
+rYe
+tuJ
+uYj
+rIm
aag
aag
aag
@@ -56837,15 +56824,15 @@ aag
aag
aag
aag
-hFR
-gbK
+jBl
+xSk
vVC
vVC
vVC
vVC
-omU
-jAn
-cay
+bvj
+fmV
+oDE
acg
acg
pUm
@@ -56879,8 +56866,8 @@ whU
whU
whU
unp
-tZE
-qBG
+rGE
+fIW
akL
adZ
fTM
@@ -56967,7 +56954,7 @@ lyS
lyS
lyS
asN
-lZt
+urO
ati
ati
asN
@@ -57041,15 +57028,15 @@ aag
aag
aag
aag
-ubj
+eaI
pZb
pZb
pZb
pZb
-tOU
-xKb
-cEe
-snW
+rYe
+ktr
+sFD
+mFZ
aag
aag
aag
@@ -57065,15 +57052,15 @@ aag
aag
aag
aag
-xsh
+wYB
pZb
pUm
vVC
vVC
vVC
vVC
-uVW
-oPq
+lyZ
+lhE
gkC
pUm
pUm
@@ -57107,8 +57094,8 @@ whU
whU
whU
unp
-nWZ
-qBG
+vAT
+fIW
fTM
adH
fTM
@@ -57258,10 +57245,10 @@ pZb
pZb
pZb
pZb
-rcs
-rcs
-xbP
-fSw
+vPo
+vPo
+wRb
+pRD
aag
aag
aag
@@ -57274,8 +57261,8 @@ pZb
pZb
pZb
pZb
-xKb
-snW
+ktr
+mFZ
aag
aag
aai
@@ -57300,8 +57287,8 @@ pUm
vVC
vVC
pUm
-lmM
-cay
+fYG
+oDE
acg
pUm
pUm
@@ -57334,9 +57321,9 @@ whU
whU
whU
whU
-mIt
-nWZ
-qBG
+vQR
+vAT
+fIW
aeT
aek
agA
@@ -57486,11 +57473,11 @@ pZb
pZb
pZb
pZb
-tOU
-gJf
-gkW
-rnz
-fSw
+rYe
+fRD
+uYj
+lLU
+pRD
aag
aag
aag
@@ -57502,7 +57489,7 @@ pZb
pZb
pZb
pZb
-snW
+mFZ
aag
aag
aag
@@ -57528,8 +57515,8 @@ pUm
pUm
pUm
pUm
-uJi
-lsD
+wCs
+dLW
acg
pUm
pUm
@@ -57562,9 +57549,9 @@ whU
fTM
whU
whU
-beD
-beD
-aTr
+sAh
+sAh
+pET
fTM
adH
fTM
@@ -57714,11 +57701,11 @@ pZb
pZb
pZb
xpR
-tOU
-gkW
-rms
-rDN
-tbw
+rYe
+uYj
+gzH
+mEo
+rpx
aag
aag
aag
@@ -57756,8 +57743,8 @@ pUm
pUm
pUm
pUm
-nUp
-qpZ
+xGL
+egU
acg
pUm
pUm
@@ -57943,10 +57930,10 @@ pZb
pZb
xpR
xpR
-gkW
-vVU
-gkW
-tbw
+uYj
+wMr
+uYj
+rpx
aag
aag
aag
@@ -57985,8 +57972,8 @@ pUm
pUm
pUm
pUm
-fMX
-dNn
+mHk
+dtr
pUm
pUm
pUm
@@ -58171,10 +58158,10 @@ pZb
pZb
xpR
xpR
-gkW
-gkW
-gkW
-tbw
+uYj
+uYj
+uYj
+rpx
aag
aai
aag
@@ -58213,9 +58200,9 @@ pUm
pUm
pUm
vVC
-omU
-fMX
-qpZ
+bvj
+mHk
+egU
abj
pUm
acg
@@ -58251,9 +58238,9 @@ vCG
fTM
akL
fTM
-mQI
-uxM
-noz
+lSA
+rgj
+gWE
ahv
ahv
slW
@@ -58322,7 +58309,7 @@ ati
atE
rGB
ati
-vhq
+rKj
ati
tJb
ati
@@ -58399,10 +58386,10 @@ pZb
pZb
pZb
xpR
-mHv
-gkW
-xKb
-snW
+bvS
+uYj
+ktr
+mFZ
aag
aag
aag
@@ -58441,10 +58428,10 @@ pUm
pUm
vVC
vVC
-dLX
-omU
-fMX
-qpZ
+xmK
+bvj
+mHk
+egU
abo
acg
acg
@@ -58479,9 +58466,9 @@ vCG
fTM
fTM
fTM
-hVR
-nWZ
-kqt
+vNT
+vAT
+vkS
ahv
ahv
slW
@@ -58627,9 +58614,9 @@ pZb
pZb
pZb
pZb
-gkW
-xKb
-snW
+uYj
+ktr
+mFZ
aag
aag
aag
@@ -58669,10 +58656,10 @@ pUm
pUm
vVC
vVC
-nBX
-omU
-sLm
-cay
+rhi
+bvj
+mNl
+oDE
acg
acg
acg
@@ -58706,10 +58693,10 @@ fTM
whU
whU
fTM
-mQI
-jTj
-nWZ
-nWZ
+lSA
+bkK
+vAT
+vAT
ahv
ahv
aeg
@@ -58855,8 +58842,8 @@ pZb
pZb
pZb
pZb
-mTH
-snW
+aPM
+mFZ
aag
aag
aag
@@ -58897,10 +58884,10 @@ pUm
pUm
vVC
vVC
-omU
-omU
-uJi
-lsD
+bvj
+bvj
+wCs
+dLW
acg
vjL
acg
@@ -58924,10 +58911,10 @@ whU
jMS
jMS
fTM
-mQI
-gZR
-gZR
-rcx
+lSA
+eMe
+eMe
+uyn
jMS
jMS
fTM
@@ -58935,8 +58922,8 @@ whU
ajc
vCG
whU
-nWZ
-beW
+vAT
+hTR
pRT
ahv
ahv
@@ -59125,9 +59112,9 @@ pUm
pUm
pUm
pUm
-omU
-bUo
-lsD
+bvj
+rER
+dLW
iiK
acg
acg
@@ -59151,13 +59138,13 @@ whU
whU
whU
whU
-gZR
-jTj
-lRR
-nWZ
-cvu
-kel
-mZV
+eMe
+bkK
+ldi
+vAT
+lBl
+loP
+bQz
fTM
wEO
fTM
@@ -59352,9 +59339,9 @@ pUm
pUm
pUm
pUm
-ppY
-ppY
-lsD
+woT
+woT
+dLW
acg
acg
acg
@@ -59379,14 +59366,14 @@ whU
whU
whU
whU
-uqx
-nWZ
-nWZ
-gYU
-nWZ
-pwG
-cvu
-rcx
+aco
+vAT
+vAT
+bcU
+vAT
+whx
+lBl
+uyn
wEO
fTM
fTM
@@ -59611,10 +59598,10 @@ whU
unp
unp
unp
-nWZ
-nWZ
-nWZ
-gDW
+vAT
+vAT
+vAT
+tqQ
eFS
fTM
fTM
@@ -59841,8 +59828,8 @@ whU
unp
unp
unp
-nSO
-bil
+gsq
+viC
wEO
fTM
fTM
@@ -60068,9 +60055,9 @@ whU
whU
whU
whU
-sug
-nWZ
-rAm
+vAg
+vAT
+lSN
fTM
akL
fTM
@@ -60226,12 +60213,12 @@ pZb
pZb
pZb
pZb
-rcs
-rcs
-oCR
-xbP
-xbP
-fSw
+vPo
+vPo
+lzf
+wRb
+wRb
+pRD
aag
aag
aai
@@ -60296,9 +60283,9 @@ whU
whU
whU
whU
-dtu
-dhn
-aTr
+ecn
+jlt
+pET
fTM
fTM
diW
@@ -60455,15 +60442,15 @@ pZb
pZb
pZb
pZb
-tOU
-tOU
-gkW
-rms
-nmQ
-xbP
-xbP
-xbP
-fSw
+rYe
+rYe
+uYj
+gzH
+qfK
+wRb
+wRb
+wRb
+pRD
aag
aag
aag
@@ -60535,7 +60522,7 @@ agm
whU
ahv
afS
-rBa
+rXt
agX
agX
agX
@@ -60684,15 +60671,15 @@ pZb
pZb
pZb
pZb
-uJU
-tOU
-gkW
-wjj
-eGu
-gkW
-rDN
-uHU
-fSw
+cfL
+rYe
+uYj
+qVi
+egc
+uYj
+mEo
+isL
+pRD
aag
aag
aai
@@ -60717,7 +60704,7 @@ pZb
pZb
vVC
vVC
-mhy
+uBR
aaQ
aaR
aaR
@@ -60917,10 +60904,10 @@ xpR
xpR
xpR
xpR
-tOU
-tOU
-gkW
-tbw
+rYe
+rYe
+uYj
+rpx
aag
aag
aag
@@ -60945,8 +60932,8 @@ pZb
pZb
vVC
vVC
-mhy
-mhy
+uBR
+uBR
aaQ
aaQ
aaQ
@@ -61146,9 +61133,9 @@ xpR
xpR
xpR
xpR
-tOU
-tOU
-hbX
+rYe
+rYe
+gze
aab
aab
aab
@@ -61173,8 +61160,8 @@ pZb
pZb
vVC
vVC
-omU
-mhy
+bvj
+uBR
nzw
nzw
nzw
@@ -61401,10 +61388,10 @@ pZb
pZb
vVC
vVC
-omU
-omU
-fMX
-qpZ
+bvj
+bvj
+mHk
+egU
acg
aaN
acg
@@ -61417,9 +61404,9 @@ acg
acg
acg
acg
-rWr
-rWr
-wMv
+iye
+iye
+bEj
acg
aaN
acg
@@ -61630,10 +61617,10 @@ pZb
vVC
vVC
vVC
-omU
-omU
-fMX
-qpZ
+bvj
+bvj
+mHk
+egU
acg
nzw
bfY
@@ -61645,9 +61632,9 @@ nzw
nzw
nzw
pUm
-fGm
-omU
-oPq
+pQV
+bvj
+lhE
acg
acg
acg
@@ -61687,7 +61674,7 @@ boe
boe
boe
boe
-vJV
+kVj
afS
ahv
ahv
@@ -61858,11 +61845,11 @@ pZb
pUm
vVC
vVC
-omU
-omU
-fSW
-fMX
-qpZ
+bvj
+bvj
+oQm
+mHk
+egU
nzw
nHq
jAo
@@ -61871,11 +61858,11 @@ acg
umb
iyr
eZC
-mhy
+uBR
pUm
vVC
-lcP
-oPq
+rAU
+lhE
acg
acg
acg
@@ -62087,11 +62074,11 @@ pUm
vVC
vVC
vVC
-omU
-omU
-omU
-fMX
-wMv
+bvj
+bvj
+bvj
+mHk
+bEj
jAo
acg
gkC
@@ -62099,12 +62086,12 @@ acg
gkC
acg
jAo
-mhy
+uBR
vVC
vVC
aaQ
-soX
-qpZ
+qPY
+egU
acg
acg
acg
@@ -62317,9 +62304,9 @@ vVC
vVC
vVC
pUm
-omU
-omU
-eeh
+bvj
+bvj
+gVR
umb
umb
umb
@@ -62327,12 +62314,12 @@ aaN
umb
umb
umb
-mhy
+uBR
vVC
vVC
vVC
-mhy
-cay
+uBR
+oDE
acg
acg
acg
@@ -62545,22 +62532,22 @@ pUm
vVC
vVC
vVC
-omU
-omU
-soX
-jMg
+bvj
+bvj
+qPY
+rwx
acg
gkC
acg
gkC
acg
-tUv
-mhy
+dfJ
+uBR
pUm
vVC
vVC
-mhy
-cay
+uBR
+oDE
acg
acg
acg
@@ -62587,7 +62574,7 @@ whU
whU
ahv
ahv
-fot
+hxt
agX
nEo
hcN
@@ -62775,21 +62762,21 @@ vVC
vVC
vVC
pUm
-mhy
-ydo
+uBR
+jhj
upQ
umb
acg
umb
fAD
rPK
-mhy
+uBR
pUm
pUm
vVC
-mhy
-fMX
-dNn
+uBR
+mHk
+dtr
acg
acg
acg
@@ -63003,8 +62990,8 @@ pUm
vVC
pUm
pUm
-mhy
-eeh
+uBR
+gVR
nzw
nzw
nzw
@@ -63015,9 +63002,9 @@ nzw
pUm
pUm
pUm
-mhy
-omU
-ccb
+uBR
+bvj
+fGn
acg
acg
aaQ
diff --git a/maps/map_files/LV624/armory/10.cheese.dmm b/maps/map_files/LV624/armory/10.cheese.dmm
index b16499db31..96b4ef5942 100644
--- a/maps/map_files/LV624/armory/10.cheese.dmm
+++ b/maps/map_files/LV624/armory/10.cheese.dmm
@@ -16,25 +16,6 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/main_hall)
-"d" = (
-/obj/item/handset{
- desc = "A model of an ancient Earth communication device.";
- force = 8
- },
-/obj/structure/surface/rack{
- layer = 2.5
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/lv624/lazarus/main_hall)
"e" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -173,25 +154,6 @@
icon_state = "cult"
},
/area/lv624/lazarus/armory)
-"w" = (
-/obj/structure/surface/rack,
-/obj/item/storage/box/mousetraps{
- pixel_x = -5
- },
-/obj/item/paper/lv_624/cheese{
- pixel_x = 8;
- pixel_y = -4
- },
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = 25;
- pixel_y = 5
- },
-/turf/open/floor{
- icon_state = "cult"
- },
-/area/lv624/lazarus/armory)
"y" = (
/obj/structure/window/reinforced{
dir = 4
@@ -242,6 +204,38 @@
icon_state = "cult"
},
/area/lv624/lazarus/armory)
+"L" = (
+/obj/structure/surface/rack,
+/obj/item/storage/box/mousetraps{
+ pixel_x = -5
+ },
+/obj/item/paper/lv_624/cheese{
+ pixel_x = 8;
+ pixel_y = -4
+ },
+/turf/open/floor{
+ icon_state = "cult"
+ },
+/area/lv624/lazarus/armory)
+"O" = (
+/obj/item/handset{
+ desc = "A model of an ancient Earth communication device.";
+ force = 8
+ },
+/obj/structure/surface/rack{
+ layer = 2.5
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/lv624/lazarus/main_hall)
"Q" = (
/obj/structure/surface/rack,
/obj/effect/landmark/crap_item,
@@ -314,7 +308,7 @@ i
l
q
Q
-w
+L
p
i
"}
@@ -331,7 +325,7 @@ B
i
"}
(7,1,1) = {"
-d
+O
g
a
j
diff --git a/maps/map_files/LV624/armory/10.extra.dmm b/maps/map_files/LV624/armory/10.extra.dmm
index e407d06c85..cf1aaaa538 100644
--- a/maps/map_files/LV624/armory/10.extra.dmm
+++ b/maps/map_files/LV624/armory/10.extra.dmm
@@ -16,25 +16,6 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/main_hall)
-"d" = (
-/obj/item/handset{
- desc = "A model of an ancient Earth communication device.";
- force = 8
- },
-/obj/structure/surface/rack{
- layer = 2.5
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/lv624/lazarus/main_hall)
"e" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -178,25 +159,6 @@
icon_state = "cult"
},
/area/lv624/lazarus/armory)
-"w" = (
-/obj/item/storage/toolbox/syndicate,
-/obj/structure/surface/rack{
- layer = 2.5
- },
-/obj/effect/landmark/crap_item,
-/obj/effect/landmark/crap_item,
-/obj/item/ammo_magazine/smg/m39/extended,
-/obj/item/weapon/gun/smg/m39,
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = 25;
- pixel_y = 5
- },
-/turf/open/floor{
- icon_state = "cult"
- },
-/area/lv624/lazarus/armory)
"y" = (
/obj/structure/window/reinforced{
dir = 4
@@ -247,6 +209,38 @@
icon_state = "cult"
},
/area/lv624/lazarus/armory)
+"L" = (
+/obj/item/storage/toolbox/syndicate,
+/obj/structure/surface/rack{
+ layer = 2.5
+ },
+/obj/effect/landmark/crap_item,
+/obj/effect/landmark/crap_item,
+/obj/item/ammo_magazine/smg/m39/extended,
+/obj/item/weapon/gun/smg/m39,
+/turf/open/floor{
+ icon_state = "cult"
+ },
+/area/lv624/lazarus/armory)
+"Z" = (
+/obj/item/handset{
+ desc = "A model of an ancient Earth communication device.";
+ force = 8
+ },
+/obj/structure/surface/rack{
+ layer = 2.5
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
+/turf/open/floor{
+ icon_state = "wood"
+ },
+/area/lv624/lazarus/main_hall)
(1,1,1) = {"
a
@@ -304,7 +298,7 @@ i
l
q
q
-w
+L
p
i
"}
@@ -321,7 +315,7 @@ B
i
"}
(7,1,1) = {"
-d
+Z
g
a
j
diff --git a/maps/map_files/LV624/armory/10.looted.dmm b/maps/map_files/LV624/armory/10.looted.dmm
index 40e2637415..cf2d4a9e02 100644
--- a/maps/map_files/LV624/armory/10.looted.dmm
+++ b/maps/map_files/LV624/armory/10.looted.dmm
@@ -17,25 +17,6 @@
icon_state = "whiteyellow"
},
/area/lv624/lazarus/main_hall)
-"d" = (
-/obj/item/handset{
- desc = "A model of an ancient Earth communication device.";
- force = 8
- },
-/obj/structure/surface/rack{
- layer = 2.5
- },
-/obj/structure/window/reinforced{
- dir = 8
- },
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/window/reinforced,
-/turf/open/floor{
- icon_state = "wood"
- },
-/area/lv624/lazarus/main_hall)
"e" = (
/obj/structure/barricade/wooden{
dir = 8
@@ -186,18 +167,25 @@
icon_state = "cult"
},
/area/lv624/lazarus/armory)
-"K" = (
-/obj/item/stack/sheet/metal,
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = 25;
- pixel_y = 5
+"Q" = (
+/obj/item/handset{
+ desc = "A model of an ancient Earth communication device.";
+ force = 8
+ },
+/obj/structure/surface/rack{
+ layer = 2.5
+ },
+/obj/structure/window/reinforced{
+ dir = 8
},
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/structure/window/reinforced,
/turf/open/floor{
- icon_state = "cult"
+ icon_state = "wood"
},
-/area/lv624/lazarus/armory)
+/area/lv624/lazarus/main_hall)
"T" = (
/obj/structure/machinery/door_control{
id = "garage_blast";
@@ -266,7 +254,7 @@ i
w
w
w
-K
+w
p
i
"}
@@ -283,7 +271,7 @@ B
i
"}
(7,1,1) = {"
-d
+Q
g
a
j
diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm
index 52130f95fc..e9c8ffd648 100644
--- a/maps/map_files/LV624/science/10.yautja.dmm
+++ b/maps/map_files/LV624/science/10.yautja.dmm
@@ -82,26 +82,6 @@
},
/turf/open/floor/plating,
/area/lv624/lazarus/research)
-"ap" = (
-/obj/structure/surface/table,
-/obj/item/reagent_container/hypospray/autoinjector/yautja,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
-"aq" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/light,
-/obj/item/tool/surgery/circular_saw/predatorbonesaw,
-/obj/item/tool/surgery/hemostat/predatorhemostat,
-/obj/item/tool/surgery/retractor/predatorretractor,
-/obj/item/tool/surgery/scalpel/predatorscalpel,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"ar" = (
/turf/closed/wall,
/area/lv624/lazarus/research)
@@ -167,21 +147,6 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
-"aC" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/effect/landmark/crap_item,
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_id = "Research Dome";
- pixel_y = 24
- },
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"aD" = (
/obj/structure/surface/rack{
layer = 2.5
@@ -227,22 +192,6 @@
icon_state = "white"
},
/area/lv624/lazarus/research)
-"aJ" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/surface/table,
-/obj/item/storage/box/disks{
- layer = 2.9;
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/paper/research_notes,
-/obj/item/prop/alien/hugger,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/lv624/lazarus/research)
"aK" = (
/obj/structure/machinery/door_control{
id = "science_blast";
@@ -270,15 +219,6 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
-"aM" = (
-/obj/structure/surface/table,
-/obj/structure/machinery/cell_charger,
-/obj/item/tool/crowbar,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"aN" = (
/obj/structure/machinery/door/poddoor/almayer{
dir = 4;
@@ -338,12 +278,6 @@
icon_state = "white"
},
/area/lv624/lazarus/research)
-"aW" = (
-/obj/structure/surface/table,
-/turf/open/floor{
- icon_state = "freezerfloor"
- },
-/area/lv624/lazarus/research)
"aX" = (
/turf/open/floor{
icon_state = "freezerfloor"
@@ -376,14 +310,6 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
-"bb" = (
-/obj/structure/surface/table,
-/obj/item/weapon/yautja/scythe,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"bd" = (
/obj/structure/bed/chair/office/dark,
/turf/open/floor{
@@ -418,14 +344,6 @@
"bh" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/central_jungle)
-"bi" = (
-/obj/structure/surface/table,
-/obj/item/weapon/yautja/knife,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"bj" = (
/obj/structure/surface/table,
/obj/item/reagent_container/hypospray/autoinjector/yautja,
@@ -466,6 +384,44 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
+"iy" = (
+/obj/structure/surface/table,
+/obj/item/weapon/yautja/scythe,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
+"lw" = (
+/obj/structure/surface/table,
+/turf/open/floor{
+ icon_state = "freezerfloor"
+ },
+/area/lv624/lazarus/research)
+"mG" = (
+/obj/structure/surface/table,
+/obj/item/reagent_container/hypospray/autoinjector/yautja,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
+"nJ" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/surface/table,
+/obj/item/storage/box/disks{
+ layer = 2.9;
+ pixel_x = 5;
+ pixel_y = 5
+ },
+/obj/item/paper/research_notes,
+/obj/item/prop/alien/hugger,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/lv624/lazarus/research)
"rg" = (
/obj/structure/surface/table,
/obj/item/paper/research_notes,
@@ -480,6 +436,15 @@
icon_state = "white"
},
/area/lv624/lazarus/research)
+"Cp" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/cell_charger,
+/obj/item/tool/crowbar,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"CC" = (
/obj/effect/decal/cleanable/blood/splatter,
/obj/effect/landmark/corpsespawner/scientist,
@@ -488,6 +453,18 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
+"Dm" = (
+/obj/structure/surface/table,
+/obj/structure/machinery/light,
+/obj/item/tool/surgery/circular_saw/predatorbonesaw,
+/obj/item/tool/surgery/hemostat/predatorhemostat,
+/obj/item/tool/surgery/retractor/predatorretractor,
+/obj/item/tool/surgery/scalpel/predatorscalpel,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"FO" = (
/obj/effect/landmark/crap_item,
/turf/open/floor{
@@ -516,16 +493,27 @@
icon_state = "white"
},
/area/lv624/lazarus/research)
-"WJ" = (
+"Rn" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
/obj/effect/landmark/crap_item,
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = -25;
- pixel_y = 5
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_id = "Research Dome";
+ pixel_y = 24
},
/turf/open/floor{
- icon_state = "white"
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
+"Rr" = (
+/obj/structure/surface/table,
+/obj/item/weapon/yautja/knife,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
"Zw" = (
@@ -574,15 +562,15 @@ aa
(3,1,1) = {"
aa
ai
-ap
+mG
aw
-aq
+Dm
ar
gM
aO
aE
ar
-aW
+lw
aX
FO
ac
@@ -646,9 +634,9 @@ Zw
ec
al
ar
-aJ
+nJ
Lo
-WJ
+gd
ar
aZ
CC
@@ -718,9 +706,9 @@ ec
ak
al
ab
-aC
+Rn
al
-bi
+Rr
ac
bg
"}
@@ -752,7 +740,7 @@ aL
aQ
al
ab
-bb
+iy
bk
aj
ac
@@ -765,7 +753,7 @@ ao
ao
ao
ab
-aM
+Cp
ak
aE
ab
diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm
index b6124474f9..9ebc528d01 100644
--- a/maps/map_files/LV624/science/40.fullylocked.dmm
+++ b/maps/map_files/LV624/science/40.fullylocked.dmm
@@ -187,17 +187,6 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
-"aF" = (
-/obj/structure/surface/table,
-/obj/item/tool/surgery/scalpel{
- pixel_y = 12
- },
-/obj/structure/machinery/light,
-/turf/open/floor{
- dir = 5;
- icon_state = "whitepurple"
- },
-/area/lv624/lazarus/research)
"aG" = (
/obj/structure/surface/rack{
layer = 2.5
@@ -274,21 +263,6 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
-"aQ" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/surface/table,
-/obj/item/storage/box/disks{
- layer = 2.9;
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/storage/fancy/vials/random,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/lv624/lazarus/research)
"aR" = (
/obj/structure/sink{
dir = 4;
@@ -347,12 +321,6 @@
icon_state = "white"
},
/area/lv624/lazarus/research)
-"bb" = (
-/obj/item/clothing/glasses/regular,
-/turf/open/floor{
- icon_state = "white"
- },
-/area/lv624/lazarus/research)
"bm" = (
/obj/structure/surface/table,
/turf/open/floor{
@@ -397,31 +365,41 @@
"bF" = (
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/central_jungle)
-"gu" = (
-/obj/structure/machinery/door_control{
- id = "secure_inner_blast";
- name = "Secure Inner Doors";
- pixel_x = -25;
+"nW" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/surface/table,
+/obj/item/storage/box/disks{
+ layer = 2.9;
+ pixel_x = 5;
pixel_y = 5
},
+/obj/item/storage/fancy/vials/random,
/turf/open/floor{
icon_state = "white"
},
/area/lv624/lazarus/research)
-"oe" = (
-/obj/structure/phone_base/colony_net{
- phone_category = "Lazarus Landing";
- phone_id = "Research Dome";
- pixel_y = 24
- },
+"qs" = (
+/obj/structure/surface/table,
+/obj/item/storage/fancy/vials/random,
/turf/open/floor{
dir = 5;
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
-"qs" = (
-/obj/structure/surface/table,
-/obj/item/storage/fancy/vials/random,
+"so" = (
+/obj/item/clothing/glasses/regular,
+/turf/open/floor{
+ icon_state = "white"
+ },
+/area/lv624/lazarus/research)
+"tP" = (
+/obj/structure/phone_base/colony_net{
+ phone_category = "Lazarus Landing";
+ phone_id = "Research Dome";
+ pixel_y = 24
+ },
/turf/open/floor{
dir = 5;
icon_state = "whitepurple"
@@ -440,6 +418,17 @@
icon_state = "whitepurple"
},
/area/lv624/lazarus/research)
+"HE" = (
+/obj/structure/surface/table,
+/obj/item/tool/surgery/scalpel{
+ pixel_y = 12
+ },
+/obj/structure/machinery/light,
+/turf/open/floor{
+ dir = 5;
+ icon_state = "whitepurple"
+ },
+/area/lv624/lazarus/research)
"Jv" = (
/obj/effect/landmark/corpsespawner/scientist,
/obj/effect/decal/cleanable/blood/splatter,
@@ -501,7 +490,7 @@ aa
ai
aj
as
-aF
+HE
au
Tz
aV
@@ -537,7 +526,7 @@ ap
ay
aG
au
-oe
+tP
ak
ay
au
@@ -571,9 +560,9 @@ aj
ay
ay
au
-aQ
+nW
Kl
-gu
+ak
au
bp
ay
@@ -674,7 +663,7 @@ ay
aK
ab
aS
-bb
+so
ay
ab
Tz
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index b1b24a71fb..ed95fd0516 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -208,32 +208,6 @@
/obj/structure/largecrate/random/barrel/red,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_s)
-"aaB" = (
-/obj/structure/machinery/firealarm{
- pixel_y = 28
- },
-/obj/structure/sign/safety/maint{
- pixel_x = -17
- },
-/obj/structure/surface/table/almayer,
-/obj/structure/phone_base/rotary{
- name = "Telephone";
- phone_category = "Almayer";
- phone_id = "Auxiliary Support Office Second Line";
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/structure/phone_base/rotary{
- name = "Telephone";
- phone_category = "Almayer";
- phone_id = "Auxiliary Support Office";
- pixel_x = 8;
- pixel_y = 8
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/auxiliary_officer_office)
"aaC" = (
/obj/structure/lattice,
/turf/open/space/basic,
@@ -1114,12 +1088,6 @@
"adu" = (
/turf/open/floor/almayer,
/area/almayer/shipboard/starboard_missiles)
-"adv" = (
-/obj/structure/machinery/power/apc/almayer{
- dir = 8
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"ady" = (
/obj/effect/step_trigger/clone_cleaner,
/obj/effect/decal/warning_stripes{
@@ -1347,16 +1315,6 @@
"aet" = (
/turf/closed/wall/almayer,
/area/almayer/living/starboard_garden)
-"aew" = (
-/obj/structure/machinery/firealarm{
- pixel_y = 28
- },
-/obj/structure/closet/secure_closet/bar{
- name = "Success Cabinet";
- req_access_txt = "1"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"aex" = (
/obj/item/reagent_container/food/drinks/cans/beer{
pixel_x = 6;
@@ -2139,18 +2097,6 @@
icon_state = "plate"
},
/area/almayer/living/cafeteria_officer)
-"aha" = (
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
- access_modified = 1;
- name = "\improper Commanding Officer's Quarters";
- req_access = null;
- req_access_txt = "31"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/living/commandbunks)
"ahb" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -2274,20 +2220,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_p)
-"ahv" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"ahw" = (
-/obj/structure/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"ahx" = (
/obj/structure/window/framed/almayer/hull,
/turf/open/floor/plating,
@@ -2395,43 +2327,6 @@
icon_state = "bluecorner"
},
/area/almayer/living/offices/flight)
-"ahY" = (
-/obj/structure/machinery/light,
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/clothing/shoes/laceup{
- desc = "The height of fashion, and they're pre-polished! The name 'Bob' is written on the inside.";
- pixel_y = -5
- },
-/obj/effect/landmark/map_item,
-/obj/item/device/flashlight/lamp/green,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"ahZ" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/paper_bin/uscm,
-/obj/item/tool/pen,
-/obj/structure/machinery/door_control{
- id = "ARES StairsLock";
- name = "ARES Exterior Lockdown Override";
- pixel_x = 8;
- pixel_y = -24;
- req_one_access_txt = "90;91;92"
- },
-/obj/structure/machinery/door_control{
- id = "ARES Emergency";
- name = "ARES Emergency Lockdown Override";
- pixel_y = -24;
- req_one_access_txt = "91;92"
- },
-/obj/structure/machinery/door_control{
- id = "Brig Lockdown Shutters";
- name = "Brig Lockdown Override";
- pixel_x = -8;
- pixel_y = -24;
- req_access_txt = "1;3"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"aia" = (
/turf/open/floor/almayer{
dir = 8;
@@ -2643,14 +2538,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
-"aiF" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"aiG" = (
-/obj/structure/filingcabinet,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"aiH" = (
/turf/open/floor/almayer{
icon_state = "plate"
@@ -2719,10 +2606,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_s)
-"aiW" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"aiX" = (
/turf/closed/wall/almayer,
/area/almayer/living/pilotbunks)
@@ -3066,59 +2949,6 @@
icon_state = "redcorner"
},
/area/almayer/shipboard/weapon_room)
-"akk" = (
-/obj/structure/machinery/door/window/westright{
- dir = 4
- },
-/obj/structure/machinery/shower{
- dir = 4
- },
-/obj/structure/window/reinforced,
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/commandbunks)
-"akl" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "W";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/commandbunks)
-"akm" = (
-/obj/structure/machinery/door/airlock/almayer/generic{
- name = "\improper Bathroom"
- },
-/obj/structure/machinery/door/firedoor/border_only/almayer,
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/living/commandbunks)
-"akn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
-"ako" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
-"akp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"akr" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -3126,12 +2956,6 @@
},
/turf/open/floor/wood/ship,
/area/almayer/living/commandbunks)
-"aks" = (
-/obj/structure/surface/table/almayer,
-/obj/item/clipboard,
-/obj/item/device/binoculars,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"akt" = (
/obj/structure/cable/heavyduty{
icon_state = "4-8"
@@ -3359,28 +3183,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/starboard_garden)
-"alb" = (
-/obj/structure/toilet{
- dir = 4
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/living/commandbunks)
-"alc" = (
-/obj/structure/sink{
- dir = 4;
- pixel_x = 11
- },
-/obj/structure/mirror{
- pixel_x = 28
- },
-/obj/effect/decal/warning_stripes{
- icon_state = "W";
- pixel_x = -1
- },
-/turf/open/floor/almayer{
- icon_state = "dark_sterile"
- },
-/area/almayer/living/commandbunks)
"ald" = (
/turf/open/floor/almayer{
icon_state = "red"
@@ -3419,15 +3221,6 @@
icon_state = "bluecorner"
},
/area/almayer/hallways/aft_hallway)
-"alj" = (
-/obj/structure/surface/table/almayer,
-/obj/item/paper,
-/obj/item/device/whistle,
-/obj/structure/sign/safety/bathunisex{
- pixel_x = -17
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"alk" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
dir = 4;
@@ -3445,13 +3238,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/hallways/aft_hallway)
-"alo" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_18"
- },
-/obj/structure/machinery/light,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"alp" = (
/turf/open/floor/almayer{
dir = 9;
@@ -3472,12 +3258,6 @@
icon_state = "bluecorner"
},
/area/almayer/hallways/aft_hallway)
-"alu" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/megaphone,
-/obj/item/device/radio,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"alw" = (
/obj/structure/machinery/door/airlock/almayer/generic{
dir = 2;
@@ -4252,15 +4032,6 @@
icon_state = "bluecorner"
},
/area/almayer/hallways/aft_hallway)
-"aox" = (
-/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
- pixel_y = 25
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "silver"
- },
-/area/almayer/command/cichallway)
"aoy" = (
/obj/structure/sign/safety/fire_haz{
pixel_x = 8;
@@ -4501,10 +4272,6 @@
icon_state = "plating"
},
/area/almayer/engineering/upper_engineering)
-"aoZ" = (
-/obj/structure/sign/prop1,
-/turf/closed/wall/almayer/reinforced,
-/area/almayer/living/commandbunks)
"apa" = (
/obj/structure/surface/rack,
/obj/item/tool/screwdriver,
@@ -6108,6 +5875,18 @@
icon_state = "test_floor4"
},
/area/almayer/command/cic)
+"atS" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/faxmachine/uscm/command/capt{
+ name = "Commanding Officer's Fax Machine";
+ pixel_y = 3;
+ pixel_x = -4
+ },
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"atT" = (
/obj/structure/toilet{
dir = 1
@@ -9260,6 +9039,27 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/stern_hallway)
+"aEq" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/overwatch/almayer{
+ dir = 8;
+ layer = 3.2;
+ pixel_x = -17;
+ pixel_y = -17
+ },
+/obj/structure/phone_base/rotary/no_dnd{
+ name = "Delta Overwatch Telephone";
+ phone_category = "Command";
+ phone_id = "Delta Overwatch"
+ },
+/obj/structure/sign/safety/terminal{
+ pixel_x = -17;
+ pixel_y = 7
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/cic)
"aEA" = (
/obj/structure/machinery/light,
/turf/open/floor/almayer{
@@ -10793,6 +10593,23 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_s)
+"aLc" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/structure/phone_base{
+ dir = 8;
+ name = "OT Telephone";
+ phone_category = "Almayer";
+ phone_id = "Ordnance Tech";
+ pixel_x = 14
+ },
+/obj/structure/disposalpipe/segment,
+/turf/open/floor/almayer{
+ dir = 4;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/engineering_workshop/hangar)
"aLd" = (
/turf/closed/wall/almayer,
/area/almayer/hull/lower_hull)
@@ -12315,6 +12132,18 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/north1)
+"aSM" = (
+/obj/structure/machinery/door/airlock/almayer/generic{
+ name = "\improper Bathroom";
+ dir = 2
+ },
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/commandbunks)
"aSO" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/reagent_container/spray/cleaner{
@@ -17497,6 +17326,20 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_m_p)
+"buE" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
+ pixel_y = -29
+ },
+/turf/open/floor/almayer{
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"buH" = (
/turf/open/floor/almayer,
/area/almayer/hallways/port_hallway)
@@ -19087,18 +18930,6 @@
icon_state = "cargo"
},
/area/almayer/living/cryo_cells)
-"bCO" = (
-/obj/item/tool/kitchen/tray{
- layer = 2.9
- },
-/obj/item/reagent_container/food/snacks/carpmeat{
- layer = 3.3
- },
-/obj/item/reagent_container/food/snacks/carpmeat{
- layer = 3.3
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"bCP" = (
/obj/structure/bed/chair{
dir = 1
@@ -20426,12 +20257,6 @@
},
/turf/closed/wall/almayer/reinforced,
/area/almayer/shipboard/navigation)
-"bIz" = (
-/mob/living/simple_animal/cat/Jones{
- dir = 8
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"bIA" = (
/obj/structure/sink{
dir = 4;
@@ -21278,6 +21103,15 @@
icon_state = "plate"
},
/area/almayer/hallways/port_hallway)
+"bLW" = (
+/obj/structure/phone_base/rotary{
+ name = "CL Office Telephone";
+ phone_category = "Almayer";
+ phone_id = "CL Office"
+ },
+/obj/structure/surface/table/woodentable/fancy,
+/turf/open/floor/carpet,
+/area/almayer/command/corporateliason)
"bLX" = (
/obj/vehicle/powerloader,
/turf/open/floor/almayer{
@@ -23714,43 +23548,6 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
-"bWR" = (
-/obj/structure/machinery/door_control{
- id = "ARES StairsUpper";
- name = "ARES Core Access";
- pixel_x = -10;
- pixel_y = -24;
- req_one_access_txt = "91;92"
- },
-/obj/structure/machinery/door_control{
- id = "ARES StairsLock";
- name = "ARES Exterior Lockdown";
- pixel_y = -24;
- req_one_access_txt = "91;92"
- },
-/obj/structure/surface/table/reinforced/almayer_B{
- climbable = 0;
- indestructible = 1;
- unacidable = 1;
- unslashable = 1
- },
-/obj/structure/phone_base/rotary{
- name = "AI Reception Telephone";
- phone_category = "ARES";
- phone_color = "blue";
- phone_id = "AI Reception"
- },
-/obj/structure/machinery/door_control{
- id = "ARES Emergency";
- name = "ARES Emergency Lockdown";
- pixel_x = 10;
- pixel_y = -24;
- req_one_access_txt = "91;92"
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "ai_floors"
- },
-/area/almayer/command/airoom)
"bWS" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/glass/bucket/mopbucket,
@@ -24056,10 +23853,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/aft_hallway)
-"bYd" = (
-/obj/structure/bookcase/manuals/engineering,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"bYe" = (
/turf/open/floor/almayer{
icon_state = "mono"
@@ -24157,6 +23950,16 @@
icon_state = "silver"
},
/area/almayer/command/cichallway)
+"bYD" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/prop/tableflag/uscm{
+ pixel_x = -5
+ },
+/obj/item/prop/tableflag/uscm2{
+ pixel_x = 5
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"bYE" = (
/obj/effect/decal/warning_stripes{
icon_state = "E";
@@ -25980,11 +25783,6 @@
icon_state = "emerald"
},
/area/almayer/squads/charlie)
-"cia" = (
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/computerlab)
"cib" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/disposalpipe/segment{
@@ -27257,6 +27055,10 @@
icon_state = "plate"
},
/area/almayer/shipboard/starboard_point_defense)
+"coY" = (
+/obj/structure/surface/table/woodentable/fancy,
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"coZ" = (
/turf/open/floor/almayer/research/containment/corner{
dir = 4
@@ -27594,18 +27396,6 @@
icon_state = "plate"
},
/area/almayer/squads/req)
-"cvg" = (
-/obj/structure/phone_base{
- name = "Brig Offices Telephone";
- phone_category = "Almayer";
- phone_id = "Brig Main Offices";
- pixel_y = 32
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "red"
- },
-/area/almayer/shipboard/brig/main_office)
"cvj" = (
/obj/structure/machinery/power/apc/almayer/hardened{
dir = 1
@@ -27669,6 +27459,15 @@
icon_state = "plating"
},
/area/almayer/command/airoom)
+"cwT" = (
+/obj/structure/closet/secure_closet/commander,
+/obj/item/clothing/suit/storage/marine/light/vest,
+/obj/item/device/whistle,
+/obj/item/device/megaphone,
+/obj/item/device/radio,
+/obj/item/clothing/shoes/laceup,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"cwX" = (
/obj/structure/ladder{
height = 1;
@@ -27920,18 +27719,23 @@
icon_state = "plate"
},
/area/almayer/hallways/starboard_hallway)
+"cBL" = (
+/obj/structure/machinery/door/firedoor/border_only/almayer,
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+ name = "\improper Commanding Officer's Quarters";
+ req_access = null;
+ req_access_txt = "31"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/commandbunks)
"cCa" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
},
/turf/open/floor/almayer,
/area/almayer/living/chapel)
-"cCd" = (
-/obj/structure/bookcase{
- icon_state = "book-5"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"cCD" = (
/obj/structure/platform{
dir = 8;
@@ -28162,6 +27966,12 @@
icon_state = "cargo_arrow"
},
/area/almayer/squads/alpha_bravo_shared)
+"cHa" = (
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"cHc" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/sign/safety/ladder{
@@ -28285,18 +28095,6 @@
icon_state = "test_floor4"
},
/area/almayer/engineering/upper_engineering/starboard)
-"cJi" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/landmark/map_item,
-/obj/item/folder/red,
-/obj/structure/phone_base/rotary{
- name = "Brig CMP's Office Telephone";
- phone_category = "Offices";
- phone_id = "Brig CMP's Office";
- pixel_x = 15
- },
-/turf/open/floor/almayer,
-/area/almayer/shipboard/brig/chief_mp_office)
"cJu" = (
/obj/effect/decal/warning_stripes{
icon_state = "SW-out"
@@ -28504,6 +28302,25 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
+"cNd" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/device/flashlight/lamp/green{
+ pixel_y = 20;
+ pixel_x = -7
+ },
+/obj/item/ashtray/bronze{
+ pixel_y = 19;
+ pixel_x = 4
+ },
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/effect/landmark/map_item{
+ pixel_y = 3;
+ pixel_x = -1
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"cNe" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 5
@@ -29020,6 +28837,15 @@
icon_state = "test_floor4"
},
/area/almayer/lifeboat_pumps/south1)
+"cZg" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/ares_console{
+ pixel_x = 9
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "plating"
+ },
+/area/almayer/command/airoom)
"cZh" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
@@ -30932,6 +30758,27 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
+"dIE" = (
+/obj/structure/machinery/firealarm{
+ pixel_x = 6;
+ pixel_y = 28
+ },
+/obj/structure/bed/chair/office/dark{
+ dir = 4;
+ layer = 3.25
+ },
+/obj/structure/phone_base{
+ name = "CE Office Telephone";
+ phone_category = "Offices";
+ phone_id = "CE Office";
+ pixel_x = -8;
+ pixel_y = 29
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "orange"
+ },
+/area/almayer/engineering/ce_room)
"dII" = (
/obj/structure/machinery/door/airlock/multi_tile/almayer/marine/shared/alpha_bravo,
/obj/effect/decal/warning_stripes{
@@ -30954,6 +30801,34 @@
icon_state = "cargo"
},
/area/almayer/hull/lower_hull/l_m_s)
+"dJH" = (
+/obj/structure/closet/secure_closet/freezer/fridge/full,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/item/reagent_container/food/condiment/enzyme,
+/obj/item/reagent_container/food/condiment/enzyme,
+/obj/structure/phone_base{
+ name = "Kitchen Telephone";
+ phone_category = "Almayer";
+ phone_id = "Kitchen";
+ pixel_x = -8;
+ pixel_y = 29
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/grunt_rnr)
+"dJX" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer{
+ dir = 8;
+ icon_state = "silver"
+ },
+/area/almayer/command/computerlab)
"dKm" = (
/obj/structure/machinery/power/apc/almayer{
dir = 4
@@ -31820,6 +31695,20 @@
icon_state = "plating"
},
/area/almayer/hallways/vehiclehangar)
+"ecT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/obj/structure/coatrack{
+ pixel_y = 1;
+ pixel_x = -5
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 5
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"ecZ" = (
/obj/structure/ladder{
height = 1;
@@ -32053,18 +31942,13 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
-"egX" = (
-/obj/structure/phone_base/no_dnd{
- name = "Requisition Telephone";
- phone_category = "Almayer";
- phone_id = "Requisition";
- pixel_y = 30
- },
+"egV" = (
+/obj/structure/surface/table/almayer,
/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
+ dir = 10;
+ icon_state = "silver"
},
-/area/almayer/squads/req)
+/area/almayer/command/computerlab)
"ehi" = (
/obj/effect/decal/warning_stripes{
icon_state = "NE-out";
@@ -32429,6 +32313,15 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/main_office)
+"eon" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"eoG" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 5
@@ -32672,10 +32565,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/port_umbilical)
-"erZ" = (
-/obj/structure/pipes/vents/scrubber,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"esi" = (
/obj/structure/sign/safety/stairs{
pixel_x = 15;
@@ -33110,10 +32999,6 @@
icon_state = "orange"
},
/area/almayer/hallways/starboard_hallway)
-"eBo" = (
-/obj/structure/machinery/cm_vending/gear/commanding_officer,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"eBC" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 10
@@ -34106,10 +33991,6 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
-"eYC" = (
-/obj/structure/machinery/vending/cigarette,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"eYH" = (
/obj/structure/platform{
dir = 4
@@ -34550,6 +34431,15 @@
},
/turf/open/floor/plating,
/area/almayer/shipboard/brig/cells)
+"fgT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"fhf" = (
/obj/structure/surface/rack,
/obj/item/storage/toolbox/mechanical,
@@ -34598,30 +34488,31 @@
icon_state = "orange"
},
/area/almayer/engineering/engine_core)
-"fjn" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/computer/overwatch/almayer{
- dir = 8;
- layer = 3.2;
- pixel_x = -17;
- pixel_y = -17
+"fix" = (
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ name = "General Listening Channel";
+ pixel_x = -6;
+ pixel_y = 28
},
-/obj/structure/machinery/light{
- dir = 1
+/obj/structure/machinery/firealarm{
+ pixel_x = 8;
+ pixel_y = 28
},
-/obj/structure/phone_base/rotary/no_dnd{
- name = "Charlie Overwatch Telephone";
- phone_category = "Command";
- phone_id = "Charlie Overwatch"
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/phone_base/rotary{
+ name = "Intelligence Center Telephone";
+ phone_category = "Almayer";
+ phone_id = "Intelligence Center Telephone"
},
-/obj/structure/sign/safety/terminal{
- pixel_x = -17;
- pixel_y = 7
+/obj/structure/machinery/computer/cameras/almayer/vehicle{
+ dir = 4;
+ pixel_x = -17
},
/turf/open/floor/almayer{
- icon_state = "plate"
+ icon_state = "silverfull"
},
-/area/almayer/command/cic)
+/area/almayer/command/securestorage)
"fjO" = (
/obj/item/tool/wet_sign,
/obj/effect/decal/cleanable/blood,
@@ -35166,47 +35057,6 @@
icon_state = "silver"
},
/area/almayer/living/briefing)
-"fvj" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/door_control{
- id = "CIC Lockdown";
- name = "CIC Lockdown";
- pixel_x = -7;
- pixel_y = 9;
- req_access_txt = "1"
- },
-/obj/structure/machinery/door_control{
- id = "Hangar Lockdown";
- name = "Hangar Lockdown";
- pixel_x = -7;
- pixel_y = 2;
- req_access_txt = "1"
- },
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 4;
- icon_state = "exposed01-supply"
- },
-/obj/structure/machinery/door_control{
- id = "bot_armory";
- name = "Armory Lockdown";
- pixel_x = -7;
- pixel_y = -5;
- req_one_access_txt = "1;4"
- },
-/obj/structure/phone_base/rotary/no_dnd{
- name = "Combat Information Center Telephone";
- phone_category = "Command";
- phone_id = "Combat Information Center";
- pixel_x = 5;
- pixel_y = 4
- },
-/obj/structure/machinery/door/window/westright{
- dir = 4
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/cic)
"fvu" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer,
@@ -35265,28 +35115,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/charlie_delta_shared)
-"fxd" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/computer/overwatch/almayer{
- dir = 8;
- layer = 3.2;
- pixel_x = -17;
- pixel_y = 15
- },
-/obj/structure/machinery/light,
-/obj/structure/phone_base/rotary/no_dnd{
- name = "Bravo Overwatch Telephone";
- phone_category = "Command";
- phone_id = "Bravo Overwatch"
- },
-/obj/structure/sign/safety/terminal{
- pixel_x = -17;
- pixel_y = -8
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/cic)
"fxu" = (
/obj/structure/sign/safety/hvac_old{
pixel_x = 8
@@ -35359,6 +35187,18 @@
icon_state = "plate"
},
/area/almayer/shipboard/weapon_room)
+"fyg" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/structure/machinery/power/apc/almayer{
+ dir = 8
+ },
+/obj/item/storage/briefcase{
+ pixel_y = 15
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"fyD" = (
/obj/structure/machinery/light,
/obj/structure/ladder{
@@ -35484,6 +35324,23 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/command/lifeboat)
+"fCE" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
+/obj/structure/mirror{
+ pixel_x = -29
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/commandbunks)
"fCL" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -36044,13 +35901,6 @@
icon_state = "green"
},
/area/almayer/hallways/aft_hallway)
-"fNb" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/computer/card{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"fNg" = (
/obj/structure/largecrate/random/barrel/yellow,
/turf/open/floor/plating/plating_catwalk,
@@ -36307,6 +36157,19 @@
icon_state = "green"
},
/area/almayer/hallways/starboard_hallway)
+"fUn" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_21"
+ },
+/obj/structure/sign/poster/io{
+ pixel_y = 32;
+ name = "propaganda poster"
+ },
+/obj/structure/sign/safety/escapepod{
+ pixel_x = -17
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
"fUA" = (
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/briefing)
@@ -36722,19 +36585,6 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/medical_science)
-"geE" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/machinery/photocopier{
- anchored = 0
- },
-/obj/structure/sign/poster/io{
- pixel_y = 32;
- name = "propaganda poster"
- },
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
"geH" = (
/obj/structure/machinery/camera/autoname/almayer{
name = "ship-grade camera"
@@ -36744,28 +36594,6 @@
icon_state = "orangecorner"
},
/area/almayer/hallways/stern_hallway)
-"geW" = (
-/obj/structure/sign/prop1{
- pixel_y = 32
- },
-/obj/item/storage/fancy/cigar,
-/obj/item/reagent_container/food/drinks/bottle/sake{
- layer = 3.6;
- pixel_x = 9;
- pixel_y = 16
- },
-/obj/item/reagent_container/food/drinks/bottle/sake{
- layer = 3.6;
- pixel_y = 16
- },
-/obj/item/reagent_container/food/drinks/bottle/sake{
- layer = 3.6;
- pixel_x = -9;
- pixel_y = 16
- },
-/obj/structure/surface/table/woodentable/fancy,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"geX" = (
/obj/structure/pipes/vents/scrubber,
/obj/structure/sign/safety/ammunition{
@@ -37086,10 +36914,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_p)
-"glU" = (
-/obj/structure/bed/chair/office/dark,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"gmb" = (
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 1
@@ -37117,6 +36941,27 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/port)
+"gmy" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+ pixel_x = -5;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+ desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself.";
+ pixel_x = 3;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/food/drinks/bottle/whiskey{
+ pixel_x = 11;
+ pixel_y = 16
+ },
+/obj/item/storage/box/drinkingglasses{
+ pixel_x = -1;
+ pixel_y = 2
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"gnu" = (
/obj/structure/surface/table/almayer,
/obj/item/facepaint/green,
@@ -37627,6 +37472,18 @@
icon_state = "silver"
},
/area/almayer/shipboard/brig/cic_hallway)
+"gyk" = (
+/obj/structure/sign/prop1{
+ pixel_y = 32
+ },
+/obj/structure/filingcabinet/security{
+ pixel_x = -8
+ },
+/obj/structure/filingcabinet/medical{
+ pixel_x = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"gyt" = (
/obj/item/storage/firstaid/regular,
/obj/structure/surface/rack,
@@ -38512,6 +38369,14 @@
icon_state = "orange"
},
/area/almayer/engineering/engineering_workshop/hangar)
+"gQy" = (
+/obj/structure/machinery/light,
+/obj/structure/flora/pottedplant{
+ pixel_y = 3;
+ pixel_x = -1
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"gQF" = (
/obj/structure/bed/chair/comfy{
buckling_y = 2;
@@ -39211,6 +39076,19 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
+"hfm" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/machinery/photocopier{
+ anchored = 0
+ },
+/obj/structure/sign/poster/io{
+ pixel_y = 32;
+ name = "propaganda poster"
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/command/corporateliason)
"hfw" = (
/obj/structure/flora/pottedplant{
icon_state = "pottedplant_22"
@@ -39689,6 +39567,28 @@
/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
/turf/open/floor/almayer/research/containment/entrance,
/area/almayer/medical/containment/cell)
+"hqi" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/overwatch/almayer{
+ dir = 8;
+ layer = 3.2;
+ pixel_x = -17;
+ pixel_y = 15
+ },
+/obj/structure/machinery/light,
+/obj/structure/phone_base/rotary/no_dnd{
+ name = "Bravo Overwatch Telephone";
+ phone_category = "Command";
+ phone_id = "Bravo Overwatch"
+ },
+/obj/structure/sign/safety/terminal{
+ pixel_x = -17;
+ pixel_y = -8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/cic)
"hqs" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -39858,6 +39758,18 @@
/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
/turf/open/floor/plating,
/area/almayer/powered/agent)
+"hvC" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/obj/item/bedsheet/hop{
+ pixel_y = 0
+ },
+/obj/structure/bed{
+ pixel_y = 0
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"hvH" = (
/turf/open/floor/wood/ship,
/area/almayer/living/commandbunks)
@@ -39874,6 +39786,20 @@
icon_state = "plate"
},
/area/almayer/engineering/upper_engineering)
+"hwP" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/phone_base{
+ dir = 4;
+ name = "Starboard Railgun Control Telephone";
+ phone_category = "Command";
+ phone_id = "Starboard Railgun Control";
+ pixel_x = -26
+ },
+/obj/item/device/binoculars,
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/shipboard/starboard_missiles)
"hwQ" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/firedoor/border_only/almayer{
@@ -40012,27 +39938,6 @@
"hyQ" = (
/turf/closed/wall/almayer,
/area/almayer/living/synthcloset)
-"hyR" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/computer/overwatch/almayer{
- dir = 8;
- layer = 3.2;
- pixel_x = -17;
- pixel_y = 16
- },
-/obj/structure/phone_base/rotary/no_dnd{
- name = "Alpha Overwatch Telephone";
- phone_category = "Command";
- phone_id = "Alpha Overwatch"
- },
-/obj/structure/sign/safety/terminal{
- pixel_x = -17;
- pixel_y = -8
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/cic)
"hzc" = (
/turf/closed/wall/almayer/outer,
/area/almayer/engineering/upper_engineering/notunnel)
@@ -40355,10 +40260,6 @@
/obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m39_submachinegun,
/turf/open/floor/plating/almayer,
/area/almayer/shipboard/brig/armory)
-"hGB" = (
-/obj/structure/machinery/light,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"hGD" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -40416,6 +40317,19 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
+"hHF" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/phone_base{
+ dir = 4;
+ name = "Port Railgun Control Telephone";
+ phone_category = "Command";
+ phone_id = "Port Railgun Control";
+ pixel_x = -26
+ },
+/turf/open/floor/almayer{
+ icon_state = "redfull"
+ },
+/area/almayer/shipboard/port_missiles)
"hHJ" = (
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
id = "vehicle1door";
@@ -41448,15 +41362,6 @@
icon_state = "sterile_green_corner"
},
/area/almayer/medical/lower_medical_lobby)
-"ieA" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/light{
- dir = 1
- },
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/securestorage)
"ieF" = (
/obj/effect/projector{
name = "Almayer_AresUp";
@@ -41561,6 +41466,18 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/main_office)
+"igX" = (
+/turf/open/floor/almayer{
+ icon_state = "silverfull"
+ },
+/area/almayer/command/computerlab)
+"igZ" = (
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer{
+ dir = 4;
+ icon_state = "silver"
+ },
+/area/almayer/command/computerlab)
"ihn" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/drinks/cans/souto/blue{
@@ -41889,6 +41806,14 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
+"ioo" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/computer/emails{
+ dir = 4;
+ pixel_y = 2
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"iow" = (
/obj/structure/machinery/cm_vending/sorted/attachments/squad{
req_access = null;
@@ -42396,6 +42321,25 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/req)
+"ixZ" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+ density = 0;
+ pixel_y = 16
+ },
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/structure/machinery/door_control{
+ id = "bot_uniforms";
+ name = "Uniform Vendor Lockdown";
+ pixel_x = -24;
+ pixel_y = 18;
+ req_access_txt = "31"
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/cic)
"iyq" = (
/obj/structure/machinery/door/poddoor/shutters/almayer/open{
dir = 2;
@@ -42469,24 +42413,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_p)
-"izB" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/cameras/almayer_network{
- dir = 1
- },
-/obj/structure/machinery/light{
- unacidable = 1;
- unslashable = 1
- },
-/obj/structure/phone_base{
- dir = 1;
- name = "Brig Warden's Office Telephone";
- phone_category = "Offices";
- phone_id = "Brig Warden's Office";
- pixel_x = -16
- },
-/turf/open/floor/almayer,
-/area/almayer/shipboard/brig/main_office)
"izG" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -42741,31 +42667,6 @@
},
/turf/open/floor/almayer,
/area/almayer/living/offices)
-"iFL" = (
-/obj/item/device/radio/intercom{
- freerange = 1;
- name = "General Listening Channel";
- pixel_x = -6;
- pixel_y = 28
- },
-/obj/structure/machinery/firealarm{
- pixel_x = 8;
- pixel_y = 28
- },
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/phone_base/rotary{
- name = "Intelligence Center Telephone";
- phone_category = "Almayer";
- phone_id = "Intelligence Center Telephone"
- },
-/obj/structure/machinery/computer/cameras/almayer/vehicle{
- dir = 4;
- pixel_x = -17
- },
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/securestorage)
"iFM" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -42785,6 +42686,12 @@
/obj/item/reagent_container/food/snacks/tomatomeat,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_m_p)
+"iGj" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 5
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/hull/upper_hull/u_f_s)
"iGn" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/closet/secure_closet/surgical{
@@ -43429,20 +43336,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
-"iVZ" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/folder/black,
-/obj/item/storage/bible/booze,
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door_control{
- id = "CO-Office";
- name = "Door Control";
- normaldoorcontrol = 1;
- pixel_x = 18;
- req_access_txt = "31"
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"iWb" = (
/obj/structure/sign/safety/hazard{
pixel_x = 32;
@@ -43898,6 +43791,25 @@
"jeb" = (
/turf/closed/wall/almayer,
/area/almayer/squads/alpha_bravo_shared)
+"jel" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
+ },
+/obj/structure/phone_base{
+ name = "CMO Office Telephone";
+ phone_category = "Offices";
+ phone_id = "CMO Office";
+ pixel_y = 29
+ },
+/obj/structure/sign/safety/commline_connection{
+ pixel_x = 23;
+ pixel_y = 32
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "sterile_green_side"
+ },
+/area/almayer/medical/upper_medical)
"jeq" = (
/obj/structure/surface/rack,
/obj/item/storage/box/pillbottles{
@@ -44155,6 +44067,12 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
+"jhB" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"jhD" = (
/obj/structure/machinery/firealarm{
pixel_y = -28
@@ -44409,6 +44327,18 @@
/obj/structure/largecrate/supply/ammo/shotgun,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_a_s)
+"jmt" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/folder/black{
+ pixel_y = 8
+ },
+/obj/item/folder/yellow,
+/obj/item/device/flashlight/lamp/green{
+ pixel_y = 8;
+ pixel_x = -16
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"jmK" = (
/turf/open/floor/almayer{
icon_state = "plate"
@@ -44722,14 +44652,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
/area/almayer/living/port_emb)
-"juN" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/paper_bin/uscm,
-/obj/item/tool/pen{
- pixel_y = 7
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"juX" = (
/obj/structure/platform_decoration{
dir = 1
@@ -45150,6 +45072,24 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
+"jGp" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/cameras/almayer_network{
+ dir = 1
+ },
+/obj/structure/machinery/light{
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/structure/phone_base{
+ dir = 1;
+ name = "Brig Warden's Office Telephone";
+ phone_category = "Offices";
+ phone_id = "Brig Warden's Office";
+ pixel_x = -16
+ },
+/turf/open/floor/almayer,
+/area/almayer/shipboard/brig/main_office)
"jGI" = (
/obj/structure/surface/table/reinforced/almayer_B,
/obj/item/reagent_container/food/drinks/cans/waterbottle,
@@ -45614,6 +45554,14 @@
dir = 8
},
/area/almayer/medical/containment/cell)
+"jQD" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_18";
+ pixel_y = 12
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"jRz" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -46244,6 +46192,18 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/port)
+"kcD" = (
+/obj/structure/machinery/cm_vending/clothing/dress{
+ density = 0;
+ pixel_y = 16
+ },
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/command/cic)
"kcH" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/living/synthcloset)
@@ -47408,10 +47368,6 @@
icon_state = "plate"
},
/area/almayer/living/pilotbunks)
-"kFk" = (
-/obj/structure/closet/secure_closet/commander,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"kFq" = (
/obj/structure/surface/table/almayer,
/obj/item/book/manual/engineering_construction,
@@ -48536,19 +48492,6 @@
icon_state = "bluefull"
},
/area/almayer/living/bridgebunks)
-"lcS" = (
-/obj/structure/phone_base{
- dir = 8;
- name = "RO Office Telephone";
- phone_category = "Offices";
- phone_id = "RO Office";
- pixel_x = 16
- },
-/turf/open/floor/almayer{
- dir = 4;
- icon_state = "green"
- },
-/area/almayer/squads/req)
"lcV" = (
/obj/structure/bed/chair{
dir = 4
@@ -48877,17 +48820,6 @@
},
/turf/open/floor/wood/ship,
/area/almayer/shipboard/brig/cells)
-"ljd" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/computer/crew/alt,
-/obj/structure/phone_base/rotary/no_dnd{
- name = "Brig Cells Telephone";
- phone_category = "Almayer";
- phone_id = "Brig Cells";
- pixel_x = 15
- },
-/turf/open/floor/almayer,
-/area/almayer/shipboard/brig/processing)
"ljf" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/drinks/cans/waterbottle,
@@ -48900,6 +48832,21 @@
/obj/effect/landmark/late_join/bravo,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/squads/bravo)
+"ljv" = (
+/obj/structure/bookcase{
+ icon_state = "book-5";
+ name = "medical manuals bookcase";
+ opacity = 0
+ },
+/obj/item/book/manual/surgery,
+/obj/item/book/manual/research_and_development,
+/obj/item/book/manual/medical_diagnostics_manual,
+/obj/item/book/manual/medical_cloning,
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"ljG" = (
/obj/structure/closet/crate/freezer,
/obj/item/reagent_container/food/condiment/coldsauce,
@@ -49045,18 +48992,14 @@
},
/area/almayer/shipboard/brig/cic_hallway)
"lnG" = (
-/obj/structure/surface/table/reinforced/prison,
-/obj/structure/phone_base{
- dir = 8;
- name = "Medical Telephone";
- phone_category = "Almayer";
- phone_id = "Medical Lower";
- pixel_x = 16
+/obj/structure/machinery/cm_vending/clothing/dress{
+ req_access = list(1);
+ pixel_y = 0
},
/turf/open/floor/almayer{
- icon_state = "sterile_green"
+ icon_state = "cargo"
},
-/area/almayer/medical/lockerroom)
+/area/almayer/living/commandbunks)
"lnJ" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 8;
@@ -49097,6 +49040,13 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
+"loc" = (
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer{
+ dir = 8;
+ icon_state = "silvercorner"
+ },
+/area/almayer/command/computerlab)
"lok" = (
/obj/structure/machinery/cm_vending/clothing/marine/charlie{
density = 0;
@@ -49144,6 +49094,16 @@
icon_state = "rasputin3"
},
/area/almayer/powered/agent)
+"loN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"loP" = (
/turf/closed/wall/almayer,
/area/almayer/engineering/laundry)
@@ -49415,11 +49375,6 @@
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/closed/wall/almayer/reinforced,
/area/almayer/shipboard/brig/main_office)
-"lue" = (
-/obj/structure/surface/table/almayer,
-/obj/item/folder/yellow,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"luk" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -49567,6 +49522,32 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/aft_hallway)
+"lwB" = (
+/obj/structure/machinery/firealarm{
+ pixel_y = 28
+ },
+/obj/structure/sign/safety/maint{
+ pixel_x = -17
+ },
+/obj/structure/surface/table/almayer,
+/obj/structure/phone_base/rotary{
+ name = "Telephone";
+ phone_category = "Almayer";
+ phone_id = "Auxiliary Support Office Second Line";
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/structure/phone_base/rotary{
+ name = "Telephone";
+ phone_category = "Almayer";
+ phone_id = "Auxiliary Support Office";
+ pixel_x = 8;
+ pixel_y = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/auxiliary_officer_office)
"lwC" = (
/obj/structure/desertdam/decals/road_edge{
icon_state = "road_edge_decal3";
@@ -49601,6 +49582,15 @@
icon_state = "plate"
},
/area/almayer/living/auxiliary_officer_office)
+"lxJ" = (
+/obj/structure/machinery/light,
+/obj/structure/machinery/cm_vending/gear/commanding_officer{
+ pixel_y = 0
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/living/commandbunks)
"lxT" = (
/obj/structure/machinery/constructable_frame,
/turf/open/floor/almayer{
@@ -49933,22 +49923,6 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
-"lCD" = (
-/obj/structure/surface/table/almayer,
-/obj/item/clothing/mask/cigarette/pipe{
- pixel_x = 8
- },
-/obj/structure/phone_base/rotary{
- name = "Reporter Telephone";
- phone_category = "Almayer";
- phone_id = "Reporter";
- pixel_x = -4;
- pixel_y = 6
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/combat_correspondent)
"lCM" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -50248,6 +50222,27 @@
icon_state = "greencorner"
},
/area/almayer/living/grunt_rnr)
+"lHE" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/tool/stamp/hop{
+ name = "Commanding Officer's rubber stamp";
+ pixel_x = -5;
+ pixel_y = 9
+ },
+/obj/item/paper_bin/uscm{
+ pixel_y = 6;
+ pixel_x = 7
+ },
+/obj/item/tool/pen/red/clicky{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/tool/pen/blue/clicky{
+ pixel_x = -6;
+ pixel_y = -3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"lHG" = (
/obj/structure/machinery/door/airlock/almayer/maint{
access_modified = 1;
@@ -50334,6 +50329,14 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_m_p)
+"lJo" = (
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/machinery/disposal,
+/obj/structure/disposalpipe/trunk,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"lJu" = (
/obj/structure/barricade/metal{
dir = 1
@@ -50558,6 +50561,27 @@
icon_state = "redcorner"
},
/area/almayer/shipboard/brig/execution)
+"lNS" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/overwatch/almayer{
+ dir = 8;
+ layer = 3.2;
+ pixel_x = -17;
+ pixel_y = 16
+ },
+/obj/structure/phone_base/rotary/no_dnd{
+ name = "Alpha Overwatch Telephone";
+ phone_category = "Command";
+ phone_id = "Alpha Overwatch"
+ },
+/obj/structure/sign/safety/terminal{
+ pixel_x = -17;
+ pixel_y = -8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/cic)
"lOl" = (
/obj/structure/machinery/light{
dir = 8
@@ -50651,11 +50675,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
-"lQq" = (
-/obj/structure/bed,
-/obj/item/bedsheet/hop,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"lQu" = (
/obj/structure/bed/stool,
/turf/open/floor/almayer{
@@ -50778,6 +50797,18 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_p)
+"lTZ" = (
+/obj/structure/toilet{
+ dir = 8;
+ pixel_y = 8;
+ layer = 2.9
+ },
+/obj/structure/window{
+ pixel_y = -2;
+ layer = 2.95
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/commandbunks)
"lUv" = (
/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun,
/turf/open/floor/almayer{
@@ -51583,6 +51614,28 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall/almayer,
/area/almayer/squads/req)
+"mqb" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/obj/structure/phone_base/rotary{
+ name = "Researcher Office Telephone";
+ phone_category = "Almayer";
+ phone_id = "Research";
+ pixel_y = 6
+ },
+/obj/item/reagent_container/glass/beaker{
+ pixel_x = 6;
+ pixel_y = -1
+ },
+/obj/item/reagent_container/glass/beaker/large{
+ pixel_x = -6
+ },
+/turf/open/floor/almayer{
+ icon_state = "sterile_green_side"
+ },
+/area/almayer/medical/medical_science)
"mqg" = (
/obj/structure/bed/chair{
dir = 4
@@ -51791,6 +51844,12 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_f_p)
+"mtH" = (
+/obj/structure/bed/chair/office/dark{
+ dir = 8
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"mtM" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
@@ -52031,6 +52090,18 @@
icon_state = "emerald"
},
/area/almayer/squads/charlie)
+"mzk" = (
+/obj/structure/phone_base/no_dnd{
+ name = "Requisition Telephone";
+ phone_category = "Almayer";
+ phone_id = "Requisition";
+ pixel_y = 30
+ },
+/turf/open/floor/almayer{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/almayer/squads/req)
"mzo" = (
/turf/closed/wall/almayer,
/area/almayer/hull/lower_hull/l_f_p)
@@ -52476,6 +52547,15 @@
icon_state = "orange"
},
/area/almayer/engineering/upper_engineering/starboard)
+"mJA" = (
+/obj/structure/closet/secure_closet/bar{
+ name = "Success Cabinet";
+ req_access_txt = "1"
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/living/captain_mess)
"mJL" = (
/turf/open/floor/almayer{
dir = 5;
@@ -52667,13 +52747,6 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/main_office)
-"mLO" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
- dir = 8;
- icon_state = "silvercorner"
- },
-/area/almayer/command/computerlab)
"mLR" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -52801,6 +52874,12 @@
icon_state = "green"
},
/area/almayer/hallways/aft_hallway)
+"mOT" = (
+/obj/structure/pipes/vents/pump{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"mOU" = (
/obj/structure/machinery/light/small{
dir = 4
@@ -54076,27 +54155,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hull/upper_hull/u_f_s)
-"nqr" = (
-/obj/structure/machinery/firealarm{
- pixel_x = 6;
- pixel_y = 28
- },
-/obj/structure/bed/chair/office/dark{
- dir = 4;
- layer = 3.25
- },
-/obj/structure/phone_base{
- name = "CE Office Telephone";
- phone_category = "Offices";
- phone_id = "CE Office";
- pixel_x = -8;
- pixel_y = 29
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "orange"
- },
-/area/almayer/engineering/ce_room)
"nqx" = (
/obj/structure/pipes/standard/manifold/hidden/supply,
/turf/open/floor/plating/plating_catwalk,
@@ -54410,15 +54468,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
-"nwv" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/item/paper{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/tool/lighter/zippo/gold,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"nww" = (
/obj/item/device/radio/intercom{
freerange = 1;
@@ -54872,6 +54921,14 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/starboard_hallway)
+"nFW" = (
+/obj/structure/machinery/cm_vending/clothing/commanding_officer{
+ pixel_y = 0
+ },
+/turf/open/floor/almayer{
+ icon_state = "cargo"
+ },
+/area/almayer/living/commandbunks)
"nFX" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
dir = 2;
@@ -55404,6 +55461,12 @@
icon_state = "red"
},
/area/almayer/shipboard/port_missiles)
+"nRW" = (
+/obj/structure/machinery/photocopier{
+ anchored = 0
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"nRX" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
@@ -55478,15 +55541,6 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
-"nTP" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/computer/ares_console{
- pixel_x = 9
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "plating"
- },
-/area/almayer/command/airoom)
"nTZ" = (
/turf/open/floor/almayer{
dir = 5;
@@ -55608,27 +55662,6 @@
icon_state = "test_floor4"
},
/area/almayer/hull/upper_hull/u_m_p)
-"nWp" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/computer/overwatch/almayer{
- dir = 8;
- layer = 3.2;
- pixel_x = -17;
- pixel_y = -17
- },
-/obj/structure/phone_base/rotary/no_dnd{
- name = "Delta Overwatch Telephone";
- phone_category = "Command";
- phone_id = "Delta Overwatch"
- },
-/obj/structure/sign/safety/terminal{
- pixel_x = -17;
- pixel_y = 7
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/command/cic)
"nWN" = (
/obj/structure/surface/table/almayer,
/turf/open/floor/wood/ship,
@@ -55848,12 +55881,6 @@
icon_state = "green"
},
/area/almayer/living/grunt_rnr)
-"ocs" = (
-/obj/structure/pipes/vents/pump{
- dir = 4
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"ocB" = (
/obj/effect/decal/warning_stripes{
icon_state = "S";
@@ -56291,19 +56318,6 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/execution)
-"okP" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_21"
- },
-/obj/structure/sign/poster/io{
- pixel_y = 32;
- name = "propaganda poster"
- },
-/obj/structure/sign/safety/escapepod{
- pixel_x = -17
- },
-/turf/open/floor/wood/ship,
-/area/almayer/command/corporateliason)
"olk" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -56565,13 +56579,6 @@
icon_state = "plate"
},
/area/almayer/living/pilotbunks)
-"oqA" = (
-/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors,
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "cargo_arrow"
- },
-/area/almayer/command/cic)
"oqD" = (
/obj/structure/surface/table/almayer,
/obj/item/tool/wet_sign,
@@ -57086,19 +57093,6 @@
dir = 10
},
/area/almayer/living/briefing)
-"oAN" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/phone_base{
- dir = 4;
- name = "Port Railgun Control Telephone";
- phone_category = "Command";
- phone_id = "Port Railgun Control";
- pixel_x = -26
- },
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/shipboard/port_missiles)
"oAO" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
@@ -57130,6 +57124,11 @@
icon_state = "silver"
},
/area/almayer/command/cichallway)
+"oBJ" = (
+/turf/open/floor/almayer{
+ icon_state = "silverfull"
+ },
+/area/almayer/command/securestorage)
"oCf" = (
/obj/structure/machinery/light{
unacidable = 1;
@@ -57359,30 +57358,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/north1)
-"oGK" = (
-/obj/structure/surface/table/almayer,
-/obj/item/reagent_container/food/drinks/cans/waterbottle{
- pixel_x = 9;
- pixel_y = 3
- },
-/obj/item/prop/helmetgarb/flair_io{
- pixel_x = -10;
- pixel_y = 6
- },
-/obj/item/prop/magazine/boots/n160{
- pixel_x = -6;
- pixel_y = -5
- },
-/obj/structure/phone_base/rotary{
- name = "Flight Deck Telephone";
- phone_category = "Almayer";
- phone_id = "Flight Deck";
- pixel_y = 8
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/hallways/repair_bay)
"oGP" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -57665,13 +57640,6 @@
icon_state = "redfull"
},
/area/almayer/squads/alpha_bravo_shared)
-"oMM" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/structure/machinery/cm_vending/clothing/commanding_officer,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"oMQ" = (
/obj/structure/pipes/vents/pump,
/turf/open/floor/almayer,
@@ -57712,6 +57680,13 @@
icon_state = "plating"
},
/area/almayer/medical/upper_medical)
+"oON" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 10
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"oOO" = (
/obj/structure/sign/safety/debark_lounge{
pixel_x = 15;
@@ -58365,6 +58340,25 @@
icon_state = "test_floor4"
},
/area/almayer/shipboard/brig/chief_mp_office)
+"peb" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/door_control{
+ id = "SEA Office Shutters";
+ name = "SEA Office Shutters";
+ pixel_y = 12
+ },
+/obj/item/ashtray/plastic{
+ pixel_x = 8;
+ pixel_y = -4
+ },
+/obj/structure/phone_base/rotary{
+ name = "Senior Enlisted Advisor Office Telephone";
+ phone_category = "Almayer";
+ phone_id = "Senior Enlisted Advisor's Office";
+ pixel_x = -3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/shipboard/sea_office)
"pef" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/sign/safety/maint{
@@ -58592,6 +58586,15 @@
icon_state = "redfull"
},
/area/almayer/squads/alpha_bravo_shared)
+"plj" = (
+/obj/structure/machinery/camera/autoname/almayer{
+ name = "ship-grade camera"
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"plE" = (
/obj/effect/decal/warning_stripes{
icon_state = "W"
@@ -58814,6 +58817,14 @@
icon_state = "plate"
},
/area/almayer/living/captain_mess)
+"prW" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/computer/card{
+ dir = 4;
+ pixel_x = 2
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"prY" = (
/obj/structure/surface/table/almayer,
/obj/item/trash/USCMtray,
@@ -58880,6 +58891,10 @@
icon_state = "sterile_green_corner"
},
/area/almayer/medical/lower_medical_medbay)
+"ptd" = (
+/obj/structure/surface/table/almayer,
+/turf/open/floor/almayer,
+/area/almayer/command/computerlab)
"pth" = (
/obj/structure/surface/table/almayer,
/obj/item/folder/blue,
@@ -58899,6 +58914,16 @@
icon_state = "plate"
},
/area/almayer/squads/charlie_delta_shared)
+"pts" = (
+/obj/structure/pipes/standard/manifold/hidden/supply,
+/obj/structure/disposalpipe/junction{
+ dir = 4;
+ icon_state = "pipe-j2"
+ },
+/turf/open/floor/almayer{
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"ptv" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/platform{
@@ -59172,6 +59197,13 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_s)
+"pAA" = (
+/obj/structure/machinery/status_display{
+ pixel_x = 32;
+ pixel_y = 16
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"pAR" = (
/obj/structure/pipes/vents/scrubber{
dir = 8
@@ -59529,6 +59561,10 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/south1)
+"pJg" = (
+/obj/structure/pipes/vents/scrubber,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"pJi" = (
/obj/structure/closet/firecloset,
/turf/open/floor/almayer{
@@ -59997,28 +60033,6 @@
icon_state = "test_floor5"
},
/area/almayer/medical/hydroponics)
-"pSg" = (
-/obj/structure/surface/table/almayer,
-/obj/effect/decal/warning_stripes{
- icon_state = "S"
- },
-/obj/structure/phone_base/rotary{
- name = "Researcher Office Telephone";
- phone_category = "Almayer";
- phone_id = "Research";
- pixel_y = 6
- },
-/obj/item/reagent_container/glass/beaker{
- pixel_x = 6;
- pixel_y = -1
- },
-/obj/item/reagent_container/glass/beaker/large{
- pixel_x = -6
- },
-/turf/open/floor/almayer{
- icon_state = "sterile_green_side"
- },
-/area/almayer/medical/medical_science)
"pSL" = (
/obj/structure/machinery/alarm/almayer{
dir = 1
@@ -60143,6 +60157,14 @@
icon_state = "silver"
},
/area/almayer/living/briefing)
+"pUI" = (
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "silverfull"
+ },
+/area/almayer/command/computerlab)
"pUJ" = (
/turf/closed/wall/almayer,
/area/almayer/hull/upper_hull/u_f_p)
@@ -60377,6 +60399,33 @@
},
/turf/open/floor/almayer,
/area/almayer/lifeboat_pumps/north1)
+"pYw" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/paper_bin/uscm{
+ pixel_y = 7;
+ pixel_x = -17
+ },
+/obj/item/tool/pen/clicky{
+ pixel_x = -13;
+ pixel_y = -1
+ },
+/obj/item/tool/pen/clicky{
+ pixel_y = 5;
+ pixel_x = -13
+ },
+/obj/structure/machinery/door_control{
+ id = "CO-Office";
+ name = "Door Control";
+ normaldoorcontrol = 1;
+ req_access_txt = "31";
+ pixel_y = 7
+ },
+/obj/item/ashtray/bronze{
+ pixel_y = 1;
+ pixel_x = 12
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"pYF" = (
/obj/structure/bed/chair{
dir = 1
@@ -60861,6 +60910,12 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
+"qhN" = (
+/obj/structure/machinery/light{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"qhU" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -61277,6 +61332,16 @@
icon_state = "green"
},
/area/almayer/living/grunt_rnr)
+"qpq" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4;
+ icon_state = "pipe-c"
+ },
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"qpx" = (
/obj/structure/surface/table/almayer,
/obj/structure/pipes/vents/scrubber,
@@ -61382,20 +61447,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_m_s)
-"qss" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/phone_base{
- dir = 4;
- name = "Starboard Railgun Control Telephone";
- phone_category = "Command";
- phone_id = "Starboard Railgun Control";
- pixel_x = -26
- },
-/obj/item/device/binoculars,
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/almayer/shipboard/starboard_missiles)
"qsC" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/disposalpipe/junction,
@@ -61562,6 +61613,18 @@
icon_state = "plate"
},
/area/almayer/living/offices)
+"qwy" = (
+/obj/structure/phone_base{
+ name = "Brig Offices Telephone";
+ phone_category = "Almayer";
+ phone_id = "Brig Main Offices";
+ pixel_y = 32
+ },
+/turf/open/floor/almayer{
+ dir = 1;
+ icon_state = "red"
+ },
+/area/almayer/shipboard/brig/main_office)
"qwJ" = (
/obj/structure/machinery/door_control{
id = "ARES Operations Left";
@@ -61575,6 +61638,30 @@
icon_state = "silver"
},
/area/almayer/command/airoom)
+"qwT" = (
+/obj/structure/surface/table/almayer,
+/obj/item/reagent_container/food/drinks/cans/waterbottle{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/prop/helmetgarb/flair_io{
+ pixel_x = -10;
+ pixel_y = 6
+ },
+/obj/item/prop/magazine/boots/n160{
+ pixel_x = -6;
+ pixel_y = -5
+ },
+/obj/structure/phone_base/rotary{
+ name = "Flight Deck Telephone";
+ phone_category = "Almayer";
+ phone_id = "Flight Deck";
+ pixel_y = 8
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/hallways/repair_bay)
"qxm" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
dir = 4;
@@ -61806,17 +61893,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/port)
-"qCi" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 5
- },
-/obj/item/device/radio/intercom{
- freerange = 1;
- name = "General Listening Channel";
- pixel_y = -28
- },
-/turf/open/floor/plating/plating_catwalk,
-/area/almayer/hull/upper_hull/u_f_s)
"qCo" = (
/obj/structure/pipes/vents/pump{
dir = 1
@@ -61937,6 +62013,12 @@
"qFl" = (
/turf/closed/wall/almayer/reinforced,
/area/almayer/hull/upper_hull/u_f_p)
+"qFm" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "S"
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"qFu" = (
/obj/structure/window/framed/almayer,
/obj/structure/machinery/door/poddoor/shutters/almayer{
@@ -62414,6 +62496,24 @@
},
/turf/open/floor/plating,
/area/almayer/hull/lower_hull/l_f_p)
+"qPv" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/faxmachine/uscm/command{
+ department = "AI Core";
+ pixel_y = 8
+ },
+/obj/structure/phone_base/rotary{
+ name = "AI Core Telephone";
+ phone_category = "ARES";
+ phone_color = "blue";
+ phone_id = "AI Core";
+ pixel_x = 8;
+ pixel_y = -8
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "ai_floors"
+ },
+/area/almayer/command/airoom)
"qPD" = (
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/perma)
@@ -62568,6 +62668,19 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/port_point_defense)
+"qSo" = (
+/obj/structure/machinery/door/window/westright,
+/obj/structure/machinery/shower{
+ dir = 8;
+ layer = 3.10;
+ plane = -4
+ },
+/obj/item/tool/soap{
+ pixel_x = 2;
+ pixel_y = 7
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/almayer/living/commandbunks)
"qSE" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/condiment/hotsauce/cholula,
@@ -62702,13 +62815,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_p)
-"qWk" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
- dir = 10;
- icon_state = "silver"
- },
-/area/almayer/command/computerlab)
"qWt" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -63019,31 +63125,17 @@
},
/turf/open/floor/plating,
/area/almayer/squads/req)
-"rcw" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 8
- },
-/obj/item/clipboard{
- base_pixel_x = 20;
- pixel_x = 5
- },
-/obj/item/paper{
- pixel_x = 5
- },
-/obj/item/tool/pen{
- pixel_x = 5
+"rcs" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
},
-/obj/structure/surface/table/reinforced/black,
-/obj/structure/phone_base/rotary{
- name = "CIC Reception Telephone";
- phone_category = "Command";
- phone_id = "CIC Reception";
- pixel_x = -7;
- pixel_y = 4
+/obj/item/device/radio/intercom{
+ freerange = 1;
+ name = "General Listening Channel";
+ pixel_y = -28
},
/turf/open/floor/almayer,
-/area/almayer/command/cic)
+/area/almayer/hull/upper_hull/u_f_s)
"rcx" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -63357,6 +63449,23 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_m_p)
+"riO" = (
+/obj/item/trash/plate{
+ pixel_x = 9;
+ pixel_y = 11
+ },
+/obj/item/reagent_container/food/snacks/carpmeat{
+ layer = 3.3;
+ pixel_y = 11;
+ pixel_x = 8
+ },
+/obj/item/reagent_container/food/snacks/carpmeat{
+ layer = 3.3;
+ pixel_y = 11;
+ pixel_x = 8
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"riP" = (
/obj/structure/machinery/light,
/obj/structure/sign/safety/rewire{
@@ -63927,6 +64036,12 @@
},
/turf/open/floor/almayer,
/area/almayer/living/pilotbunks)
+"rua" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"rub" = (
/obj/structure/surface/table/almayer,
/obj/effect/landmark/map_item,
@@ -64296,14 +64411,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/port)
-"rDd" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/machinery/computer/emails{
- dir = 1;
- pixel_y = 2
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"rDe" = (
/obj/structure/surface/table/almayer,
/obj/item/reagent_container/food/snacks/kepler_crisps{
@@ -64955,6 +65062,24 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
+"rRC" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/storage/bible{
+ desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'.";
+ name = "Holy Bible";
+ pixel_x = -3;
+ pixel_y = 9
+ },
+/obj/item/prop/helmetgarb/rosary{
+ pixel_y = 5;
+ pixel_x = -4
+ },
+/obj/item/device/flashlight/lamp{
+ pixel_y = 1;
+ pixel_x = 3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"rRQ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/pipes/standard/simple/hidden/supply,
@@ -66162,6 +66287,27 @@
allow_construction = 0
},
/area/almayer/stair_clone/upper)
+"sty" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/item/storage/fancy/cigar{
+ pixel_y = 2;
+ layer = 3.04;
+ pixel_x = -2
+ },
+/obj/item/reagent_container/food/drinks/bottle/sake{
+ pixel_x = -11;
+ pixel_y = 16
+ },
+/obj/item/reagent_container/food/drinks/bottle/sake{
+ pixel_y = 16;
+ pixel_x = -2
+ },
+/obj/item/reagent_container/food/drinks/bottle/sake{
+ pixel_x = 7;
+ pixel_y = 16
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"stY" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/pipes/standard/simple/hidden/supply{
@@ -66252,6 +66398,36 @@
icon_state = "greencorner"
},
/area/almayer/living/grunt_rnr)
+"sww" = (
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
+"swA" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/computer/overwatch/almayer{
+ dir = 8;
+ layer = 3.2;
+ pixel_x = -17;
+ pixel_y = -17
+ },
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/obj/structure/phone_base/rotary/no_dnd{
+ name = "Charlie Overwatch Telephone";
+ phone_category = "Command";
+ phone_id = "Charlie Overwatch"
+ },
+/obj/structure/sign/safety/terminal{
+ pixel_x = -17;
+ pixel_y = 7
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/cic)
"swE" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/alarm/almayer{
@@ -66447,24 +66623,6 @@
icon_state = "orange"
},
/area/almayer/engineering/ce_room)
-"sBF" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/machinery/door/firedoor/border_only/almayer{
- dir = 2
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/machinery/door/airlock/almayer/command/reinforced{
- access_modified = 1;
- dir = 1;
- id_tag = "CO-Office";
- name = "\improper Commanding Officer's Office";
- req_access = null;
- req_access_txt = "31"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/almayer/living/commandbunks)
"sBH" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 10
@@ -66797,6 +66955,16 @@
icon_state = "red"
},
/area/almayer/squads/alpha)
+"sHZ" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "SW-out"
+ },
+/obj/structure/sign/safety/bathunisex{
+ pixel_x = 11;
+ pixel_y = -26
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"sIf" = (
/obj/effect/step_trigger/teleporter_vector{
name = "Almayer_AresDown";
@@ -67732,6 +67900,17 @@
icon_state = "mono"
},
/area/almayer/lifeboat_pumps/south1)
+"tek" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "silver"
+ },
+/area/almayer/command/cichallway)
"teo" = (
/obj/structure/pipes/standard/manifold/hidden/supply{
dir = 4
@@ -67764,16 +67943,6 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/starboard_hallway)
-"teI" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
- dir = 8;
- icon_state = "silver"
- },
-/area/almayer/command/computerlab)
"teY" = (
/obj/structure/machinery/light{
dir = 1
@@ -68043,6 +68212,21 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/weapon_room)
+"tkK" = (
+/obj/structure/bed/bedroll{
+ name = "cat bed";
+ desc = "A bed of cotton fabric, purposely made for a cat to comfortably sleep on.";
+ pixel_y = 0
+ },
+/mob/living/simple_animal/cat/Jones{
+ dir = 8
+ },
+/obj/structure/machinery/firealarm{
+ pixel_y = 28;
+ pixel_x = -1
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"tkN" = (
/obj/structure/machinery/cm_vending/sorted/cargo_ammo/squad{
req_access = null;
@@ -68263,6 +68447,15 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_f_s)
+"tpj" = (
+/obj/structure/safe/co_office,
+/obj/item/weapon/pole/fancy_cane,
+/obj/item/tool/lighter/zippo/gold{
+ pixel_y = 3;
+ layer = 3.05
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"tpn" = (
/turf/closed/wall/almayer,
/area/almayer/shipboard/brig/evidence_storage)
@@ -69263,6 +69456,23 @@
icon_state = "green"
},
/area/almayer/living/grunt_rnr)
+"tJW" = (
+/obj/structure/pipes/standard/simple/hidden/supply,
+/obj/structure/machinery/door/firedoor/border_only/almayer{
+ dir = 2
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/machinery/door/airlock/almayer/command/reinforced{
+ dir = 1;
+ id_tag = "CO-Office";
+ name = "\improper Commanding Officer's Office";
+ req_access = null;
+ req_access_txt = "31"
+ },
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/living/commandbunks)
"tKf" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/machinery/light{
@@ -69331,11 +69541,6 @@
icon_state = "red"
},
/area/almayer/hallways/aft_hallway)
-"tMn" = (
-/obj/structure/pipes/standard/simple/hidden/supply,
-/obj/structure/bed/chair/comfy/beige,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"tMW" = (
/obj/effect/decal/warning_stripes{
icon_state = "NW-out";
@@ -69483,10 +69688,6 @@
/obj/structure/machinery/light,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/hangar)
-"tQM" = (
-/obj/structure/safe/co_office,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"tQV" = (
/turf/closed/wall/almayer/outer,
/area/almayer/lifeboat_pumps/south1)
@@ -69679,6 +69880,11 @@
icon_state = "bluefull"
},
/area/almayer/living/bridgebunks)
+"tVo" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"tVq" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -69694,14 +69900,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_p)
-"tVN" = (
-/obj/structure/machinery/light{
- dir = 8
- },
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/computerlab)
"tWg" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
@@ -69905,12 +70103,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_s)
-"tZB" = (
-/obj/structure/machinery/light{
- dir = 1
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"tZF" = (
/obj/structure/machinery/light/small{
dir = 8
@@ -70062,24 +70254,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/lifeboat_pumps/south2)
-"ucS" = (
-/obj/structure/surface/table/reinforced/almayer_B,
-/obj/structure/machinery/faxmachine/uscm/command{
- department = "AI Core";
- pixel_y = 8
- },
-/obj/structure/phone_base/rotary{
- name = "AI Core Telephone";
- phone_category = "ARES";
- phone_color = "blue";
- phone_id = "AI Core";
- pixel_x = 8;
- pixel_y = -8
- },
-/turf/open/floor/almayer/no_build{
- icon_state = "ai_floors"
- },
-/area/almayer/command/airoom)
"udb" = (
/obj/structure/sign/safety/ammunition{
pixel_y = 32
@@ -70358,6 +70532,10 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_m_s)
+"uik" = (
+/obj/structure/bed/chair/comfy/blue,
+/turf/open/floor/carpet,
+/area/almayer/living/commandbunks)
"uim" = (
/obj/structure/largecrate/random/secure,
/turf/open/floor/almayer{
@@ -71109,26 +71287,6 @@
icon_state = "red"
},
/area/almayer/shipboard/brig/cells)
-"uvZ" = (
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
- desc = "A premium double-malt whiskey, this bottle was gifted to the Captain of the USS Almayer after the completion of the ship's space trials by the VADM. himself.";
- pixel_x = 1;
- pixel_y = 16
- },
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
- pixel_x = 9;
- pixel_y = 16
- },
-/obj/item/reagent_container/food/drinks/bottle/whiskey{
- pixel_x = -7;
- pixel_y = 16
- },
-/obj/item/clothing/mask/cigarette/pipe{
- pixel_y = 5
- },
-/obj/structure/surface/table/woodentable/fancy,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"uws" = (
/obj/structure/machinery/light{
dir = 4
@@ -71149,6 +71307,23 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cic_hallway)
+"uwX" = (
+/obj/structure/machinery/light/small{
+ dir = 8
+ },
+/obj/item/prop/magazine/boots/n160{
+ pixel_y = -8;
+ pixel_x = 4;
+ layer = 2.8
+ },
+/obj/effect/decal/warning_stripes{
+ icon_state = "E";
+ pixel_x = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "dark_sterile"
+ },
+/area/almayer/living/commandbunks)
"uwZ" = (
/obj/effect/decal/warning_stripes{
icon_state = "N";
@@ -71239,6 +71414,42 @@
icon_state = "dark_sterile"
},
/area/almayer/medical/chemistry)
+"uyN" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/manifold/hidden/supply{
+ dir = 8
+ },
+/obj/item/clipboard{
+ base_pixel_x = 20;
+ pixel_x = 5
+ },
+/obj/item/paper{
+ pixel_x = 5
+ },
+/obj/item/tool/pen{
+ pixel_x = 5
+ },
+/obj/structure/surface/table/reinforced/black,
+/obj/structure/phone_base/rotary{
+ name = "CIC Reception Telephone";
+ phone_category = "Command";
+ phone_id = "CIC Reception";
+ pixel_x = -7;
+ pixel_y = 4
+ },
+/turf/open/floor/almayer,
+/area/almayer/command/cic)
+"uzb" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/computer/crew/alt,
+/obj/structure/phone_base/rotary/no_dnd{
+ name = "Brig Cells Telephone";
+ phone_category = "Almayer";
+ phone_id = "Brig Cells";
+ pixel_x = 15
+ },
+/turf/open/floor/almayer,
+/area/almayer/shipboard/brig/processing)
"uzg" = (
/obj/structure/sign/safety/water{
pixel_x = 8;
@@ -72561,15 +72772,6 @@
/obj/effect/landmark/start/engineering,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/engineering/upper_engineering/port)
-"vcA" = (
-/obj/structure/phone_base/rotary{
- name = "CL Office Telephone";
- phone_category = "Almayer";
- phone_id = "CL Office"
- },
-/obj/structure/surface/table/woodentable/fancy,
-/turf/open/floor/carpet,
-/area/almayer/command/corporateliason)
"vcE" = (
/turf/open/floor/almayer{
icon_state = "mono"
@@ -73124,6 +73326,19 @@
icon_state = "silver"
},
/area/almayer/shipboard/brig/cic_hallway)
+"vlc" = (
+/obj/structure/phone_base{
+ dir = 8;
+ name = "RO Office Telephone";
+ phone_category = "Offices";
+ phone_id = "RO Office";
+ pixel_x = 16
+ },
+/turf/open/floor/almayer{
+ dir = 4;
+ icon_state = "green"
+ },
+/area/almayer/squads/req)
"vli" = (
/obj/structure/machinery/light/small{
dir = 1
@@ -73563,14 +73778,6 @@
icon_state = "test_floor4"
},
/area/almayer/hallways/port_hallway)
-"vtT" = (
-/obj/structure/pipes/standard/manifold/hidden/supply,
-/obj/structure/disposalpipe/junction{
- dir = 4;
- icon_state = "pipe-j2"
- },
-/turf/open/floor/almayer,
-/area/almayer/command/cichallway)
"vub" = (
/turf/closed/wall/almayer,
/area/almayer/shipboard/sea_office)
@@ -74093,16 +74300,6 @@
/obj/structure/machinery/vending/coffee,
/turf/open/floor/almayer,
/area/almayer/living/briefing)
-"vEJ" = (
-/obj/structure/surface/table/woodentable/fancy,
-/obj/structure/phone_base/rotary{
- name = "Captain's Office";
- phone_category = "Offices";
- phone_id = "Captain's Office";
- pixel_y = 6
- },
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"vFb" = (
/obj/structure/surface/table/almayer,
/obj/item/attachable/lasersight,
@@ -74283,6 +74480,47 @@
icon_state = "blue"
},
/area/almayer/hallways/aft_hallway)
+"vIP" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/door_control{
+ id = "CIC Lockdown";
+ name = "CIC Lockdown";
+ pixel_x = -7;
+ pixel_y = 9;
+ req_access_txt = "1"
+ },
+/obj/structure/machinery/door_control{
+ id = "Hangar Lockdown";
+ name = "Hangar Lockdown";
+ pixel_x = -7;
+ pixel_y = 2;
+ req_access_txt = "1"
+ },
+/obj/structure/pipes/standard/simple/hidden/supply{
+ dir = 4;
+ icon_state = "exposed01-supply"
+ },
+/obj/structure/machinery/door_control{
+ id = "bot_armory";
+ name = "Armory Lockdown";
+ pixel_x = -7;
+ pixel_y = -5;
+ req_one_access_txt = "1;4"
+ },
+/obj/structure/phone_base/rotary/no_dnd{
+ name = "Combat Information Center Telephone";
+ phone_category = "Command";
+ phone_id = "Combat Information Center";
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/structure/machinery/door/window/westright{
+ dir = 4
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/cic)
"vJg" = (
/obj/structure/machinery/light/small,
/turf/open/floor/almayer{
@@ -74644,11 +74882,6 @@
icon_state = "silvercorner"
},
/area/almayer/command/securestorage)
-"vQn" = (
-/turf/open/floor/almayer{
- icon_state = "silverfull"
- },
-/area/almayer/command/securestorage)
"vQq" = (
/obj/structure/surface/table/almayer,
/obj/item/device/camera,
@@ -75082,6 +75315,25 @@
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
+"vXM" = (
+/obj/structure/bookcase{
+ icon_state = "book-5";
+ name = "law and engineering manuals bookcase";
+ opacity = 0
+ },
+/obj/item/book/manual/marine_law,
+/obj/item/book/manual/detective,
+/obj/item/book/manual/security_space_law,
+/obj/item/book/manual/engineering_guide,
+/obj/item/book/manual/engineering_construction,
+/obj/item/book/manual/orbital_cannon_manual,
+/obj/item/book/manual/ripley_build_and_repair,
+/obj/item/book/manual/engineering_hacking,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"vXQ" = (
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 1
@@ -75583,23 +75835,6 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull/l_f_p)
-"wgQ" = (
-/obj/structure/pipes/standard/manifold/hidden/supply{
- dir = 4
- },
-/obj/structure/phone_base{
- dir = 8;
- name = "OT Telephone";
- phone_category = "Almayer";
- phone_id = "Ordnance Tech";
- pixel_x = 14
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/almayer{
- dir = 4;
- icon_state = "orange"
- },
-/area/almayer/engineering/engineering_workshop/hangar)
"wgR" = (
/obj/structure/surface/table/almayer,
/obj/effect/spawner/random/technology_scanner,
@@ -76300,24 +76535,6 @@
icon_state = "red"
},
/area/almayer/lifeboat_pumps/south1)
-"wvH" = (
-/obj/structure/closet/secure_closet/freezer/fridge/full,
-/obj/structure/machinery/light{
- dir = 1
- },
-/obj/item/reagent_container/food/condiment/enzyme,
-/obj/item/reagent_container/food/condiment/enzyme,
-/obj/structure/phone_base{
- name = "Kitchen Telephone";
- phone_category = "Almayer";
- phone_id = "Kitchen";
- pixel_x = -8;
- pixel_y = 29
- },
-/turf/open/floor/almayer{
- icon_state = "plate"
- },
-/area/almayer/living/grunt_rnr)
"wvI" = (
/obj/item/paper_bin/uscm{
pixel_y = 7
@@ -76379,13 +76596,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hallways/port_hallway)
-"www" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer{
- dir = 4;
- icon_state = "silver"
- },
-/area/almayer/command/computerlab)
"wwD" = (
/obj/structure/bed/chair/comfy/orange,
/turf/open/floor/almayer{
@@ -77156,6 +77366,40 @@
icon_state = "plate"
},
/area/almayer/hull/lower_hull)
+"wNq" = (
+/obj/structure/surface/table/woodentable/fancy,
+/obj/structure/machinery/light{
+ dir = 8
+ },
+/obj/item/clothing/mask/cigarette/pipe{
+ pixel_y = -7;
+ layer = 2.8
+ },
+/obj/item/reagent_container/spray/cleaner{
+ pixel_x = -4;
+ pixel_y = 7;
+ layer = 3.04
+ },
+/obj/structure/machinery/door_control/brbutton{
+ pixel_y = 26;
+ pixel_x = -12;
+ id = "Brig Lockdown Shutters";
+ name = "Brig Lockdown"
+ },
+/obj/structure/machinery/door_control/brbutton{
+ pixel_y = 26;
+ id = "ARES StairsLock";
+ name = "ARES Exterior Lockdown Override";
+ pixel_x = -2
+ },
+/obj/structure/machinery/door_control/brbutton{
+ pixel_y = 26;
+ pixel_x = 8;
+ name = "ARES Emergency Lockdown Override";
+ id = "ARES Emergency"
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"wNT" = (
/obj/structure/platform,
/turf/open/floor/almayer,
@@ -77968,25 +78212,6 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_a_p)
-"xdl" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/door_control{
- id = "SEA Office Shutters";
- name = "SEA Office Shutters";
- pixel_y = 12
- },
-/obj/item/ashtray/plastic{
- pixel_x = 8;
- pixel_y = -4
- },
-/obj/structure/phone_base/rotary{
- name = "Senior Enlisted Advisor Office Telephone";
- phone_category = "Almayer";
- phone_id = "Senior Enlisted Advisor's Office";
- pixel_x = -3
- },
-/turf/open/floor/wood/ship,
-/area/almayer/shipboard/sea_office)
"xdx" = (
/obj/structure/surface/rack,
/obj/item/storage/firstaid/regular/empty,
@@ -78001,6 +78226,11 @@
icon_state = "sterile_green_side"
},
/area/almayer/medical/lower_medical_medbay)
+"xdy" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/pipes/standard/simple/hidden/supply,
+/turf/open/floor/almayer,
+/area/almayer/command/cichallway)
"xeG" = (
/obj/structure/machinery/door/airlock/almayer/maint,
/turf/open/floor/almayer{
@@ -78473,6 +78703,18 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/upper_hull/u_a_s)
+"xot" = (
+/obj/structure/surface/table/almayer,
+/obj/effect/landmark/map_item,
+/obj/item/folder/red,
+/obj/structure/phone_base/rotary{
+ name = "Brig CMP's Office Telephone";
+ phone_category = "Offices";
+ phone_id = "Brig CMP's Office";
+ pixel_x = 15
+ },
+/turf/open/floor/almayer,
+/area/almayer/shipboard/brig/chief_mp_office)
"xoJ" = (
/obj/structure/machinery/door/airlock/almayer/maint{
dir = 1
@@ -79090,6 +79332,19 @@
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
+"xAa" = (
+/obj/structure/surface/table/reinforced/prison,
+/obj/structure/phone_base{
+ dir = 8;
+ name = "Medical Telephone";
+ phone_category = "Almayer";
+ phone_id = "Medical Lower";
+ pixel_x = 16
+ },
+/turf/open/floor/almayer{
+ icon_state = "sterile_green"
+ },
+/area/almayer/medical/lockerroom)
"xAe" = (
/turf/closed/wall/almayer/research/containment/wall/corner,
/area/almayer/medical/containment/cell)
@@ -79215,6 +79470,15 @@
/obj/structure/machinery/light/small,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/hull/lower_hull/l_f_s)
+"xCT" = (
+/obj/structure/surface/table/reinforced/almayer_B,
+/obj/structure/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/almayer{
+ icon_state = "silverfull"
+ },
+/area/almayer/command/securestorage)
"xCX" = (
/obj/structure/machinery/door/airlock/almayer/maint{
dir = 1
@@ -79241,6 +79505,14 @@
icon_state = "plate"
},
/area/almayer/hull/upper_hull/u_f_s)
+"xDr" = (
+/obj/structure/machinery/light,
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_21";
+ pixel_y = 3
+ },
+/turf/open/floor/wood/ship,
+/area/almayer/living/commandbunks)
"xDC" = (
/obj/structure/pipes/standard/simple/hidden/supply/no_boom,
/turf/open/floor/almayer/no_build{
@@ -79549,6 +79821,22 @@
},
/turf/open/floor/almayer,
/area/almayer/hallways/hangar)
+"xKw" = (
+/obj/structure/surface/table/almayer,
+/obj/item/clothing/mask/cigarette/pipe{
+ pixel_x = 8
+ },
+/obj/structure/phone_base/rotary{
+ name = "Reporter Telephone";
+ phone_category = "Almayer";
+ phone_id = "Reporter";
+ pixel_x = -4;
+ pixel_y = 6
+ },
+/turf/open/floor/almayer{
+ icon_state = "plate"
+ },
+/area/almayer/command/combat_correspondent)
"xKM" = (
/obj/structure/machinery/status_display{
pixel_x = 16;
@@ -79761,25 +80049,6 @@
dir = 4
},
/area/almayer/medical/containment/cell)
-"xPj" = (
-/obj/structure/pipes/standard/simple/hidden/supply{
- dir = 10
- },
-/obj/structure/phone_base{
- name = "CMO Office Telephone";
- phone_category = "Offices";
- phone_id = "CMO Office";
- pixel_y = 29
- },
-/obj/structure/sign/safety/commline_connection{
- pixel_x = 23;
- pixel_y = 32
- },
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "sterile_green_side"
- },
-/area/almayer/medical/upper_medical)
"xPE" = (
/obj/structure/largecrate/random/barrel/white,
/turf/open/floor/plating/plating_catwalk,
@@ -80001,10 +80270,6 @@
/obj/effect/landmark/late_join,
/turf/open/floor/plating/plating_catwalk,
/area/almayer/living/cryo_cells)
-"xSS" = (
-/obj/structure/surface/table/almayer,
-/turf/open/floor/almayer,
-/area/almayer/command/computerlab)
"xSW" = (
/turf/open/floor/almayer{
dir = 8;
@@ -80313,11 +80578,6 @@
icon_state = "redfull"
},
/area/almayer/command/cic)
-"xZz" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/faxmachine/uscm/command/capt,
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
"xZI" = (
/obj/structure/prop/invuln/lattice_prop{
dir = 1;
@@ -80571,17 +80831,6 @@
icon_state = "plate"
},
/area/almayer/command/lifeboat)
-"yeo" = (
-/obj/structure/machinery/cm_vending/clothing/dress{
- req_access = list(1)
- },
-/turf/open/floor/wood/ship,
-/area/almayer/living/commandbunks)
-"yev" = (
-/obj/item/device/flashlight/lamp/green,
-/obj/structure/surface/table/woodentable/fancy,
-/turf/open/floor/carpet,
-/area/almayer/living/commandbunks)
"yeH" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer,
@@ -80729,6 +80978,43 @@
icon_state = "redfull"
},
/area/almayer/medical/upper_medical)
+"yhB" = (
+/obj/structure/machinery/door_control{
+ id = "ARES StairsUpper";
+ name = "ARES Core Access";
+ pixel_x = -10;
+ pixel_y = -24;
+ req_one_access_txt = "91;92"
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES StairsLock";
+ name = "ARES Exterior Lockdown";
+ pixel_y = -24;
+ req_one_access_txt = "91;92"
+ },
+/obj/structure/surface/table/reinforced/almayer_B{
+ climbable = 0;
+ indestructible = 1;
+ unacidable = 1;
+ unslashable = 1
+ },
+/obj/structure/phone_base/rotary{
+ name = "AI Reception Telephone";
+ phone_category = "ARES";
+ phone_color = "blue";
+ phone_id = "AI Reception"
+ },
+/obj/structure/machinery/door_control{
+ id = "ARES Emergency";
+ name = "ARES Emergency Lockdown";
+ pixel_x = 10;
+ pixel_y = -24;
+ req_one_access_txt = "91;92"
+ },
+/turf/open/floor/almayer/no_build{
+ icon_state = "ai_floors"
+ },
+/area/almayer/command/airoom)
"yhI" = (
/turf/open/floor/almayer{
dir = 4;
@@ -80829,6 +81115,12 @@
icon_state = "blue"
},
/area/almayer/living/pilotbunks)
+"yjP" = (
+/obj/structure/machinery/door/poddoor/shutters/almayer/uniform_vendors,
+/turf/open/floor/almayer{
+ icon_state = "test_floor4"
+ },
+/area/almayer/command/cic)
"ykj" = (
/obj/structure/machinery/door/firedoor/border_only/almayer{
dir = 2
@@ -88515,7 +88807,7 @@ aTg
pdG
vAG
dOL
-cJi
+xot
hwS
wly
wIC
@@ -90941,7 +91233,7 @@ vBm
vBm
vBm
vBm
-cvg
+qwy
mLJ
fkn
gaJ
@@ -91966,13 +92258,13 @@ gaJ
gaJ
tRA
lMc
-ljd
+uzb
cMl
oeB
rkL
ldu
eRL
-izB
+jGp
vBm
qJZ
ohJ
@@ -94290,7 +94582,7 @@ dqd
uNL
hJp
kcp
-aaB
+lwB
bTS
bTS
lxo
@@ -96814,7 +97106,7 @@ aaa
aaa
aad
aeE
-qss
+hwP
ayq
cfE
cfE
@@ -96862,7 +97154,7 @@ btD
rVN
rVN
vly
-oAN
+hHF
pun
ajZ
aaa
@@ -99476,9 +99768,9 @@ wVW
wVW
wVW
swH
-fxd
+hqi
wVW
-fjn
+swA
sEM
wVW
wVW
@@ -99677,13 +99969,13 @@ apo
fHh
wVW
lZs
-hyR
+lNS
sni
ayz
dAX
aQg
vpV
-nWp
+aEq
aGp
wVW
aDv
@@ -99865,14 +100157,14 @@ svp
avl
agj
agj
-aew
-bCO
-hvH
-hvH
-hvH
+wNq
+ioo
+cNd
+fyg
+nFW
kcN
-cod
-oqA
+ixZ
+yjP
aic
aov
wVW
@@ -100067,15 +100359,15 @@ npB
umY
avl
agj
-yeo
+tpj
agc
-bIz
+mtH
agc
-hvH
-lQq
+qFm
+lxJ
kcN
cod
-oqA
+yjP
aic
aov
wVW
@@ -100268,18 +100560,18 @@ ahE
aiV
wBY
hJJ
-qCi
+iGj
agj
-eBo
-agc
+tkK
+riO
agc
agc
-ahY
-mXj
-kcN
+qFm
+lnG
kcN
-agj
-amI
+kcD
+yjP
+aic
aKq
luZ
alX
@@ -100471,16 +100763,16 @@ pCi
kwS
avl
avl
-lIh
+rcs
agj
-oMM
-agc
-agc
-glU
-rDd
+gmy
+mOT
+cHa
+pJg
+sHZ
mXj
-akk
-alb
+kcN
+kcN
agj
aic
aKq
@@ -100676,14 +100968,14 @@ avl
hCo
lIh
agj
-kFk
+sty
hvH
+rua
hvH
hvH
-ahZ
-mXj
-akl
-alc
+aSM
+uwX
+fCE
agj
bFA
aov
@@ -100879,16 +101171,16 @@ avl
hMI
lFb
agj
+cwT
+qhN
+rua
+hvC
+rRC
mXj
-mXj
-aoZ
-aha
-mXj
-mXj
-akm
-mXj
+lTZ
+qSo
agj
-aox
+aic
aoA
wVW
teY
@@ -101073,7 +101365,7 @@ bdH
aaa
aaa
bdH
-aaa
+bdH
aaa
aad
ahE
@@ -101083,13 +101375,13 @@ iDT
tDx
agj
mXj
-tZB
-hvH
-hvH
-hvH
-adv
-hvH
-alj
+mXj
+cBL
+mXj
+mXj
+mXj
+mXj
+mXj
agj
aic
aov
@@ -101276,7 +101568,7 @@ bdH
bdH
bdH
aaa
-aaa
+bdH
aaa
aad
pCi
@@ -101285,16 +101577,16 @@ dTt
jgM
lFb
agj
-eYC
-agc
-fNb
-vEJ
-agc
-agc
-hvH
-alo
+mXj
+qpq
+oON
+tVo
+tVo
+ecT
+vXM
+mXj
agj
-aic
+amI
aov
wVW
wVW
@@ -101304,7 +101596,7 @@ wVW
rOC
soX
azX
-fvj
+vIP
aCb
aDv
aEC
@@ -101488,17 +101780,17 @@ avl
jpJ
lzH
agj
-uvZ
-agc
-agc
-juN
-pxG
-agc
-ocs
+lJo
+akr
+prW
+jQD
agc
+eon
+mOT
+gQy
agj
aic
-aov
+buE
wVW
asQ
awG
@@ -101691,17 +101983,17 @@ avl
llM
lGL
agj
-geW
-erZ
-tMn
-iVZ
-aiW
-aiW
-akn
-xyk
-sBF
-amY
-vtT
+nRW
+hvH
+agc
+pYw
+pxG
+fgT
+agc
+agc
+agj
+aic
+tek
wVW
nww
atN
@@ -101894,17 +102186,17 @@ avl
avl
mrc
agj
-cCd
-agc
-agc
-nwv
-pxG
-agc
-ako
+gyk
+hvH
+uik
+coY
agc
-agj
-aic
-aov
+loN
+xyk
+xyk
+tJW
+xdy
+pts
wVW
qyJ
qEk
@@ -102097,16 +102389,16 @@ pCi
jTi
nRq
agj
-bYd
+lHE
+hvH
agc
-qck
-yev
+bYD
+pxG
+sww
agc
agc
-akp
-hGB
agj
-aic
+plj
aov
wVW
qyJ
@@ -102197,7 +102489,7 @@ nXP
mNf
hJp
uNL
-oGK
+qwT
xSI
uZQ
aoH
@@ -102300,14 +102592,14 @@ pCi
avl
myn
agj
-mXj
-tZB
+atS
hvH
-ahv
-aiF
-aiF
-akr
-xZz
+qck
+jmt
+agc
+jhB
+pJg
+xDr
agj
aic
aov
@@ -102504,13 +102796,13 @@ cnX
lIh
agj
mXj
-tQM
-lue
-ahw
-aiG
-aiG
-aks
-alu
+qhN
+hvH
+hvH
+pAA
+hvH
+ljv
+mXj
agj
aic
aoA
@@ -103132,7 +103424,7 @@ aCj
ayK
aAd
aAP
-rcw
+uyN
ayu
aCj
bYY
@@ -103951,7 +104243,7 @@ aGV
rvA
aKE
awF
-cST
+mJA
aUw
aUm
aET
@@ -106893,7 +107185,7 @@ qyD
omo
blZ
bqN
-lnG
+xAa
bqN
bwR
gfW
@@ -108122,7 +108414,7 @@ mWw
apT
apA
arC
-wgQ
+aLc
cSN
asy
atw
@@ -109832,7 +110124,7 @@ ajl
vtx
ajl
ajl
-xPj
+jel
fbB
cyU
bho
@@ -111864,7 +112156,7 @@ lMv
dVu
eSo
qmD
-pSg
+mqb
lJv
aCt
kXw
@@ -112281,7 +112573,7 @@ kSJ
avj
cGr
awE
-okP
+fUn
wQv
rne
guC
@@ -112795,7 +113087,7 @@ vzP
bJt
hjB
bJt
-wvH
+dJH
bDs
gSk
bDs
@@ -112894,7 +113186,7 @@ bqy
bYj
eUR
gEI
-vcA
+bLW
bYj
xne
cNH
@@ -114716,7 +115008,7 @@ ajr
aii
avm
awE
-geE
+hfm
rne
rne
fAo
@@ -118970,8 +119262,8 @@ avK
aqU
aCZ
dgg
-teI
-qWk
+dJX
+egV
aHq
sDC
ajt
@@ -119778,7 +120070,7 @@ mLE
tmK
avK
aug
-bWR
+yhB
aqU
lyE
rsO
@@ -120380,18 +120672,18 @@ uLu
anC
aiC
ioU
-iFL
+fix
qPE
xqD
-vQn
-cia
-tVN
-cia
-cia
+oBJ
+igX
+pUI
+igX
+igX
aHq
cnE
liJ
-mLO
+loc
cbn
aHq
uLu
@@ -120583,7 +120875,7 @@ aSz
anG
aiC
ioU
-ieA
+xCT
wTd
cmK
lFm
@@ -121404,7 +121696,7 @@ oeM
eed
oeM
eed
-xSS
+ptd
aRi
aGN
qrv
@@ -121607,7 +121899,7 @@ fXx
kXf
huO
iLO
-www
+igZ
xNv
iLO
bUa
@@ -121905,7 +122197,7 @@ bdj
bri
bLX
bdl
-egX
+mzk
bNP
bmD
bNP
@@ -123444,7 +123736,7 @@ anG
apf
oIB
tSF
-lCD
+xKw
jog
oIB
sFR
@@ -125352,7 +125644,7 @@ sou
bAX
bdl
wIr
-lcS
+vlc
jAB
iYt
bMa
@@ -126375,7 +126667,7 @@ qlz
xYf
skn
bQX
-xdl
+peb
cLl
qlz
tez
@@ -129101,7 +129393,7 @@ bNM
iEr
owg
eNi
-nqr
+dIE
eJX
sAC
wYY
@@ -138903,7 +139195,7 @@ lmz
daz
cwS
ffE
-nTP
+cZg
wpw
ffE
ffE
@@ -140130,7 +140422,7 @@ wyv
pTt
gAe
rCi
-ucS
+qPv
mUz
our
rna
diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm
index 88182faf3b..6a045d9c03 100644
--- a/maps/map_files/generic/Admin_level.dmm
+++ b/maps/map_files/generic/Admin_level.dmm
@@ -11,27 +11,10 @@
},
/turf/open/floor/wood/ship,
/area/adminlevel/ert_station)
-"ad" = (
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome)
"ae" = (
/obj/docking_port/stationary/vehicle_elevator/adminlevel,
/turf/open/space/basic,
/area/space)
-"ag" = (
-/obj/structure/window/framed/almayer/hull,
-/obj/structure/machinery/door/poddoor/almayer/open{
- id = "tdome_observer";
- name = "\improper Observer Shutters"
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome)
"aj" = (
/obj/structure/machinery/cm_vending/sorted/tech/tool_storage,
/obj/effect/spider/stickyweb,
@@ -59,34 +42,6 @@
"as" = (
/turf/open/space/basic,
/area/space)
-"az" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "W"
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome)
-"aA" = (
-/obj/effect/decal/warning_stripes{
- icon_state = "E"
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome)
-"aB" = (
-/obj/structure/machinery/door/poddoor/almayer/locked{
- dir = 4;
- id = "tdome_t2";
- name = "\improper Team 2 Shutters"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/tdome)
"aC" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -100,12 +55,6 @@
},
/turf/open/space,
/area/space)
-"aE" = (
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "w-y0"
- },
-/area/tdome)
"aK" = (
/obj/structure/closet/cabinet,
/turf/open/floor/carpet,
@@ -181,6 +130,13 @@
"dG" = (
/turf/open/floor/plating/almayer,
/area/adminlevel/ert_station/shuttle_dispatch)
+"dO" = (
+/obj/effect/landmark/thunderdome/two,
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdome2)
"dR" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -194,6 +150,13 @@
},
/turf/open/space/transit/east/shuttlespace_ew7,
/area/space)
+"dV" = (
+/obj/structure/machinery/vending/cola,
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
"ej" = (
/turf/open/floor/plating/bare_catwalk,
/area/supply/dock)
@@ -434,6 +397,15 @@
"hp" = (
/turf/closed/wall/indestructible,
/area/start)
+"hu" = (
+/obj/structure/flora/pottedplant{
+ icon_state = "pottedplant_20"
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
"hH" = (
/turf/open/floor/almayer{
dir = 9;
@@ -461,6 +433,12 @@
icon_state = "silver"
},
/area/adminlevel/ert_station)
+"iA" = (
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome)
"iL" = (
/obj/structure/machinery/status_display{
pixel_y = 30
@@ -482,6 +460,29 @@
/obj/effect/landmark/newplayer_start,
/turf/open/floor,
/area/start)
+"jp" = (
+/obj/structure/surface/table/almayer,
+/obj/item/storage/fancy/cigar,
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
+"ju" = (
+/obj/structure/machinery/door/poddoor/almayer/locked{
+ dir = 4;
+ id = "tdome_t1";
+ name = "\improper Team 1 Shutters"
+ },
+/turf/open/floor/tdome{
+ icon_state = "test_floor4"
+ },
+/area/tdome)
+"jS" = (
+/turf/open/floor/tdome{
+ icon_state = "tcomms"
+ },
+/area/tdome)
"kn" = (
/obj/docking_port/stationary/emergency_response/idle_port3,
/turf/open/floor/plating,
@@ -510,6 +511,37 @@
icon_state = "silver"
},
/area/adminlevel/ert_station)
+"mB" = (
+/obj/structure/surface/table/almayer,
+/obj/structure/machinery/door_control{
+ id = "tdome_t1";
+ name = "Team 1 Shutters (Left)";
+ pixel_y = -3
+ },
+/obj/structure/machinery/door_control{
+ id = "tdome_t2";
+ name = "Team 2 Shutters (Right)";
+ pixel_y = 3
+ },
+/obj/structure/machinery/door_control{
+ id = "tdome_observer";
+ name = "Observer Shutters";
+ pixel_y = 9
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
+"no" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "E"
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome)
"nP" = (
/turf/open/floor/almayer{
dir = 8;
@@ -567,6 +599,17 @@
icon_state = "silver"
},
/area/adminlevel/ert_station/shuttle_dispatch)
+"oD" = (
+/obj/structure/window/framed/almayer/hull,
+/obj/structure/machinery/door/poddoor/almayer/open{
+ id = "tdome_observer";
+ name = "\improper Observer Shutters"
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome)
"oQ" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -661,33 +704,6 @@
},
/turf/open/space/transit/east/shuttlespace_ew8,
/area/space)
-"qu" = (
-/obj/structure/phone_base/hidden{
- dir = 8;
- name = "Station Telephone";
- phone_id = "Unknown Signal";
- pixel_x = 14
- },
-/turf/open/floor/almayer{
- icon_state = "floor"
- },
-/area/adminlevel/ert_station)
-"qz" = (
-/obj/structure/surface/table/almayer,
-/obj/item/device/binoculars{
- pixel_x = -4
- },
-/obj/item/device/binoculars{
- pixel_x = 3
- },
-/obj/item/device/binoculars{
- pixel_y = 4
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"rf" = (
/obj/structure/sink{
dir = 8;
@@ -705,6 +721,13 @@
icon_state = "kitchen"
},
/area/adminlevel/ert_station)
+"rT" = (
+/obj/structure/machinery/vending/cigarette/free,
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
"sj" = (
/obj/structure/machinery/faxmachine,
/obj/structure/surface/table/reinforced/prison,
@@ -712,6 +735,12 @@
icon_state = "floor"
},
/area/adminlevel/ert_station)
+"sq" = (
+/turf/open/floor/tdome{
+ dir = 1;
+ icon_state = "w-y0"
+ },
+/area/tdome)
"sy" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -731,12 +760,35 @@
},
/turf/open/floor/carpet,
/area/adminlevel/ert_station)
+"sW" = (
+/obj/effect/landmark/thunderdome/one,
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdome1)
+"tg" = (
+/turf/open/floor/tdome{
+ icon_state = "bluefull"
+ },
+/area/tdome/tdome1)
"th" = (
/obj/structure/machinery/medical_pod/bodyscanner,
/turf/open/floor/almayer{
icon_state = "dark_sterile"
},
/area/adminlevel/ert_station)
+"tn" = (
+/obj/structure/phone_base/hidden{
+ dir = 8;
+ name = "Station Telephone";
+ phone_id = "Unknown Signal";
+ pixel_x = 14
+ },
+/turf/open/floor/almayer{
+ icon_state = "floor"
+ },
+/area/adminlevel/ert_station)
"tx" = (
/obj/structure/machinery/hologram/holopad,
/turf/open/floor/carpet,
@@ -895,12 +947,6 @@
icon_state = "silver"
},
/area/adminlevel/ert_station/shuttle_dispatch)
-"wj" = (
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "w-y2"
- },
-/area/tdome)
"wp" = (
/turf/open/floor/almayer{
dir = 8;
@@ -919,13 +965,6 @@
icon_state = "dark_sterile"
},
/area/adminlevel/ert_station)
-"wv" = (
-/obj/structure/machinery/vending/snack,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"wA" = (
/obj/structure/surface/table/reinforced/prison,
/obj/structure/machinery/computer/emails{
@@ -1032,6 +1071,16 @@
icon_state = "kitchen"
},
/area/adminlevel/ert_station)
+"yH" = (
+/obj/effect/landmark/thunderdome/two,
+/obj/effect/decal/warning_stripes{
+ icon_state = "E"
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdome2)
"yQ" = (
/obj/structure/surface/table/reinforced,
/obj/structure/machinery/microwave{
@@ -1142,14 +1191,9 @@
/obj/effect/decal/cleanable/blood/oil/streak,
/turf/open/floor/plating/almayer,
/area/adminlevel/ert_station/shuttle_dispatch)
-"BD" = (
-/obj/effect/landmark/thunderdome/two,
-/obj/effect/decal/warning_stripes{
- icon_state = "E"
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
+"Bz" = (
+/turf/open/floor/tdome{
+ icon_state = "redfull"
},
/area/tdome/tdome2)
"BO" = (
@@ -1159,15 +1203,6 @@
},
/turf/open/floor/plating/almayer,
/area/adminlevel/ert_station/shuttle_dispatch)
-"BU" = (
-/obj/structure/flora/pottedplant{
- icon_state = "pottedplant_20"
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"BV" = (
/obj/structure/closet/secure_closet/freezer/fridge/groceries,
/turf/open/floor/prison{
@@ -1276,18 +1311,12 @@
},
/turf/open/floor/plating/almayer,
/area/adminlevel/ert_station/shuttle_dispatch)
-"DV" = (
-/turf/open/floor/almayer{
- icon_state = "tcomms"
+"Ed" = (
+/turf/open/floor/tdome{
+ dir = 1;
+ icon_state = "w-y1"
},
/area/tdome)
-"Ee" = (
-/obj/effect/landmark/thunderdome/one,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdome1)
"Ef" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -1358,6 +1387,16 @@
icon_state = "silver"
},
/area/adminlevel/ert_station/shuttle_dispatch)
+"Fa" = (
+/obj/structure/machinery/door/poddoor/almayer/locked{
+ dir = 4;
+ id = "tdome_t2";
+ name = "\improper Team 2 Shutters"
+ },
+/turf/open/floor/tdome{
+ icon_state = "test_floor4"
+ },
+/area/tdome)
"Fd" = (
/obj/structure/disposalpipe/segment{
dir = 2
@@ -1372,14 +1411,6 @@
},
/turf/open/floor/plating/almayer,
/area/adminlevel/ert_station)
-"Fw" = (
-/obj/structure/surface/table/almayer,
-/obj/item/storage/fancy/cigar,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"FB" = (
/turf/open/floor/plating,
/area/adminlevel/ert_station)
@@ -1514,6 +1545,22 @@
icon_state = "dark_sterile"
},
/area/adminlevel/ert_station)
+"Hv" = (
+/obj/structure/bed/chair/comfy/black,
+/turf/open/floor/tdome{
+ icon_state = "tcomms"
+ },
+/area/tdome/tdomeobserve)
+"HA" = (
+/obj/structure/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
"HL" = (
/obj/structure/sign/catclock{
pixel_x = 32
@@ -1638,11 +1685,6 @@
"Kk" = (
/turf/closed/wall/mineral/gold,
/area/adminlevel/ert_station)
-"Kq" = (
-/turf/open/floor/almayer{
- icon_state = "redfull"
- },
-/area/tdome/tdome2)
"Kv" = (
/turf/open/floor/almayer{
dir = 5;
@@ -1684,6 +1726,15 @@
icon_state = "silver"
},
/area/adminlevel/ert_station/shuttle_dispatch)
+"Lq" = (
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome)
"Lt" = (
/obj/structure/disposalpipe/segment{
dir = 2
@@ -1733,16 +1784,6 @@
/obj/item/trash/barcardine,
/turf/open/floor/wood/ship,
/area/adminlevel/ert_station)
-"LO" = (
-/obj/structure/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"LR" = (
/obj/structure/machinery/optable,
/obj/item/tank/anesthetic,
@@ -1869,13 +1910,6 @@
/obj/structure/sign/nosmoking_2,
/turf/closed/wall,
/area/adminlevel/ert_station)
-"NU" = (
-/obj/structure/machinery/vending/cola,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"NZ" = (
/turf/open/floor/carpet,
/area/adminlevel/ert_station)
@@ -1932,16 +1966,6 @@
icon_state = "test_floor5"
},
/area/adminlevel/ert_station)
-"OK" = (
-/obj/effect/landmark/thunderdome/one,
-/obj/effect/decal/warning_stripes{
- icon_state = "W"
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdome1)
"OT" = (
/turf/closed/wall/almayer/outer,
/area/tdome/tdomeobserve)
@@ -1965,19 +1989,6 @@
"PE" = (
/turf/open/floor/engine,
/area/adminlevel/simulation)
-"PF" = (
-/obj/effect/landmark/thunderdome/two,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdome2)
-"PJ" = (
-/turf/open/floor/almayer{
- dir = 1;
- icon_state = "w-y1"
- },
-/area/tdome)
"PS" = (
/obj/item/trash/cigbutt/cigarbutt,
/turf/open/floor/almayer{
@@ -2009,6 +2020,19 @@
icon_state = "floor"
},
/area/adminlevel/ert_station)
+"Qh" = (
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
+"Qo" = (
+/obj/structure/machinery/vending/snack,
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
"Qq" = (
/obj/structure/bed/sofa/vert/grey/top,
/obj/effect/decal/cleanable/dirt,
@@ -2039,12 +2063,16 @@
icon_state = "silver"
},
/area/adminlevel/ert_station)
-"QL" = (
-/obj/structure/bed/chair/comfy/black,
-/turf/open/floor/almayer{
- icon_state = "tcomms"
+"Rg" = (
+/obj/effect/landmark/thunderdome/one,
+/obj/effect/decal/warning_stripes{
+ icon_state = "W"
},
-/area/tdome/tdomeobserve)
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdome1)
"Rj" = (
/obj/structure/window/framed/colony,
/turf/open/floor/almayer{
@@ -2089,16 +2117,6 @@
/obj/structure/machinery/cm_vending/sorted/boozeomat/chess,
/turf/open/floor/wood/ship,
/area/adminlevel/ert_station)
-"Sb" = (
-/obj/structure/machinery/door/poddoor/almayer/locked{
- dir = 4;
- id = "tdome_t1";
- name = "\improper Team 1 Shutters"
- },
-/turf/open/floor/almayer{
- icon_state = "test_floor4"
- },
-/area/tdome)
"Sk" = (
/obj/structure/machinery/door/poddoor/almayer{
id = "ERT Lock Big";
@@ -2119,6 +2137,12 @@
/obj/structure/machinery/newscaster/security_unit,
/turf/closed/wall/r_wall/unmeltable,
/area/adminlevel/ert_station)
+"SB" = (
+/turf/open/floor/tdome{
+ dir = 1;
+ icon_state = "w-y2"
+ },
+/area/tdome)
"ST" = (
/obj/structure/machinery/door/airlock/almayer/medical/glass{
dir = 1;
@@ -2148,28 +2172,6 @@
icon_state = "w-y1"
},
/area/adminlevel/ert_station)
-"Tm" = (
-/obj/structure/surface/table/almayer,
-/obj/structure/machinery/door_control{
- id = "tdome_t1";
- name = "Team 1 Shutters (Left)";
- pixel_y = -3
- },
-/obj/structure/machinery/door_control{
- id = "tdome_t2";
- name = "Team 2 Shutters (Right)";
- pixel_y = 3
- },
-/obj/structure/machinery/door_control{
- id = "tdome_observer";
- name = "Observer Shutters";
- pixel_y = 9
- },
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"TD" = (
/turf/open/floor/almayer{
dir = 8;
@@ -2264,6 +2266,22 @@
icon_state = "greencorner"
},
/area/adminlevel/ert_station)
+"Uw" = (
+/obj/structure/surface/table/almayer,
+/obj/item/device/binoculars{
+ pixel_x = -4
+ },
+/obj/item/device/binoculars{
+ pixel_x = 3
+ },
+/obj/item/device/binoculars{
+ pixel_y = 4
+ },
+/turf/open/floor/tdome{
+ dir = 5;
+ icon_state = "plating"
+ },
+/area/tdome/tdomeobserve)
"UI" = (
/obj/structure/surface/table/gamblingtable,
/obj/item/toy/deck{
@@ -2311,13 +2329,6 @@
/obj/structure/sign/poster/clf,
/turf/closed/wall,
/area/adminlevel/ert_station)
-"VD" = (
-/obj/structure/machinery/vending/cigarette/free,
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"VI" = (
/turf/open/floor/almayer{
icon_state = "silvercorner"
@@ -2482,12 +2493,6 @@
icon_state = "silver"
},
/area/adminlevel/ert_station)
-"YP" = (
-/turf/open/floor/almayer{
- dir = 5;
- icon_state = "plating"
- },
-/area/tdome/tdomeobserve)
"YU" = (
/turf/closed/wall,
/area/adminlevel/ert_station)
@@ -2497,11 +2502,6 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/adminlevel/ert_station)
-"Zd" = (
-/turf/open/floor/almayer{
- icon_state = "bluefull"
- },
-/area/tdome/tdome1)
"Zh" = (
/obj/structure/surface/table/reinforced/prison,
/obj/item/storage/surgical_tray,
@@ -3234,11 +3234,11 @@ aC
aa
AS
AS
-Kq
-Kq
-Kq
-Kq
-Kq
+Bz
+Bz
+Bz
+Bz
+Bz
AS
AS
aa
@@ -3385,13 +3385,13 @@ aa
aC
aa
AS
-Kq
-PF
-PF
-PF
-PF
-PF
-Kq
+Bz
+dO
+dO
+dO
+dO
+dO
+Bz
AS
aa
aC
@@ -3537,13 +3537,13 @@ aa
aC
aa
AS
-Kq
-PF
-PF
-PF
-PF
-PF
-Kq
+Bz
+dO
+dO
+dO
+dO
+dO
+Bz
AS
aa
aC
@@ -3689,13 +3689,13 @@ aa
aC
aa
AS
-Kq
-PF
-PF
-PF
-PF
-PF
-Kq
+Bz
+dO
+dO
+dO
+dO
+dO
+Bz
AS
aa
aC
@@ -3841,13 +3841,13 @@ aC
aC
aa
AS
-Kq
-PF
-PF
-PF
-PF
-PF
-Kq
+Bz
+dO
+dO
+dO
+dO
+dO
+Bz
AS
aa
aC
@@ -3993,13 +3993,13 @@ aC
aa
aa
AS
-Kq
-BD
-BD
-BD
-BD
-BD
-Kq
+Bz
+yH
+yH
+yH
+yH
+yH
+Bz
AS
aa
aa
@@ -4146,11 +4146,11 @@ aa
ab
ab
ab
-Sb
-Sb
-Sb
-Sb
-Sb
+ju
+ju
+ju
+ju
+ju
ab
ab
ab
@@ -4296,15 +4296,15 @@ aC
aa
aa
ab
-ad
-ad
-az
-az
-az
-az
-az
-ad
-ad
+iA
+iA
+Lq
+Lq
+Lq
+Lq
+Lq
+iA
+iA
ab
aa
aa
@@ -4448,15 +4448,15 @@ aC
aa
ab
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
ab
aa
@@ -4599,17 +4599,17 @@ aa
aC
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -4751,17 +4751,17 @@ aa
aC
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -4903,17 +4903,17 @@ aC
aC
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -5055,17 +5055,17 @@ aa
aa
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -5207,17 +5207,17 @@ OT
OT
OT
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -5353,23 +5353,23 @@ aa
aC
aa
OT
-BU
-YP
-YP
-qz
-Tm
-ag
-ad
-ad
-ad
-ad
-ad
-DV
-ad
-ad
-ad
-ad
-ad
+hu
+Qh
+Qh
+Uw
+mB
+oD
+iA
+iA
+iA
+iA
+iA
+jS
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -5505,23 +5505,23 @@ aa
aC
aa
OT
-NU
-YP
-YP
-YP
-QL
-ag
-ad
-ad
-ad
-ad
-DV
-aE
-DV
-ad
-ad
-ad
-ad
+dV
+Qh
+Qh
+Qh
+Hv
+oD
+iA
+iA
+iA
+iA
+jS
+sq
+jS
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -5657,23 +5657,23 @@ aa
aC
aa
OT
-VD
-YP
-YP
-YP
-QL
-ag
-ad
-ad
-ad
-ad
-DV
-PJ
-DV
-ad
-ad
-ad
-ad
+rT
+Qh
+Qh
+Qh
+Hv
+oD
+iA
+iA
+iA
+iA
+jS
+Ed
+jS
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -5809,23 +5809,23 @@ aa
aC
aa
OT
-wv
-YP
-YP
-YP
-QL
-ag
-ad
-ad
-ad
-ad
-DV
-wj
-DV
-ad
-ad
-ad
-ad
+Qo
+Qh
+Qh
+Qh
+Hv
+oD
+iA
+iA
+iA
+iA
+jS
+SB
+jS
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -5961,23 +5961,23 @@ aa
aC
aa
OT
-LO
-YP
-YP
-Fw
-Tm
-ag
-ad
-ad
-ad
-ad
-ad
-DV
-ad
-ad
-ad
-ad
-ad
+HA
+Qh
+Qh
+jp
+mB
+oD
+iA
+iA
+iA
+iA
+iA
+jS
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -6119,17 +6119,17 @@ OT
OT
OT
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -6271,17 +6271,17 @@ aa
aa
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -6423,17 +6423,17 @@ aa
aa
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -6575,17 +6575,17 @@ aC
aC
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -6632,7 +6632,7 @@ Kv
Qr
sj
wA
-qu
+tn
oa
il
NE
@@ -6727,17 +6727,17 @@ aa
aC
aa
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
aa
aC
@@ -6880,15 +6880,15 @@ aC
aa
ab
ab
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
-ad
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
+iA
ab
ab
aa
@@ -7032,15 +7032,15 @@ aC
aa
aa
ab
-ad
-ad
-aA
-aA
-aA
-aA
-aA
-ad
-ad
+iA
+iA
+no
+no
+no
+no
+no
+iA
+iA
ab
aa
aa
@@ -7186,11 +7186,11 @@ aa
ab
ab
ab
-aB
-aB
-aB
-aB
-aB
+Fa
+Fa
+Fa
+Fa
+Fa
ab
ab
ab
@@ -7337,13 +7337,13 @@ aC
aa
aa
ak
-Zd
-OK
-OK
-OK
-OK
-OK
-Zd
+tg
+Rg
+Rg
+Rg
+Rg
+Rg
+tg
ak
aa
aa
@@ -7489,13 +7489,13 @@ aC
aC
aa
ak
-Zd
-Ee
-Ee
-Ee
-Ee
-Ee
-Zd
+tg
+sW
+sW
+sW
+sW
+sW
+tg
ak
aa
aC
@@ -7641,13 +7641,13 @@ aa
aC
aa
ak
-Zd
-Ee
-Ee
-Ee
-Ee
-Ee
-Zd
+tg
+sW
+sW
+sW
+sW
+sW
+tg
ak
aa
aC
@@ -7793,13 +7793,13 @@ aa
aC
aa
ak
-Zd
-Ee
-Ee
-Ee
-Ee
-Ee
-Zd
+tg
+sW
+sW
+sW
+sW
+sW
+tg
ak
aa
aC
@@ -7945,13 +7945,13 @@ aa
aC
aa
ak
-Zd
-Ee
-Ee
-Ee
-Ee
-Ee
-Zd
+tg
+sW
+sW
+sW
+sW
+sW
+tg
ak
aa
aC
@@ -8098,11 +8098,11 @@ aC
aa
ak
ak
-Zd
-Zd
-Zd
-Zd
-Zd
+tg
+tg
+tg
+tg
+tg
ak
ak
aa
diff --git a/sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg b/sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg
new file mode 100644
index 0000000000..9fe0b4c11d
Binary files /dev/null and b/sound/vehicles/Dropships/single_alarm_brr_dropship_1.ogg differ
diff --git a/tgui/packages/tgui-panel/settings/reducer.js b/tgui/packages/tgui-panel/settings/reducer.js
index 42d799fd65..0c93a5b94d 100644
--- a/tgui/packages/tgui-panel/settings/reducer.js
+++ b/tgui/packages/tgui-panel/settings/reducer.js
@@ -16,7 +16,7 @@ const initialState = {
fontFamily: FONTS[0],
lineHeight: 1.2,
theme: 'light',
- adminMusicVolume: 0.5,
+ adminMusicVolume: 0.2,
// Keep these two state vars for compatibility with other servers
highlightText: '',
highlightColor: '#ffdd44',
diff --git a/tgui/packages/tgui/interfaces/CanvasLayer.js b/tgui/packages/tgui/interfaces/CanvasLayer.js
new file mode 100644
index 0000000000..e647ae765b
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CanvasLayer.js
@@ -0,0 +1,311 @@
+import { Box, Icon, Tooltip } from '../components';
+import { Component, createRef } from 'inferno';
+
+// this file should probably not be in interfaces, should move it later.
+export class CanvasLayer extends Component {
+ constructor(props) {
+ super(props);
+ this.canvasRef = createRef();
+
+ // color selection
+ // using this.state prevents unpredictable behavior
+ this.state = {
+ selection: this.props.selection,
+ mapLoad: true,
+ };
+
+ // needs to be of type png of jpg
+ this.img = null;
+ this.imageSrc = this.props.imageSrc;
+
+ // stores the stacked lines
+ this.lineStack = [];
+
+ // stores the individual line drawn
+ this.currentLine = [];
+
+ this.ctx = null;
+ this.isPainting = false;
+ this.lastX = null;
+ this.lastY = null;
+
+ this.complexity = 0;
+ }
+
+ componentDidMount() {
+ this.ctx = this.canvasRef.current.getContext('2d');
+ this.ctx.lineWidth = 4;
+ this.ctx.lineCap = 'round';
+
+ this.img = new Image();
+
+ this.img.src = this.imageSrc;
+
+ this.img.onload = () => {
+ this.setState({ mapLoad: true });
+ };
+
+ this.img.onerror = () => {
+ this.setState({ mapLoad: false });
+ };
+
+ this.drawCanvas();
+ }
+
+ handleMouseDown = (e) => {
+ this.isPainting = true;
+
+ const rect = this.canvasRef.current.getBoundingClientRect();
+ const x = e.clientX - rect.left;
+ const y = e.clientY - rect.top;
+
+ this.ctx.beginPath();
+ this.ctx.moveTo(this.lastX, this.lastY);
+ this.lastX = x;
+ this.lastY = y;
+ };
+
+ handleMouseMove = (e) => {
+ if (!this.isPainting || !this.state.selection) {
+ return;
+ }
+ if (e.buttons === 0) {
+ // We probably dragged off the window - lets not get stuck drawing
+ this.handleMouseUp(e);
+ return;
+ }
+
+ this.ctx.strokeStyle = this.state.selection;
+
+ const rect = this.canvasRef.current.getBoundingClientRect();
+ const x = e.clientX - rect.left;
+ const y = e.clientY - rect.top;
+
+ if (this.lastX !== null && this.lastY !== null) {
+ // this controls how often we make new strokes
+ if (Math.abs(this.lastX - x) + Math.abs(this.lastY - y) < 20) {
+ return;
+ }
+
+ this.ctx.moveTo(this.lastX, this.lastY);
+ this.ctx.lineTo(x, y);
+ this.ctx.stroke();
+ this.currentLine.push([
+ this.lastX,
+ this.lastY,
+ x,
+ y,
+ this.ctx.strokeStyle,
+ ]);
+ }
+
+ this.lastX = x;
+ this.lastY = y;
+ };
+
+ handleMouseUp = (e) => {
+ if (
+ this.isPainting &&
+ this.state.selection &&
+ this.lastX !== null &&
+ this.lastY !== null
+ ) {
+ const rect = this.canvasRef.current.getBoundingClientRect();
+ const x = e.clientX - rect.left;
+ const y = e.clientY - rect.top;
+
+ this.ctx.moveTo(this.lastX, this.lastY);
+ this.ctx.lineTo(x, y);
+ this.ctx.stroke();
+ this.currentLine.push([
+ this.lastX,
+ this.lastY,
+ x,
+ y,
+ this.ctx.strokeStyle,
+ ]);
+ }
+
+ this.isPainting = false;
+ this.lastX = null;
+ this.lastY = null;
+
+ if (this.currentLine.length === 0) {
+ return;
+ }
+
+ this.lineStack.push([...this.currentLine]);
+ this.currentLine = [];
+ this.complexity = this.getComplexity();
+ this.props.onDraw();
+ };
+
+ handleSelectionChange = () => {
+ const { selection } = this.props;
+
+ if (selection === 'clear') {
+ this.ctx.clearRect(
+ 0,
+ 0,
+ this.canvasRef.current.width,
+ this.canvasRef.current.height
+ );
+ this.ctx.drawImage(
+ this.img,
+ 0,
+ 0,
+ this.canvasRef.current.width,
+ this.canvasRef.current.height
+ );
+
+ this.lineStack = [];
+ this.complexity = 0;
+ return;
+ }
+
+ if (selection === 'undo') {
+ if (this.lineStack.length === 0) {
+ return;
+ }
+
+ const line = this.lineStack.pop();
+ if (line.length === 0) {
+ return;
+ }
+
+ const prevColor = line[0][4];
+
+ this.ctx.clearRect(
+ 0,
+ 0,
+ this.canvasRef.current.width,
+ this.canvasRef.current.height
+ );
+ this.ctx.drawImage(
+ this.img,
+ 0,
+ 0,
+ this.canvasRef.current.width,
+ this.canvasRef.current.height
+ );
+ this.ctx.globalCompositeOperation = 'source-over';
+
+ this.lineStack.forEach((currentLine) => {
+ currentLine.forEach(([lastX, lastY, x, y, colorSelection]) => {
+ this.ctx.strokeStyle = colorSelection;
+ this.ctx.beginPath();
+ this.ctx.moveTo(lastX, lastY);
+ this.ctx.lineTo(x, y);
+ this.ctx.stroke();
+ });
+ });
+
+ this.complexity = this.getComplexity();
+ this.setState({ selection: prevColor });
+ this.props.onUndo(prevColor);
+ return;
+ }
+
+ if (selection === 'export') {
+ const svgData = this.convertToSVG();
+ this.props.onImageExport(svgData);
+ return;
+ }
+
+ this.setState({ selection: selection });
+ };
+
+ componentDidUpdate(prevProps) {
+ if (prevProps.actionQueueChange !== this.props.actionQueueChange) {
+ this.handleSelectionChange();
+ }
+ }
+
+ drawCanvas() {
+ this.img.onload = () => {
+ // this onload may or may not be causing problems.
+ this.ctx.drawImage(
+ this.img,
+ 0,
+ 0,
+ this.canvasRef.current?.width,
+ this.canvasRef.current?.height
+ );
+ };
+ }
+
+ convertToSVG() {
+ const lines = this.lineStack.flat();
+ const combinedArray = lines.flatMap(
+ ([lastX, lastY, x, y, colorSelection]) => [
+ lastX,
+ lastY,
+ x,
+ y,
+ colorSelection,
+ ]
+ );
+ return combinedArray;
+ }
+
+ getComplexity() {
+ let count = 0;
+ this.lineStack.forEach((item) => {
+ count += item.length;
+ });
+ return count;
+ }
+
+ displayCanvas() {
+ return (
+
+ {this.complexity > 500 && (
+
+
+
+ )}
+
+ );
+ }
+
+ displayLoading() {
+ return (
+
+
+
+ Please wait a few minutes before attempting to access the canvas.
+
+
+
+ );
+ }
+
+ render() {
+ if (this.state.mapLoad) {
+ return this.displayCanvas();
+ } else {
+ // edge case where a new user joins and tries to draw on the canvas before they cached the png
+ return this.displayLoading();
+ }
+ }
+}
diff --git a/tgui/packages/tgui/interfaces/DrawnMap.js b/tgui/packages/tgui/interfaces/DrawnMap.js
new file mode 100644
index 0000000000..cd5a9539f8
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/DrawnMap.js
@@ -0,0 +1,110 @@
+import { Box } from '../components';
+import { Component, createRef } from 'inferno';
+
+export class DrawnMap extends Component {
+ constructor(props) {
+ super(props);
+ this.containerRef = createRef();
+ this.flatImgSrc = this.props.flatImage;
+ this.backupImgSrc = this.props.backupImage;
+ this.state = {
+ mapLoad: true,
+ loadingBackup: true,
+ };
+ this.img = null;
+ this.svg = this.props.svgData;
+ }
+
+ componentDidMount() {
+ this.img = new Image();
+ this.img.src = this.flatImgSrc;
+ this.img.onload = () => {
+ this.setState({ mapLoad: true });
+ };
+
+ this.img.onerror = () => {
+ this.img.src = this.backupImgSrc;
+ this.setState({ mapLoad: false });
+ };
+
+ const backupImg = new Image();
+ backupImg.src = this.backupImgSrc;
+ backupImg.onload = () => {
+ this.setState({ loadingBackup: false });
+ };
+ }
+
+ parseSvgData(svgDataArray) {
+ if (!svgDataArray) return null;
+ let lines = [];
+ for (let i = 0; i < svgDataArray.length; i += 5) {
+ const x1 = svgDataArray[i];
+ const y1 = svgDataArray[i + 1];
+ const x2 = svgDataArray[i + 2];
+ const y2 = svgDataArray[i + 3];
+ const stroke = svgDataArray[i + 4];
+ lines.push({ x1, y1, x2, y2, stroke });
+ }
+ return lines;
+ }
+
+ getSize() {
+ const ratio = Math.min(
+ (self.innerWidth - 50) / 650,
+ (self.innerHeight - 150) / 600
+ );
+ return { width: 650 * ratio, height: 600 * ratio };
+ }
+
+ render() {
+ const parsedSvgData = this.parseSvgData(this.svg);
+ const size = this.getSize();
+
+ return (
+
+ {this.state.loadingBackup && !this.state.mapLoad && (
+
+ Loading map...
+
+ )}
+ {this.img && this.state.mapLoad && (
+
+ )}
+ {parsedSvgData && this.state.mapLoad && (
+
+ )}
+