diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index 38e5693dcbe5..deee80c7a91d 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 71d0ed8e7445..003d723600c4 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/traits.dm b/code/__DEFINES/traits.dm index bbf8fda99f61..af8af22ca707 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -143,6 +143,8 @@ // #define TRAIT_X "t_x" //-- mob traits -- +/// Prevents voluntary movement. +#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" @@ -294,6 +296,7 @@ GLOBAL_LIST_INIT(mob_traits, list( */ GLOBAL_LIST_INIT(traits_by_type, list( /mob = list( + "TRAIT_IMMOBILIZED" = TRAIT_IMMOBILIZED, "TRAIT_UNDENSE" = TRAIT_UNDENSE, "TRAIT_YAUTJA_TECH" = TRAIT_YAUTJA_TECH, "TRAIT_SUPER_STRONG" = TRAIT_SUPER_STRONG, @@ -411,6 +414,8 @@ GLOBAL_LIST(trait_name_map) //Status trait coming from clothing. #define TRAIT_SOURCE_CLOTHING "t_s_clothing" +/// traits associated with actively interacted machinery +#define INTERACTION_TRAIT "interaction" /// trait effect related to active specialist gear #define SPECIALIST_GEAR_TRAIT "specialist_gear" /// traits associated with usage of snowflake dropship double seats diff --git a/code/__DEFINES/vehicle.dm b/code/__DEFINES/vehicle.dm index 9c6685085788..8a1617229926 100644 --- a/code/__DEFINES/vehicle.dm +++ b/code/__DEFINES/vehicle.dm @@ -53,5 +53,6 @@ #define VEHICLE_CLASS_LIGHT (1<<2) //light class armor (APC, tank) #define VEHICLE_CLASS_MEDIUM (1<<3) //medium class armor (tank) #define VEHICLE_CLASS_HEAVY (1<<4) //heavy class armor (tank) - -#define TANK_POPLOCK 90 +// Other vehicle flags +/// Vehicle can bypass vehicle blockers, typically going further into maps than intended +#define VEHICLE_BYPASS_BLOCKERS (1<<5) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 1116f1acb2a8..24e39ff16c89 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/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 540c8f085601..b85aa18fdb6b 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -461,3 +461,11 @@ DEFINE_BITFIELD(vend_flags, list( "VEND_FACTION_THEMES" = VEND_FACTION_THEMES, "VEND_USE_VENDOR_FLAGS" = VEND_USE_VENDOR_FLAGS, )) + +DEFINE_BITFIELD(vehicle_flags, list( + "VEHICLE_CLASS_WEAK" = VEHICLE_CLASS_WEAK, + "VEHICLE_CLASS_LIGHT" = VEHICLE_CLASS_LIGHT, + "VEHICLE_CLASS_MEDIUM" = VEHICLE_CLASS_MEDIUM, + "VEHICLE_CLASS_HEAVY" = VEHICLE_CLASS_HEAVY, + "VEHICLE_BYPASS_BLOCKERS" = VEHICLE_BYPASS_BLOCKERS, +)) diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 1e1e9cefd5db..3ba92a7c4d0c 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 44f4b2c4010f..cd6708198eae 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/controllers/subsystem/inactivity.dm b/code/controllers/subsystem/inactivity.dm index 5edd4e8c5294..6b8542444040 100644 --- a/code/controllers/subsystem/inactivity.dm +++ b/code/controllers/subsystem/inactivity.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(inactivity) return for(var/client/current as anything in GLOB.clients) - if(current.admin_holder && current.admin_holder.rights & R_ADMIN) //Skip admins. + if(current.admin_holder && current.admin_holder.rights & R_MOD) //Skip admins. continue if(current.is_afk(INACTIVITY_KICK)) if(!istype(current.mob, /mob/dead)) diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 6f5b9303a91f..d28fe916291a 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -256,8 +256,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 */ @@ -322,7 +320,7 @@ SUBSYSTEM_DEF(minimaps) minimaps_by_z["[z_level]"].images_assoc["[flag]"] -= source /** - * 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 @@ -338,6 +336,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]) @@ -442,7 +604,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 @@ -452,17 +614,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) @@ -476,11 +682,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 @@ -493,7 +904,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 @@ -516,3 +927,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/datums/agents/tools/chloroform.dm b/code/datums/agents/tools/chloroform.dm index cc804c1d270c..c6e3320688eb 100644 --- a/code/datums/agents/tools/chloroform.dm +++ b/code/datums/agents/tools/chloroform.dm @@ -47,7 +47,7 @@ /obj/item/weapon/chloroform/proc/grab_stun(mob/living/M, mob/living/user) M.anchored = TRUE - M.frozen = TRUE + ADD_TRAIT(M, TRAIT_IMMOBILIZED, CHLOROFORM_TRAIT) ADD_TRAIT(M, TRAIT_UNDENSE, CHLOROFORM_TRAIT) M.able_to_speak = FALSE M.update_canmove() @@ -82,7 +82,7 @@ M.density = TRUE M.able_to_speak = TRUE M.layer = MOB_LAYER - M.unfreeze() + REMOVE_TRAIT(M, TRAIT_IMMOBILIZED, CHLOROFORM_TRAIT) REMOVE_TRAIT(M, TRAIT_UNDENSE, CHLOROFORM_TRAIT) QDEL_NULL(mask_item) diff --git a/code/datums/effects/xeno_strains/boiler_trap.dm b/code/datums/effects/xeno_strains/boiler_trap.dm index 61451391e816..1833b9641a9a 100644 --- a/code/datums/effects/xeno_strains/boiler_trap.dm +++ b/code/datums/effects/xeno_strains/boiler_trap.dm @@ -4,19 +4,17 @@ effect_name = "boiler trap" duration = null flags = INF_DURATION - /// Ghetto flag indicating whether we actually placed the freeze or not, until we have an actual effects system - var/freezer = FALSE /datum/effects/boiler_trap/New(atom/A, mob/from, last_dmg_source, zone) . = ..() if(!QDELETED(src)) var/mob/M = affected_atom - freezer = M.freeze() + ADD_TRAIT(M, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY(effect_name)) /datum/effects/boiler_trap/Destroy(force) - if(ismob(affected_atom) && freezer) + if(ismob(affected_atom)) var/mob/M = affected_atom - M.unfreeze() + REMOVE_TRAIT(M, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY(effect_name)) return ..() /datum/effects/boiler_trap/validate_atom(atom/A) @@ -29,7 +27,5 @@ . = ..() if(!.) return FALSE var/mob/M = affected_atom - if(M.frozen) return TRUE - if(!freezer) - freezer = M.freeze() + ADD_TRAIT(M, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY(effect_name)) return TRUE diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm index 65c5a47896fa..b0df9bca7745 100644 --- a/code/datums/mob_hud.dm +++ b/code/datums/mob_hud.dm @@ -798,7 +798,7 @@ var/global/image/hud_icon_hudfocus tag_holder.overlays += image('icons/mob/hud/hud.dmi', src, "prae_tag") // Hacky, but works. Currently effects are hard to make with precise timings - var/freeze_found = frozen + var/freeze_found = HAS_TRAIT(src, TRAIT_IMMOBILIZED) && !buckled && !lying if (freeze_found) freeze_holder.overlays += image('icons/mob/hud/hud.dmi', src, "xeno_freeze") diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 44494bea83a0..e0590265840c 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -723,7 +723,7 @@ Parameters are passed from New. usr.client.cmd_admin_emp(src) if(href_list[VV_HK_MODIFY_TRANSFORM] && check_rights(R_VAREDIT)) - var/result = tgui_input_list(usr, "Choose the transformation to apply","Transform Mod", list("Scale","Translate","Rotate")) + var/result = tgui_input_list(usr, "Choose the transformation to apply","Transform Mod", list("Scale","Translate","Rotate", "Reflect X Axis", "Reflect Y Axis")) if(!result) return if(!result) @@ -749,7 +749,22 @@ Parameters are passed from New. return var/matrix/base_matrix = matrix(base_transform) update_base_transform(base_matrix.Turn(angle)) - + if("Reflect X Axis") + var/matrix/current = matrix(base_transform) + var/matrix/reflector = matrix() + reflector.a = -1 + reflector.d = 0 + reflector.b = 0 + reflector.e = 1 + update_base_transform(current * reflector) + if("Reflect Y Axis") + var/matrix/current = matrix(base_transform) + var/matrix/reflector = matrix() + reflector.a = 1 + reflector.d = 0 + reflector.b = 0 + reflector.e = -1 + update_base_transform(current * reflector) SEND_SIGNAL(src, COMSIG_ATOM_VV_MODIFY_TRANSFORM) if(href_list[VV_HK_AUTO_RENAME] && check_rights(R_VAREDIT)) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index effd3325f887..17a255009089 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -423,7 +423,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() @@ -443,9 +443,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 @@ -479,14 +476,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) @@ -614,20 +611,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/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 3332577683fe..b39f59530adc 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 9856ae8f970e..f2b36276c8eb 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/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index 7bbc86681eb1..ff21671ed758 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -6,6 +6,7 @@ var/list/alldepartments = list() #define DEPARTMENT_CMB "CMB Incident Command Center, Local Operations" #define DEPARTMENT_PROVOST "USCM Provost Office" #define DEPARTMENT_PRESS "Various Press Organizations" +#define HIGHCOM_DEPARTMENTS list(DEPARTMENT_WY, DEPARTMENT_HC, DEPARTMENT_CMB, DEPARTMENT_PROVOST, DEPARTMENT_PRESS) /obj/structure/machinery/faxmachine // why not fax_machine? name = "\improper General Purpose Fax Machine" @@ -319,10 +320,14 @@ var/list/alldepartments = list() GLOB.fax_contents += faxcontents + var/scan_department = target_department + if(department in HIGHCOM_DEPARTMENTS) + scan_department = department + var/msg_admin = SPAN_STAFF_IC("[target_department]: [key_name(user, 1)] ") msg_admin += "[CC_MARK(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_JMP_USER(user)] " - switch(target_department) + switch(scan_department) if(DEPARTMENT_HC) GLOB.USCMFaxes.Add("\['[original_fax.name]' from [key_name(usr)], [scan] at [time2text(world.timeofday, "hh:mm:ss")]\] REPLY") msg_admin += "(RPLY): " diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index 70ef402ae4e0..f2eff1c23e56 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -443,7 +443,44 @@ GLOBAL_LIST_EMPTY(vending_products) //------------TGUI PROCS--------------- /obj/structure/machinery/cm_vending/ui_data(mob/user) - return vendor_user_ui_data(src, user) + if(vend_flags & VEND_LIMITED_INVENTORY) + return vendor_inventory_ui_data(user) + + . = list() + var/list/ui_listed_products = get_listed_products(user) + // list format + // ( + // name: str + // cost + // item reference + // allowed to buy flag + // item priority (mandatory/recommended/regular) + // ) + + var/list/stock_values = list() + + var/mob/living/carbon/human/marine = user + var/points = 0 + + if(instanced_vendor_points) + points = available_points_to_display + else + if(use_snowflake_points) + points = marine.marine_snowflake_points + else if(use_points) + points = marine.marine_points + + for (var/i in 1 to length(ui_listed_products)) + var/list/myprod = ui_listed_products[i] //we take one list from listed_products + var/prod_available = FALSE + var/p_cost = myprod[2] + var/category = myprod[4] + if(points >= p_cost && (!category || ((category in marine.marine_buyable_categories) && (marine.marine_buyable_categories[category])))) + prod_available = TRUE + stock_values += list(prod_available) + + .["stock_listing"] = stock_values + .["current_m_points"] = points /obj/structure/machinery/cm_vending/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() @@ -530,7 +567,7 @@ GLOBAL_LIST_EMPTY(vending_products) vend_fail() return FALSE - if(!handle_vend(src, itemspec, user)) + if(!handle_vend(itemspec, user)) to_chat(user, SPAN_WARNING("You can't buy things from this category anymore.")) vend_fail() return FALSE @@ -548,7 +585,7 @@ GLOBAL_LIST_EMPTY(vending_products) vend_fail() return TRUE // one left and the player spam click during a lagspike. - vendor_successful_vend(src, itemspec, user) + vendor_successful_vend(itemspec, user) return TRUE add_fingerprint(user) @@ -779,7 +816,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/structure/machinery/cm_vending/gear/ui_static_data(mob/user) . = ..(user) .["vendor_type"] = "gear" - .["displayed_categories"] = vendor_user_inventory_list(src, user) + .["displayed_categories"] = vendor_user_inventory_list(user) //------------CLOTHING VENDORS--------------- //clothing vendors automatically put item on user. QoL at it's finest. @@ -796,7 +833,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/structure/machinery/cm_vending/clothing/ui_static_data(mob/user) . = ..(user) .["vendor_type"] = "clothing" - .["displayed_categories"] = vendor_user_inventory_list(src, user) + .["displayed_categories"] = vendor_user_inventory_list(user) //------------SORTED VENDORS--------------- //22.06.2019 Modified ex-"marine_selector" system that doesn't use points by Jeser. In theory, should replace all vendors. @@ -855,7 +892,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/structure/machinery/cm_vending/sorted/ui_static_data(mob/user) . = ..(user) .["vendor_type"] = "sorted" - .["displayed_categories"] = vendor_user_inventory_list(src, user, null, 4) + .["displayed_categories"] = vendor_user_inventory_list(user, null, 4) /obj/structure/machinery/cm_vending/sorted/MouseDrop_T(atom/movable/A, mob/user) @@ -934,7 +971,7 @@ GLOBAL_LIST_EMPTY(vending_products) /obj/structure/machinery/cm_vending/own_points/ui_static_data(mob/user) . = ..(user) .["vendor_type"] = "gear" - .["displayed_categories"] = vendor_user_inventory_list(src, user) + .["displayed_categories"] = vendor_user_inventory_list(user) //------------ESSENTIALS SETS AND RANDOM GEAR SPAWNER--------------- @@ -1060,7 +1097,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( //---helper procs -/proc/vendor_user_inventory_list(vendor, mob/user, cost_index=2, priority_index=5) +/obj/structure/machinery/cm_vending/proc/vendor_user_inventory_list(mob/user, cost_index=2, priority_index=5) . = list() // default list format // ( @@ -1070,8 +1107,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( // allowed to buy flag // item priority (mandatory/recommended/regular) // ) - var/obj/structure/machinery/cm_vending/vending_machine = vendor - var/list/ui_listed_products = vending_machine.get_listed_products(user) + var/list/ui_listed_products = get_listed_products(user) for (var/i in 1 to length(ui_listed_products)) var/list/myprod = ui_listed_products[i] //we take one list from listed_products @@ -1113,10 +1149,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( var/last_category = .[last_index] last_category["items"] += list(display_item) -/proc/vendor_inventory_ui_data(vendor, mob/user) +/obj/structure/machinery/cm_vending/proc/vendor_inventory_ui_data(mob/user) . = list() - var/obj/structure/machinery/cm_vending/vending_machine = vendor - var/list/ui_listed_products = vending_machine.get_listed_products(user) + var/list/ui_listed_products = get_listed_products(user) var/list/ui_categories = list() for (var/i in 1 to length(ui_listed_products)) @@ -1125,92 +1160,50 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( ui_categories += list(p_amount) .["stock_listing"] = ui_categories -/proc/vendor_user_ui_data(obj/structure/machinery/cm_vending/vending_machine, mob/user) - if(vending_machine.vend_flags & VEND_LIMITED_INVENTORY) - return vendor_inventory_ui_data(vending_machine, user) - - . = list() - var/list/ui_listed_products = vending_machine.get_listed_products(user) - // list format - // ( - // name: str - // cost - // item reference - // allowed to buy flag - // item priority (mandatory/recommended/regular) - // ) - - var/list/stock_values = list() - - var/mob/living/carbon/human/marine = user - var/points = 0 - - if(vending_machine.instanced_vendor_points) - points = vending_machine.available_points_to_display - else - if(vending_machine.use_snowflake_points) - points = marine.marine_snowflake_points - else if(vending_machine.use_points) - points = marine.marine_points - - for (var/i in 1 to length(ui_listed_products)) - var/list/myprod = ui_listed_products[i] //we take one list from listed_products - var/prod_available = FALSE - var/p_cost = myprod[2] - var/category = myprod[4] - if(points >= p_cost && (!category || ((category in marine.marine_buyable_categories) && (marine.marine_buyable_categories[category])))) - prod_available = TRUE - stock_values += list(prod_available) - - .["stock_listing"] = stock_values - .["current_m_points"] = points - -/proc/vendor_successful_vend(obj/structure/machinery/cm_vending/vendor, list/itemspec, mob/living/carbon/human/user) - if(vendor.stat & IN_USE) +/obj/structure/machinery/cm_vending/proc/vendor_successful_vend(list/itemspec, mob/living/carbon/human/user) + if(stat & IN_USE) return - vendor.stat |= IN_USE + stat |= IN_USE - var/vend_flags = vendor.vend_flags - var/turf/target_turf = vendor.get_appropriate_vend_turf(user) + var/turf/target_turf = get_appropriate_vend_turf(user) if(LAZYLEN(itemspec)) //making sure it's not empty - if(vendor.vend_delay) - vendor.overlays.Cut() - vendor.icon_state = "[initial(vendor.icon_state)]_vend" - if(vendor.vend_sound) - playsound(vendor.loc, vendor.vend_sound, 25, 1, 2) //heard only near vendor - sleep(vendor.vend_delay) + if(vend_delay) + overlays.Cut() + icon_state = "[initial(icon_state)]_vend" + if(vend_sound) + playsound(loc, vend_sound, 25, 1, 2) //heard only near vendor + sleep(vend_delay) var/prod_type = itemspec[3] if(islist(prod_type)) for(var/each_type in prod_type) - vendor_successful_vend_one(vendor, each_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) + vendor_successful_vend_one(each_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) else - vendor_successful_vend_one(vendor, prod_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) + vendor_successful_vend_one(prod_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM) if(vend_flags & VEND_LIMITED_INVENTORY) itemspec[2]-- if(vend_flags & VEND_LOAD_AMMO_BOXES) - vendor.update_derived_ammo_and_boxes(itemspec) + update_derived_ammo_and_boxes(itemspec) else to_chat(user, SPAN_WARNING("ERROR: itemspec is missing. Please report this to admins.")) sleep(15) - vendor.stat &= ~IN_USE - vendor.icon_state = initial(vendor.icon_state) - vendor.update_icon() + stat &= ~IN_USE + icon_state = initial(icon_state) + update_icon() -/proc/vendor_successful_vend_one(obj/structure/machinery/cm_vending/vendor, prod_type, mob/living/carbon/human/user, turf/target_turf, insignas_override) +/obj/structure/machinery/cm_vending/proc/vendor_successful_vend_one(prod_type, mob/living/carbon/human/user, turf/target_turf, insignas_override) var/obj/item/new_item - var/vend_flags = vendor.vend_flags if(ispath(prod_type, /obj/item)) if(ispath(prod_type, /obj/item/weapon/gun)) new_item = new prod_type(target_turf, TRUE) else if(prod_type == /obj/item/device/radio/headset/almayer/marine) - prod_type = vendor.headset_type + prod_type = headset_type else if(prod_type == /obj/item/clothing/gloves/marine) - prod_type = vendor.gloves_type + prod_type = gloves_type new_item = new prod_type(target_turf) new_item.add_fingerprint(user) else @@ -1239,13 +1232,13 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( if(vend_flags & VEND_TO_HAND) if(user.client?.prefs && (user.client?.prefs?.toggle_prefs & TOGGLE_VEND_ITEM_TO_HAND)) - if(vendor.Adjacent(user)) + if(Adjacent(user)) user.put_in_any_hand_if_possible(new_item, disable_warning = TRUE) new_item.post_vendor_spawn_hook(user) -/proc/handle_vend(obj/structure/machinery/cm_vending/vendor, list/listed_products, mob/living/carbon/human/vending_human) - if(vendor.vend_flags & VEND_USE_VENDOR_FLAGS) +/obj/structure/machinery/cm_vending/proc/handle_vend(list/listed_products, mob/living/carbon/human/vending_human) + if(vend_flags & VEND_USE_VENDOR_FLAGS) return TRUE var/buying_category = listed_products[4] if(buying_category) @@ -1281,62 +1274,3 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( stat &= ~IN_USE if(destroy) qdel(src) - -//------------HACKING--------------- - -//Hacking code from old vendors, in case someone will actually would like to add complex hacking in future. For now, simple access hacking I believe sufficient. -/* -/obj/structure/machinery/vending/proc/get_wire_descriptions() - return list( - VENDING_WIRE_EXTEND = "Inventory control computer", - VENDING_WIRE_IDSCAN = "ID scanner", - VENDING_WIRE_SHOCK = "Ground safety", - VENDING_WIRE_SHOOT_INV = "Dispenser motor control" - ) - -/obj/structure/machinery/vending/proc/isWireCut(wire) - return !(wires & getWireFlag(wire)) - -/obj/structure/machinery/vending/proc/cut(wire) - wires ^= getWireFlag(wire) - - switch(wire) - if(VENDING_WIRE_EXTEND) - src.extended_inventory = 0 - visible_message(SPAN_NOTICE("A weak yellow light turns off underneath \the [src].")) - if(VENDING_WIRE_SHOCK) - src.seconds_electrified = -1 - visible_message(SPAN_DANGER("Electric arcs shoot off from \the [src]!")) - if (VENDING_WIRE_SHOOT_INV) - if(!src.shoot_inventory) - src.shoot_inventory = TRUE - visible_message(SPAN_WARNING("\The [src] begins whirring noisily.")) - -/obj/structure/machinery/vending/proc/mend(wire) - wires |= getWireFlag(wire) - - switch(wire) - if(VENDING_WIRE_EXTEND) - src.extended_inventory = 1 - visible_message(SPAN_NOTICE("A weak yellow light turns on underneath \the [src].")) - if(VENDING_WIRE_SHOCK) - src.seconds_electrified = 0 - if (VENDING_WIRE_SHOOT_INV) - src.shoot_inventory = FALSE - visible_message(SPAN_NOTICE("\The [src] stops whirring.")) - -/obj/structure/machinery/vending/proc/pulse(wire) - switch(wire) - if(VENDING_WIRE_EXTEND) - src.extended_inventory = !src.extended_inventory - visible_message(SPAN_NOTICE("A weak yellow light turns [extended_inventory ? "on" : "off"] underneath \the [src].")) - if (VENDING_WIRE_SHOCK) - src.seconds_electrified = 30 - visible_message(SPAN_DANGER("Electric arcs shoot off from \the [src]!")) - if (VENDING_WIRE_SHOOT_INV) - src.shoot_inventory = !src.shoot_inventory - if(shoot_inventory) - visible_message(SPAN_WARNING("\The [src] begins whirring noisily.")) - else - visible_message(SPAN_NOTICE("\The [src] stops whirring.")) -*/ diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index 891a2a907b39..d352936b5434 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -55,8 +55,10 @@ SIGNAL_HANDLER UnregisterSignal(SSdcs, COMSIG_GLOB_VEHICLE_ORDERED) - selected_vehicle = "APC" - available_categories &= ~(VEHICLE_ARMOR_AVAILABLE|VEHICLE_INTEGRAL_AVAILABLE) //APC lacks these, so we need to remove these flags to be able to access spare parts section + if(!selected_vehicle) + selected_vehicle = "APC" // The whole thing seems to be based upon the assumption you unlock tank as an override, defaulting to APC + if(selected_vehicle == "APC") + available_categories &= ~(VEHICLE_ARMOR_AVAILABLE|VEHICLE_INTEGRAL_AVAILABLE) //APC lacks these, so we need to remove these flags to be able to access spare parts section /obj/structure/machinery/cm_vending/gear/vehicle_crew/get_listed_products(mob/user) var/list/display_list = list() diff --git a/code/game/objects/effects/decals/posters.dm b/code/game/objects/effects/decals/posters.dm index c688c4e6fb67..7a8054efce1a 100644 --- a/code/game/objects/effects/decals/posters.dm +++ b/code/game/objects/effects/decals/posters.dm @@ -184,6 +184,12 @@ serial_number = pick(27,28,30,31) .=..() +/obj/structure/sign/poster/io + icon_state = "poster14" + +/obj/structure/sign/poster/io/Initialize() + serial_number = 14 + . = ..() //////////////// //Hero Posters// //////////////// diff --git a/code/game/objects/effects/decals/warning_stripes.dm b/code/game/objects/effects/decals/warning_stripes.dm index ce0802d72d8e..20c96c2ac737 100644 --- a/code/game/objects/effects/decals/warning_stripes.dm +++ b/code/game/objects/effects/decals/warning_stripes.dm @@ -91,6 +91,20 @@ /obj/effect/decal/sand_overlay/sand2/corner2 icon_state = "sand2_c" +/obj/effect/decal/grass_overlay + name = "grass edge" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + unacidable = TRUE + icon = 'icons/turf/floors/auto_strata_grass.dmi' + layer = TURF_LAYER + +/obj/effect/decal/grass_overlay/grass1 + icon_state = "grass_outercorner" + +/obj/effect/decal/grass_overlay/grass1/inner + name = "grass edge" + icon_state = "grass_innercorner" + /obj/effect/decal/siding name = "siding" icon = 'icons/turf/floors/floors.dmi' diff --git a/code/game/objects/items/devices/cictablet.dm b/code/game/objects/items/devices/cictablet.dm index 6abd70980136..69e745da0803 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/fulton.dm b/code/game/objects/items/fulton.dm index 98987d1cd2b3..6a0e0f933144 100644 --- a/code/game/objects/items/fulton.dm +++ b/code/game/objects/items/fulton.dm @@ -90,7 +90,7 @@ var/global/list/deployed_fultons = list() var/mob/living/carbon/human/H = target_atom if(isyautja(H) && H.stat == DEAD) can_attach = TRUE - else if((H.stat != DEAD || H.mind && H.check_tod() && H.is_revivable())) + else if((H.stat != DEAD || H.check_tod() && H.is_revivable())) to_chat(user, SPAN_WARNING("You can't attach [src] to [target_atom], they still have a chance!")) return else diff --git a/code/game/objects/items/storage/smartpack.dm b/code/game/objects/items/storage/smartpack.dm index 8df079c92ca4..0b0fd05eac17 100644 --- a/code/game/objects/items/storage/smartpack.dm +++ b/code/game/objects/items/storage/smartpack.dm @@ -144,7 +144,7 @@ immobile_form = FALSE M.status_flags |= CANPUSH M.anchored = FALSE - M.unfreeze() + REMOVE_TRAIT(M, TRAIT_IMMOBILIZED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK)) ..() /obj/item/storage/backpack/marine/smartpack/attack_self(mob/user) @@ -236,7 +236,7 @@ battery_charge -= IMMOBILE_COST user.status_flags &= ~CANPUSH user.anchored = TRUE - user.frozen = TRUE + ADD_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK)) to_chat(user, SPAN_DANGER("[name] beeps, \"You are anchored in place and cannot be moved.\"")) to_chat(user, SPAN_INFO("The current charge reads [battery_charge]/[SMARTPACK_MAX_POWER_STORED]")) @@ -248,7 +248,7 @@ else user.status_flags |= CANPUSH user.anchored = FALSE - user.unfreeze() + REMOVE_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK)) to_chat(user, SPAN_DANGER("[name] beeps, \"You can now move again.\"")) user.remove_filter("synth_immobile_form") diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm index 284daf0028aa..f85b1e65fff5 100644 --- a/code/game/objects/structures/blocker.dm +++ b/code/game/objects/structures/blocker.dm @@ -105,9 +105,21 @@ /obj/structure/blocker/forcefield/vehicles types = list(/obj/vehicle/) + +/obj/structure/blocker/forcefield/vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle) + if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS) + return TRUE + return FALSE + /obj/structure/blocker/forcefield/multitile_vehicles types = list(/obj/vehicle/multitile/) + +/obj/structure/blocker/forcefield/multitile_vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle) + if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS) + return TRUE + return FALSE + /obj/structure/blocker/forcefield/human types = list(/mob/living/carbon/human) icon_state = "purple_line" diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm index 50505ab239b8..44efd5ce84ea 100644 --- a/code/game/objects/structures/vulture_spotter.dm +++ b/code/game/objects/structures/vulture_spotter.dm @@ -92,7 +92,7 @@ user.lighting_alpha = 127 user.sync_lighting_plane_alpha() user.overlay_fullscreen("vulture_spotter", /atom/movable/screen/fullscreen/vulture/spotter) - user.freeze() + ADD_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Vulture spotter")) user.status_flags |= IMMOBILE_ACTION user.visible_message(SPAN_NOTICE("[user] looks through [src]."),SPAN_NOTICE("You look through [src], ready to go!")) user.forceMove(loc) @@ -105,7 +105,7 @@ /obj/structure/vulture_spotter_tripod/on_unset_interaction(mob/user) user.status_flags &= ~IMMOBILE_ACTION user.visible_message(SPAN_NOTICE("[user] looks up from [src]."),SPAN_NOTICE("You look up from [src].")) - user.unfreeze() + REMOVE_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Vulture spotter")) user.reset_view(null) user.Move(get_step(src, reverse_direction(src.dir))) user.client?.change_view(world_view_size, src) diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index cf7f81b2204f..422a42c66541 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -1315,6 +1315,14 @@ var/datum/controller/supply/supply_controller = new() /datum/vehicle_order/tank/has_vehicle_lock() return +/datum/vehicle_order/tank/broken + name = "Smashed M34A2 Longstreet Light Tank" + ordered_vehicle = /obj/effect/vehicle_spawner/tank/hull/broken + +/datum/vehicle_order/tank/plain + name = "M34A2 Longstreet Light Tank" + ordered_vehicle = /obj/effect/vehicle_spawner/tank + /datum/vehicle_order/apc name = "M577 Armored Personnel Carrier" ordered_vehicle = /obj/effect/vehicle_spawner/apc/decrepit @@ -1327,18 +1335,19 @@ var/datum/controller/supply/supply_controller = new() name = "M577-CMD Armored Personnel Carrier" ordered_vehicle = /obj/effect/vehicle_spawner/apc_cmd/decrepit +/datum/vehicle_order/apc/empty + name = "Barebones M577 Armored Personal Carrier" + ordered_vehicle = /obj/effect/vehicle_spawner/apc/unarmed/broken + /obj/structure/machinery/computer/supplycomp/vehicle/Initialize() . = ..() vehicles = list( - /datum/vehicle_order/apc, - /datum/vehicle_order/apc/med, - /datum/vehicle_order/apc/cmd, + new /datum/vehicle_order/apc(), + new /datum/vehicle_order/apc/med(), + new /datum/vehicle_order/apc/cmd(), ) - for(var/order as anything in vehicles) - new order - if(!VehicleElevatorConsole) VehicleElevatorConsole = src @@ -1408,6 +1417,7 @@ var/datum/controller/supply/supply_controller = new() return if(!is_admin_level(SSshuttle.vehicle_elevator.z)) + to_chat(usr, SPAN_WARNING("The elevator needs to be in the cargo bay dock to call a vehicle up. Ask someone to send it away.")) return if(ismaintdrone(usr)) diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 1b4091eb2aab..f976da220b29 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -28,15 +28,23 @@ /obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend, ) + /// The type of wall decoration we use, to avoid the wall changing icon all the time + var/decoration_type + +/turf/closed/wall/almayer/Initialize(mapload, ...) + if(!special_icon && prob(20)) + decoration_type = rand(0,3) + return ..() + /turf/closed/wall/almayer/update_icon() - ..() - if(special_icon) - return + if(decoration_type == null) + return ..() if(neighbors_list in list(EAST|WEST)) - var/r1 = rand(0,10) //Make a random chance for this to happen - var/r2 = rand(0,3) // Which wall if we do choose it - if(r1 >= 9) - overlays += image(icon, icon_state = "almayer_deco_wall[r2]") + special_icon = TRUE + icon_state = "almayer_deco_wall[decoration_type]" + else // Wall connection was broken, return to normality + special_icon = FALSE + return ..() /turf/closed/wall/almayer/take_damage(dam, mob/M) var/damage_check = max(0, damage + dam) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7d9127313094..5d02917f70ee 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -69,6 +69,7 @@ var/list/admin_verbs_default = list( /client/proc/toggle_ares_ping, /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/cmd_admin_tacmaps_panel, ) var/list/admin_verbs_admin = list( diff --git a/code/modules/admin/player_panel/actions/general.dm b/code/modules/admin/player_panel/actions/general.dm index 79cf192fa420..a47a42d44cc2 100644 --- a/code/modules/admin/player_panel/actions/general.dm +++ b/code/modules/admin/player_panel/actions/general.dm @@ -113,9 +113,13 @@ name = "Toggle Frozen" /datum/player_action/toggle_frozen/act(client/user, mob/target, list/params) - target.frozen = text2num(params["freeze"]) + var/frozen = text2num(params["freeze"]) + if(frozen) + ADD_TRAIT(target, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ADMIN) + else + REMOVE_TRAIT(target, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ADMIN) - message_admins("[key_name_admin(user)] [target.frozen? "froze" : "unfroze"] [key_name_admin(target)]") + message_admins("[key_name_admin(user)] [frozen? "froze" : "unfroze"] [key_name_admin(target)]") return TRUE // MESSAGE diff --git a/code/modules/admin/player_panel/player_panel.dm b/code/modules/admin/player_panel/player_panel.dm index a8217b5d9402..e29ea83ef5ce 100644 --- a/code/modules/admin/player_panel/player_panel.dm +++ b/code/modules/admin/player_panel/player_panel.dm @@ -480,7 +480,7 @@ else .["mob_sleeping"] = 0 - .["mob_frozen"] = targetMob.frozen + .["mob_frozen"] = HAS_TRAIT_FROM(targetMob, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ADMIN) .["mob_speed"] = targetMob.speed .["mob_status_flags"] = targetMob.status_flags 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 000000000000..dcc8c7d5b664 --- /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 000000000000..e4b6f6846031 --- /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/almayer/machinery.dm b/code/modules/almayer/machinery.dm index cb90db9e8535..e72f4e7f9f52 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 9268cd3aadba..7811a6c9cb5a 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/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index 88964d76c3eb..62a7417c57f8 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() . = ..() @@ -318,7 +318,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 f716d69b5b7e..185bee06c513 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/m2c.dm b/code/modules/cm_marines/m2c.dm index a0943bb7f0a6..75c96f67176b 100644 --- a/code/modules/cm_marines/m2c.dm +++ b/code/modules/cm_marines/m2c.dm @@ -466,7 +466,7 @@ return if(user.get_active_hand() == null && user.get_inactive_hand() == null) - user.freeze() + ADD_TRAIT(user, TRAIT_IMMOBILIZED, INTERACTION_TRAIT) user.set_interaction(src) give_action(user, /datum/action/human_action/mg_exit) else diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 6db426a348c3..3cf33ebd391e 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_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index b450f5f02841..225b85506279 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -831,7 +831,7 @@ to_chat(user, SPAN_WARNING("You aren't allowed to use firearms!")) return else - user.freeze() + ADD_TRAIT(user, TRAIT_IMMOBILIZED, INTERACTION_TRAIT) user.set_interaction(src) give_action(user, /datum/action/human_action/mg_exit) @@ -859,7 +859,7 @@ SEND_SIGNAL(src, COMSIG_GUN_INTERRUPT_FIRE) user.status_flags &= ~IMMOBILE_ACTION user.visible_message(SPAN_NOTICE("[user] lets go of \the [src]."),SPAN_NOTICE("You let go of \the [src], letting the gun rest.")) - user.unfreeze() + REMOVE_TRAIT(user, TRAIT_IMMOBILIZED, INTERACTION_TRAIT) UnregisterSignal(user, list(COMSIG_MOB_MOUSEUP, COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEDRAG)) user.reset_view(null) user.remove_temp_pass_flags(PASS_MOB_THRU) // this is necessary because being knocked over while using the gun makes you incorporeal diff --git a/code/modules/cm_preds/yaut_machines.dm b/code/modules/cm_preds/yaut_machines.dm index a1782ca22b85..f076c6782d9a 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/implements/tank.dm b/code/modules/cm_tech/implements/tank.dm index 1ce83c37eae3..ae7dfc580e38 100644 --- a/code/modules/cm_tech/implements/tank.dm +++ b/code/modules/cm_tech/implements/tank.dm @@ -1,16 +1,3 @@ -/datum/supply_packs/vc_kit - name = "Vehicle Crewman Kits" - contains = list( - /obj/item/pamphlet/skill/vc, - /obj/item/pamphlet/skill/vc, - ) - cost = 0 - containertype = /obj/structure/closet/crate/supply - containername = "vehicle crewman kits crate" - buyable = 0 - group = "Operations" - iteration_needed = null - /obj/item/pamphlet/skill/vc name = "vehicle training manual" desc = "A manual used to quickly impart vital knowledge on driving vehicles." @@ -18,22 +5,30 @@ trait = /datum/character_trait/skills/vc bypass_pamphlet_limit = TRUE -/obj/item/tank_coupon - name = "tank coupon" - desc = "A coupon to be used for ASRS Vehicle Consoles to grant the wearer a TANK! One use only." +/obj/item/vehicle_coupon + name = "vehicle coupon" + desc = "A coupon to be used for ASRS Vehicle Consoles to grant the wearer an actual APC! Yeah baby, we're done walking! One use only. The ASRS elevator must be manually sent to lower level. Special restrictions may apply. No warranty." icon = 'icons/obj/items/pamphlets.dmi' icon_state = "pamphlet_written" item_state = "pamphlet_written" + var/vehicle_type = /datum/vehicle_order/apc/empty + var/vehicle_category = "APC" -/obj/item/tank_coupon/attack_self(mob/user) +/obj/item/vehicle_coupon/tank + name = "tank coupon" + desc = "We're done playing! This coupon allows the ship crew to retrieve a complete Longstreet tank from Vehicle ASRS. Make sure to send the ASRS lift down so it can be retrieved. One use only. LTB not included. Comes with free friendly fire." + vehicle_type = /datum/vehicle_order/tank/broken + vehicle_category = "TANK" + +/obj/item/vehicle_coupon/attack_self(mob/user) if(QDELETED(src)) return - if(redeem_tank()) - to_chat(user, SPAN_WARNING("\The [src] catches fire as it is read, resetting the ASRS Vehicle system!")) + if(redeem_vehicle()) + to_chat(user, SPAN_WARNING("\The [src] catches fire as it is read and resets the ASRS Vehicle system! Send the lift down and haul your prize up.")) qdel(src) return ..() -/obj/item/tank_coupon/proc/redeem_tank(mob/user) +/obj/item/vehicle_coupon/proc/redeem_vehicle(mob/user) SHOULD_NOT_SLEEP(TRUE) . = FALSE var/obj/structure/machinery/computer/supplycomp/vehicle/comp = VehicleElevatorConsole @@ -46,7 +41,7 @@ comp.spent = FALSE QDEL_NULL_LIST(comp.vehicles) comp.vehicles = list( - new /datum/vehicle_order/tank() + new vehicle_type(), ) comp.allowed_roles = null comp.req_access = list() @@ -56,17 +51,7 @@ gearcomp.req_access = list() gearcomp.req_one_access = list() gearcomp.vendor_role = list() - gearcomp.selected_vehicle = "TANK" + gearcomp.selected_vehicle = vehicle_category gearcomp.available_categories = VEHICLE_ALL_AVAILABLE - var/datum/supply_packs/VK = /datum/supply_packs/vc_kit - var/pack = initial(VK.name) - var/datum/supply_order/O = new /datum/supply_order() - O.ordernum = supply_controller.ordernum - supply_controller.ordernum++ - O.object = supply_controller.supply_packs[pack] - O.orderedby = MAIN_AI_SYSTEM - O.approvedby = MAIN_AI_SYSTEM - supply_controller.shoppinglist += O - return TRUE diff --git a/code/modules/desert_dam/motion_sensor/sensortower.dm b/code/modules/desert_dam/motion_sensor/sensortower.dm index 5783d0ce9f20..4ef11c32245d 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() diff --git a/code/modules/escape_menu/admin_buttons.dm b/code/modules/escape_menu/admin_buttons.dm index e6771d05bf68..661901c1b77a 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/maptext_alerts/screen_alerts.dm b/code/modules/maptext_alerts/screen_alerts.dm index 820c64301bc2..0b923f7dc753 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 8d9513093349..a68a67cfdf53 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -248,7 +248,7 @@ RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_REMOVE, PROC_REF(observe_target_screen_remove)) ///makes the ghost see the target hud and sets the eye at the target. -/mob/dead/observer/proc/do_observe(mob/target) +/mob/dead/observer/proc/do_observe(atom/movable/target) if(!client || !target || !istype(target)) return @@ -257,24 +257,23 @@ if(!ishuman(target) || !client.prefs?.auto_observe) return + var/mob/living/carbon/human/human_target = target - client.eye = target + client.eye = human_target - if(!target.hud_used) + if(!human_target.hud_used) return client.clear_screen() - LAZYINITLIST(target.observers) - target.observers |= src - target.hud_used.show_hud(target.hud_used.hud_version, src) - - var/mob/living/carbon/human/human_target = target + LAZYINITLIST(human_target.observers) + human_target.observers |= src + human_target.hud_used.show_hud(human_target.hud_used.hud_version, src) var/list/target_contents = human_target.get_contents() //Handles any currently open storage containers the target is looking in when we observe for(var/obj/item/storage/checked_storage in target_contents) - if(!(target in checked_storage.content_watchers)) + if(!(human_target in checked_storage.content_watchers)) continue client.add_to_screen(checked_storage.closer) @@ -289,7 +288,7 @@ break - observe_target_mob = target + observe_target_mob = human_target RegisterSignal(observe_target_mob, COMSIG_PARENT_QDELETING, PROC_REF(clean_observe_target)) RegisterSignal(observe_target_mob, COMSIG_MOB_GHOSTIZE, PROC_REF(observe_target_ghosting)) RegisterSignal(observe_target_mob, COMSIG_MOB_NEW_MIND, PROC_REF(observe_target_new_mind)) @@ -297,8 +296,8 @@ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(observer_move_react)) - if(target.client) - observe_target_client = target.client + if(human_target.client) + observe_target_client = human_target.client RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_ADD, PROC_REF(observe_target_screen_add)) RegisterSignal(observe_target_client, COMSIG_CLIENT_SCREEN_REMOVE, PROC_REF(observe_target_screen_remove)) return @@ -378,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) @@ -899,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/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 26c8fd867f72..228504195e52 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -463,7 +463,8 @@ msg += "Security records: \[View\]" if(!observer) msg += " \[Add comment\]\n" - + else + msg += "\n" if(hasHUD(user,"medical")) var/cardcolor = holo_card_color if(!cardcolor) cardcolor = "none" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 2ec8ccf2531d..3bc8e97623da 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) diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm index fda4cea20ad1..027e279e2983 100644 --- a/code/modules/mob/living/carbon/human/human_abilities.dm +++ b/code/modules/mob/living/carbon/human/human_abilities.dm @@ -456,21 +456,21 @@ CULT to_chat(chosen, SPAN_HIGHDANGER("You feel a dangerous presence in the back of your head. You find yourself unable to move!")) - chosen.frozen = TRUE + ADD_TRAIT(chosen, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Cultist Stun")) chosen.update_canmove() chosen.update_xeno_hostile_hud() if(!do_after(H, 2 SECONDS, INTERRUPT_ALL | BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE, chosen, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) to_chat(H, SPAN_XENOMINORWARNING("You decide not to stun [chosen].")) - unroot_human(chosen) + unroot_human(chosen, TRAIT_SOURCE_ABILITY("Cultist Stun")) enter_cooldown(5 SECONDS) return enter_cooldown() - unroot_human(chosen) + unroot_human(chosen, TRAIT_SOURCE_ABILITY("Cultist Stun")) chosen.apply_effect(10, PARALYZE) chosen.make_jittery(105) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 56eba38a4000..f3f58b859e25 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -378,16 +378,6 @@ Contains most of the procs that are called when a mob is attacked by something var/list/overlap = compare_group & access_to_check return length(overlap) -/mob/living/carbon/human/freeze() - . = ..() - if(.) - update_xeno_hostile_hud() - -/mob/living/carbon/human/unfreeze() - . = ..() - if(.) - update_xeno_hostile_hud() - /mob/living/carbon/human/get_target_lock(access_to_check) if(isnull(access_to_check)) return diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 7f36df8ceae2..c4690c03068f 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -230,7 +230,6 @@ /mob/living/carbon/human/proc/disable_special_flags() status_flags |= CANPUSH anchored = FALSE - frozen = FALSE /mob/living/carbon/human/proc/disable_special_items() set waitfor = FALSE // Scout decloak animation uses sleep(), which is problematic for taser gun diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index fd9c786bd147..1dcefec9b63b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -799,3 +799,11 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, #undef FIRE_LAYER #undef BURST_LAYER +/* To update the rooting graphic effect. Surely there's a better way... */ +/mob/living/carbon/human/on_immobilized_trait_gain(datum/source) + . = ..() + update_xeno_hostile_hud() + +/mob/living/carbon/human/on_immobilized_trait_loss(datum/source) + . = ..() + update_xeno_hostile_hud() diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index 27895555a9f1..780299547a51 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -320,9 +320,8 @@ if(pounceAction.freeze_play_sound) playsound(loc, rand(0, 100) < 95 ? 'sound/voice/alien_pounce.ogg' : 'sound/voice/alien_pounce2.ogg', 25, 1) canmove = FALSE - frozen = TRUE - pounceAction.freeze_timer_id = addtimer(CALLBACK(src, PROC_REF(unfreeze)), pounceAction.freeze_time, TIMER_STOPPABLE) - + ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) + pounceAction.freeze_timer_id = addtimer(CALLBACK(src, PROC_REF(unfreeze_pounce)), pounceAction.freeze_time, TIMER_STOPPABLE) pounceAction.additional_effects(M) if(pounceAction.slash) @@ -330,6 +329,9 @@ throwing = FALSE //Reset throwing since something was hit. +/mob/living/carbon/xenomorph/proc/unfreeze_pounce() + REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) + /mob/living/carbon/xenomorph/proc/pounced_mob_wrapper(mob/living/L) pounced_mob(L) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index 3a9ce03d34e9..ee6b39a1fcf7 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/ability_helper_procs.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm index 6b1c7d14b262..6ce6de84a086 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_helper_procs.dm @@ -160,11 +160,11 @@ SPAN_XENOWARNING("You vomit globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!"), null, 5) playsound(loc, "sound/bullets/acid_impact1.ogg", 25) -/proc/unroot_human(mob/living/carbon/H) +/proc/unroot_human(mob/living/carbon/H, trait_source) if (!isxeno_human(H)) return - H.frozen = 0 + REMOVE_TRAIT(H, TRAIT_IMMOBILIZED, trait_source) H.update_canmove() if(ishuman(H)) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm index 4ce83f37592c..8b8e3f9c86a3 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm @@ -35,7 +35,6 @@ return // TODO Make immune to all damage here. to_chat(src, SPAN_XENOWARNING("You burrow yourself into the ground.")) - frozen = TRUE invisibility = 101 anchored = TRUE density = FALSE @@ -45,6 +44,7 @@ COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED, ), PROC_REF(flamer_crossed_immune)) + ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Burrow")) ADD_TRAIT(src, TRAIT_ABILITY_BURROWED, TRAIT_SOURCE_ABILITY("Burrow")) ADD_TRAIT(src, TRAIT_UNDENSE, TRAIT_SOURCE_ABILITY("Burrow")) playsound(src.loc, 'sound/effects/burrowing_b.ogg', 25) @@ -74,9 +74,9 @@ COMSIG_LIVING_FLAMER_CROSSED, COMSIG_LIVING_FLAMER_FLAMED, )) + REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Burrow")) REMOVE_TRAIT(src, TRAIT_ABILITY_BURROWED, TRAIT_SOURCE_ABILITY("Burrow")) REMOVE_TRAIT(src, TRAIT_UNDENSE, TRAIT_SOURCE_ABILITY("Burrow")) - frozen = FALSE invisibility = FALSE anchored = FALSE density = TRUE @@ -166,9 +166,7 @@ /mob/living/carbon/xenomorph/proc/do_tunnel(turf/T) to_chat(src, SPAN_NOTICE("You tunnel to your destination.")) anchored = FALSE - unfreeze() forceMove(T) - UnregisterSignal(src, COMSIG_LIVING_FLAMER_FLAMED) burrow_off() /mob/living/carbon/xenomorph/proc/do_tunnel_cooldown() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm index bf773645e491..bbb202fef3c2 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_powers.dm @@ -217,7 +217,7 @@ else X.armor_deflection_buff += 30 X.armor_explosive_buff += 60 - X.frozen = TRUE + ADD_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Fortify")) X.anchored = TRUE X.small_explosives_stun = FALSE X.update_canmove() @@ -228,7 +228,7 @@ X.fortify = TRUE else to_chat(X, SPAN_XENOWARNING("You resume your normal stance.")) - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Fortify")) X.anchored = FALSE if(X.mutation_type == DEFENDER_STEELCREST) X.armor_deflection_buff -= 10 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index c1b1ee5f8902..5e3ab3b0afd9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -251,7 +251,7 @@ if(freeze_timer_id == TIMER_ID_NULL) return var/mob/living/carbon/xenomorph/X = owner - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) X.update_canmove() deltimer(freeze_timer_id) freeze_timer_id = TIMER_ID_NULL diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index 1882f2b69157..270ddbdfcc82 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -411,7 +411,7 @@ if (windup) X.set_face_dir(get_cardinal_dir(X, A)) if (!windup_interruptable) - X.frozen = TRUE + ADD_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) X.anchored = TRUE X.update_canmove() pre_windup_effects() @@ -419,14 +419,14 @@ if (!do_after(X, windup_duration, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) to_chat(X, SPAN_XENODANGER("You cancel your [ability_name]!")) if (!windup_interruptable) - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) X.anchored = FALSE X.update_canmove() post_windup_effects(interrupted = TRUE) return if (!windup_interruptable) - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) X.anchored = FALSE X.update_canmove() post_windup_effects() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm index 0c9358119def..2facee1edc9d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm @@ -30,20 +30,20 @@ if (istype(lurker_invis)) lurker_invis.invisibility_off() -/datum/action/xeno_action/activable/pounce/lurker/additional_effects(mob/living/L) - var/mob/living/carbon/xenomorph/X = owner - if (!istype(X)) +/datum/action/xeno_action/activable/pounce/lurker/additional_effects(mob/living/living_mob) + var/mob/living/carbon/xenomorph/xeno = owner + if (!istype(xeno)) return - if (X.mutation_type == LURKER_NORMAL) - RegisterSignal(X, COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF, PROC_REF(remove_freeze), TRUE) // Suppresses runtime ever we pounce again before slashing + if (xeno.mutation_type == LURKER_NORMAL) + RegisterSignal(xeno, COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF, PROC_REF(remove_freeze), TRUE) // Suppresses runtime ever we pounce again before slashing -/datum/action/xeno_action/activable/pounce/lurker/proc/remove_freeze(mob/living/carbon/xenomorph/X) +/datum/action/xeno_action/activable/pounce/lurker/proc/remove_freeze(mob/living/carbon/xenomorph/xeno) SIGNAL_HANDLER - var/datum/behavior_delegate/lurker_base/BD = X.behavior_delegate - if (istype(BD)) - UnregisterSignal(X, COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF) + var/datum/behavior_delegate/lurker_base/behaviour_del = xeno.behavior_delegate + if (istype(behaviour_del)) + UnregisterSignal(xeno, COMSIG_XENO_SLASH_ADDITIONAL_EFFECTS_SELF) end_pounce_freeze() /datum/action/xeno_action/onclick/lurker_invisibility diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm index b58d94a6ed5b..13734a5b9cf4 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_powers.dm @@ -208,6 +208,9 @@ xeno.visible_message(SPAN_XENOWARNING("\The [xeno] strikes the window with their tail!"), SPAN_XENOWARNING("You strike the window with your tail!")) apply_cooldown(cooldown_modifier = 0.5) return + if(current_structure.density) + to_chat(xeno, SPAN_WARNING("There's something blocking you from striking!")) + return if(!isxeno_human(hit_target) || xeno.can_not_harm(hit_target) || hit_target.stat == DEAD) xeno.visible_message(SPAN_XENOWARNING("\The [xeno] swipes their tail through the air!"), SPAN_XENOWARNING("You swipe your tail through the air!")) 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 e926349af60d..0d7a86c58318 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 @@ -175,14 +175,14 @@ vanguard_user.visible_message(SPAN_XENODANGER("[vanguard_user] slams [target_atom] into the ground!"), SPAN_XENOHIGHDANGER("You slam [target_atom] into the ground!")) - target_carbon.frozen = TRUE + ADD_TRAIT(target_carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Cleave")) target_carbon.update_canmove() if (ishuman(target_carbon)) var/mob/living/carbon/human/Hu = target_carbon Hu.update_xeno_hostile_hud() - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target_carbon), get_xeno_stun_duration(target_carbon, root_duration)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target_carbon, TRAIT_SOURCE_ABILITY("Cleave")), get_xeno_stun_duration(target_carbon, root_duration)) to_chat(target_carbon, SPAN_XENOHIGHDANGER("[vanguard_user] has pinned you to the ground! You cannot move!")) vanguard_user.flick_attack_overlay(target_carbon, "punch") @@ -292,7 +292,7 @@ var/throw_target_turf = get_step(X.loc, facing) - X.frozen = TRUE + 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.")) @@ -302,7 +302,7 @@ telegraph_atom_list -= XT qdel(XT) - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) X.update_canmove() return @@ -310,7 +310,7 @@ if(!check_and_use_plasma_owner()) return - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) X.update_canmove() playsound(get_turf(X), 'sound/effects/bang.ogg', 25, 0) @@ -340,7 +340,7 @@ H.apply_effect(1, SLOW) else if (LAZYLEN(targets) == 2) - H.frozen = TRUE + ADD_TRAIT(H, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) H.update_canmove() if (ishuman(H)) var/mob/living/carbon/human/Hu = H @@ -409,16 +409,16 @@ oppressor_user.animation_attack_on(target_carbon) oppressor_user.flick_attack_overlay(target_carbon, "punch") - if (target_carbon.frozen || target_carbon.slowed || target_carbon.knocked_down) + if (HAS_TRAIT(target_carbon, TRAIT_IMMOBILIZED) || target_carbon.slowed || target_carbon.knocked_down) target_carbon.apply_damage(get_xeno_damage_slash(target_carbon, damage), BRUTE, target_limb? target_limb.name : "chest") - target_carbon.frozen = TRUE + ADD_TRAIT(target_carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Oppressor Punch")) target_carbon.update_canmove() if (ishuman(target_carbon)) var/mob/living/carbon/human/Hu = target_carbon Hu.update_xeno_hostile_hud() - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target_carbon), get_xeno_stun_duration(target_carbon, 12)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target_carbon, TRAIT_SOURCE_ABILITY("Oppressor Punch")), get_xeno_stun_duration(target_carbon, 1.2 SECONDS)) to_chat(target_carbon, SPAN_XENOHIGHDANGER("[oppressor_user] has pinned you to the ground! You cannot move!")) var/datum/action/xeno_action/activable/prae_abduct/abduct_action = get_xeno_action_by_type(oppressor_user, /datum/action/xeno_action/activable/prae_abduct) @@ -1012,7 +1012,7 @@ if(!(behind_turf.density)) throw_target_turf = behind_turf - X.frozen = TRUE + ADD_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) X.update_canmove() if(windup) if(!do_after(X, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1)) @@ -1023,12 +1023,12 @@ telegraph_atom_list -= XT qdel(XT) - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) X.update_canmove() return - X.frozen = FALSE + REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) X.update_canmove() playsound(get_turf(X), 'sound/effects/bang.ogg', 25, 0) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm index 3b52a60419df..a26cc922c528 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_powers.dm @@ -78,14 +78,14 @@ for(var/mob/living/carbon/carbon in oview(round(behavior.kills * 0.5 + 2), xeno)) if(!xeno.can_not_harm(carbon) && carbon.stat != DEAD) - carbon.frozen = 1 + ADD_TRAIT(carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Smash")) carbon.update_canmove() if (ishuman(carbon)) var/mob/living/carbon/human/human = carbon human.update_xeno_hostile_hud() - addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), carbon), get_xeno_stun_duration(carbon, freeze_duration)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), carbon, TRAIT_SOURCE_ABILITY("Smash")), get_xeno_stun_duration(carbon, freeze_duration)) for(var/mob/M in view(xeno)) @@ -125,7 +125,7 @@ if (!check_and_use_plasma_owner()) return - carbon.frozen = 1 + ADD_TRAIT(carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) carbon.update_canmove() if (ishuman(carbon)) @@ -134,7 +134,7 @@ apply_cooldown() - xeno.frozen = 1 + ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) xeno.anchored = TRUE xeno.update_canmove() @@ -151,8 +151,9 @@ playsound(owner, 'sound/voice/predalien_growl.ogg', 75, 0, status = 0) - xeno.frozen = 0 + REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Devastate")) xeno.anchored = FALSE + unroot_human(carbon, TRAIT_SOURCE_ABILITY("Devastate")) xeno.update_canmove() unroot_human(carbon) 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 65ea443c133c..23da1ce65903 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/abilities/ravager/ravager_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm index cd4533eabc83..a6c8067660dc 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm @@ -118,30 +118,30 @@ return FALSE // Supplemental behavior for our charge -/datum/action/xeno_action/activable/pounce/charge/additional_effects(mob/living/L) +/datum/action/xeno_action/activable/pounce/charge/additional_effects(mob/living/living) - var/mob/living/carbon/human/H = L - var/mob/living/carbon/xenomorph/X = owner - if(X.mutation_type != RAVAGER_NORMAL) + var/mob/living/carbon/human/human = living + var/mob/living/carbon/xenomorph/xeno = owner + if(xeno.mutation_type != RAVAGER_NORMAL) return - var/datum/behavior_delegate/ravager_base/BD = X.behavior_delegate - if(BD.empower_targets < BD.super_empower_threshold) + var/datum/behavior_delegate/ravager_base/behavior = xeno.behavior_delegate + if(behavior.empower_targets < behavior.super_empower_threshold) return - X.visible_message(SPAN_XENODANGER("The [X] uses its shield to bash [H] as it charges at them!"), SPAN_XENODANGER("You use your shield to bash [H] as you charge at them!")) - H.apply_effect(BD.knockdown_amount, WEAKEN) - H.attack_alien(X, rand(X.melee_damage_lower, X.melee_damage_upper)) + xeno.visible_message(SPAN_XENODANGER("The [xeno] uses its shield to bash [human] as it charges at them!"), SPAN_XENODANGER("You use your shield to bash [human] as you charge at them!")) + human.apply_effect(behavior.knockdown_amount, WEAKEN) + human.attack_alien(xeno, rand(xeno.melee_damage_lower, xeno.melee_damage_upper)) - var/facing = get_dir(X, H) - var/turf/T = X.loc - var/turf/temp = X.loc + var/facing = get_dir(xeno, human) + var/turf/turf = xeno.loc + var/turf/temp = xeno.loc - for(var/x in 0 to BD.fling_distance-1) - temp = get_step(T, facing) + for(var/step in 0 to behavior.fling_distance-1) + temp = get_step(turf, facing) if (!temp) break - T = temp + turf = temp - H.throw_atom(T, BD.fling_distance, SPEED_VERY_FAST, X, TRUE) + human.throw_atom(turf, behavior.fling_distance, SPEED_VERY_FAST, xeno, TRUE) /datum/action/xeno_action/activable/scissor_cut/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/ravager_user = owner @@ -164,12 +164,12 @@ var/list/turf/target_turfs = list() var/facing = Get_Compass_Dir(ravager_user, target_atom) - var/turf/T = ravager_user.loc + var/turf/turf = ravager_user.loc var/turf/temp = ravager_user.loc var/list/telegraph_atom_list = list() - for (var/x in 0 to 3) - temp = get_step(T, facing) + for (var/step in 0 to 3) + 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)) @@ -182,9 +182,9 @@ var/blocked = FALSE for(var/obj/structure/structure_blocker in temp) if(istype(structure_blocker, /obj/structure/window/framed)) - var/obj/structure/window/framed/W = structure_blocker - if(!W.unslashable) - W.deconstruct(disassembled = FALSE) + var/obj/structure/window/framed/framed_window = structure_blocker + if(!framed_window.unslashable) + framed_window.deconstruct(disassembled = FALSE) if(structure_blocker.opacity) blocked = TRUE @@ -192,13 +192,13 @@ if(blocked) break - T = temp - target_turfs += T - telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/red(T, 0.25 SECONDS) + turf = temp + target_turfs += turf + telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/red(turf, 0.25 SECONDS) // Extract our 'optimal' turf, if it exists - if (target_turfs.len >= 2) - ravager_user.animation_attack_on(target_turfs[target_turfs.len], 15) + if (length(target_turfs) >= 2) + ravager_user.animation_attack_on(target_turfs[length(target_turfs)], 15) // Hmm today I will kill a marine while looking away from them ravager_user.face_atom(target_atom) @@ -218,7 +218,7 @@ playsound(get_turf(carbon_target), "alien_claw_flesh", 30, TRUE) if(should_sslow) - new /datum/effects/xeno_slow/superslow/(carbon_target, ravager_user, ttl = superslow_duration) + new /datum/effects/xeno_slow/superslow(carbon_target, ravager_user, ttl = superslow_duration) apply_cooldown() return ..() @@ -226,133 +226,133 @@ ///////////// BERSERKER POWERS -/datum/action/xeno_action/onclick/apprehend/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner +/datum/action/xeno_action/onclick/apprehend/use_ability(atom/affected_atom) + var/mob/living/carbon/xenomorph/xeno = owner - if (!istype(X)) + if (!istype(xeno)) return if (!action_cooldown_check()) return - if (!X.check_state()) + if (!xeno.check_state()) return if (!check_and_use_plasma_owner()) return - var/datum/behavior_delegate/ravager_berserker/BD = X.behavior_delegate - if (istype(BD)) - BD.next_slash_buffed = TRUE + var/datum/behavior_delegate/ravager_berserker/behavior = xeno.behavior_delegate + if (istype(behavior)) + behavior.next_slash_buffed = TRUE - to_chat(X, SPAN_XENODANGER("Your next slash will slow!")) + to_chat(xeno, SPAN_XENODANGER("Your next slash will slow!")) addtimer(CALLBACK(src, PROC_REF(unbuff_slash)), buff_duration) - X.speed_modifier -= speed_buff - X.recalculate_speed() + xeno.speed_modifier -= speed_buff + xeno.recalculate_speed() addtimer(CALLBACK(src, PROC_REF(apprehend_off)), buff_duration, TIMER_UNIQUE) - X.add_filter("apprehend_on", 1, list("type" = "outline", "color" = "#522020ff", "size" = 1)) // Dark red because the berserker is scary in this state + xeno.add_filter("apprehend_on", 1, list("type" = "outline", "color" = "#522020ff", "size" = 1)) // Dark red because the berserker is scary in this state apply_cooldown() return ..() /datum/action/xeno_action/onclick/apprehend/proc/apprehend_off() - var/mob/living/carbon/xenomorph/X = owner - X.remove_filter("apprehend_on") - if (istype(X)) - X.speed_modifier += speed_buff - X.recalculate_speed() - to_chat(X, SPAN_XENOHIGHDANGER("You feel your speed wane!")) + var/mob/living/carbon/xenomorph/xeno = owner + xeno.remove_filter("apprehend_on") + if (istype(xeno)) + xeno.speed_modifier += speed_buff + xeno.recalculate_speed() + to_chat(xeno, SPAN_XENOHIGHDANGER("You feel your speed wane!")) /datum/action/xeno_action/onclick/apprehend/proc/unbuff_slash() - var/mob/living/carbon/xenomorph/X = owner - if (!istype(X)) + var/mob/living/carbon/xenomorph/xeno = owner + if (!istype(xeno)) return - var/datum/behavior_delegate/ravager_berserker/BD = X.behavior_delegate - if (istype(BD)) + var/datum/behavior_delegate/ravager_berserker/behavior = xeno.behavior_delegate + if (istype(behavior)) // In case slash has already landed - if (!BD.next_slash_buffed) + if (!behavior.next_slash_buffed) return - BD.next_slash_buffed = FALSE + behavior.next_slash_buffed = FALSE - to_chat(X, SPAN_XENODANGER("You have waited too long, your slash will no longer slow enemies!")) + to_chat(xeno, SPAN_XENODANGER("You have waited too long, your slash will no longer slow enemies!")) -/datum/action/xeno_action/activable/clothesline/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner +/datum/action/xeno_action/activable/clothesline/use_ability(atom/affected_atom) + var/mob/living/carbon/xenomorph/xeno = owner if (!action_cooldown_check()) return - if (!X.check_state()) + if (!xeno.check_state()) return - if (!isxeno_human(A) || X.can_not_harm(A)) - to_chat(X, SPAN_XENOWARNING("You must target a hostile!")) + if (!isxeno_human(affected_atom) || xeno.can_not_harm(affected_atom)) + to_chat(xeno, SPAN_XENOWARNING("You must target a hostile!")) return - if (!X.Adjacent(A)) - to_chat(X, SPAN_XENOWARNING("You must be adjacent to your target!")) + if (!xeno.Adjacent(affected_atom)) + to_chat(xeno, SPAN_XENOWARNING("You must be adjacent to your target!")) return - var/mob/living/carbon/H = A + var/mob/living/carbon/carbon = affected_atom var/heal_amount = base_heal var/fling_distance = fling_dist_base var/debilitate = TRUE // Do we apply neg. status effects to the target? - if (H.mob_size >= MOB_SIZE_BIG) - to_chat(X, SPAN_XENOWARNING("This creature is too massive to target")) + if (carbon.mob_size >= MOB_SIZE_BIG) + to_chat(xeno, SPAN_XENOWARNING("This creature is too massive to target")) return - if (H.stat == DEAD) + if (carbon.stat == DEAD) return // All strain-specific behavior - if (X.mutation_type == RAVAGER_BERSERKER) - var/datum/behavior_delegate/ravager_berserker/BD = X.behavior_delegate + if (xeno.mutation_type == RAVAGER_BERSERKER) + var/datum/behavior_delegate/ravager_berserker/behavior = xeno.behavior_delegate - if (BD.rage >= 2) - BD.decrement_rage() + if (behavior.rage >= 2) + behavior.decrement_rage() heal_amount += additional_healing_enraged else - to_chat(X, SPAN_XENOWARNING("Your rejuvenation was weaker without rage!")) + to_chat(xeno, SPAN_XENOWARNING("Your rejuvenation was weaker without rage!")) debilitate = FALSE fling_distance-- // Damage - var/obj/limb/head/head = H.get_limb("head") - if(ishuman(H) && head) - H.apply_armoured_damage(damage, ARMOR_MELEE, BRUTE, "head") + var/obj/limb/head/head = carbon.get_limb("head") + if(ishuman(carbon) && head) + carbon.apply_armoured_damage(damage, ARMOR_MELEE, BRUTE, "head") else - H.apply_armoured_damage(get_xeno_damage_slash(H, damage), ARMOR_MELEE, BRUTE) // just for consistency + carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, damage), ARMOR_MELEE, BRUTE) // just for consistency // Heal - if(!X.on_fire) - X.gain_health(heal_amount) + if(!xeno.on_fire) + xeno.gain_health(heal_amount) // Fling - var/facing = get_dir(X, H) - var/turf/T = X.loc - var/turf/temp = X.loc + var/facing = get_dir(xeno, carbon) + var/turf/turf = xeno.loc + var/turf/temp = xeno.loc - for (var/x in 0 to fling_distance-1) - temp = get_step(T, facing) + for (var/step in 0 to fling_distance-1) + temp = get_step(turf, facing) if (!temp) break - T = temp + turf = temp - H.throw_atom(T, fling_distance, SPEED_VERY_FAST, X, TRUE) + carbon.throw_atom(turf, fling_distance, SPEED_VERY_FAST, xeno, TRUE) // Negative stat effects if (debilitate) - H.dazed += daze_amount + carbon.dazed += daze_amount apply_cooldown() return ..() -/datum/action/xeno_action/activable/eviscerate/use_ability(atom/A) +/datum/action/xeno_action/activable/eviscerate/use_ability(atom/affected_atom) var/mob/living/carbon/xenomorph/xeno = owner if(!action_cooldown_check() || xeno.action_busy) @@ -385,7 +385,7 @@ else xeno.visible_message(SPAN_XENODANGER("[xeno] begins digging in for a strike!"), SPAN_XENOHIGHDANGER("You begin digging in for a strike!")) - xeno.frozen = 1 + ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Eviscerate")) xeno.anchored = TRUE xeno.update_canmove() @@ -430,7 +430,7 @@ if(!xeno.on_fire) xeno.gain_health(Clamp(valid_count * lifesteal_per_marine, 0, max_lifesteal)) - xeno.frozen = 0 + REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Eviscerate")) xeno.anchored = FALSE xeno.update_canmove() @@ -502,33 +502,33 @@ xeno.overlay_shields() return -/datum/action/xeno_action/activable/rav_spikes/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner +/datum/action/xeno_action/activable/rav_spikes/use_ability(atom/affected_atom) + var/mob/living/carbon/xenomorph/xeno = owner if (!action_cooldown_check()) return - if(!A || A.layer >= FLY_LAYER || !isturf(X.loc) || !X.check_state()) + if(!affected_atom || affected_atom.layer >= FLY_LAYER || !isturf(xeno.loc) || !xeno.check_state()) return - if (X.mutation_type == RAVAGER_HEDGEHOG) - var/datum/behavior_delegate/ravager_hedgehog/BD = X.behavior_delegate - if (!BD.check_shards(shard_cost)) - to_chat(X, SPAN_DANGER("Not enough shards! You need [shard_cost - BD.shards] more!")) + if (xeno.mutation_type == RAVAGER_HEDGEHOG) + var/datum/behavior_delegate/ravager_hedgehog/behavior = xeno.behavior_delegate + if (!behavior.check_shards(shard_cost)) + to_chat(xeno, SPAN_DANGER("Not enough shards! You need [shard_cost - behavior.shards] more!")) return - BD.use_shards(shard_cost) + behavior.use_shards(shard_cost) - X.visible_message(SPAN_XENOWARNING("The [X] fires their spikes at [A]!"), SPAN_XENOWARNING("You fire your spikes at [A]!")) + xeno.visible_message(SPAN_XENOWARNING("The [xeno] fires their spikes at [affected_atom]!"), SPAN_XENOWARNING("You fire your spikes at [affected_atom]!")) - var/turf/target = locate(A.x, A.y, A.z) - var/obj/projectile/P = new /obj/projectile(X.loc, create_cause_data(initial(X.caste_type), X)) + var/turf/target = locate(affected_atom.x, affected_atom.y, affected_atom.z) + var/obj/projectile/projectile = new /obj/projectile(xeno.loc, create_cause_data(initial(xeno.caste_type), xeno)) - var/datum/ammo/ammoDatum = GLOB.ammo_list[ammo_type] + var/datum/ammo/ammo_datum = GLOB.ammo_list[ammo_type] - P.generate_bullet(ammoDatum) + projectile.generate_bullet(ammo_datum) - P.fire_at(target, X, X, ammoDatum.max_range, ammoDatum.shell_speed) - playsound(X, 'sound/effects/spike_spray.ogg', 25, 1) + projectile.fire_at(target, xeno, xeno, ammo_datum.max_range, ammo_datum.shell_speed) + playsound(xeno, 'sound/effects/spike_spray.ogg', 25, 1) apply_cooldown() return ..() @@ -537,38 +537,38 @@ if(!owner) return FALSE if (cooldown_timer_id == TIMER_ID_NULL) - var/mob/living/carbon/xenomorph/X = owner - if(!istype(X)) + var/mob/living/carbon/xenomorph/xeno = owner + if(!istype(xeno)) return FALSE - if (X.mutation_type == RAVAGER_HEDGEHOG) - var/datum/behavior_delegate/ravager_hedgehog/BD = X.behavior_delegate - return BD.check_shards(shard_cost) + if (xeno.mutation_type == RAVAGER_HEDGEHOG) + var/datum/behavior_delegate/ravager_hedgehog/behavior = xeno.behavior_delegate + return behavior.check_shards(shard_cost) return TRUE else return FALSE -/datum/action/xeno_action/onclick/spike_shed/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner +/datum/action/xeno_action/onclick/spike_shed/use_ability(atom/affected_atom) + var/mob/living/carbon/xenomorph/xeno = owner if (!action_cooldown_check()) return - if (!X.check_state()) + if (!xeno.check_state()) return - if (X.mutation_type == RAVAGER_HEDGEHOG) - var/datum/behavior_delegate/ravager_hedgehog/BD = X.behavior_delegate - if (!BD.check_shards(shard_cost)) - to_chat(X, SPAN_DANGER("Not enough shards! You need [shard_cost - BD.shards] more!")) + if (xeno.mutation_type == RAVAGER_HEDGEHOG) + var/datum/behavior_delegate/ravager_hedgehog/behavior = xeno.behavior_delegate + if (!behavior.check_shards(shard_cost)) + to_chat(xeno, SPAN_DANGER("Not enough shards! You need [shard_cost - behavior.shards] more!")) return - BD.use_shards(shard_cost) - BD.lock_shards() + behavior.use_shards(shard_cost) + behavior.lock_shards() - X.visible_message(SPAN_XENOWARNING("The [X] sheds their spikes, firing them in all directions!"), SPAN_XENOWARNING("You shed your spikes, firing them in all directions!!")) - X.spin_circle() - create_shrapnel(get_turf(X), shrapnel_amount, null, null, ammo_type, create_cause_data(initial(X.caste_type), owner), TRUE) - playsound(X, 'sound/effects/spike_spray.ogg', 25, 1) + xeno.visible_message(SPAN_XENOWARNING("The [xeno] sheds their spikes, firing them in all directions!"), SPAN_XENOWARNING("You shed your spikes, firing them in all directions!!")) + xeno.spin_circle() + create_shrapnel(get_turf(xeno), shrapnel_amount, null, null, ammo_type, create_cause_data(initial(xeno.caste_type), owner), TRUE) + playsound(xeno, 'sound/effects/spike_spray.ogg', 25, 1) apply_cooldown() return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm index b0a44b0e3835..23f8ffc8acd6 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm @@ -119,7 +119,7 @@ /// This check mainly exists because of the new resin node ability for resin whisperer. /mob/living/carbon/xenomorph/hivelord/proc/on_weeds() - var/turf/T = get_turf(src) - if(locate(/obj/effect/alien/weeds) in T) + var/turf/turf = get_turf(src) + if(locate(/obj/effect/alien/weeds) in turf) return TRUE return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm index 315f8abf023a..1c7ba8503d4d 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm @@ -84,7 +84,7 @@ target_carbon.set_effect(get_xeno_stun_duration(target_carbon, 3), SUPERSLOW) next_slash_buffed = FALSE var/datum/action/xeno_action/onclick/lurker_assassinate/ability = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_assassinate) - if (ability && istype(ability)) + if (ability) ability.button.icon_state = "template" return original_damage @@ -110,22 +110,22 @@ /datum/behavior_delegate/lurker_base/melee_attack_additional_effects_self() ..() - var/datum/action/xeno_action/onclick/lurker_invisibility/LIA = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility) - if (LIA && istype(LIA)) - LIA.invisibility_off() + var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invis_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility) + if (lurker_invis_action) + lurker_invis_action.invisibility_off() /datum/behavior_delegate/lurker_base/proc/decloak_handler(mob/source) SIGNAL_HANDLER - var/datum/action/xeno_action/onclick/lurker_invisibility/LIA = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility) - if(istype(LIA)) - LIA.invisibility_off() + var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invis_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility) + if(istype(lurker_invis_action)) + lurker_invis_action.invisibility_off() // What to do when we go invisible /datum/behavior_delegate/lurker_base/proc/on_invisibility() - var/datum/action/xeno_action/activable/pounce/lurker/LPA = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/pounce/lurker) - if (LPA && istype(LPA)) - LPA.knockdown = TRUE // pounce knocks down - LPA.freeze_self = TRUE + var/datum/action/xeno_action/activable/pounce/lurker/lurker_pounce_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/pounce/lurker) + if (lurker_pounce_action) + lurker_pounce_action.knockdown = TRUE // pounce knocks down + lurker_pounce_action.freeze_self = TRUE ADD_TRAIT(bound_xeno, TRAIT_CLOAKED, TRAIT_SOURCE_ABILITY("cloak")) RegisterSignal(bound_xeno, COMSIG_MOB_EFFECT_CLOAK_CANCEL, PROC_REF(decloak_handler)) bound_xeno.stealth = TRUE @@ -133,10 +133,10 @@ invis_start_time = world.time /datum/behavior_delegate/lurker_base/proc/on_invisibility_off() - var/datum/action/xeno_action/activable/pounce/lurker/LPA = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/pounce/lurker) - if (LPA && istype(LPA)) - LPA.knockdown = FALSE // pounce no longer knocks down - LPA.freeze_self = FALSE + var/datum/action/xeno_action/activable/pounce/lurker/lurker_pounce_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/activable/pounce/lurker) + if (lurker_pounce_action) + lurker_pounce_action.knockdown = FALSE // pounce no longer knocks down + lurker_pounce_action.freeze_self = FALSE bound_xeno.stealth = FALSE REMOVE_TRAIT(bound_xeno, TRAIT_CLOAKED, TRAIT_SOURCE_ABILITY("cloak")) UnregisterSignal(bound_xeno, COMSIG_MOB_EFFECT_CLOAK_CANCEL) @@ -153,9 +153,9 @@ can_go_invisible = TRUE if(bound_xeno) - var/datum/action/xeno_action/onclick/lurker_invisibility/LIA = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility) - if(LIA && istype(LIA)) - LIA.end_cooldown() + var/datum/action/xeno_action/onclick/lurker_invisibility/lurker_invisibility_action = get_xeno_action_by_type(bound_xeno, /datum/action/xeno_action/onclick/lurker_invisibility) + if(lurker_invisibility_action) + lurker_invisibility_action.end_cooldown() /datum/behavior_delegate/lurker_base/append_to_stat() . = list() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm index 35938ff7f808..7853934da2dd 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm @@ -73,7 +73,7 @@ var/super_empower_threshold = 3 var/dmg_buff_per_target = 2 -/datum/behavior_delegate/ravager_base/melee_attack_modify_damage(original_damage, mob/living/carbon/A) +/datum/behavior_delegate/ravager_base/melee_attack_modify_damage(original_damage, mob/living/carbon/carbon) var/damage_plus if(empower_targets) damage_plus = dmg_buff_per_target * empower_targets @@ -90,18 +90,18 @@ /datum/behavior_delegate/ravager_base/append_to_stat() . = list() var/shield_total = 0 - for (var/datum/xeno_shield/XS in bound_xeno.xeno_shields) - if (XS.shield_source == XENO_SHIELD_SOURCE_RAVAGER) - shield_total += XS.amount + for (var/datum/xeno_shield/xeno_shield in bound_xeno.xeno_shields) + if (xeno_shield.shield_source == XENO_SHIELD_SOURCE_RAVAGER) + shield_total += xeno_shield.amount . += "Empower Shield: [shield_total]" . += "Bonus Slash Damage: [dmg_buff_per_target * empower_targets]" /datum/behavior_delegate/ravager_base/on_life() var/datum/xeno_shield/rav_shield - for (var/datum/xeno_shield/XS in bound_xeno.xeno_shields) - if (XS.shield_source == XENO_SHIELD_SOURCE_RAVAGER) - rav_shield = XS + for (var/datum/xeno_shield/xeno_shield in bound_xeno.xeno_shields) + if (xeno_shield.shield_source == XENO_SHIELD_SOURCE_RAVAGER) + rav_shield = xeno_shield break if (rav_shield && ((rav_shield.last_damage_taken + shield_decay_time) < world.time)) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index 4a3c06819c26..ee79c685f00a 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -129,7 +129,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 var/list/available_nicknumbers = list() @@ -139,6 +139,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/living/carbon/xenomorph/mutators/strains/praetorian/oppressor.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/oppressor.dm index 4a3bd3a7d182..ecb0e1eff51e 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/oppressor.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/praetorian/oppressor.dm @@ -56,7 +56,7 @@ if(target_carbon.stat == DEAD) return - if(!(target_carbon.knocked_down || target_carbon.frozen || target_carbon.slowed)) + if(!(target_carbon.knocked_down || HAS_TRAIT(target_carbon, TRAIT_IMMOBILIZED) || target_carbon.slowed)) return target_carbon.apply_armoured_damage(get_xeno_damage_slash(target_carbon, tearing_damage), ARMOR_MELEE, BRUTE, bound_xeno.zone_selected ? bound_xeno.zone_selected : "chest") diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index b591844a937a..d7edd02893b3 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -1,7 +1,22 @@ /// Called on [/mob/living/Initialize(mapload)], for the mob to register to relevant signals. /mob/living/proc/register_init_signals() + + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), PROC_REF(on_immobilized_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_IMMOBILIZED), PROC_REF(on_immobilized_trait_loss)) RegisterSignal(src, list(SIGNAL_ADDTRAIT(TRAIT_UNDENSE), SIGNAL_REMOVETRAIT(TRAIT_UNDENSE)), PROC_REF(undense_changed)) +/// Called when [TRAIT_IMMOBILIZED] is added to the mob. +/mob/living/proc/on_immobilized_trait_gain(datum/source) + SIGNAL_HANDLER +// mobility_flags &= ~MOBILITY_MOVE + update_canmove() + +/// Called when [TRAIT_IMMOBILIZED] is removed from the mob. +/mob/living/proc/on_immobilized_trait_loss(datum/source) + SIGNAL_HANDLER +// mobility_flags |= MOBILITY_MOVE + update_canmove() + /// Called when [TRAIT_UNDENSE] is gained or lost /mob/living/proc/undense_changed(datum/source) SIGNAL_HANDLER diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 827b94394671..c28de81ecfc1 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -724,7 +724,7 @@ note dizziness decrements automatically in the mob's Life() proc. else lying = FALSE - canmove = !frozen + canmove = !HAS_TRAIT(src, TRAIT_IMMOBILIZED) if(isliving(src)) // Temporary I SWEAR. This whole proc is going down var/mob/living/living = src @@ -799,22 +799,6 @@ note dizziness decrements automatically in the mob's Life() proc. /mob/proc/get_species() return "" -/// Sets freeze if possible and wasn't already set, returning success -/mob/proc/freeze() - if(frozen) - return FALSE - frozen = TRUE - update_canmove() - return TRUE - -/// Attempts to unfreeze mob, returning success -/mob/proc/unfreeze() - if(!frozen) - return FALSE - frozen = FALSE - update_canmove() - return TRUE - /mob/proc/flash_weak_pain() overlay_fullscreen("pain", /atom/movable/screen/fullscreen/pain, 1) clear_fullscreen("pain") diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index eec0ca75af8d..dc107e1bd190 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -65,7 +65,6 @@ var/dizziness = 0//Carbon var/jitteriness = 0//Carbon var/floatiness = 0 - var/frozen = 0 var/losebreath = 0.0//Carbon var/shakecamera = 0 diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 39cc5b25e519..a234c5962f72 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -60,8 +60,8 @@ if(!ishuman(user)) //only humans can reinforce a grab. if (isxeno(user)) - var/mob/living/carbon/xenomorph/X = user - X.pull_power(grabbed_thing) + var/mob/living/carbon/xenomorph/xeno = user + xeno.pull_power(grabbed_thing) return @@ -102,21 +102,21 @@ if(M == grabbed_thing) attack_self(user) else if(M == user && user.pulling && isxeno(user)) - var/mob/living/carbon/xenomorph/X = user - var/mob/living/carbon/pulled = X.pulling + var/mob/living/carbon/xenomorph/xeno = user + var/mob/living/carbon/pulled = xeno.pulling if(!istype(pulled)) return if(isxeno(pulled) || issynth(pulled)) - to_chat(X, SPAN_WARNING("That wouldn't taste very good.")) + to_chat(xeno, SPAN_WARNING("That wouldn't taste very good.")) return 0 if(pulled.buckled) - to_chat(X, SPAN_WARNING("[pulled] is buckled to something.")) + to_chat(xeno, SPAN_WARNING("[pulled] is buckled to something.")) return 0 if(pulled.stat == DEAD && !pulled.chestburst) - to_chat(X, SPAN_WARNING("Ew, [pulled] is already starting to rot.")) + to_chat(xeno, SPAN_WARNING("Ew, [pulled] is already starting to rot.")) return 0 - if(X.stomach_contents.len) //Only one thing in the stomach at a time, please - to_chat(X, SPAN_WARNING("You already have something in your belly, there's no way that will fit.")) + if(xeno.stomach_contents.len) //Only one thing in the stomach at a time, please + to_chat(xeno, SPAN_WARNING("You already have something in your belly, there's no way that will fit.")) return 0 /* Saving this in case we want to allow devouring of dead bodies UNLESS their client is still online somewhere if(pulled.client) //The client is still inside the body @@ -126,19 +126,21 @@ to_chat(src, "You start to devour [pulled] but realize \he is already dead.") return */ if(user.action_busy) - to_chat(X, SPAN_WARNING("You are already busy with something.")) + to_chat(xeno, SPAN_WARNING("You are already busy with something.")) return - X.visible_message(SPAN_DANGER("[X] starts to devour [pulled]!"), \ + xeno.visible_message(SPAN_DANGER("[xeno] starts to devour [pulled]!"), \ SPAN_DANGER("You start to devour [pulled]!"), null, 5) - if(do_after(X, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) - if(isxeno(pulled.loc) && !X.stomach_contents.len) - to_chat(X, SPAN_WARNING("Someone already ate \the [pulled].")) + if(HAS_TRAIT(xeno, TRAIT_CLOAKED)) //cloaked don't show the visible message, so we gotta work around + to_chat(pulled, FONT_SIZE_HUGE(SPAN_DANGER("[xeno] is trying to devour you!"))) + if(do_after(xeno, 50, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + if(isxeno(pulled.loc) && !xeno.stomach_contents.len) + to_chat(xeno, SPAN_WARNING("Someone already ate \the [pulled].")) return 0 - if(X.pulling == pulled && !pulled.buckled && (pulled.stat != DEAD || pulled.chestburst) && !X.stomach_contents.len) //make sure you've still got them in your claws, and alive - if(SEND_SIGNAL(pulled, COMSIG_MOB_DEVOURED, X) & COMPONENT_CANCEL_DEVOUR) + if(xeno.pulling == pulled && !pulled.buckled && (pulled.stat != DEAD || pulled.chestburst) && !xeno.stomach_contents.len) //make sure you've still got them in your claws, and alive + if(SEND_SIGNAL(pulled, COMSIG_MOB_DEVOURED, xeno) & COMPONENT_CANCEL_DEVOUR) return FALSE - X.visible_message(SPAN_WARNING("[X] devours [pulled]!"), \ + xeno.visible_message(SPAN_WARNING("[xeno] devours [pulled]!"), \ SPAN_WARNING("You devour [pulled]!"), null, 5) if(ishuman(pulled)) @@ -146,10 +148,10 @@ pulled_human.disable_lights() //Then, we place the mob where it ought to be - X.stomach_contents.Add(pulled) - X.devour_timer = world.time + 500 + rand(0,200) // 50-70 seconds - pulled.forceMove(X) + xeno.stomach_contents.Add(pulled) + xeno.devour_timer = world.time + 500 + rand(0,200) // 50-70 seconds + pulled.forceMove(xeno) return TRUE - if(!(pulled in X.stomach_contents)) - to_chat(X, SPAN_WARNING("You stop devouring \the [pulled]. \He probably tasted gross anyways.")) + if(!(pulled in xeno.stomach_contents)) + to_chat(xeno, SPAN_WARNING("You stop devouring \the [pulled]. \He probably tasted gross anyways.")) return 0 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index a6b654ba2da1..cebe265a673c 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/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index d71db37074f1..24b137a6804a 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -256,9 +256,16 @@ GLOBAL_LIST_EMPTY(command_apc_list) handle_direction(APC) APC.update_icon() + return APC + /obj/effect/vehicle_spawner/apc/unarmed/load_hardpoints(obj/vehicle/multitile/apc/V) return +/obj/effect/vehicle_spawner/apc/unarmed/broken/spawn_vehicle() + var/obj/vehicle/multitile/apc/apc = ..() + load_damage(apc) + apc.update_icon() + //PRESET: default hardpoints, destroyed /obj/effect/vehicle_spawner/apc/unarmed/decrepit/spawn_vehicle() var/obj/vehicle/multitile/apc/unarmed/APC = new (loc) diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm index c5bd55928362..ace9df2b2a25 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/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index 9e4d2c9d297b..c8138c5b8f86 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -240,26 +240,15 @@ var/amt_hardpoints = LAZYLEN(hardpoints) if(amt_hardpoints) - var/list/hardpoint_images[amt_hardpoints] - var/list/C[HDPT_LAYER_MAX] - - // Counting sort the images into a list so we get the hardpoint images sorted by layer - for(var/obj/item/hardpoint/H in hardpoints) - C[H.hdpt_layer] += 1 - - for(var/i = 2 to HDPT_LAYER_MAX) - C[i] += C[i-1] - - for(var/obj/item/hardpoint/H in hardpoints) - hardpoint_images[C[H.hdpt_layer]] = H.get_hardpoint_image() - C[H.hdpt_layer] -= 1 - - for(var/i = 1 to amt_hardpoints) - var/image/I = hardpoint_images[i] - // get_hardpoint_image() can return a list of images - if(istype(I)) - I.layer = layer + (i*0.1) - overlays += I + for(var/obj/item/hardpoint/hardpoint in hardpoints) + var/image/hardpoint_image = hardpoint.get_hardpoint_image() + if(istype(hardpoint_image)) + hardpoint_image.layer = layer + hardpoint.hdpt_layer * 0.1 + else if(islist(hardpoint_image)) + var/list/image/hardpoint_image_list = hardpoint_image // Linter will complain about iterating on "an image" otherwise + for(var/image/subimage in hardpoint_image_list) + subimage.layer = layer + hardpoint.hdpt_layer * 0.1 + overlays += hardpoint_image if(clamped) var/image/J = image(icon, icon_state = "vehicle_clamp", layer = layer+0.1) diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm index ad69f80cdfb6..fd953b04100a 100644 --- a/code/modules/vehicles/tank/tank.dm +++ b/code/modules/vehicles/tank/tank.dm @@ -189,6 +189,8 @@ handle_direction(TANK) TANK.update_icon() + return TANK + /obj/effect/vehicle_spawner/tank/load_hardpoints(obj/vehicle/multitile/tank/V) V.add_hardpoint(new /obj/item/hardpoint/holder/tank_turret) @@ -201,6 +203,12 @@ /obj/effect/vehicle_spawner/tank/hull/load_hardpoints(obj/vehicle/multitile/tank/V) return +//Just the hull and it's broken TOO, you get the full experience +/obj/effect/vehicle_spawner/tank/hull/broken/spawn_vehicle() + var/obj/vehicle/multitile/tank/tonk = ..() + load_damage(tonk) + tonk.update_icon() + //PRESET: default hardpoints, destroyed /obj/effect/vehicle_spawner/tank/decrepit/spawn_vehicle() var/obj/vehicle/multitile/tank/TANK = new (loc) diff --git a/colonialmarines.dme b/colonialmarines.dme index ce2c1f713810..cd32d56022ca 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1377,6 +1377,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/html/changelogs/archive/2023-11.yml b/html/changelogs/archive/2023-11.yml index 75f629cbd028..2498cfca4286 100644 --- a/html/changelogs/archive/2023-11.yml +++ b/html/changelogs/archive/2023-11.yml @@ -211,3 +211,54 @@ 2023-11-15: Birdtalon: - code_imp: Replaced single letter vars in runner code. +2023-11-16: + fira: + - bugfix: Rooting effects should now properly update when stacked and unstacked. +2023-11-17: + Birdtalon: + - bugfix: Lurker can no longer tail jab through doors/structures. + - code_imp: Var disambiguation, cleanup and removal of redundant typechecks in lurker + code. + - bugfix: Adds missing newline when viewing sec records as observer. + - bugfix: Fixes posters in CL office displaying IO description. + - code_imp: Replaces single letter var in hivelord code + - code_imp: Replaces single letter vars in ravager code + - code_imp: Refactors vending machine global scope procs + Doubleumc: + - rscadd: vehicles can be followed by ghosts + SpartanBobby, GDS Pathe: + - maptweak: Updates bigred floortiles + - maptweak: Re-adds reactor to bigred + Steelpoint: + - maptweak: LV-624's Caves have had an aesthetic change regarding jungle tiles and + flora. + casperr04: + - bugfix: Removes the ability to fulton bodies that can still be revived + fira: + - admin: VV 'Modify Transform' can now be used to flip objects. + - bugfix: Horizontal Almayer walls no longer change icon randomly, and now properly + display damage overlays. + realforest2001: + - 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. diff --git a/html/statbrowser.js b/html/statbrowser.js index 105270ad298e..289536d37da1 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/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index 52f2c7f0a9cb..d0f816e2b7fa 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 412d970cffbd..2cdf06d411c7 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -10233,6 +10233,15 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"aCO" = ( +/obj/structure/surface/table, +/obj/item/stack/cable_coil, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "aCP" = ( /obj/structure/closet/secure_closet/bar, /obj/effect/landmark/objective_landmark/close, @@ -13544,7 +13553,10 @@ "aLJ" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "aLM" = ( /obj/structure/machinery/shower{ @@ -13579,7 +13591,9 @@ /obj/structure/surface/table, /obj/item/tool/lighter/random, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "aLQ" = ( /obj/structure/window/reinforced/toughened{ @@ -13858,8 +13872,10 @@ /obj/structure/surface/table, /obj/effect/decal/cleanable/dirt, /obj/item/tool/pen, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "aMC" = ( /obj/effect/landmark/railgun_camera_pos, @@ -18585,6 +18601,13 @@ icon_state = "dark" }, /area/bigredv2/outside/chapel) +"aZJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "aZK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -18655,6 +18678,15 @@ }, /turf/open/floor/carpet, /area/bigredv2/outside/admin_building) +"aZV" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/tool, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "aZW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19377,6 +19409,13 @@ icon_state = "white" }, /area/bigredv2/outside/office_complex) +"bcg" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "bch" = ( /obj/structure/surface/table, /obj/item/clipboard, @@ -21866,8 +21905,8 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bkw" = ( @@ -21875,8 +21914,8 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bkx" = ( @@ -21886,8 +21925,8 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bky" = ( @@ -21924,18 +21963,30 @@ icon_state = "sovietsoda-broken"; stat = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkE" = ( -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkG" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkH" = ( /obj/structure/dispenser/oxygen, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkI" = ( /obj/structure/cryofeed/right{ @@ -21954,7 +22005,9 @@ "bkK" = ( /obj/structure/closet/toolcloset, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/filtration_plant) "bkL" = ( /obj/structure/surface/table, @@ -21962,29 +22015,43 @@ dir = 1 }, /obj/item/tank/air, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkM" = ( /obj/structure/surface/table, /obj/effect/spawner/random/bomb_supply, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkN" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkO" = ( /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkP" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Atmospherics Condenser Storage" }, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/filtration_plant) "bkS" = ( /obj/structure/closet/toolcloset, @@ -21992,7 +22059,10 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bkT" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/chan, @@ -22144,19 +22214,27 @@ /obj/effect/spawner/random/toolbox, /obj/item/tool/extinguisher, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bly" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "blA" = ( /obj/structure/dispenser/oxygen, /obj/structure/machinery/camera/autoname{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "blB" = ( /obj/effect/landmark/survivor_spawner, @@ -22168,24 +22246,34 @@ dir = 4; pixel_x = -30 }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "blC" = ( /obj/structure/closet/firecloset/full, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "blD" = ( /obj/structure/surface/table, /obj/item/circuitboard/firealarm, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "blE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/crap_item, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "blF" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -22199,12 +22287,6 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) -"blL" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - icon_state = "delivery" - }, -/area/bigredv2/outside/engineering) "blT" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -22212,7 +22294,9 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "blV" = ( /obj/structure/bed/chair/office/light{ @@ -22221,7 +22305,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "blW" = ( /obj/structure/surface/table, @@ -22231,25 +22317,35 @@ dir = 8 }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "blX" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "blY" = ( /obj/structure/bed/chair{ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "blZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bma" = ( /obj/effect/decal/cleanable/dirt, @@ -22258,7 +22354,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bmb" = ( /obj/structure/surface/table, @@ -22267,42 +22365,69 @@ pixel_x = 32 }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bme" = ( /turf/open/mars, /area/bigredv2/outside/sw) "bmf" = ( /obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/engineering) "bmg" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmh" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmi" = ( -/turf/open/floor, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/structure/curtain/red, +/turf/open/floor{ + icon_state = "freezerfloor" + }, /area/bigredv2/outside/engineering) "bmj" = ( -/obj/structure/machinery/light{ - dir = 4 - }, /obj/effect/decal/cleanable/liquid_fuel, -/turf/open/floor, +/obj/structure/machinery/shower{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, /area/bigredv2/outside/engineering) "bml" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmm" = ( /obj/structure/machinery/portable_atmospherics/canister/air, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmn" = ( /obj/structure/machinery/power/smes/buildable{ @@ -22312,31 +22437,41 @@ /area/bigredv2/outside/engineering) "bmp" = ( /obj/structure/machinery/mill, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmq" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, -/area/bigredv2/outside/engineering) -"bmr" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/tool, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bms" = ( /obj/structure/machinery/autolathe, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmt" = ( /obj/structure/machinery/computer/atmos_alert, /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmu" = ( /obj/structure/machinery/computer/station_alert, /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmw" = ( /obj/structure/closet/secure_closet/engineering_chief, @@ -22344,20 +22479,32 @@ dir = 1 }, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmx" = ( /obj/structure/bookcase/manuals/engineering, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmy" = ( /obj/effect/decal/cleanable/liquid_fuel, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmz" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmA" = ( /obj/structure/barricade/wooden, @@ -22379,33 +22526,49 @@ dir = 4 }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bmD" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bmF" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bmG" = ( /obj/structure/closet/wardrobe/atmospherics_yellow, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bmH" = ( /obj/structure/surface/table, /obj/item/tool/lighter/random, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bmJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bmM" = ( /obj/effect/landmark/hunter_primary, @@ -22420,14 +22583,24 @@ "bmO" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmP" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/effect/decal/cleanable/liquid_fuel, /obj/item/stack/sheet/metal, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmQ" = ( /obj/structure/machinery/shower{ @@ -22443,13 +22616,18 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bmS" = ( /obj/structure/machinery/portable_atmospherics/canister/air, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bmT" = ( /obj/structure/machinery/power/terminal{ @@ -22475,23 +22653,33 @@ /area/bigredv2/outside/engineering) "bmW" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bmX" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bmZ" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/effect/decal/cleanable/liquid_fuel, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bna" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/liquid_fuel, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bnb" = ( /obj/structure/machinery/door_control{ @@ -22499,14 +22687,20 @@ name = "Storm Shutters"; pixel_x = -32 }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnd" = ( /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/machinery/computer3/server/rack, -/turf/open/floor, +/obj/structure/machinery/computer3/server, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bne" = ( /obj/structure/cryofeed, @@ -22519,7 +22713,10 @@ /area/bigredv2/outside/filtration_plant) "bnf" = ( /obj/structure/machinery/computer3/server/rack, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bng" = ( /obj/effect/decal/cleanable/dirt, @@ -22527,12 +22724,16 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnj" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -22541,8 +22742,8 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Atmospherics Condenser Storage" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bnl" = ( @@ -22550,66 +22751,93 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnn" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bno" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/radio/headset, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnp" = ( /obj/structure/machinery/computer/area_atmos/area, /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bnr" = ( /obj/structure/largecrate/random, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bns" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; name = "\improper Engineering SMES" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bnt" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/glasses/welding, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bnu" = ( /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bnw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bnx" = ( /obj/structure/surface/table, @@ -22619,7 +22847,9 @@ /obj/effect/decal/cleanable/dirt, /obj/item/clothing/glasses/meson, /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bny" = ( /obj/structure/window/reinforced/toughened{ @@ -22644,41 +22874,55 @@ /obj/structure/surface/table, /obj/item/tool/lighter/zippo, /obj/item/tool/lighter/zippo, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bnA" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony{ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bnB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnE" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnF" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bnH" = ( /obj/structure/machinery/computer/general_air_control, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnI" = ( /obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnK" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -22687,40 +22931,53 @@ /obj/structure/machinery/camera/autoname{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnL" = ( /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnN" = ( /obj/structure/bed/chair{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnO" = ( /obj/structure/machinery/computer/atmos_alert{ dir = 8 }, /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bnQ" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/engineering) "bnR" = ( /obj/structure/machinery/shower{ @@ -22733,30 +22990,40 @@ /area/bigredv2/outside/engineering) "bnS" = ( /obj/item/trash/eat, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bnT" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ name = "\improper Engineering Secure Storage" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bnV" = ( /obj/structure/sign/safety/electronics{ pixel_y = 32 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bnW" = ( /obj/structure/pipes/vents/pump, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "bnX" = ( /obj/item/folder/yellow, /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bnY" = ( /obj/structure/machinery/photocopier, @@ -22766,26 +23033,36 @@ name = "General Listening Channel"; pixel_x = 30 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bnZ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "boa" = ( /obj/structure/bed/chair{ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bob" = ( /obj/structure/bed/chair{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boc" = ( /obj/structure/machinery/light{ @@ -22793,64 +23070,85 @@ }, /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boe" = ( -/obj/structure/machinery/computer3/server, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bof" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "boj" = ( /obj/structure/closet/secure_closet/engineering_welding, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/engineering) "bok" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, -/area/bigredv2/outside/engineering) -"bop" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bor" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bos" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bou" = ( /obj/structure/machinery/light{ dir = 8 }, /obj/structure/machinery/computer3/server/rack, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bov" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /obj/item/weapon/twohanded/fireaxe, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "box" = ( /obj/item/frame/table, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "boy" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -22868,44 +23166,63 @@ dir = 1; name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/engineering) "boG" = ( /obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/engineering) "boH" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/crap_item, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "boI" = ( /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boK" = ( /obj/item/trash/pistachios, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "boL" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boM" = ( /obj/structure/closet/firecloset/full, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boN" = ( /obj/structure/closet/firecloset/full, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boR" = ( /obj/structure/surface/table, @@ -22914,14 +23231,19 @@ dir = 1 }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boS" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, /obj/effect/spawner/random/technology_scanner, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "boU" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -22929,8 +23251,8 @@ dir = 1; name = "\improper Chief Engineer's Office" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "boV" = ( @@ -22938,17 +23260,22 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "boW" = ( /obj/structure/closet/secure_closet/atmos_personal, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/filtration_plant) "boX" = ( /obj/structure/machinery/pipedispenser, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "boY" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, @@ -22958,17 +23285,24 @@ phone_id = "Filtration"; pixel_y = 24 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "boZ" = ( /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpa" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpc" = ( /obj/structure/barricade/handrail, @@ -22978,26 +23312,41 @@ /area/bigredv2/outside/filtration_plant) "bpe" = ( /obj/effect/landmark/survivor_spawner, -/turf/open/floor, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bpi" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpj" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpk" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -23005,19 +23354,26 @@ dir = 1; name = "\improper Engineering Tool Storage" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bpl" = ( /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpm" = ( -/obj/effect/landmark/corpsespawner/engineer, -/turf/open/floor, +/obj/structure/surface/table, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/glasses/welding, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bpn" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -23026,25 +23382,34 @@ /obj/structure/machinery/camera/autoname{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bpo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpp" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpu" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ @@ -23076,8 +23441,8 @@ dir = 1; name = "\improper Engineering Lockers" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bpA" = ( @@ -23086,44 +23451,51 @@ dir = 1; name = "\improper Engineering Lockers" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bpC" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpD" = ( /obj/structure/surface/rack, /obj/item/device/camera_film, -/obj/item/device/analyzer, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpE" = ( /obj/structure/surface/rack, -/obj/item/weapon/gun/smg/nailgun, -/obj/item/weapon/gun/smg/nailgun, -/obj/item/ammo_magazine/smg/nailgun, -/obj/item/ammo_magazine/smg/nailgun, -/obj/item/ammo_magazine/smg/nailgun, -/obj/item/ammo_magazine/smg/nailgun, -/obj/item/ammo_magazine/smg/nailgun, -/obj/item/ammo_magazine/smg/nailgun, -/turf/open/floor, +/obj/item/device/analyzer, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpI" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -23131,7 +23503,10 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/device/lightreplacer, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpK" = ( /obj/structure/machinery/light{ @@ -23140,31 +23515,43 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bpL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/landmark/hunter_secondary, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "bpM" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor, +/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bpN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/decal/cleanable/liquid_fuel, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bpO" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bpP" = ( /obj/structure/machinery/camera/autoname{ @@ -23173,7 +23560,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpQ" = ( /obj/structure/machinery/light{ @@ -23183,20 +23572,26 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpR" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpS" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/landmark/good_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bpT" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -23207,13 +23602,14 @@ "bpU" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/stationary, /obj/effect/decal/warning_stripes, -/turf/open/floor, +/turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) "bpV" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N" + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor, +/turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) "bpX" = ( /turf/open/floor{ @@ -23275,8 +23671,8 @@ dir = 1; name = "\improper Engineering Break Room" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bqg" = ( @@ -23291,34 +23687,39 @@ dir = 1; pixel_y = -30 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bql" = ( -/obj/effect/decal/cleanable/liquid_fuel, /obj/structure/machinery/door_control{ id = "Engineering"; name = "Storm Shutters"; pixel_y = -32 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bqo" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bqv" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/floor, +/turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) "bqw" = ( /obj/effect/decal/warning_stripes{ icon_state = "E-corner" }, -/turf/open/floor, +/turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) "bqA" = ( /obj/structure/closet/toolcloset, @@ -23339,21 +23740,30 @@ icon_state = "snack-broken"; stat = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bqJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "bqK" = ( /obj/item/folder/yellow, /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "bqL" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -23362,8 +23772,8 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engineering Workshop" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bqM" = ( @@ -23371,29 +23781,39 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bqN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bqP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1; + pixel_y = -1 + }, /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; name = "\improper Engine Reactor Control" }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bqT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/survivor_spawner, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bqV" = ( /obj/structure/machinery/light{ @@ -23402,13 +23822,16 @@ /obj/structure/surface/table, /obj/item/paper, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bqX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/turf/open/floor, +/turf/open/floor/plating, /area/bigredv2/outside/filtration_plant) "brb" = ( /obj/structure/machinery/landinglight/ds2{ @@ -23434,14 +23857,17 @@ /area/bigredv2/outside/sw) "bre" = ( /obj/structure/bed/chair, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "brf" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engineering Workshop" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "brg" = ( @@ -23449,57 +23875,73 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bri" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/metal, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "brj" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, -/area/bigredv2/outside/engineering) -"brm" = ( -/obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "brn" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/technology_scanner, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/transmitter/colony_net{ - phone_category = "Solaris Ridge"; - phone_color = "yellow"; - phone_id = "Engineering"; - pixel_y = 24 +/obj/structure/machinery/power/breakerbox/activated, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" }, -/turf/open/floor, /area/bigredv2/outside/engineering) "bro" = ( /obj/structure/machinery/camera/autoname, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bru" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "brv" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "brw" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "brx" = ( /obj/structure/surface/table, /obj/item/stack/cable_coil, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bry" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -23507,14 +23949,18 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "brz" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "brA" = ( /obj/structure/surface/table, @@ -23529,17 +23975,25 @@ pixel_x = 30 }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "brB" = ( /obj/structure/machinery/light{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "brC" = ( /obj/effect/landmark/good_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "brD" = ( /turf/open/floor/plating, @@ -23560,42 +24014,61 @@ /obj/item/stack/sheet/metal{ amount = 30 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "brJ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/glass, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "brK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/hunter_primary, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "brL" = ( /obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "brM" = ( /obj/structure/surface/table, /obj/effect/spawner/random/powercell, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "brO" = ( /obj/structure/machinery/light{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "brP" = ( /obj/structure/bed/chair/office/light{ dir = 8 }, -/turf/open/floor, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "brR" = ( /obj/item/device/radio/intercom{ @@ -23604,36 +24077,50 @@ name = "General Listening Channel"; pixel_x = 30 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "podhatchfloor" + }, /area/bigredv2/outside/engineering) "brU" = ( /obj/structure/surface/table, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "brV" = ( /obj/structure/bed/chair/office/light{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "brW" = ( /obj/structure/surface/table, /obj/item/weapon/baton, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "brY" = ( /obj/structure/bed/chair/office/light, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "brZ" = ( /obj/structure/bed/chair/office/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/filtration_plant) "bsa" = ( /obj/structure/machinery/floodlight/landing/floor, @@ -23683,11 +24170,9 @@ amount = 30 }, /obj/effect/landmark/crap_item, -/turf/open/floor, -/area/bigredv2/outside/engineering) -"bso" = ( -/obj/structure/machinery/power/geothermal, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bss" = ( /obj/structure/prop/invuln/minecart_tracks{ @@ -23698,40 +24183,50 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) -"bsu" = ( -/obj/effect/landmark/crap_item, -/turf/open/floor, -/area/bigredv2/outside/engineering) "bsB" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, /obj/effect/spawner/random/tool, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bsC" = ( /obj/structure/surface/table, /obj/effect/spawner/random/technology_scanner, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bsD" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, /obj/effect/spawner/random/toolbox, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bsE" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bsF" = ( /obj/structure/surface/table, /obj/item/circuitboard/solar_tracker, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bsG" = ( /obj/structure/closet/wardrobe/engineering_yellow, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/filtration_plant) "bsH" = ( /obj/effect/landmark/hunter_primary, @@ -23747,19 +24242,26 @@ icon_state = "coffee-broken"; stat = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bsK" = ( /obj/structure/machinery/light, /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bsL" = ( /obj/effect/landmark/crap_item, /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bsM" = ( /obj/structure/machinery/door_control{ @@ -23767,7 +24269,10 @@ name = "Storm Shutters"; pixel_y = -32 }, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bsN" = ( /obj/structure/surface/table, @@ -23779,49 +24284,62 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bsP" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/toolbox, -/turf/open/floor, +/obj/structure/closet/radiation, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/engineering) "bsX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bsY" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Atmospherics Condenser" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/area/bigredv2/outside/filtration_plant) +/area/bigredv2/outside/engineering) "bsZ" = ( /obj/structure/janitorialcart, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bta" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "btb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/constructable_frame, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "btc" = ( /obj/structure/surface/table, /obj/structure/machinery/light, /obj/effect/spawner/random/tool, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "btd" = ( /obj/structure/surface/table, @@ -23829,28 +24347,48 @@ /obj/item/stack/sheet/metal{ amount = 30 }, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bte" = ( -/obj/structure/machinery/light, -/turf/open/floor, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/sign/safety/high_rad{ + pixel_x = 32 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bti" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "btj" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor, -/area/bigredv2/outside/filtration_plant) +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "btk" = ( /obj/structure/bed/chair, -/turf/open/floor, -/area/bigredv2/outside/filtration_plant) +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "btn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -23865,43 +24403,40 @@ }, /area/bigredv2/outside/se) "btr" = ( -/obj/structure/machinery/computer/station_alert{ - dir = 1 +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" }, -/obj/structure/surface/table, -/turf/open/floor, -/area/bigredv2/outside/engineering) -"bts" = ( -/obj/structure/machinery/power/monitor{ - name = "Main Power Grid Monitoring" - }, -/turf/open/floor, /area/bigredv2/outside/engineering) "btt" = ( -/obj/structure/surface/table, -/obj/item/device/analyzer, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/obj/structure/bed/chair/office/light, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "btu" = ( -/obj/structure/machinery/computer/atmos_alert{ - dir = 1 +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" }, -/obj/structure/surface/table, -/turf/open/floor, /area/bigredv2/outside/engineering) "btw" = ( /turf/open/floor/plating, /area/bigredv2/outside/lz2_south_cas) "btA" = ( /obj/effect/landmark/hunter_primary, -/turf/open/floor, -/area/bigredv2/outside/filtration_plant) +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "btB" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor, -/area/bigredv2/outside/filtration_plant) +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "btD" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -23915,8 +24450,8 @@ dir = 1; name = "\improper Engineering Complex" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "btJ" = ( @@ -23924,13 +24459,19 @@ dir = 4 }, /obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "btK" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/stack/sheet/metal, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" }, -/turf/open/floor, /area/bigredv2/outside/engineering) "btN" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -23940,15 +24481,18 @@ /obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor, -/area/bigredv2/outside/filtration_plant) +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "bua" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Engineering Complex" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "bub" = ( @@ -25524,7 +26068,9 @@ /obj/structure/surface/table, /obj/item/trash/kepler, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bAp" = ( /obj/structure/pipes/vents/pump{ @@ -25835,9 +26381,12 @@ }, /area/bigredv2/caves/eta/xenobiology) "bBg" = ( -/obj/structure/machinery/power/geothermal, -/turf/open/floor/plating, -/area/bigredv2/outside/medical) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "bBh" = ( /obj/structure/filingcabinet, /turf/open/floor{ @@ -27309,12 +27858,27 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/telecomm/lz2_cave) +"bYW" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "bZp" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/plating, /area/bigredv2/outside/nw/ceiling) +"bZJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/radiation, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "bZL" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -27338,7 +27902,10 @@ /obj/structure/surface/table, /obj/effect/spawner/random/bomb_supply, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "cdA" = ( /turf/open/mars_cave{ @@ -27386,6 +27953,14 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"cla" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "clB" = ( /turf/open/floor{ dir = 1; @@ -27505,10 +28080,15 @@ icon_state = "darkyellowcorners2" }, /area/bigredv2/caves/eta/living) -"cuF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor, +"cud" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cvi" = ( /obj/effect/decal/cleanable/dirt, @@ -27583,12 +28163,6 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) -"cFb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal, -/obj/structure/bed/chair/office/light, -/turf/open/floor, -/area/bigredv2/outside/engineering) "cGQ" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ @@ -27603,7 +28177,10 @@ pixel_x = -32; start_charge = 0 }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "cGZ" = ( /turf/open/mars_cave{ @@ -27681,6 +28258,12 @@ icon_state = "mars_cave_20" }, /area/bigredv2/caves_north) +"cKu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "cLZ" = ( /obj/structure/closet/secure_closet/brig, /obj/effect/landmark/objective_landmark/close, @@ -27688,12 +28271,31 @@ icon_state = "dark" }, /area/bigredv2/outside/marshal_office) +"cNb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "cNH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ icon_state = "delivery" }, /area/bigredv2/outside/bar) +"cOa" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/crap_item, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "cOl" = ( /turf/open/mars_cave{ icon_state = "mars_cave_18" @@ -27799,6 +28401,12 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"cZB" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "daf" = ( /obj/effect/landmark/crap_item, /turf/open/mars_cave{ @@ -27835,6 +28443,14 @@ icon_state = "delivery" }, /area/bigredv2/outside/c) +"dhN" = ( +/obj/structure/window/framed/solaris, +/obj/structure/machinery/door/poddoor/almayer{ + id = "rad_door"; + name = "\improper Radiation Shielding" + }, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering) "dhS" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -27926,6 +28542,19 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"dsm" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) +"dsy" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "dtf" = ( /obj/structure/prop/server_equipment/broken, /turf/open/floor{ @@ -27947,6 +28576,12 @@ /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"duA" = ( +/obj/structure/platform{ + dir = 1 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "dvB" = ( /obj/item/ore/coal{ pixel_x = 9; @@ -27959,10 +28594,10 @@ /area/bigredv2/caves/mining) "dvC" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, -/area/bigredv2/outside/filtration_plant) +/area/bigredv2/outside/engineering) "dwL" = ( /obj/structure/bed/chair{ buckling_y = 5; @@ -27991,6 +28626,16 @@ "dyv" = ( /turf/open/mars, /area/bigredv2/caves/eta/xenobiology) +"dyH" = ( +/obj/structure/machinery/computer/area_atmos{ + dir = 1 + }, +/obj/structure/surface/table, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "dzY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor{ @@ -28035,6 +28680,17 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"dBU" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.01; + pixel_y = 9 + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "dCb" = ( /obj/effect/landmark/corpsespawner/security/marshal, /obj/effect/decal/cleanable/blood/oil, @@ -28227,6 +28883,12 @@ icon_state = "mars_cave_23" }, /area/bigredv2/caves/mining) +"dQw" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/mars_cave{ + icon_state = "mars_cave_5" + }, +/area/bigredv2/caves_sw) "dQF" = ( /obj/effect/spawner/random/tool, /turf/open/mars_cave{ @@ -28234,16 +28896,13 @@ }, /area/bigredv2/caves/mining) "dQZ" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - name = "\improper Engine Reactor Control" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, +/obj/structure/closet/toolcloset, +/obj/effect/decal/cleanable/dirt, /turf/open/floor{ - icon_state = "delivery" + dir = 5; + icon_state = "darkyellow2" }, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/filtration_plant) "dSg" = ( /obj/effect/landmark/crap_item, /obj/effect/decal/cleanable/dirt, @@ -28273,6 +28932,14 @@ icon_state = "mars_cave_5" }, /area/bigredv2/outside/lz2_south_cas) +"dWd" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "dWg" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/mars{ @@ -28281,7 +28948,10 @@ /area/bigredv2/outside/c) "dWl" = ( /obj/structure/closet/toolcloset, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "dXs" = ( /obj/item/tool/pickaxe{ @@ -28325,6 +28995,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"ebr" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "ebZ" = ( /turf/open/floor{ icon_state = "darkgreencorners2" @@ -28375,6 +29052,14 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"egL" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "egS" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -28548,6 +29233,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"ewv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/curtain/red, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/bigredv2/outside/engineering) "exc" = ( /turf/open/floor{ dir = 4; @@ -28635,10 +29327,9 @@ }, /area/bigredv2/caves_sw) "eGM" = ( -/obj/structure/surface/table, -/obj/item/device/lightreplacer, -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "eHA" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -28646,6 +29337,14 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/xenobiology) +"eIN" = ( +/obj/structure/machinery/power/port_gen/pacman, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "eJE" = ( /turf/open/floor{ dir = 4; @@ -28670,7 +29369,10 @@ pixel_x = 30; throw_range = 15 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "eLp" = ( /obj/structure/closet/secure_closet/brig, @@ -28738,6 +29440,13 @@ }, /turf/closed/wall/solaris, /area/bigredv2/outside/dorms) +"eSm" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "eSu" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -28883,8 +29592,13 @@ /area/bigredv2/caves/lambda/research) "fgE" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/static_comms/net_two, -/turf/open/floor, +/obj/effect/decal/remains/human, +/obj/effect/landmark/static_comms/net_two{ + broken_on_spawn = 1 + }, +/turf/open/floor{ + icon_state = "podhatchfloor" + }, /area/bigredv2/outside/engineering) "fhy" = ( /obj/structure/bed/chair/comfy/blue{ @@ -29085,6 +29799,11 @@ /obj/structure/pipes/standard/tank/phoron, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"fBo" = ( +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) "fCb" = ( /turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) @@ -29094,6 +29813,14 @@ icon_state = "darkred2" }, /area/bigredv2/caves/eta/research) +"fEv" = ( +/obj/structure/machinery/door/airlock/almayer/secure/colony{ + name = "\improper Engine Reactor" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "fFG" = ( /obj/structure/largecrate/random/barrel, /turf/open/mars_cave{ @@ -29141,6 +29868,12 @@ icon_state = "mars_cave_6" }, /area/bigredv2/caves_virology) +"fLl" = ( +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "fLA" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -29221,7 +29954,10 @@ /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "fOM" = ( /obj/effect/decal/warning_stripes{ @@ -29295,12 +30031,31 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"fUp" = ( +/obj/structure/machinery/door/airlock/almayer/secure/colony{ + dir = 1; + name = "\improper Engine Reactor" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "fWw" = ( /turf/open/jungle{ bushes_spawn = 0; icon_state = "grass_impenetrable" }, /area/bigredv2/caves/eta/xenobiology) +"fXm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "fYH" = ( /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/caves/mining) @@ -29330,8 +30085,8 @@ }, /area/bigredv2/outside/eta) "gad" = ( -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "gan" = ( @@ -29354,6 +30109,12 @@ "gda" = ( /turf/open/mars_cave, /area/bigredv2/outside/lz1_telecomm_cas) +"gdx" = ( +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "gdN" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars, @@ -29363,6 +30124,14 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/lz1_north_cas) +"gfX" = ( +/obj/structure/sign/safety/hazard{ + pixel_y = -32 + }, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "ggC" = ( /obj/structure/surface/rack, /obj/effect/landmark/good_item, @@ -29381,6 +30150,10 @@ "gio" = ( /turf/open/mars_cave, /area/bigredv2/outside/filtration_cave_cas) +"giB" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/mars_cave, +/area/bigredv2/caves_sw) "giY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29420,6 +30193,15 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/lz2_south_cas) +"gmm" = ( +/obj/structure/window/framed/solaris, +/obj/effect/decal/cleanable/molten_item, +/obj/structure/machinery/door/poddoor/almayer{ + id = "rad_door"; + name = "\improper Radiation Shielding" + }, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering) "gmN" = ( /turf/open/mars_cave{ icon_state = "mars_cave_18" @@ -29493,6 +30275,12 @@ "gtX" = ( /turf/open/mars_cave, /area/bigredv2/caves_se) +"guu" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "guM" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_4" @@ -29520,6 +30308,13 @@ icon_state = "elevatorshaft" }, /area/bigredv2/caves/lambda/breakroom) +"gwg" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "gxJ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_18" @@ -29568,7 +30363,10 @@ "gCx" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "gCC" = ( /obj/structure/closet/secure_closet, @@ -29596,6 +30394,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_east) +"gFR" = ( +/obj/structure/machinery/power/port_gen/pacman, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "gGO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ @@ -29609,6 +30414,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"gHV" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "gJw" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave, @@ -29619,6 +30431,13 @@ icon_state = "mars_cave_4" }, /area/bigredv2/caves_virology) +"gML" = ( +/obj/structure/machinery/power/turbine, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "gNz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -29640,6 +30459,15 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_research) +"gPh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door/airlock/almayer/secure/colony{ + name = "\improper Engine Reactor" + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "gPE" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/flashlight/lantern, @@ -29683,6 +30511,28 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"gUD" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.01; + pixel_y = 9 + }, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"gVl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "gVm" = ( /turf/open/floor{ dir = 6; @@ -29726,12 +30576,50 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_sw) +"gZc" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/sign/safety/high_rad{ + pixel_x = -32 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"haT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "hcb" = ( /obj/effect/landmark/hunter_secondary, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, /area/bigredv2/outside/lz1_telecomm_cas) +"hcH" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/tool, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"hdc" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "heG" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -29776,6 +30664,12 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/outside/lz1_north_cas) +"hhK" = ( +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "hiP" = ( /obj/structure/sign/safety/one{ pixel_x = 16 @@ -29874,7 +30768,9 @@ "hsF" = ( /obj/structure/closet/firecloset/full, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "hsJ" = ( /obj/item/ore, @@ -30126,6 +31022,18 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"hYB" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 5 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "hYI" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, @@ -30161,6 +31069,10 @@ }, /turf/open/floor, /area/bigredv2/outside/cargo) +"iaC" = ( +/obj/structure/platform, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "iaN" = ( /obj/structure/largecrate/random/barrel/red, /obj/effect/decal/cleanable/dirt, @@ -30186,6 +31098,13 @@ icon_state = "mars_cave_6" }, /area/bigredv2/caves_sw) +"idM" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "iep" = ( /obj/structure/surface/rack, /obj/item/clothing/head/hardhat/dblue{ @@ -30254,6 +31173,11 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/outside/eta) +"iig" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/framed/solaris, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering) "ijU" = ( /obj/structure/prop/almayer/cannon_cables{ name = "\improper Cables" @@ -30387,13 +31311,24 @@ "iyd" = ( /obj/structure/machinery/computer/general_air_control, /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "iyY" = ( /turf/open/mars_cave{ icon_state = "mars_cave_13" }, /area/bigredv2/outside/lz1_north_cas) +"izb" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/tool, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "izh" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -30422,6 +31357,12 @@ icon_state = "mars_cave_11" }, /area/bigredv2/caves_sw) +"iAI" = ( +/obj/structure/platform{ + dir = 8 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "iDJ" = ( /obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood{ @@ -30471,6 +31412,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"iFa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/bananapeel, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "iGK" = ( /turf/open/mars_cave, /area/bigredv2/caves_sw) @@ -30511,10 +31460,8 @@ }, /area/bigredv2/caves/mining) "iNR" = ( -/turf/open/mars_cave{ - icon_state = "mars_cave_20" - }, -/area/bigredv2/caves_sw) +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "iOL" = ( /obj/effect/landmark/crap_item, /turf/open/mars_cave{ @@ -30534,12 +31481,10 @@ /turf/open/gm/river, /area/bigredv2/outside/filtration_plant) "iQC" = ( -/obj/structure/surface/table, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/effect/landmark/crap_item, +/turf/open/floor{ + icon_state = "dark" }, -/obj/item/clothing/head/welding, -/turf/open/floor, /area/bigredv2/outside/engineering) "iQG" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -30569,6 +31514,15 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_research) +"iSz" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.01; + pixel_y = 9 + }, +/obj/structure/barricade/handrail, +/turf/open/floor/plating/plating_catwalk, +/area/bigredv2/outside/engineering) "iUe" = ( /turf/open/floor{ dir = 6; @@ -30869,6 +31823,19 @@ icon_state = "bcircuitoff" }, /area/bigredv2/caves/lambda/research) +"jxA" = ( +/obj/structure/barricade/handrail, +/turf/open/floor/plating/plating_catwalk, +/area/bigredv2/outside/engineering) +"jxS" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "jzD" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor{ @@ -30894,6 +31861,11 @@ icon_state = "mars_cave_5" }, /area/bigredv2/caves_sw) +"jAJ" = ( +/turf/open/floor{ + icon_state = "podhatchfloor" + }, +/area/bigredv2/outside/engineering) "jAN" = ( /obj/item/tool/pickaxe, /turf/open/mars_cave{ @@ -30949,6 +31921,14 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"jDT" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "jEx" = ( /obj/structure/machinery/power/port_gen/pacman/super, /turf/open/mars_cave{ @@ -31036,6 +32016,16 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_sw) +"jMn" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/ash, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "jOc" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -31119,6 +32109,21 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"jRn" = ( +/obj/structure/machinery/computer3/server, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"jTk" = ( +/obj/structure/surface/table, +/obj/effect/decal/cleanable/molten_item, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "jUc" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -31199,6 +32204,25 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"jXf" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"jXJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light_construct{ + dir = 8 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "jXP" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave{ @@ -31220,7 +32244,9 @@ /area/bigredv2/caves/mining) "jYF" = ( /obj/structure/machinery/recharge_station, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/engineering) "jYS" = ( /obj/effect/decal/cleanable/blood, @@ -31415,6 +32441,15 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"kka" = ( +/obj/structure/barricade/handrail, +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.01; + pixel_y = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/bigredv2/outside/engineering) "kli" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -31448,6 +32483,12 @@ icon_state = "delivery" }, /area/bigredv2/outside/admin_building) +"kmx" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "knN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31490,6 +32531,13 @@ /obj/effect/decal/cleanable/blood/writing, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"ksO" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "ktE" = ( /obj/item/tool/wrench{ pixel_x = -7; @@ -31507,6 +32555,13 @@ icon_state = "mars_cave_17" }, /area/bigredv2/outside/filtration_plant) +"ktY" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "kuu" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/cigbutt, @@ -31675,6 +32730,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_research) +"kNK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "kNP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -31758,10 +32820,10 @@ }, /area/bigredv2/outside/filtration_cave_cas) "kVT" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" }, -/turf/open/floor, /area/bigredv2/outside/engineering) "kVY" = ( /obj/structure/surface/rack, @@ -31808,6 +32870,13 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"lck" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "lcu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/mask/cigarette, @@ -31866,6 +32935,13 @@ }, /turf/open/floor, /area/bigredv2/outside/lz2_south_cas) +"lmi" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "lms" = ( /turf/open/floor{ dir = 6; @@ -31885,6 +32961,16 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) +"lqo" = ( +/obj/item/tool/lighter/random, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "lrH" = ( /obj/effect/landmark/crap_item, /turf/open/mars_cave{ @@ -32036,6 +33122,14 @@ icon_state = "redfull" }, /area/bigredv2/caves/eta/research) +"lEi" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "lEw" = ( /obj/item/tool/pickaxe{ pixel_y = -3 @@ -32181,6 +33275,23 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_cave_cas) +"lTi" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"lTM" = ( +/obj/item/folder/yellow, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "lUd" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -32234,6 +33345,12 @@ icon_state = "platingdmg2" }, /area/bigredv2/caves/mining) +"lYH" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "lYZ" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -32246,8 +33363,8 @@ }, /area/bigredv2/caves/mining) "maD" = ( -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "maF" = ( @@ -32256,6 +33373,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"maH" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "mdU" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -32294,6 +33419,21 @@ }, /turf/closed/wall/solaris/reinforced/hull, /area/bigredv2/caves/mining) +"mhZ" = ( +/obj/structure/machinery/portable_atmospherics/canister/air, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"mij" = ( +/obj/item/folder/yellow, +/obj/effect/landmark/crap_item, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "miD" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/security/marshal, @@ -32308,6 +33448,13 @@ }, /turf/open/floor, /area/bigred/ground/garage_workshop) +"mlV" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "mmg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip{ @@ -32338,6 +33485,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"mqh" = ( +/obj/structure/window/framed/solaris, +/turf/open/floor{ + icon_state = "panelscorched" + }, +/area/bigredv2/outside/engineering) "mqX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave{ @@ -32563,6 +33716,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"mPK" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "mRi" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/mars_cave{ @@ -32581,6 +33742,12 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"mSS" = ( +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "mST" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -32678,6 +33845,12 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"ndw" = ( +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "ndy" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -3; @@ -32699,6 +33872,15 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"niQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "njf" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_6" @@ -32734,6 +33916,12 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"nlJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "nlW" = ( /obj/structure/platform/kutjevo/rock, /obj/structure/platform/kutjevo/rock{ @@ -32742,6 +33930,13 @@ /obj/structure/platform_decoration/kutjevo/rock, /turf/open/mars, /area/space) +"nmU" = ( +/obj/structure/surface/table, +/obj/item/device/analyzer, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "nny" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_7" @@ -32754,6 +33949,23 @@ icon_state = "asteroidfloor" }, /area/bigredv2/outside/e) +"nnU" = ( +/obj/structure/machinery/door_control{ + desc = "A remote control-switch for opening the engines blast doors."; + id = "rad_door"; + name = "Reactor Radiation Shielding control"; + pixel_x = 30; + req_access_txt = "7" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "npz" = ( /obj/structure/surface/table, /obj/item/spacecash/c100, @@ -32811,6 +34023,18 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"nug" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 9 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "nuw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -32821,6 +34045,19 @@ icon_state = "dark" }, /area/bigredv2/outside/admin_building) +"nuz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/handrail, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"nwB" = ( +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "nwS" = ( /obj/item/ore{ pixel_x = -7; @@ -32838,6 +34075,13 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) +"nzN" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "nBb" = ( /obj/item/ammo_magazine/pistol/b92fs, /obj/item/weapon/gun/pistol/b92fs{ @@ -32875,6 +34119,14 @@ icon_state = "mars_dirt_5" }, /area/bigredv2/outside/eta) +"nEP" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/filtration_plant) "nEV" = ( /obj/item/weapon/twohanded/folded_metal_chair{ pixel_x = -10; @@ -32931,6 +34183,15 @@ icon_state = "delivery" }, /area/bigredv2/outside/filtration_cave_cas) +"nIi" = ( +/obj/structure/machinery/door/airlock/almayer/secure/colony{ + dir = 1; + name = "\improper Engine Reactor" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/bigredv2/outside/engineering) "nKL" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "An exchange valve"; @@ -32944,6 +34205,12 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"nLw" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/mars_cave{ + icon_state = "mars_dirt_4" + }, +/area/bigredv2/outside/sw) "nMB" = ( /obj/structure/machinery/door_control{ id = "workshop_br_g"; @@ -32963,6 +34230,15 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"nPz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "nQl" = ( /obj/item/ore{ pixel_x = -1; @@ -33023,10 +34299,9 @@ }, /area/bigredv2/outside/filtration_cave_cas) "nVq" = ( -/obj/structure/surface/table, -/obj/item/clothing/glasses/welding, -/obj/structure/pipes/vents/pump, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "nVw" = ( /turf/open/mars_cave{ @@ -33211,6 +34486,12 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/sw) +"ojD" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "okh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -33351,7 +34632,9 @@ "orZ" = ( /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/landmark/objective_landmark/medium, -/turf/open/floor, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/bigredv2/outside/filtration_plant) "otb" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -33368,6 +34651,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"ouh" = ( +/obj/item/tool/extinguisher, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "ovq" = ( /turf/open/floor{ icon_state = "delivery" @@ -33491,6 +34781,16 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves/mining) +"oIK" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 4 + }, +/obj/structure/platform_decoration{ + dir = 6 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "oJd" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -33657,6 +34957,14 @@ icon_state = "darkblue2" }, /area/bigredv2/outside/admin_building) +"oWp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/handrail, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "oWC" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -33807,6 +35115,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"pgk" = ( +/obj/structure/machinery/portable_atmospherics/canister/air, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "pgu" = ( /obj/effect/decal/warning_stripes{ icon_state = "W-corner" @@ -33856,6 +35171,15 @@ icon_state = "mars_dirt_11" }, /area/bigredv2/caves_north) +"pog" = ( +/obj/structure/platform{ + dir = 1 + }, +/obj/structure/platform{ + dir = 8 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "pow" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ @@ -33963,6 +35287,13 @@ icon_state = "dark" }, /area/bigredv2/outside/admin_building) +"pBv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "pBD" = ( /turf/open/floor{ dir = 4; @@ -34037,12 +35368,28 @@ icon_state = "mars_cave_14" }, /area/bigredv2/caves/mining) +"pKP" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/tool, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "pLj" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/mars_cave{ icon_state = "mars_cave_19" }, /area/bigredv2/caves/mining) +"pMi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/extinguisher, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "pMm" = ( /turf/open/floor{ dir = 8; @@ -34076,12 +35423,28 @@ icon_state = "wood" }, /area/bigredv2/outside/admin_building) +"pOg" = ( +/obj/structure/machinery/compressor{ + dir = 1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "pOL" = ( /obj/structure/closet/crate/miningcar/yellow, /turf/open/mars_cave{ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"pPo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) "pQv" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, @@ -34098,6 +35461,14 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave, /area/bigredv2/outside/lz1_telecomm_cas) +"pRG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "pRP" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/telecomm/n_cave) @@ -34137,6 +35508,16 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"pVv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/compressor{ + dir = 1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "pVP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ @@ -34144,6 +35525,14 @@ icon_state = "asteroidfloor" }, /area/bigred/ground/garage_workshop) +"pWs" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.01; + pixel_y = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/bigredv2/outside/engineering) "pXm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -34241,7 +35630,10 @@ /obj/structure/surface/table, /obj/effect/spawner/random/tool, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "qeX" = ( /obj/structure/largecrate, @@ -34395,6 +35787,13 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"qqw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "qrZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/fire, @@ -34541,6 +35940,20 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"qGY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"qHc" = ( +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/filtration_plant) "qHY" = ( /turf/open/mars_cave{ icon_state = "mars_cave_10" @@ -34640,6 +36053,15 @@ icon_state = "dark" }, /area/bigredv2/caves/eta/xenobiology) +"qUF" = ( +/obj/structure/machinery/computer/area_atmos{ + dir = 1 + }, +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "qUS" = ( /turf/open/mars_cave{ icon_state = "mars_dirt_6" @@ -34743,6 +36165,13 @@ icon_state = "mars_cave_16" }, /area/bigredv2/caves_research) +"rdr" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "rdR" = ( /turf/open/floor, /area/bigredv2/outside/lz2_south_cas) @@ -34793,6 +36222,18 @@ icon_state = "warnplate" }, /area/bigredv2/outside/telecomm/warehouse) +"rhP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "rie" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/stack/cable_coil/cut{ @@ -34830,6 +36271,12 @@ "rnc" = ( /turf/open/mars_cave, /area/bigredv2/caves_research) +"rnV" = ( +/obj/item/stack/sheet/glass, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "row" = ( /turf/open/floor{ dir = 8; @@ -34934,6 +36381,12 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"rvS" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/mars_cave{ + icon_state = "mars_cave_2" + }, +/area/bigredv2/caves_sw) "rxh" = ( /turf/open/mars_cave{ icon_state = "mars_cave_2" @@ -34945,6 +36398,12 @@ icon_state = "mars_cave_23" }, /area/bigredv2/caves_east) +"rzb" = ( +/obj/structure/bed/chair, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "rzO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/water_cooler/stacks{ @@ -35194,6 +36653,12 @@ }, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"rUN" = ( +/obj/structure/platform{ + dir = 4 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "rUZ" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -35249,6 +36714,13 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) +"rYr" = ( +/obj/structure/surface/table, +/obj/effect/decal/cleanable/ash, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "rYt" = ( /obj/effect/landmark/crap_item, /turf/open/mars_cave{ @@ -35276,6 +36748,23 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"sap" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"saX" = ( +/obj/structure/machinery/power/turbine, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "sbk" = ( /obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, @@ -35374,11 +36863,17 @@ icon_state = "mars_dirt_5" }, /area/bigredv2/caves/mining) +"slC" = ( +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) "slG" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + icon_state = "dark" }, -/turf/open/floor, /area/bigredv2/outside/engineering) "smh" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -35411,6 +36906,15 @@ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) +"snv" = ( +/obj/structure/machinery/light_construct{ + dir = 4 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "sog" = ( /obj/item/explosive/grenade/slug/baton{ dir = 1; @@ -35596,6 +37100,19 @@ icon_state = "mars_dirt_6" }, /area/bigredv2/caves/mining) +"szy" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) +"sAG" = ( +/obj/effect/landmark/hunter_primary, +/turf/open/mars_cave{ + icon_state = "mars_cave_2" + }, +/area/bigredv2/caves_sw) "sAS" = ( /obj/item/toy/prize/fireripley{ pixel_y = 19 @@ -35603,6 +37120,17 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating, /area/bigredv2/caves/mining) +"sBm" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "sBu" = ( /obj/effect/landmark/hunter_secondary, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -35617,9 +37145,9 @@ }, /area/bigredv2/caves/mining) "sCt" = ( -/obj/structure/closet/toolcloset, -/obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "sDs" = ( /obj/structure/closet/crate/miningcar, @@ -35639,6 +37167,20 @@ icon_state = "mars_cave_9" }, /area/bigredv2/caves_sw) +"sDO" = ( +/obj/structure/machinery/power/port_gen/pacman, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"sDZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/welding, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "sEi" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -35716,6 +37258,12 @@ /obj/structure/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/plating, /area/bigredv2/outside/admin_building) +"sNP" = ( +/obj/structure/window/framed/solaris, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/bigredv2/outside/engineering) "sNQ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_11" @@ -35850,6 +37398,10 @@ icon_state = "mars_cave_3" }, /area/bigredv2/caves_research) +"tcP" = ( +/obj/effect/decal/cleanable/dirt/greenglow, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/engineering) "tdn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -35875,6 +37427,14 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves_se) +"tdN" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "tdZ" = ( /obj/item/tool/pickaxe/drill, /obj/structure/machinery/light{ @@ -35965,6 +37525,17 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"tju" = ( +/obj/structure/machinery/shower{ + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/bigredv2/outside/engineering) "tkN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -36034,7 +37605,10 @@ /obj/structure/surface/table, /obj/effect/spawner/random/tool, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "trW" = ( /obj/item/clothing/suit/storage/hazardvest, @@ -36086,6 +37660,15 @@ icon_state = "mars_cave_14" }, /area/bigredv2/outside/lz2_south_cas) +"tub" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "tuu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -36110,12 +37693,29 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/lz2_south_cas) +"tvH" = ( +/obj/structure/machinery/compressor{ + dir = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "twS" = ( /turf/open/floor{ dir = 1; icon_state = "asteroidwarning" }, /area/bigredv2/outside/telecomm/lz2_cave) +"tzJ" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + name = "\improper Engine Reactor Control" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/bigredv2/outside/engineering) "tAe" = ( /obj/structure/bed, /obj/effect/landmark/objective_landmark/close, @@ -36253,6 +37853,13 @@ icon_state = "mars_cave_7" }, /area/bigredv2/caves_lambda) +"tIv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "tIA" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -36282,6 +37889,15 @@ icon_state = "mars_dirt_4" }, /area/bigredv2/caves/mining) +"tKr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) "tKC" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/cans/beer{ @@ -36394,9 +38010,10 @@ }, /area/bigredv2/caves/lambda/research) "tTI" = ( -/obj/structure/surface/table, -/obj/item/pizzabox, -/turf/open/floor, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "tUL" = ( /obj/effect/decal/cleanable/dirt, @@ -36444,6 +38061,17 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) +"uaS" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + name = "\improper Engine Reactor Control" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/bigredv2/outside/engineering) "ubY" = ( /obj/structure/barricade/wooden, /turf/open/mars_cave{ @@ -36458,6 +38086,13 @@ icon_state = "mars_cave_4" }, /area/bigredv2/caves_se) +"ueL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/window/framed/solaris, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/bigredv2/outside/engineering) "ufu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -36581,6 +38216,14 @@ icon_state = "delivery" }, /area/bigredv2/outside/admin_building) +"urn" = ( +/obj/structure/surface/table, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "usg" = ( /obj/item/tool/warning_cone, /turf/open/floor{ @@ -36657,6 +38300,14 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"uBi" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "uCa" = ( /obj/effect/landmark/corpsespawner/miner, /turf/open/floor/plating{ @@ -36677,6 +38328,12 @@ }, /turf/closed/wall/wood, /area/bigredv2/caves/mining) +"uDA" = ( +/obj/item/stack/sheet/glass, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "uDI" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A pipe."; @@ -36726,6 +38383,13 @@ icon_state = "mars_cave_15" }, /area/bigredv2/caves/mining) +"uGs" = ( +/obj/structure/surface/table, +/obj/effect/decal/cleanable/ash, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "uGz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -36761,6 +38425,15 @@ icon_state = "asteroidfloor" }, /area/bigred/ground/garage_workshop) +"uJj" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "uJu" = ( /obj/item/robot_parts/robot_component/diagnosis_unit{ pixel_y = 15 @@ -36858,6 +38531,13 @@ icon_state = "mars_dirt_10" }, /area/bigredv2/outside/space_port_lz2) +"uTO" = ( +/obj/structure/machinery/pipedispenser, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "uUV" = ( /obj/structure/prop/server_equipment/yutani_server/broken, /turf/open/floor/greengrid, @@ -36868,6 +38548,12 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_cave_cas) +"uVn" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/mars_cave{ + icon_state = "mars_cave_7" + }, +/area/bigredv2/caves_sw) "uWo" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -36891,6 +38577,13 @@ icon_state = "darkpurple2" }, /area/bigredv2/caves/lambda/research) +"vbp" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "vcm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -36918,6 +38611,17 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"vdl" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "vdS" = ( /obj/item/explosive/grenade/incendiary/molotov{ pixel_x = -10; @@ -36967,6 +38671,14 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"vin" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) "vis" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37067,6 +38779,14 @@ icon_state = "wood" }, /area/bigredv2/outside/library) +"voG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/handrail, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "vpu" = ( /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/mars_cave{ @@ -37222,6 +38942,13 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"vCf" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/toolbox, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "vCU" = ( /turf/open/mars_cave{ icon_state = "mars_cave_16" @@ -37350,6 +39077,13 @@ icon_state = "mars_cave_2" }, /area/bigredv2/caves/mining) +"vTt" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "vVl" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Dormitories Toilet" @@ -37359,6 +39093,15 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"vVz" = ( +/obj/structure/machinery/power/geothermal{ + name = "Reactor Turbine"; + power_generation_max = 100000 + }, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "vVF" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -5; @@ -37371,6 +39114,12 @@ "vVZ" = ( /turf/closed/wall/solaris, /area/bigredv2/outside/filtration_cave_cas) +"vWm" = ( +/obj/structure/surface/table, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "vXp" = ( /obj/structure/machinery/light{ dir = 8 @@ -37516,7 +39265,9 @@ "whE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/objective_landmark/close, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "whZ" = ( /obj/effect/decal/cleanable/blood/oil/streak, @@ -37535,10 +39286,9 @@ /area/bigred/ground/garage_workshop) "wiK" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ - dir = 1 +/turf/open/floor{ + icon_state = "podhatchfloor" }, -/turf/open/floor, /area/bigredv2/outside/engineering) "wjW" = ( /obj/structure/platform/shiva{ @@ -37586,6 +39336,12 @@ icon_state = "mars_cave_19" }, /area/bigredv2/caves_north) +"wpn" = ( +/obj/structure/closet/radiation, +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) "wpT" = ( /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/mars, @@ -37621,7 +39377,16 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) +"wtG" = ( +/obj/structure/machinery/computer3/server/rack, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "wtJ" = ( /obj/effect/decal/cleanable/blood{ @@ -37666,20 +39431,34 @@ }, /area/bigredv2/outside/virology) "wvK" = ( -/obj/structure/machinery/power/geothermal, -/turf/open/floor/plating, -/area/bigredv2/outside/admin_building) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) "wvR" = ( /turf/open/floor{ icon_state = "delivery" }, /area/bigredv2/caves/lambda/virology) +"wwT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/engineering) "wxo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor{ icon_state = "asteroidwarning" }, /area/bigredv2/outside/c) +"wyF" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/toolbox, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "wBi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -37722,12 +39501,14 @@ }, /area/bigredv2/caves_north) "wFL" = ( -/obj/structure/surface/table, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/structure/sign/safety/hazard{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor{ + icon_state = "darkyellow2" }, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, /area/bigredv2/outside/engineering) "wFO" = ( /turf/open/mars_cave{ @@ -37841,6 +39622,19 @@ icon_state = "mars_cave_9" }, /area/bigredv2/caves_north) +"wMM" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "wMQ" = ( /obj/structure/largecrate/random/secure, /turf/open/floor, @@ -37919,6 +39713,22 @@ icon_state = "mars_cave_13" }, /area/bigredv2/caves/mining) +"wVw" = ( +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"wVB" = ( +/obj/structure/platform, +/obj/structure/platform{ + dir = 8 + }, +/obj/structure/platform_decoration{ + dir = 10 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) "wVQ" = ( /turf/open/mars_cave{ icon_state = "mars_cave_17" @@ -37954,6 +39764,16 @@ icon_state = "wood" }, /area/bigredv2/outside/bar) +"wYE" = ( +/obj/structure/prop/server_equipment/yutani_server{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "wZC" = ( /turf/open/mars{ icon_state = "mars_dirt_11" @@ -38295,7 +40115,10 @@ /obj/structure/machinery/power/apc{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "xBn" = ( /obj/structure/platform{ @@ -38327,8 +40150,8 @@ "xDW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/engineering) "xFZ" = ( @@ -38552,6 +40375,17 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"xXq" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.01; + pixel_y = 9 + }, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "xXP" = ( /obj/structure/prop/invuln/minecart_tracks/bumper, /turf/open/mars_cave{ @@ -38588,6 +40422,12 @@ icon_state = "mars_dirt_7" }, /area/bigredv2/caves/mining) +"yar" = ( +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "ybk" = ( /turf/open/mars_cave{ icon_state = "mars_cave_17" @@ -38677,6 +40517,20 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"ygP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1 + }, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "yha" = ( /obj/structure/surface/table, /obj/item/device/radio{ @@ -38704,8 +40558,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "yjU" = ( @@ -38715,6 +40569,15 @@ icon_state = "platingdmg3" }, /area/bigredv2/caves/mining) +"yjV" = ( +/obj/structure/platform_decoration{ + dir = 8 + }, +/turf/open/gm/river, +/area/bigredv2/outside/engineering) +"ykR" = ( +/turf/closed/wall/mineral/uranium, +/area/bigredv2/outside/engineering) "ykW" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -3; @@ -47992,7 +49855,7 @@ ayf bsa ayf axX -bmi +maD boD axX bpx @@ -48209,8 +50072,8 @@ ayf ayf ayf azb -bmi -bmi +hhK +sCt azb bpx ufD @@ -48426,8 +50289,8 @@ aFc aFc aFc azb -bmi -bmi +hhK +sCt azb bpx ufD @@ -48643,8 +50506,8 @@ aFc aFc bme azb -bmi -bmi +hhK +sCt azb bpx ufD @@ -48860,8 +50723,8 @@ aFc aFc bme azb -bmi -bmi +hhK +sCt azb bpy ufD @@ -49077,8 +50940,8 @@ aFc aFc bme azb -bmi -bmi +hhK +sCt azb bme bqe @@ -49294,8 +51157,8 @@ aFc bme bme azb -bmi -bmi +hhK +sCt axX azB axX @@ -49511,15 +51374,15 @@ bme bme bme azb -bmi -bmi -bmi -bmi +hhK +mSS +btr +kVT azb bqI bre -bmq -bob +maH +hdc bsJ axX bsI @@ -49728,16 +51591,16 @@ bme bme bme azb -bmi -bmi -bmi -bmi +hhK +nVq +nVq +sCt azb -bmi -bmi -bmi -bmi -bmi +hhK +nVq +nVq +nVq +sCt azb bme bme @@ -49945,15 +51808,15 @@ bme bme bme azb -bmi -bmi -bmi -bmi +hhK +nVq +nVq +nVq bqf -bmi -bmi -bmg -bre +nVq +nVq +tTI +rzb bsK axX bme @@ -50162,15 +52025,15 @@ bme bme bme azb -bmi -bmi -bmi -bmi +hhK +nVq +nVq +sCt azb -bmi -bmi -bmg -bre +hhK +nVq +tTI +rzb bsL azb bme @@ -50379,15 +52242,15 @@ bme bme bme azb -bmi -bmi -bmi -bmi +fLl +btu +btu +gdx azb -bmi -bmi -bmi -bmi +fLl +nVq +btu +nVq bsM axX bpx @@ -50817,16 +52680,16 @@ boj boG boj axX -bmi -bmi -bmi +jYF +sap +nVq brI -bmi +sCt azb bpx bpx bpx -aao +bpx aao aao aao @@ -51030,21 +52893,21 @@ bmf bmf bmf bnQ -bmi -bmi +ygP +cud bpe axX jYF -bmi -bmi -bmg -bmi +sap +nVq +tTI +sCt azb kdh -aao -aao -aao -aao +bpx +bpx +bpx +bpx aao aao euF @@ -51245,23 +53108,23 @@ bli bsX bmg bmO -bmy -bmy -bmg -bmg -bmi +vdl +vdl +rhP +tTI +sCt axX ayr ayr brg -bmg -bmi +tTI +sCt axX axX axX -aao -aao -aao +bpx +bpx +bpx aao aao aao @@ -51459,26 +53322,26 @@ bfB bbe bbe blj -blL +dvC bmh bmP bnq -bnq -bnq +qGY +qGY boH bpf bpz -bmg +lck bqJ -bmg +tTI brJ -bpF +niQ bsN bsZ axX -aao -aao -aao +bpx +bpx +bpx aao aao aao @@ -51685,17 +53548,17 @@ ayr boI bor ayr -bmg -bmg -bmg +tTI +tTI +tTI brK -bor -bmg -bmi +cla +tTI +sCt axX -aao -aao -aao +bpx +bpx +bpx aao aao aao @@ -51896,25 +53759,23 @@ aZr axX bmj bmQ -bmQ -bnR +tju bnR -bnW +ewv +bYW bpO bpA -bop +eSm bqK -bnq -bop +kNK +slG bqN -bmg +tTI bta -axX -aao -aao -aao -aao -aao +azb +nLw +bpx +bpx aao aao aao @@ -51923,9 +53784,11 @@ aao aao aao wog +oQI +wog +wog +wog wog -trk -jXX aao uCD aao @@ -52120,30 +53983,30 @@ ayr ayr ayr ayr -bor +nPz bri -bmi +nVq bsm -bmi +nVq btb -axX -aao -aao -aao -aao -aao -aao -aao -aao +azb +nLw +bpx +bpx aao aao aao wog wog -hiY -dxV -dxV -dxV +wog +wog +sAG +wog +oQI +wog +wog +wog +aao aao aao aao @@ -52335,20 +54198,18 @@ bnr bok bnr bpi -bmi +kVT ayr -bor -bmi +nPz +nVq brL -bmi -bmi +nVq +nVq btc axX -aao -aao -aao -aao -aao +nLw +bpx +bpx aao aao aao @@ -52356,11 +54217,13 @@ wog wog wog wog -trk -jXX -dxV -qUS -dxV +wog +wog +wog +icQ +wog +aao +aao aao aao aao @@ -52547,38 +54410,38 @@ bll axX bmm bmS -bmg -bmg -bsu +tTI +tTI +iQC boK -bmi -bmg +nVq +cKu ayr -bor +nPz brj brM aMB -bmg +gwg btd axX +nLw +nLw aao aao aao +giB +giB +giB +giB +giB +giB +giB +giB +giB +aao aao aao aao -wog -wog -trk -wog -wog -jXX -dxV -dxV -dxV -dxV -buz -sDC aao aao qUS @@ -52762,11 +54625,11 @@ aZu aZu blm axX -bmm -bmm -bmi +mhZ +pgk +btu bnS -bmg +tTI boL bpj bpC @@ -52778,27 +54641,27 @@ ayZ axX axX axX +axX +axX +axX +axX +axX +axX +axX +axX +wwT +axX +axX +axX +axX +axX +axX +axX +axX aao aao aao aao -aao -aao -aao -jXX -dxV -qgY -hiY -dxV -dxV -dxV -dxV -dxV -qgY -wog -aao -aao -aao buz wog wog @@ -52988,32 +54851,32 @@ ayr ayr ayr ayr -bor -bmi -bmg -bso -bso -bso +cla +btr +lck +kVT +ayZ +bsP +ayZ +ouh +lck +jXJ +btr +sDO +pOg +saX +pVv +saX +eIN +lck +btr +ayZ +btr +kVT +axX axX aao aao -aao -aao -aao -aao -aao -dxV -dxV -qgY -hiY -dxV -pYt -dxV -pYt -dxV -iNR -wog -wog wog wog wog @@ -53199,37 +55062,37 @@ axX bmn bmT ayr -bmg -bmg +nzN +tTI boM ayr bpD -bmi +btr bqM -bmi -bmi -bmi -bmi +rnV +nVq +tTI +nIi bte +nIi +btu +gwg +gwg +gwg +tTI +btu +gwg +gwg +tTI +btu +btu +ndw +fUp +nVq +sCt +wpn axX aao -aao -aao -aao -aao -aao -dxV -dxV -dxV -qgY -hiY -dxV -dxV -buz -sDC -dxV -dxV -qgY wog wog wog @@ -53416,37 +55279,37 @@ axX bmn bmU bns -bmi -bmg +hhK +tTI boN ayr bpE -bmi -bor -bmi -bmi -bso -bso -bso +nVq +cla +nVq +nVq +gfX +axX +axX +axX +iig +iig +iig +mqh +fEv +iig +iig +ayZ +fEv +ueL +ueL +ayZ +axX +fEv +ayZ +axX axX aao -aao -aao -aao -aao -dxV -dxV -dxV -buz -wog -hiY -dxV -buz -wog -hiY -dxV -dxV -qgY wog wog wog @@ -53634,36 +55497,36 @@ bmn bmV ayr bnV -bmg -bmg +tTI +cKu ayZ bpF -bop +slG bqN -bmi -bmi -bmi -bmi +nVq +nVq +uDA +bsP bsP axX +hYB +iAI +iAI +dsy +iSz +hYB +iAI +wVB +kka +pog +iAI +wVB +ayZ +ndw +sCt +axX aao aao -aao -aao -dxV -dxV -buz -ibZ -wog -wog -wog -ibZ -wog -wog -wog -sDC -dxV -iNR wog wog wog @@ -53851,36 +55714,36 @@ ayr ayr ayr xAX -bmg -bmg +tTI +cKu ayZ -bor -bmg +nPz tTI -brm -bmi -bmi -bmi -brm +tTI +tTI +dsm +mSS +mij +kVT +dhN +duA +iNR +ykR +iaC +iSz +duA +iNR +iaC +kka +duA +ykR +iaC +ayZ +hhK +sCt axX aao -aao -dxV -aao -dxV -dxV -qgY -wog -wog -wog -wog -aao -wog wog -wog -jXX -dxV -dxV qgY wog hiY @@ -54065,40 +55928,40 @@ asK asK axX dWl -bmi -bmi +btr +btr bnW -bop -bmz +slG +ksO bpk bpM -bmi -bmi -bmi -bmi -bmi -bmi +slG +slG +slG +slG +slG +dWd +sCt +dhN +duA +iNR +iNR +iaC +iSz +duA +iNR +iaC +kka +duA +iNR +iaC +ayZ +hhK sCt axX aao -aao -dxV -dxV -dxV -dxV -iNR wog wog -aao -aao -aao -aao -wog -hiY -dxV -dxV -buz -wog wog hiY dxV @@ -54281,40 +56144,40 @@ bjx bjx bjw axX -dWl -bmi -bmg -bmg -bmg -bmg +lmi +nVq +tTI +tTI +tTI +cKu ayZ bpH -bmg -bmg -bmg +kmx +gwg +gwg brO -bmg -bmi -dWl +gwg +cla +gdx +dhN +nug +yjV +ykR +iaC +iSz +duA +iNR +iaC +kka +duA +ykR +iaC +ayZ +hhK +sCt axX -aao -aao -dxV -qUS -pYt -dxV -dxV -qgY -aao -aao -aao -aao -aao +uVn wog -hiY -dxV -dxV -iNR wog wog hiY @@ -54499,39 +56362,39 @@ bjB blq axX bmp -bmi -bmg +nVq +tTI bnX -bmg +tTI aLP ayZ bpI -bmg +cKu axX axX axX axX +uaS axX axX axX -aao -aao -aao -dxV -dxV -dxV -dxV -qgY -aao -aao -aao -aao -qUS +duA iNR -jXX -dxV -dxV -dxV +iaC +iSz +nug +rUN +oIK +kka +duA +iNR +iaC +ayZ +hhK +sCt +axX +dQw +wog qgY wog wog @@ -54716,39 +56579,39 @@ bkp blq axX bmq -bmi +nVq bnt -bmg -bmi +tTI +nVq boR ayr -bor -bmi +nPz +sCt axX brn -bmq -trr -bpl +jDT +vTt +cla btr -axX -aao -aao -aao -dxV -dxV -dxV -dxV -qgY +jTk +dhN +duA +ykR +iaC +pWs +vVz +vVz +vVz +jxA +duA +ykR +iaC +ueL +nzN +sCt +tcP +dQw wog -aao -aao -aao -dxV -dxV -dxV -dxV -dxV -buz wog wog wog @@ -54933,38 +56796,38 @@ bjA blq axX trr -bmg -bmg -bmi -bmi -fOK +tTI +tTI +nVq +nVq +wyF ayZ bpH -bmg +cKu axX bro brP slG -bmg -trr -axX -aao -aao -aao -aao -dxV -dxV -buz -wog -wog -aao -aao -dxV -dxV -pYt -dxV -dxV -buz +bqN +btt +uGs +gmm +duA +iNR +iaC +gUD +btr +jxS +btr +oWp +duA +iNR +iaC +ueL +nzN +cKu +tcP +rvS wog wog wog @@ -55150,38 +57013,38 @@ bjA blq axX bms -bmg +gwg bnu bnY -trr +hcH boS ayZ btK -bnq +tTI bqP -bop -bop -bpM -bmg -bts +fXm +wMM +gVl +tTI +nVq +qUF +dhN +duA +ykR +iaC +dBU +guu axX -aao -aao -aao -aao -aao -buz -wog -wog -wog -wog -wog -ibZ -sDC -dxV -dxV -buz -wog +cNb +nuz +duA +ykR +iaC +ayZ +hhK +cKu +axX +rvS wog wog wog @@ -55378,27 +57241,27 @@ bqk axX wiK fgE -bor -cFb +sap +tTI btt +nmU +dhN +duA +iNR +iaC +xXq +btu +uJj +gwg +voG +duA +iNR +iaC +ayZ +hhK +sCt axX -aao -aao -aao -aao -aao -wog -wog -trk -trk -wog -wog -wog -wog -ibZ -ibZ -wog -wog +rvS wog wog trk @@ -55584,39 +57447,39 @@ bjH blq axX bmt -bmi +btr fOK -trr -bmq +pKP +egL ayZ bpl bpL -bmg +cKu axX -bmi +jAJ brR -bor -bmi +nnU +nVq btu +gHV +dhN +duA +ykR +iaC +pWs +vVz +vVz +vVz +jxA +duA +ykR +iaC +ayZ +nzN +sCt axX -aao -aao -aao -aao +rvS wog -wog -jXX -dxV -dxV -iNR -wog -wog -wog -wog -wog -aao -aao -aao jXX pYt dxV @@ -55801,37 +57664,37 @@ bjH blq axX bmu -bmi +nVq bnw bnZ boq azE -bmi -bor +hhK +cla bql axX axX axX -dQZ axX +tzJ axX axX -aao -aao -aao -wog -wog -hiY -dxV -dxV -pYt -dxV +axX +duA iNR -wog -wog -trk -trk -aao +iaC +iSz +hYB +iAI +wVB +kka +duA +iNR +iaC +ayZ +nzN +sCt +axX aao aao aao @@ -56023,32 +57886,32 @@ bnx boa bor ayZ -bmi -bor -bmg -bmi -bmi -bmi -bor -bmg +hhK +cla +bZJ +btr +btr +jMn +btr +tTI kVT -axX -axX -aao -aao -wog -wog -wog -sDC -dxV -dxV -dxV -dxV +dhN +hYB +ojD +ykR +iaC +iSz +duA iNR -jXX -dxV -aao -aao +iaC +kka +duA +ykR +iaC +iig +nzN +sCt +axX aao aao aao @@ -56237,39 +58100,39 @@ axX bmw bmX bAo -bmg +tTI bos boU -bop -bpM -bmi -bmi -bmi -bmi -bor -bmg -bmi +slG +cZB +cOa +lEi +lEi +tTI +nVq +tTI +sCt +dhN +duA +iNR +iNR +iaC +iSz +duA +iNR +iaC +kka +duA +iNR +iaC +ayZ +hhK +sCt axX aao aao aao aao -wog -wog -wog -ibZ -ibZ -sDC -dxV -dxV -dxV -dxV -aao -aao -aao -aao -aao -aao aao aao wog @@ -56452,42 +58315,42 @@ bjH blr axX bmx -bmW +rdr bnz bob -bmi +gdx ayZ -bmy -bor +bcg +cla bpm -bmi -bre -bmr +izb +rYr +tTI iQC -bob -bmi +nVq +vWm +dhN +duA +iNR +ykR +iaC +iSz +duA +iNR +iaC +kka +duA +ykR +iaC +ayZ +hhK +sCt axX aao aao aao aao aao -wog -wog -wog -wog -hiY -dxV -dxV -aao -aao -aao -aao -aao -aao -aao -aao -aao aao aao wog @@ -56674,32 +58537,32 @@ ayZ ayr ayr ayr -bpe -bor -bmi -bmi -bre +ktY +cla +vCf +mlV +lqo nVq eGM -bob -bmi +btu +dyH +axX +nug +rUN +rUN +oIK +iSz +nug +rUN +oIK +kka +nug +rUN +oIK +ayZ +slC +sCt axX -aao -aao -aao -aao -aao -aao -aao -wog -aao -aao -qUS -aao -aao -aao -aao -aao aao aao aao @@ -56888,36 +58751,36 @@ bsX bmy bmZ bmZ -bmO -bmg +mPK +lck boV -bmi +slC bpN -bmi -bmi -bre -fOK +bqo +bqo +sBm +tTI wFL -bob -bmg axX -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao +axX +axX +ayZ +ayZ +ayZ +ayZ +fEv +ayZ +sNP +ueL +gPh +sNP +ayZ +ayZ +axX +fEv +ayZ +axX +axX aao aao aao @@ -57108,16 +58971,32 @@ bmz boc bmz xDW -bop +eSm +jXf +eSm +ebr bpO -bop -bop -bop -bnq -cuF -bmi -bmi -axX +bpf +tTI +nIi +gZc +nIi +btr +lck +lck +lck +tTI +lck +lck +ouh +tTI +btr +btr +slC +fUp +nVq +sCt +wpn axX aao aao @@ -57127,22 +59006,6 @@ aao aao aao aao -bub -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao -aao wog wog wog @@ -57328,30 +59191,30 @@ axX axX axX axX -axX -bmi -bmg -bor -bmg -bmi -axX +wYE +lTM +bqM +pMi +ayZ +bsP +ayZ +btu +iFa +snv +btu +gFR +tvH +gML +tvH +gML +gFR +btu +btu +ayZ +btu +gdx axX axX -gNH -aao -bjA -bjA -bjA -bjH -bub -bub -bub -aao -aao -aao -aao -aao -aao aao aao aao @@ -57481,7 +59344,7 @@ axC alu ayV ayV -bBg +ayV alu aHF aMg @@ -57543,31 +59406,31 @@ bjx bjx bjx bjx -bjx bjw axX +axX bru -bmg bqM -bmi -bmi +sDZ +axX +axX +axX +axX +axX +axX +axX +axX +axX +axX +axX +axX +axX +axX +axX axX axX axX axX -bjY -bjA -bjA -bjA -bjH -bub -bub -bub -aao -aao -aao -aao -aao aao aao aao @@ -57698,7 +59561,7 @@ axE alu ayW ayV -bBg +ayV alu aHD aBR @@ -57760,17 +59623,17 @@ bjA bjA bjA bjA -bjA -blq +blu +bjw axX brv -bmi bos -bop -bop -bop -bop -boq +szy +vbp +vbp +vbp +vbp +tub axX bjY bjA @@ -57981,12 +59844,12 @@ bjA blq axX brw -bmi -bmg +btu +pRG brO bti -bpC -bmi +idM +ndw bor axX bjY @@ -58418,9 +60281,9 @@ bjx bjx bjw ayr -bmq -bmq -bmi +tdN +maH +slC bor ayr bjY @@ -58637,7 +60500,7 @@ blq ayr bmq bqo -bmi +nVq btJ ayr bjw @@ -58803,8 +60666,8 @@ aXL aPS aOM aof -wvK -wvK +aTa +aTa aof oWe aOM @@ -58852,10 +60715,10 @@ bjy bjy blq bsX -bmi -bmi -bmi -btK +nVq +nVq +nVq +uBi bua buo buo @@ -59069,10 +60932,10 @@ bjy bjy blq maD -bmi -bmi -bsu -bor +nVq +nVq +iQC +cla maD bjw bjw @@ -59285,12 +61148,12 @@ bkb bkb bkb bjw -awp +ayr btj -bkE -bkE -bpo -awp +nVq +nVq +bor +ayr bjw bjY bjy @@ -59502,12 +61365,12 @@ awp awp awp awp -awp +ayr btk -bkE -bkE -bpo -awp +nVq +nVq +bor +ayr bjw bjY bjy @@ -59705,7 +61568,7 @@ aMg awp bkD blx -qeK +aZV bmC bnb bnB @@ -59714,17 +61577,17 @@ bku bmF bmF bpP -bkE -gCx +fBo +nEP brx brU -brx -awp +aCO +ayr btk -bkE +nVq btA -bpo -awp +bor +ayr bjw bjY bjz @@ -59924,24 +61787,24 @@ bmF wtC blT bmD -bmJ +pPo bpp boe awp awp awp bpQ -blX +wvK bqT -blX -blX -blX +wvK +wvK +wvK bsY -bkE -bkE -bkE -bpo -awp +slC +nVq +nVq +bor +ayr bjw bjY bkq @@ -60141,12 +62004,12 @@ bkE bly bly bly -blX -bkE -bkE +wvK +fBo +boe ayF boW -bkE +lTi bpR bnF bnF @@ -60154,11 +62017,11 @@ bry bnF bof dvC -bmF -bmF +eSm +eSm btB btN -awp +ayr bjw bjY bjA @@ -60355,27 +62218,27 @@ erf aHF awp bkG -blX -blX -blX -bkE -bkE -bkE +wvK +wvK +tKr +vin +fBo +boe ayF orZ -bkE +lTi bpS -blX -blX +wvK +wvK brz brV -bkE -awp -awp -awp -awp -awp -awp +boe +ayr +ayr +ayr +ayr +ayr +ayr bjw bjY bjA @@ -60573,20 +62436,20 @@ bkf awp bkH blA -bkE -bkE +wtG +jRn bnd -bnf -boe +wtG +wVw ayF boW -bkE +lTi bpo -bkE +fBo bqV brA brW -gCx +urn awp bjw bjx @@ -61016,7 +62879,7 @@ awM boX bpn bpp -bkE +fBo bnb brB bkN @@ -61235,8 +63098,8 @@ bpo bpU bqv bpU -blX -blX +wvK +wvK bsC awp bjY @@ -61447,12 +63310,12 @@ awM awM awM awM -boX +uTO bpo bpV -bkE +bkU bqX -blX +wvK brY bsD awp @@ -61658,19 +63521,19 @@ aHF awp bkK blB -blX -bkE +tIv +nwB bnf bnf bnf bou -bkE +qHc bpo bpU -bkE +bkU bpU -blX -blX +wvK +wvK bsE awp bjY @@ -61874,19 +63737,19 @@ erf aHF awp bkK -blX -blX -blX -blX +bBg +wvK +wvK +wvK bnE -blX -blX +wvK +wvK boZ bpo bpV -bkE +bkU bqX -bkE +fBo brZ bsF azG @@ -62091,8 +63954,8 @@ auX aHF awp bkL -bkE -bkE +qHc +fBo bly bng bnF @@ -62104,7 +63967,7 @@ bpU bqw bpU brC -blX +nlJ bsG azG btn @@ -62308,20 +64171,20 @@ auX aHF awp bkM -bkE +fBo blV bmF bnh -blX -blX +wvK +wvK bly bpa bpq -blX -blX -bkE -blX -bly +wvK +wvK +fBo +wvK +qqw bsG azG bjY @@ -62530,15 +64393,15 @@ blW ccP bpo bnH -bkE +yar box -bkE +yar iyd iyd eKU -bkE -bkE -blX +yar +yar +aZJ bsG awp bjY @@ -62963,7 +64826,7 @@ blC awp bmG bpo -bkG +lYH awp bWk bWk @@ -63397,7 +65260,7 @@ blC awp bmG bpo -bkE +boe awp bWk bMf @@ -63831,7 +65694,7 @@ blD cGT bmH bnl -blX +pBv ayF vjc bpc @@ -64043,10 +65906,10 @@ asv beI bgx awp -blX -blX +bBg +wvK blY -blX +wvK bnm bnK ayF @@ -64477,11 +66340,11 @@ asv bjL bkg awp -blX +bBg bly bma -bmJ -bmJ +pPo +pPo bnM ayF bWk @@ -64697,7 +66560,7 @@ awp bkS bly bly -blX +wvK bno bnN ayF @@ -64911,8 +66774,8 @@ aZF bjM bgx awp -bkK -bly +dQZ +haT bmb gCx bnp diff --git a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm index b1a2ababa604..8f6063172ff5 100644 --- a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm +++ b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm @@ -1,7 +1,9 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ai" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "ak" = ( /obj/effect/spawner/random/tool, @@ -10,25 +12,35 @@ "al" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "am" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "an" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "ao" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "aq" = ( /turf/closed/wall/solaris/reinforced, @@ -42,13 +54,17 @@ "aD" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "aE" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, /obj/effect/spawner/random/technology_scanner, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "aF" = ( /obj/structure/window/framed/solaris, @@ -56,34 +72,51 @@ /area/bigredv2/outside/engineering) "aT" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "aU" = ( /obj/structure/surface/rack, /obj/item/device/camera_film, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "aV" = ( /obj/structure/surface/rack, /obj/item/device/analyzer, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "aW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "aY" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "aZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "ba" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -91,14 +124,20 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/device/lightreplacer, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/item/stack/sheet/metal, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bc" = ( /obj/structure/machinery/light{ @@ -107,41 +146,58 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bd" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/landmark/hunter_secondary, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "be" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /obj/effect/decal/cleanable/liquid_fuel, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bg" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bi" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/mask/breath, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/stack/sheet/metal, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bk" = ( /obj/effect/decal/cleanable/dirt, @@ -149,7 +205,9 @@ dir = 1; pixel_y = -30 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bl" = ( /obj/effect/decal/cleanable/liquid_fuel, @@ -158,7 +216,9 @@ name = "Storm Shutters"; pixel_y = -32 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bm" = ( /obj/structure/bed/chair{ @@ -166,26 +226,35 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bn" = ( /obj/structure/surface/table, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/glasses/welding, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bo" = ( /obj/structure/bed/chair{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bp" = ( /obj/item/folder/yellow, /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "bq" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -194,14 +263,18 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engineering Workshop" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "br" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bs" = ( /obj/effect/decal/cleanable/dirt, @@ -217,41 +290,60 @@ dir = 1; name = "\improper Engine Reactor Control" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/telecomm/engi) "bv" = ( /obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bw" = ( -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bx" = ( /obj/structure/machinery/computer/arcade, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "by" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bz" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/metal, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bA" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bB" = ( /obj/item/stack/sheet/glass, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bC" = ( /obj/effect/decal/cleanable/dirt, @@ -269,19 +361,30 @@ dir = 8 }, /obj/effect/spawner/random/technology_scanner, -/turf/open/floor, +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/telecomm/engi) "bF" = ( /obj/structure/machinery/camera/autoname, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/telecomm/engi) "bG" = ( -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/telecomm/engi) "bH" = ( /obj/structure/surface/table, /obj/effect/decal/cleanable/ash, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bJ" = ( /obj/structure/bed/chair{ @@ -290,46 +393,70 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bK" = ( /obj/item/folder/yellow, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "bL" = ( /obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bM" = ( /obj/structure/machinery/vending/snack, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bN" = ( /obj/structure/machinery/vending/cola, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bO" = ( /obj/structure/bed/chair/office/light{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bP" = ( /obj/structure/surface/table, /obj/effect/spawner/random/powercell, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bQ" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "bR" = ( /obj/structure/machinery/light{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "bS" = ( /obj/structure/bed/chair/office/light{ @@ -338,13 +465,18 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/telecomm/engi) "bT" = ( /obj/structure/pipes/vents/pump{ dir = 8 }, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/telecomm/engi) "bU" = ( /obj/item/device/radio/intercom{ @@ -353,21 +485,27 @@ name = "General Listening Channel"; pixel_x = 30 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "podhatchfloor" + }, /area/bigredv2/outside/telecomm/engi) "bV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bY" = ( /obj/effect/decal/cleanable/dirt, @@ -375,19 +513,27 @@ amount = 30 }, /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "bZ" = ( /obj/structure/surface/table, /obj/effect/decal/cleanable/dirt, /obj/item/tool/pen, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "ca" = ( /obj/structure/sign/safety/hazard{ pixel_y = -32 }, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "ce" = ( /obj/item/tool/lighter/random, @@ -395,7 +541,9 @@ dir = 4 }, /obj/effect/decal/cleanable/ash, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "cf" = ( /obj/item/stack/sheet/metal, @@ -411,38 +559,55 @@ /area/bigredv2/outside/engineering) "ch" = ( /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "ck" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/suit/radiation, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, /area/bigredv2/outside/engineering) "cl" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/welding, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cn" = ( /obj/structure/machinery/door/airlock/almayer/secure/colony{ dir = 1; name = "\improper Engine Reactor" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "co" = ( /obj/structure/closet/radiation, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "cp" = ( /obj/item/folder/yellow, /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cq" = ( /obj/effect/decal/cleanable/ash, @@ -453,7 +618,10 @@ /area/bigredv2/outside/telecomm/engi) "cr" = ( /obj/effect/decal/cleanable/molten_item, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/telecomm/engi) "cs" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -462,7 +630,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engine Reactor Control" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/telecomm/engi) "ct" = ( /obj/structure/machinery/door_control{ @@ -480,7 +650,9 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Engine Reactor Control" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/telecomm/engi) "cw" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -494,18 +666,24 @@ /obj/structure/machinery/constructable_frame{ icon_state = "box_1" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/constructable_frame, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cz" = ( /obj/structure/surface/table, /obj/structure/machinery/light, /obj/effect/spawner/random/tool, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cA" = ( /obj/structure/surface/table, @@ -513,7 +691,10 @@ /obj/item/stack/sheet/metal{ amount = 30 }, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cB" = ( /obj/structure/machinery/light{ @@ -522,7 +703,9 @@ /obj/structure/sign/safety/high_rad{ pixel_x = 32 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "cC" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -534,7 +717,10 @@ /area/bigredv2/outside/engineering) "cD" = ( /obj/structure/machinery/computer/area_atmos, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cE" = ( /obj/structure/machinery/light{ @@ -543,12 +729,17 @@ /obj/structure/sign/safety/high_rad{ pixel_x = -32 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/engineering) "cF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cG" = ( /obj/structure/window/framed/solaris/reinforced, @@ -564,7 +755,9 @@ /obj/effect/landmark/static_comms/net_two{ broken_on_spawn = 1 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "podhatchfloor" + }, /area/bigredv2/outside/telecomm/engi) "cI" = ( /obj/structure/sign/safety/hazard{ @@ -572,12 +765,16 @@ }, /obj/effect/decal/cleanable/dirt, /obj/item/tool/extinguisher, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "cK" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/molten_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/telecomm/engi) "cM" = ( /turf/open/mars, @@ -615,7 +812,9 @@ dir = 1; name = "\improper Engineering Complex" }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "delivery" + }, /area/bigredv2/outside/engineering) "cY" = ( /turf/open/mars_cave{ @@ -655,7 +854,10 @@ dir = 8 }, /obj/effect/decal/cleanable/ash, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/engineering) "dj" = ( /obj/effect/decal/cleanable/dirt/greenglow, @@ -991,7 +1193,10 @@ /area/bigredv2/outside/engineering) "eI" = ( /obj/effect/decal/cleanable/ash, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/telecomm/engi) "eJ" = ( /obj/effect/decal/cleanable/molten_item, @@ -1024,6 +1229,31 @@ "eO" = ( /turf/closed/wall/mineral/uranium/leaking, /area/bigredv2/outside/engineering) +"fI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) +"gT" = ( +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"im" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) +"iQ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "jr" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ @@ -1034,6 +1264,14 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave, /area/bigredv2/outside/lz2_south_cas) +"ng" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) "oE" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "rad_door"; @@ -1041,12 +1279,26 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/telecomm/engi) +"oK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "sU" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ icon_state = "mars_dirt_6" }, /area/bigredv2/outside/lz2_south_cas) +"to" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "vs" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/telecomm/engi) @@ -1058,6 +1310,19 @@ icon_state = "panelscorched" }, /area/bigredv2/outside/telecomm/engi) +"xl" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) +"xz" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/telecomm/engi) "yH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1072,7 +1337,9 @@ /area/bigredv2/outside/lz2_south_cas) "Bo" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/telecomm/engi) "CA" = ( /obj/effect/decal/cleanable/dirt, @@ -1083,6 +1350,26 @@ icon_state = "panelscorched" }, /area/bigredv2/outside/telecomm/engi) +"Dh" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/engineering) +"Dq" = ( +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"ET" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "IE" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ @@ -1093,12 +1380,31 @@ /obj/structure/window_frame/solaris/reinforced, /turf/open/floor/plating, /area/bigredv2/outside/telecomm/engi) +"Lf" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) "LE" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/plating{ icon_state = "panelscorched" }, /area/bigredv2/outside/telecomm/engi) +"Nv" = ( +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/engineering) +"NT" = ( +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/telecomm/engi) "NX" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars{ @@ -1116,10 +1422,35 @@ icon_state = "panelscorched" }, /area/bigredv2/outside/telecomm/engi) +"Sz" = ( +/obj/item/stack/sheet/glass, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) +"SC" = ( +/turf/open/floor{ + icon_state = "delivery" + }, +/area/bigredv2/outside/engineering) +"Tv" = ( +/turf/open/floor{ + icon_state = "podhatchfloor" + }, +/area/bigredv2/outside/telecomm/engi) "Uo" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "podhatchfloor" + }, /area/bigredv2/outside/telecomm/engi) +"WI" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/engineering) (1,1,1) = {" au @@ -1131,7 +1462,7 @@ bp by ai bX -bQ +fI cx cG Ah @@ -1161,9 +1492,9 @@ au au an bz -bw +Nv bY -bw +Nv cy cG NX @@ -1192,10 +1523,10 @@ au au au an -bw +Nv bO -bw -bw +Nv +Nv cz aq Ph @@ -1227,7 +1558,7 @@ an bA bP bZ -bQ +WI cA aq Ph @@ -1287,9 +1618,9 @@ au au au au -an +ng bw -bQ +oK ca aq co @@ -1321,8 +1652,8 @@ aU bw br bB -bw -bQ +Nv +fI cn cB cn @@ -1350,11 +1681,11 @@ au au au aV -bw -an -bw -bw -bw +Nv +ng +Nv +Nv +gT aq aq aq @@ -1384,9 +1715,9 @@ au aW ai bs -bw +Nv ew -bB +Sz co co dk @@ -1479,8 +1810,8 @@ au au aZ bQ -bQ -bQ +WI +WI bR ez cC @@ -1510,7 +1841,7 @@ au au au ba -bQ +iQ vs vs vs @@ -1542,7 +1873,7 @@ au au au an -bw +gT vs bE eI @@ -1574,7 +1905,7 @@ au au au aZ -bQ +iQ vs bF bS @@ -1606,12 +1937,12 @@ ak au au bb -bQ +fI bu bG bT -bG -Uo +NT +xz RN eE oE @@ -1670,9 +2001,9 @@ au au au bd -bQ +iQ vs -bG +Tv bU ct RN @@ -1701,7 +2032,7 @@ dR au au au -an +ng bl vs vs @@ -1733,13 +2064,13 @@ dT au au au -an +ng ck bw bw di bw -bQ +fI ew dr cS @@ -1769,8 +2100,8 @@ be bm bv bv -bQ -bw +fI +Nv ez ew dr @@ -1797,11 +2128,11 @@ dT au au au -an +ng bn aE bH -bQ +fI ch ew ew @@ -1829,11 +2160,11 @@ dT au au au -an +ng aD al ce -bw +Nv ew ew cD @@ -1865,8 +2196,8 @@ bf bo bo bJ -bQ -bQ +fI +iQ aq aq aq @@ -1894,11 +2225,11 @@ au au au bg -ai -ai -bg +to +Dh +im bV -bQ +fI cn cE cn @@ -1994,11 +2325,11 @@ au aq bM ao -ai -ai -ai -ai -ai +xl +ET +ET +ET +ET am aq as @@ -2025,13 +2356,13 @@ au au aq bN -bw +Dq cm bR cF aT -bw -an +Nv +Lf aq as as @@ -2062,7 +2393,7 @@ aq aq aq aq -bw +SC cX aq as diff --git a/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm b/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm index 47984a920749..adbdf51bd259 100644 --- a/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm +++ b/maps/map_files/BigRed/sprinkles/35.filtration_restored.dmm @@ -7,7 +7,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "ad" = ( /obj/effect/decal/cleanable/dirt, @@ -17,12 +19,16 @@ /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "af" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "ah" = ( /obj/structure/window/framed/solaris, @@ -36,13 +42,19 @@ /area/bigredv2/caves) "ak" = ( /obj/structure/closet/wardrobe/atmospherics_yellow, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "al" = ( /obj/structure/surface/table, /obj/item/tool/lighter/random, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "am" = ( /turf/open/floor{ @@ -53,43 +65,59 @@ "an" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "ap" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "aq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "ar" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "as" = ( /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "at" = ( /obj/structure/bed/chair{ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "au" = ( /obj/structure/machinery/computer/atmos_alert{ dir = 8 }, /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "av" = ( /obj/item/tool/warning_cone, @@ -123,8 +151,8 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony{ name = "\improper Atmospherics Condenser Storage" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "aB" = ( @@ -132,8 +160,8 @@ dir = 1; name = "\improper Atmospherics Condenser" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "aC" = ( @@ -141,7 +169,9 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aD" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -149,14 +179,16 @@ name = "\improper Atmospherics Condenser" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "aE" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/radio/headset, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aF" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/chan, @@ -173,7 +205,9 @@ /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aJ" = ( /turf/open/floor{ @@ -187,39 +221,49 @@ /area/bigredv2/outside/se) "aL" = ( /obj/structure/reagent_dispensers/fueltank, -/turf/open/floor{ - dir = 1; - icon_state = "bot" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "aM" = ( /obj/structure/reagent_dispensers/watertank, -/turf/open/floor{ - dir = 1; - icon_state = "bot" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "aN" = ( /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aO" = ( /obj/structure/pipes/vents/pump, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aP" = ( /obj/effect/landmark/crap_item, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aQ" = ( /obj/structure/surface/table, /obj/effect/landmark/good_item, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "aR" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "aS" = ( /turf/open/floor{ @@ -229,9 +273,8 @@ /area/bigredv2/outside/filtration_plant) "aT" = ( /obj/structure/dispenser/oxygen, -/turf/open/floor{ - dir = 1; - icon_state = "bot" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "aV" = ( @@ -239,24 +282,34 @@ icon_state = "U-N" }, /obj/structure/machinery/computer3/server/rack, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aW" = ( /obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "aY" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/filtration_plant) "aZ" = ( /obj/structure/machinery/computer/general_air_control, -/turf/open/floor, +/obj/structure/surface/table, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bb" = ( /obj/structure/surface/table, @@ -264,23 +317,34 @@ /obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, /obj/effect/spawner/random/tool, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bd" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "be" = ( /obj/structure/surface/table, /obj/item/circuitboard/solar_tracker, -/turf/open/floor, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bf" = ( /obj/structure/machinery/light{ @@ -293,34 +357,53 @@ /obj/effect/decal/warning_stripes{ icon_state = "U-S" }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bh" = ( /obj/effect/decal/warning_stripes{ icon_state = "U-S" }, /obj/structure/machinery/computer3/server/rack, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bj" = ( /obj/structure/surface/rack, /obj/item/tank/air, /obj/item/tool/pickaxe, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bk" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, /obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bl" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; name = "\improper Filtration Facility" }, -/turf/open/floor{ - icon_state = "delivery" +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bm" = ( @@ -329,34 +412,42 @@ name = "\improper Filtration Facility" }, /obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bn" = ( -/obj/structure/closet/firecloset/full, /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 }, -/turf/open/floor, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bo" = ( /obj/item/tank/air, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bp" = ( /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bq" = ( /obj/effect/landmark/crap_item, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "br" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ @@ -365,8 +456,8 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "bt" = ( @@ -378,7 +469,9 @@ dir = 4 }, /obj/item/frame/table, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bv" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber/huge/chan, @@ -393,7 +486,9 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bz" = ( /obj/effect/decal/cleanable/dirt, @@ -413,7 +508,10 @@ /obj/structure/machinery/computer/atmos_alert{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bD" = ( /obj/structure/window/framed/solaris/reinforced/hull, @@ -435,11 +533,20 @@ /area/bigredv2/outside/filtration_plant) "bG" = ( /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bH" = ( -/obj/structure/machinery/computer/area_atmos/area, -/turf/open/floor, +/obj/structure/machinery/computer/area_atmos/area{ + dir = 8 + }, +/obj/structure/surface/table, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bI" = ( /obj/structure/window_frame/solaris/reinforced, @@ -450,7 +557,10 @@ /area/bigredv2/outside/filtration_plant) "bJ" = ( /obj/item/weapon/twohanded/fireaxe, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bK" = ( /turf/open/mars, @@ -458,7 +568,10 @@ "bN" = ( /obj/structure/surface/table, /obj/effect/spawner/random/technology_scanner, -/turf/open/floor, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bO" = ( /turf/open/mars_cave{ @@ -475,29 +588,36 @@ /obj/structure/surface/table, /obj/effect/spawner/random/technology_scanner, /obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bS" = ( /obj/item/frame/table, /obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bT" = ( /obj/effect/decal/cleanable/dirt, /obj/item/frame/table, /obj/effect/decal/cleanable/dirt, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "bU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "bW" = ( -/obj/structure/largecrate/random, /turf/open/floor{ - dir = 1; - icon_state = "bot" + icon_state = "dark" }, /area/bigredv2/outside/filtration_plant) "bX" = ( @@ -519,7 +639,9 @@ pixel_x = -32 }, /obj/structure/machinery/light, -/turf/open/floor, +/turf/open/floor{ + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "ce" = ( /obj/structure/machinery/light, @@ -533,8 +655,8 @@ id = "FiltrationShutters"; name = "\improper Airlock Shutters" }, -/turf/open/floor{ - icon_state = "delivery" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/bigredv2/outside/filtration_plant) "cg" = ( @@ -559,7 +681,10 @@ /area/bigredv2/outside/filtration_cave_cas) "cj" = ( /obj/item/tool/pickaxe, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "bot" + }, /area/bigredv2/outside/filtration_plant) "ck" = ( /obj/effect/decal/warning_stripes{ @@ -581,13 +706,61 @@ icon_state = "delivery" }, /area/bigredv2/outside/filtration_plant) +"cO" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/bigredv2/outside/filtration_plant) +"et" = ( +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/bigredv2/outside/filtration_plant) +"eL" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 5; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"ff" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) +"gt" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"hk" = ( +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "jh" = ( /obj/structure/machinery/light, /turf/open/floor, /area/bigredv2/outside/filtration_plant) "ka" = ( /obj/structure/closet/firecloset/full, -/turf/open/floor, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"kE" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "nk" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -597,23 +770,152 @@ /obj/item/tank/air, /turf/open/floor, /area/bigredv2/outside/filtration_plant) +"oE" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) +"qi" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor{ + dir = 1; + icon_state = "bot" + }, +/area/bigredv2/outside/filtration_plant) +"ti" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 1; + icon_state = "bot" + }, +/area/bigredv2/outside/filtration_plant) +"tp" = ( +/obj/structure/largecrate/random, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"tz" = ( +/turf/open/floor{ + dir = 9; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "tB" = ( /obj/effect/landmark/crap_item, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) +"vK" = ( +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"xd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"yi" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"yZ" = ( +/turf/open/floor{ + dir = 8; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/filtration_plant) "zu" = ( /turf/open/mars_cave{ icon_state = "mars_cave_7" }, /area/bigredv2/outside/filtration_cave_cas) +"Ap" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor{ + dir = 4; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/filtration_plant) +"AD" = ( +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"Ee" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"FI" = ( +/turf/open/floor{ + dir = 4; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"FK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor{ + icon_state = "dark" + }, +/area/bigredv2/outside/filtration_plant) +"Jy" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor{ + dir = 1; + icon_state = "bot" + }, +/area/bigredv2/outside/filtration_plant) +"Kp" = ( +/obj/structure/surface/table, +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "Ms" = ( /obj/structure/machinery/computer3/server/rack, /obj/effect/decal/warning_stripes{ icon_state = "U-N" }, -/turf/open/floor, +/turf/open/floor{ + dir = 8; + icon_state = "darkyellow2" + }, /area/bigredv2/outside/filtration_plant) "Qx" = ( /obj/effect/decal/cleanable/dirt, @@ -623,6 +925,12 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"QJ" = ( +/turf/open/floor{ + dir = 10; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "Rv" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor{ @@ -630,11 +938,36 @@ icon_state = "asteroidwarning" }, /area/bigredv2/outside/filtration_plant) +"Sj" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 1; + name = "\improper Filtration Facility" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/bigredv2/outside/filtration_plant) +"Sk" = ( +/obj/structure/machinery/light, +/obj/structure/largecrate/random, +/turf/open/floor{ + dir = 6; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) +"TC" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "TX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor, +/turf/open/floor{ + icon_state = "dark" + }, /area/bigredv2/outside/filtration_plant) "UH" = ( /obj/effect/decal/warning_stripes{ @@ -656,12 +989,34 @@ icon_state = "bot" }, /area/bigredv2/outside/filtration_plant) +"Wc" = ( +/turf/open/floor{ + dir = 1; + icon_state = "darkyellowcorners2" + }, +/area/bigredv2/outside/filtration_plant) +"Wz" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "WD" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave{ icon_state = "mars_cave_2" }, /area/bigredv2/outside/filtration_cave_cas) +"Xx" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/technology_scanner, +/turf/open/floor{ + icon_state = "darkyellow2" + }, +/area/bigredv2/outside/filtration_plant) "XC" = ( /obj/structure/cargo_container/grant/right, /turf/open/floor{ @@ -710,12 +1065,12 @@ TX ap aa aL -aS +et aL aL aa -az -az +tz +vK bJ bw bw @@ -734,16 +1089,16 @@ bw (3,1,1) = {" ak TX -jh +TC aa -bf -az -az -az +oE +FK +FK +FK bl -az +bW bp -az +AD bw bw bw @@ -761,19 +1116,19 @@ aY (4,1,1) = {" ak TX -az +AD aa aT aM aT -aS +et aa -az +hk TX -az +yZ bU bB -bG +Kp aY cg az @@ -795,17 +1150,17 @@ aa aa aa aa -bf +Wz bq -az -az -az +bW +bW +bW cb aY bf ad -ad -ad +ti +ti az aS aS @@ -817,22 +1172,22 @@ al ac aq aa -az +tz bg Ms -az +QJ aa -az +hk TX -aS -aS -aS -az +bW +bW +bW +bW cf az ad -ad -az +ti +aS az aS VW @@ -840,21 +1195,21 @@ az bw "} (7,1,1) = {" -ad +ff aC ar aB -az -az -az -az -bl -az +bW +bW +bW +bW +Sj +bW TX -aL bW -aS -az +bW +bW +bW cf az az @@ -871,22 +1226,22 @@ an ae as ah -az +hk bh aV -ad +gt ah -ad +xd TX -aS -aS bW -az +bW +bW +bW cf az az -az -az +aS +aS az aS XC @@ -901,19 +1256,19 @@ aD aN aN ar -az +AD ah -az +hk TX -aS -aS -aS -az +bW +bW +bW +bW cf az az -az -az +aS +aS np bz aS @@ -921,25 +1276,25 @@ jh aY "} (10,1,1) = {" -ad +ff aE at aa -bf -az +Wz +bW ac bk aa -bf +eL TX -az -az -az -jh +FI +yi +tp +Sk aY bf az -az +aS cj az aS @@ -980,11 +1335,11 @@ ah ah aa ka -az +bW TX -az +AD aa -az +tz TX bN bw @@ -1013,7 +1368,7 @@ aN bm aN aW -bN +Xx bt bF bF @@ -1034,11 +1389,11 @@ ai ai aa bb -az -az -jh +bW +bW +TC ay -bf +Wz TX bQ bw @@ -1065,9 +1420,9 @@ aR aQ be aa -az +hk TX -bN +Xx bw bF bF @@ -1092,9 +1447,9 @@ aa ay aa aa -az +hk TX -az +AD bw bD bD @@ -1116,10 +1471,10 @@ am am am aY -bf +Ee bj bj -az +Wc TX bS aa @@ -1142,14 +1497,14 @@ am am am am -US -az -az -az -az +et +bW +bW +bW +bW bu -ad -cn +ff +cO WD bO bO @@ -1169,14 +1524,14 @@ am am am am -US -az -az +et +bW +bW aP aO by -az -US +bW +et WD bO bO @@ -1196,14 +1551,14 @@ am am am am -US -az -az -ad +et +FI +FI +Ap bo -az +bW bT -US +et WD bO bO @@ -1224,12 +1579,12 @@ am aG aG aY -bf -ka +qi +Jy bn -az -az -jh +FI +FI +kE bX WD bO diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 3d97333ad161..ba11b0b8ee3d 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -283,6 +283,9 @@ /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" = ( @@ -398,7 +401,7 @@ "aco" = ( /obj/effect/landmark/crap_item, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/gm/dirt, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_east_caves) "acp" = ( /turf/closed/wall/cult, @@ -506,7 +509,7 @@ /obj/structure/tunnel{ id = "hole1" }, -/turf/open/gm/dirt, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/west_caves) "acL" = ( /obj/item/tool/shovel, @@ -581,6 +584,9 @@ /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" = ( @@ -2581,6 +2587,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, @@ -2708,6 +2721,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, @@ -7923,6 +7940,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{ @@ -7930,6 +7953,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, @@ -9532,6 +9566,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, @@ -10445,6 +10487,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{ @@ -11911,6 +11959,11 @@ icon_state = "red" }, /area/lv624/lazarus/security) +"aYI" = ( +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/lv624/ground/caves/south_west_caves) "aYJ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/trash/chips, @@ -12266,6 +12319,13 @@ /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, @@ -12344,6 +12404,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{ @@ -12414,9 +12497,21 @@ /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"bje" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 9 + }, +/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, @@ -12444,6 +12539,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, @@ -12476,6 +12577,10 @@ /obj/structure/flora/jungle/vines/light_1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"brC" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) "bsR" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) @@ -12548,6 +12653,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) @@ -12558,6 +12674,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, @@ -12601,6 +12723,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) @@ -12614,6 +12744,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) @@ -12667,6 +12805,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, @@ -12703,6 +12847,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; @@ -12717,6 +12870,17 @@ }, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) +"bPE" = ( +/obj/structure/flora/bush/ausbushes/pointybush, +/turf/open/auto_turf/strata_grass/layer1, +/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"; @@ -12828,6 +12992,10 @@ icon_state = "white" }, /area/lv624/lazarus/medbay) +"cdw" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_west_caves) "cdF" = ( /obj/effect/landmark/nightmare{ insert_tag = "lv-centralcaves" @@ -12843,6 +13011,11 @@ "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) @@ -12885,6 +13058,16 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) +"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_west_caves) "cij" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, @@ -12914,6 +13097,13 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"clO" = ( +/obj/effect/landmark/crap_item, +/obj/effect/decal/grass_overlay/grass1{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "cmf" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/grass/grass1, @@ -12936,6 +13126,12 @@ icon_state = "squareswood" }, /area/lv624/ground/caves/sand_temple) +"cop" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/east_caves) "cpQ" = ( /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) @@ -12954,6 +13150,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, @@ -12962,6 +13166,23 @@ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz1) +"cqH" = ( +/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, @@ -12994,13 +13215,17 @@ icon_state = "desert_dug" }, /area/lv624/ground/barrens/west_barrens) +"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, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_central_jungle) "czq" = ( /obj/effect/landmark/objective_landmark/science, -/turf/open/gm/dirt, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/central_caves) "czu" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, @@ -13048,6 +13273,11 @@ "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, @@ -13072,6 +13302,12 @@ /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, @@ -13084,6 +13320,12 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"cHW" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "cIL" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, @@ -13096,6 +13338,9 @@ /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) "cJw" = ( @@ -13131,6 +13376,12 @@ /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, @@ -13156,6 +13407,10 @@ "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, @@ -13181,6 +13436,12 @@ /obj/item/tool/surgery/surgicaldrill/predatorsurgicaldrill, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"cSL" = ( +/obj/item/reagent_container/food/snacks/grown/mushroom/plumphelmet{ + pixel_x = 8 + }, +/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, @@ -13202,6 +13463,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, @@ -13229,6 +13494,14 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"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 = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "dbA" = ( /obj/structure/xenoautopsy/tank, /turf/open/shuttle{ @@ -13265,7 +13538,7 @@ /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/gm/dirt, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/east_caves) "dhp" = ( /obj/structure/flora/bush/ausbushes/reedbush, @@ -13316,9 +13589,18 @@ /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, @@ -13376,6 +13658,13 @@ icon_state = "green" }, /area/lv624/lazarus/hydroponics) +"dtr" = ( +/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) "dvf" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, @@ -13438,6 +13727,31 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) +"dzM" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 1 + }, +/turf/open/gm/dirt, +/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 + }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/north_east_barrens) "dCL" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle{ pixel_x = 2 @@ -13482,6 +13796,9 @@ "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" = ( @@ -13495,6 +13812,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"dHg" = ( +/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, @@ -13505,6 +13826,18 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/medbay) +"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) "dID" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata{ @@ -13526,6 +13859,10 @@ "dKg" = ( /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"dKl" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/west_caves) "dLd" = ( /obj/structure/bookcase, /obj/item/book/manual/research_and_development, @@ -13537,6 +13874,13 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) +"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, /turf/closed/wall/r_wall, @@ -13547,6 +13891,12 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_jungle) +"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, /area/lv624/ground/jungle/east_jungle) @@ -13578,11 +13928,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, @@ -13641,12 +13999,18 @@ /area/lv624/lazarus/crashed_ship_containers) "dWM" = ( /obj/effect/landmark/monkey_spawn, -/turf/open/gm/dirt, +/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, @@ -13670,6 +14034,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, /area/lv624/ground/barrens/central_barrens) +"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 @@ -13683,6 +14055,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) @@ -13709,9 +14089,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" @@ -13743,6 +14141,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, @@ -13774,6 +14180,22 @@ icon_state = "green" }, /area/lv624/lazarus/hydroponics) +"elp" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 10 + }, +/obj/effect/decal/grass_overlay/grass1{ + dir = 10 + }, +/turf/open/gm/dirt, +/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/barrens/north_east_barrens) "eny" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/gm/grass/grass1, @@ -13788,6 +14210,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{ @@ -13817,6 +14243,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) @@ -13831,6 +14261,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) "euh" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/gm/dirt, @@ -13989,6 +14423,12 @@ icon_state = "floor4" }, /area/lv624/lazarus/crashed_ship_containers) +"eMe" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 8 + }, +/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) @@ -14026,6 +14466,9 @@ /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, @@ -14046,6 +14489,10 @@ 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) "eYh" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, @@ -14059,6 +14506,10 @@ /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, @@ -14090,6 +14541,16 @@ /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) @@ -14196,12 +14657,25 @@ icon_state = "asteroidfloor" }, /area/lv624/lazarus/corporate_dome) +"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" = ( /turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/barrens/east_barrens) "fqh" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_jungle) +"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 @@ -14211,6 +14685,12 @@ icon_state = "asteroidwarning" }, /area/lv624/ground/colony/telecomm/sw_lz2) +"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{ @@ -14218,6 +14698,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 @@ -14313,10 +14799,18 @@ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz1) +"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, @@ -14357,6 +14851,11 @@ icon_state = "asteroidfloor" }, /area/lv624/ground/colony/telecomm/cargo) +"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, /turf/open/gm/grass/grass1, @@ -14391,12 +14890,24 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor, /area/lv624/lazarus/medbay) +"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) +"fKc" = ( +/obj/structure/flora/bush/ausbushes/ausbush, +/turf/open/auto_turf/strata_grass/layer1, +/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; @@ -14422,6 +14933,14 @@ "fQL" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) +"fRD" = ( +/obj/structure/flora/bush/ausbushes/ausbush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/north_east_caves) +"fRU" = ( +/obj/structure/flora/bush/ausbushes/genericbush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/west_caves) "fSX" = ( /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) @@ -14441,6 +14960,14 @@ "fTM" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) +"fTN" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/strata_grass/layer1, +/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, @@ -14454,6 +14981,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) @@ -14487,6 +15018,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{ @@ -14572,6 +15113,16 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"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" @@ -14581,6 +15132,10 @@ /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) "gpC" = ( /obj/structure/flora/jungle/vines/light_2, /obj/structure/flora/jungle/vines/heavy, @@ -14599,10 +15154,21 @@ /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) "grZ" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/plating, /area/lv624/ground/barrens/central_barrens) +"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{ @@ -14642,6 +15208,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) @@ -14660,6 +15237,12 @@ }, /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" @@ -14671,6 +15254,10 @@ 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, @@ -14746,12 +15333,22 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"gPu" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "gPN" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/barrens/south_eastern_barrens) "gQr" = ( /turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) +"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, @@ -14759,6 +15356,12 @@ "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) "gTu" = ( /obj/structure/filingcabinet{ density = 0; @@ -14791,6 +15394,18 @@ "gUq" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_east_jungle) +"gVw" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 8 + }, +/turf/open/gm/dirt, +/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{ @@ -14806,6 +15421,12 @@ 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, @@ -14831,6 +15452,16 @@ /obj/structure/prop/brazier, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) +"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, @@ -14882,6 +15513,16 @@ 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 @@ -14914,6 +15555,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; @@ -14929,6 +15575,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{ @@ -14938,6 +15590,25 @@ }, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) +"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) +"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, @@ -14953,6 +15624,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) "hpN" = ( /obj/structure/surface/table, /obj/effect/landmark/good_item, @@ -14988,6 +15669,15 @@ "hsc" = ( /turf/closed/wall/r_wall, /area/lv624/ground/river/central_river) +"htV" = ( +/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) "huH" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/flora/jungle/vines/light_3, @@ -15007,6 +15697,13 @@ /obj/effect/decal/remains/xeno, /turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"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, @@ -15042,6 +15739,10 @@ /obj/effect/decal/remains/xeno, /turf/open/gm/dirt, /area/lv624/ground/colony/west_tcomms_road) +"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, @@ -15106,6 +15807,10 @@ }, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) +"hKP" = ( +/obj/effect/decal/grass_overlay/grass1/inner, +/turf/open/gm/dirt, +/area/lv624/ground/caves/north_west_caves) "hLu" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_central_jungle) @@ -15143,6 +15848,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 @@ -15159,6 +15868,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, @@ -15184,6 +15905,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) @@ -15261,6 +15986,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) +"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; @@ -15289,10 +16018,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) +"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) @@ -15303,6 +16046,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{ @@ -15319,6 +16067,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, @@ -15326,6 +16078,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{ @@ -15355,6 +16114,13 @@ }, /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) "isR" = ( /obj/effect/landmark/objective_landmark/medium, /obj/structure/largecrate/random, @@ -15369,6 +16135,13 @@ icon_state = "asteroidwarning" }, /area/lv624/lazarus/landing_zones/lz2) +"iuf" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 10 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "iuO" = ( /turf/open/gm/dirtgrassborder{ icon_state = "desert3" @@ -15400,6 +16173,12 @@ icon_state = "multi_tiles" }, /area/lv624/ground/caves/sand_temple) +"iye" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 8 + }, +/turf/open/gm/dirt, +/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, @@ -15452,6 +16231,11 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/west_nexus_road) +"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{ @@ -15462,10 +16246,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, @@ -15514,6 +16307,10 @@ /obj/structure/ore_box, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) +"iNJ" = ( +/obj/structure/flora/bush/ausbushes/var3/leafybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/north_west_caves) "iOz" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -15555,6 +16352,14 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) +"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, @@ -15581,6 +16386,10 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/colony/west_nexus_road) +"iXX" = ( +/obj/item/reagent_container/food/snacks/grown/mushroom/angel, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/north_west_caves) "iYJ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1, @@ -15613,6 +16422,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, @@ -15625,10 +16440,30 @@ "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) +"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 @@ -15652,6 +16487,12 @@ /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; @@ -15675,6 +16516,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{ @@ -15699,6 +16555,12 @@ /obj/structure/cargo_container/lockmart/mid, /turf/open/floor, /area/lv624/ground/barrens/containers) +"jvQ" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 8 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "jwW" = ( /turf/open/floor/plating{ dir = 6; @@ -15774,6 +16636,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, @@ -15798,6 +16673,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) @@ -15821,6 +16702,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, @@ -15850,6 +16741,12 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) +"jLY" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/north_west_caves) "jMk" = ( /obj/structure/lattice{ layer = 2.9 @@ -15865,6 +16762,12 @@ icon_state = "warnplate" }, /area/lv624/lazarus/engineering) +"jMD" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 6 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_east_caves) "jMH" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -15939,6 +16842,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, @@ -16001,6 +16914,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{ @@ -16023,6 +16950,10 @@ /obj/effect/landmark/lv624/fog_blocker, /turf/closed/wall/rock/brown, /area/lv624/ground/river/west_river) +"kdj" = ( +/obj/structure/flora/bush/ausbushes/pointybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) "keS" = ( /turf/open/floor/plating, /area/lv624/ground/barrens/east_barrens/ceiling) @@ -16049,6 +16980,18 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/east_jungle) +"klD" = ( +/obj/effect/decal/grass_overlay/grass1{ + 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, @@ -16068,6 +17011,12 @@ /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"kpx" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 5 + }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/north_east_barrens) "kqx" = ( /obj/structure/flora/jungle/plantbot1, /obj/structure/flora/jungle/vines/light_3, @@ -16077,6 +17026,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, @@ -16103,6 +17064,12 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) +"ktr" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 6 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/north_east_caves) "kuP" = ( /obj/item/tool/hatchet{ pixel_x = 6; @@ -16133,12 +17100,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, @@ -16160,6 +17140,12 @@ icon_state = "green" }, /area/lv624/lazarus/hydroponics) +"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, @@ -16168,6 +17154,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, @@ -16199,6 +17189,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, @@ -16221,6 +17215,10 @@ "kHU" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) +"kIM" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) "kJm" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) @@ -16232,11 +17230,31 @@ /obj/structure/flora/jungle/planttop1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_west_jungle) +"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, +/area/lv624/ground/caves/central_caves) "kLP" = ( /obj/structure/flora/jungle/plantbot1, /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, @@ -16303,6 +17321,12 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_tcomms_road) +"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/west_caves) "kVP" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, @@ -16318,6 +17342,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; @@ -16361,6 +17389,11 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) +"lav" = ( +/turf/open/gm/dirt{ + icon_state = "desert_dug" + }, +/area/lv624/ground/caves/west_caves) "laY" = ( /obj/structure/flora/jungle/vines/light_1, /turf/closed/wall/strata_ice/jungle, @@ -16368,12 +17401,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) +"ldi" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_east_caves) "ldB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 @@ -16391,6 +17435,24 @@ /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) @@ -16402,6 +17464,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 @@ -16413,6 +17480,10 @@ icon_state = "warning" }, /area/lv624/lazarus/landing_zones/lz1) +"lnr" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) "lnK" = ( /obj/structure/flora/bush/ausbushes/genericbush, /obj/effect/landmark/nightmare{ @@ -16428,6 +17499,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" @@ -16491,6 +17572,19 @@ "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" @@ -16500,6 +17594,12 @@ /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{ @@ -16582,6 +17682,13 @@ icon_state = "dark" }, /area/lv624/lazarus/quartstorage) +"lIL" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/effect/decal/grass_overlay/grass1{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "lIU" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/south_central_jungle) @@ -16621,6 +17728,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) @@ -16628,12 +17745,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{ @@ -16641,6 +17769,16 @@ 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" @@ -16678,6 +17816,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, @@ -16699,6 +17854,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"; @@ -16711,6 +17885,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, @@ -16758,6 +17938,16 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirt, /area/lv624/ground/jungle/east_jungle) +"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 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) "mdQ" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/west_caves) @@ -16765,6 +17955,16 @@ /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 @@ -16779,6 +17979,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; @@ -16890,6 +18096,11 @@ /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 @@ -16982,6 +18193,12 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) +"mEo" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 10 + }, +/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, @@ -16990,10 +18207,22 @@ /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) +"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) @@ -17008,6 +18237,10 @@ 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) @@ -17017,6 +18250,10 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"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, @@ -17036,6 +18273,12 @@ icon_state = "vault" }, /area/lv624/lazarus/quartstorage) +"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, @@ -17052,6 +18295,10 @@ /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) @@ -17128,6 +18375,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, @@ -17138,6 +18389,10 @@ "mWe" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/jungle/south_west_jungle) +"mWA" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/north_east_caves) "mXR" = ( /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/colony/north_nexus_road) @@ -17168,10 +18423,22 @@ icon_state = "asteroidwarning" }, /area/lv624/lazarus/landing_zones/lz2) +"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, @@ -17186,6 +18453,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, @@ -17282,6 +18557,15 @@ }, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) +"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) @@ -17379,6 +18663,12 @@ 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, @@ -17535,6 +18825,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{ @@ -17556,6 +18852,16 @@ /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, @@ -17587,6 +18893,16 @@ 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) "nRb" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -17598,6 +18914,13 @@ 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{ @@ -17647,6 +18970,10 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"nUZ" = ( +/obj/effect/decal/grass_overlay/grass1, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "nVC" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -17777,10 +19104,21 @@ 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) +"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) @@ -17794,6 +19132,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, @@ -17817,6 +19170,10 @@ "omK" = ( /turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/barrens/west_barrens) +"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) @@ -17853,6 +19210,20 @@ icon_state = "asteroidwarning" }, /area/lv624/ground/colony/telecomm/cargo) +"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 + }, +/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, @@ -17872,9 +19243,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) +"owZ" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 6 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "oxY" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -17936,6 +19319,10 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"oDE" = ( +/obj/effect/decal/grass_overlay/grass1, +/turf/open/gm/dirt, +/area/lv624/ground/caves/east_caves) "oDY" = ( /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 4 @@ -17976,6 +19363,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 @@ -18079,6 +19474,10 @@ 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) @@ -18248,6 +19647,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; @@ -18281,6 +19684,15 @@ /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, @@ -18319,6 +19731,13 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"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) @@ -18366,6 +19785,11 @@ 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, @@ -18415,10 +19839,18 @@ icon_state = "white" }, /area/lv624/lazarus/medbay) +"pAE" = ( +/obj/structure/flora/bush/ausbushes/var3/leafybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) "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" @@ -18457,6 +19889,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"; @@ -18466,10 +19904,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) +"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_east_caves) "pHn" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/gm/dirt, @@ -18485,6 +19937,12 @@ icon_state = "whiteblue" }, /area/lv624/lazarus/corporate_dome) +"pIl" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 5 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_west_caves) "pIy" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/north, @@ -18493,6 +19951,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, @@ -18526,6 +19988,15 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/colony/west_nexus_road) +"pLv" = ( +/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/north_west_caves) "pMM" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/dirtgrassborder/east, @@ -18572,6 +20043,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) "pRe" = ( /obj/item/storage/firstaid/adv/empty, /obj/structure/machinery/door_control{ @@ -18618,9 +20093,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, @@ -18635,6 +20122,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, @@ -18675,6 +20171,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, @@ -18707,9 +20209,25 @@ /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) +"qhl" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) +"qiL" = ( +/obj/item/reagent_container/food/snacks/grown/mushroom/amanita, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/north_west_caves) "qjf" = ( /turf/open/floor, /area/lv624/ground/barrens/containers) @@ -18739,6 +20257,14 @@ "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 @@ -18748,6 +20274,14 @@ "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, @@ -18932,6 +20466,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) @@ -18974,6 +20514,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, @@ -18984,6 +20532,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 @@ -19006,9 +20564,32 @@ "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) +"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, @@ -19025,6 +20606,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, @@ -19047,6 +20632,16 @@ 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 @@ -19103,10 +20698,26 @@ /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/r_wall, /area/lv624/lazarus/corporate_dome) +"rgj" = ( +/obj/effect/decal/remains/xeno, +/obj/effect/decal/grass_overlay/grass1{ + dir = 8 + }, +/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) @@ -19127,10 +20738,37 @@ icon_state = "dark" }, /area/lv624/lazarus/engineering) +"rmt" = ( +/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_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) +"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{ @@ -19186,6 +20824,9 @@ /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" = ( @@ -19199,6 +20840,11 @@ 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, @@ -19213,6 +20859,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{ @@ -19235,6 +20887,16 @@ icon_state = "asteroidfloor" }, /area/lv624/lazarus/corporate_dome) +"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/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/east_caves) "rBF" = ( /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/grass/grass1, @@ -19253,6 +20915,13 @@ "rCV" = ( /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_central_jungle) +"rER" = ( +/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) "rGd" = ( /obj/structure/girder/displaced, /obj/structure/shuttle/engine/propulsion, @@ -19271,6 +20940,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, @@ -19284,11 +20963,34 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) +"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) +"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" @@ -19381,6 +21083,13 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_tcomms_road) +"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) "rVH" = ( /obj/structure/transmitter/colony_net{ phone_category = "Lazarus Landing"; @@ -19393,6 +21102,12 @@ icon_state = "brown" }, /area/lv624/lazarus/comms) +"rWs" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "rWW" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/river, @@ -19402,6 +21117,11 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/west_central_jungle) +"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 @@ -19434,6 +21154,12 @@ icon_state = "white" }, /area/lv624/lazarus/corporate_dome) +"scs" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "sdh" = ( /obj/structure/barricade/sandbags/wired, /turf/open/floor/wood, @@ -19467,6 +21193,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 @@ -19497,6 +21233,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" @@ -19518,10 +21263,26 @@ icon_state = "cult" }, /area/lv624/lazarus/armory) +"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/west_caves) +"soY" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "spm" = ( /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/lv624/ground/barrens/east_barrens) +"spK" = ( +/obj/effect/decal/grass_overlay/grass1/inner, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "sqj" = ( /turf/open/gm/river, /area/lv624/ground/river/central_river) @@ -19551,6 +21312,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) @@ -19558,6 +21325,11 @@ /obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"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/north_west_caves) "suv" = ( /obj/structure/flora/jungle/vines/light_1, /turf/open/gm/grass/grass2, @@ -19575,9 +21347,21 @@ /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) "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) "sxY" = ( /obj/structure/surface/rack, /obj/item/moneybag, @@ -19595,6 +21379,16 @@ /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{ @@ -19613,6 +21407,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"; @@ -19642,10 +21439,23 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) +"sET" = ( +/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) "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"; @@ -19699,6 +21509,19 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"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/gm/dirt, +/area/lv624/ground/caves/central_caves) "sLX" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -19716,6 +21539,12 @@ }, /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) "sOp" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/grass/grass1, @@ -19739,6 +21568,10 @@ /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) +"sPK" = ( +/obj/item/reagent_container/food/snacks/grown/mushroom/angel, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) "sRH" = ( /obj/structure/flora/bush/ausbushes/palebush, /turf/open/gm/grass/grass1, @@ -19773,6 +21606,14 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor, /area/lv624/lazarus/hydroponics) +"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) "sWy" = ( /obj/effect/landmark/monkey_spawn, /turf/open/gm/grass/grass1, @@ -19804,6 +21645,16 @@ icon_state = "squareswood" }, /area/lv624/ground/caves/sand_temple) +"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 @@ -19833,6 +21684,16 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) +"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/caves/south_central_caves) "tdX" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -19885,6 +21746,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; @@ -19913,6 +21784,13 @@ icon_state = "multi_tiles" }, /area/lv624/ground/caves/sand_temple) +"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 @@ -19920,12 +21798,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) -"tiw" = ( -/mob/living/simple_animal/bat, -/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/north_west_caves) "tka" = ( /obj/item/ammo_casing/bullet{ icon_state = "casing_9_1" @@ -19938,6 +21810,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, @@ -19961,6 +21837,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, @@ -19990,6 +21871,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, @@ -20012,6 +21897,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, @@ -20027,6 +21919,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{ @@ -20102,6 +22004,14 @@ }, /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{ @@ -20201,10 +22111,38 @@ icon_state = "whiteyellowfull" }, /area/lv624/ground/barrens/south_eastern_barrens) +"tMQ" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "tOS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) +"tOV" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/strata_grass/layer1, +/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, @@ -20214,9 +22152,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, @@ -20231,6 +22180,12 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) +"tVw" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/north_east_caves) "tWw" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor{ @@ -20254,8 +22209,17 @@ /area/lv624/lazarus/crashed_ship_containers) "tYx" = ( /obj/effect/landmark/objective_landmark/medium, +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 4 + }, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"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, @@ -20267,6 +22231,10 @@ "tZD" = ( /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz2) +"uaL" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/west_caves) "uaP" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/grass/grass1, @@ -20391,6 +22359,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; @@ -20432,6 +22408,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_jungle) +"uop" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/east_caves) "upM" = ( /obj/effect/landmark/crap_item, /turf/open/gm/grass/grass1, @@ -20449,6 +22429,10 @@ }, /turf/open/gm/dirt, /area/lv624/ground/jungle/east_jungle) +"uqm" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_west_caves) "urR" = ( /turf/open/floor/corsat{ dir = 1; @@ -20479,6 +22463,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, @@ -20488,6 +22478,16 @@ /obj/effect/landmark/corpsespawner/security/liaison, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) +"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/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) "uxT" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/coast/east, @@ -20498,6 +22498,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; @@ -20507,6 +22513,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."; @@ -20568,6 +22579,12 @@ icon_state = "whitebluecorner" }, /area/lv624/lazarus/corporate_dome) +"uHc" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/north_east_caves) "uHI" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/gm/grass/grass2, @@ -20590,11 +22607,17 @@ }, /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/gm/dirt, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/central_caves) "uMD" = ( /obj/structure/flora/jungle/vines/light_3, @@ -20605,6 +22628,20 @@ /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) "uOK" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor{ @@ -20615,6 +22652,10 @@ /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) @@ -20693,6 +22734,9 @@ icon_state = "wood-broken" }, /area/lv624/ground/caves/north_central_caves) +"uYj" = ( +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/north_east_caves) "uYC" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -20739,10 +22783,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; @@ -20801,6 +22857,19 @@ /obj/structure/girder, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) +"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/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, @@ -20828,6 +22897,25 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/gm/dirt, /area/lv624/ground/jungle/south_central_jungle) +"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, @@ -20866,6 +22954,14 @@ /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, @@ -20900,6 +22996,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, @@ -20911,6 +23014,25 @@ icon_state = "vault" }, /area/lv624/lazarus/quartstorage) +"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, /area/lv624/ground/jungle/east_central_jungle) @@ -20957,6 +23079,19 @@ }, /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{ @@ -21006,10 +23141,23 @@ /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, @@ -21021,6 +23169,14 @@ "vOF" = ( /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_central_jungle) +"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) "vPu" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor, @@ -21028,6 +23184,10 @@ "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, @@ -21069,6 +23229,12 @@ /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, @@ -21078,6 +23244,18 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) +"waw" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/north_west_caves) +"wbg" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "wbK" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, @@ -21133,6 +23311,16 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/sand_temple) +"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, @@ -21149,6 +23337,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."; @@ -21243,9 +23435,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, @@ -21267,6 +23469,10 @@ /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{ @@ -21300,6 +23506,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"wzI" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) "wAe" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/structure/machinery/door_control{ @@ -21312,6 +23522,12 @@ icon_state = "white" }, /area/lv624/lazarus/research) +"wAF" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_west_caves) "wAI" = ( /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/dirtgrassborder/south, @@ -21324,6 +23540,12 @@ /obj/item/clothing/suit/armor/yautja_flavor, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) +"wCs" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 6 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/east_caves) "wEO" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -21349,12 +23571,28 @@ icon_state = "wood-broken3" }, /area/lv624/ground/caves/north_central_caves) +"wHh" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 6 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/west_caves) "wHp" = ( /turf/open/floor/plating{ dir = 1; icon_state = "asteroidfloor" }, /area/lv624/lazarus/landing_zones/lz2) +"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/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_west_caves) "wJA" = ( /obj/structure/flora/jungle/vines/light_3, /obj/structure/window/framed/colony/reinforced, @@ -21389,10 +23627,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) +"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/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/north_east_caves) "wNp" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/gm/dirt, @@ -21435,6 +23687,18 @@ /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/south_west_jungle) +"wQK" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 1 + }, +/turf/open/gm/dirt, +/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, @@ -21568,6 +23832,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, @@ -21585,6 +23861,10 @@ }, /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{ @@ -21599,6 +23879,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) @@ -21635,6 +23919,17 @@ "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) @@ -21645,6 +23940,10 @@ icon_state = "whiteyellow" }, /area/lv624/lazarus/corporate_dome) +"xmK" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/east_caves) "xov" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, @@ -21713,6 +24012,10 @@ "xwr" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/west_barrens) +"xwN" = ( +/obj/structure/flora/bush/ausbushes/var3/brflowers, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/east_caves) "xwQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/handcuffs/cable/white{ @@ -21732,6 +24035,14 @@ icon_state = "whiteyellow" }, /area/lv624/lazarus/corporate_dome) +"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 @@ -21755,6 +24066,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, @@ -21786,10 +24101,23 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) +"xGL" = ( +/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) "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, @@ -21808,11 +24136,24 @@ /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) +"xNi" = ( +/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) "xNK" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/containers) @@ -21844,12 +24185,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, @@ -21883,6 +24234,12 @@ "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, @@ -21894,6 +24251,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, @@ -21922,8 +24285,14 @@ /area/lv624/ground/barrens/south_eastern_jungle_barrens) "ydz" = ( /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirt, +/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" @@ -21961,6 +24330,11 @@ icon_state = "purple" }, /area/lv624/lazarus/sleep_female) +"yhT" = ( +/turf/open/gm/dirt{ + icon_state = "desert2" + }, +/area/lv624/ground/caves/west_caves) "yhY" = ( /obj/structure/inflatable/door, /turf/open/gm/dirt, @@ -21993,6 +24367,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{ @@ -23264,7 +25642,7 @@ mdQ mdQ gwP gwP -gwP +yhT mdQ mdQ mdQ @@ -23716,10 +26094,10 @@ gwP gwP gwP tOS -gwP -gwP -gwP -tOS +vle +qdx +qdx +hyF gwP gwP gwP @@ -23942,18 +26320,18 @@ gwP gwP gwP gwP +vle +qdx +cHW +dOA +dmT +grW +xKL gwP -gwP -gwP -gwP -gwP -gwP -gwP -gwP -gwP +yhT tOS gwP -gwP +ptm gwP gwP gwP @@ -24165,19 +26543,19 @@ mdQ mdQ mdQ gwP +ptm gwP -gwP -gwP +tnY tOS gwP -gwP -gwP -gwP -gwP -gwP -gwP -gwP -gwP +wQK +cQB +dmT +dmT +rmW +ndk +grW +xKL gwP gwP gwP @@ -24213,7 +26591,7 @@ amy ane ane ane -ahF +krs ahF ane ane @@ -24398,14 +26776,14 @@ gwP gwP gwP gwP -gwP +wQK mdQ mdQ onU onU -gwP -gwP -gwP +owe +dmT +uRe gwP gwP gwP @@ -24433,7 +26811,7 @@ nBh afV ahF ahF -ahF +aYI ahF ahF ahF @@ -24623,23 +27001,23 @@ gwP gwP gwP gwP -gwP -gwP -gwP +vle +qdx +qdx mdQ mdQ mdQ onU onU mdQ -gwP -tOS +dmT +igN gwP gwP mdQ gwP gwP -gwP +yhT gwP gwP gwP @@ -24850,9 +27228,9 @@ mdQ gwP gwP tOS -gwP -gwP -gwP +vle +amI +dmT mdQ mdQ onU @@ -24860,8 +27238,8 @@ onU onU mdQ mdQ -gwP -gwP +bcb +wHh gwP gwP mdQ @@ -24898,7 +27276,7 @@ ahF ahF ahF ahF -ahF +cCP ahF ane ane @@ -25078,8 +27456,8 @@ gwP gwP gwP gwP -gwP -gwP +wQK +dmT mdQ mdQ onU @@ -25302,13 +27680,13 @@ mdQ mdQ mdQ mdQ +ofg gwP gwP gwP -gwP -gwP -gwP -gwP +wQK +dmT +fRU onU onU onU @@ -25317,7 +27695,7 @@ mdQ gwP gwP gwP -gwP +ptm gwP gwP mdQ @@ -25336,8 +27714,8 @@ afV afV afV afV -ahF -ahF +hRy +aYI ahF afV afV @@ -25530,18 +27908,18 @@ gwP mdQ mdQ gwP +ptm gwP gwP gwP -gwP -gwP -gwP -gwP -gwP -gwP +wQK +dmT +dmT +nRA +htV onU mdQ -gwP +uRe gwP gwP gwP @@ -25562,6 +27940,7 @@ ahF ahF ahF ahF +aYI ahF ahF ahF @@ -25572,8 +27951,7 @@ ahF ahF ahF ahF -ahF -ahF +krs ahF ane ane @@ -25757,19 +28135,19 @@ gwP gwP mdQ mdQ +lav gwP gwP +ofg gwP -gwP -gwP -gwP -tOS -gwP -gwP -gwP -gwP -gwP -gwP +hjo +gvm +qJE +dmT +dmT +dmT +fLh +uRe gwP tOS gwP @@ -25796,7 +28174,7 @@ ahF ahF ahF ahF -ahF +fDT ahF ahF ahF @@ -25992,12 +28370,12 @@ gwP gwP gwP gwP -gwP -gwP -gwP -tOS -gwP -gwP +hjo +qJE +tlk +gRk +owZ +wHh gwP gwP gwP @@ -26022,7 +28400,7 @@ ahF ahF ahF ahF -ahF +krs ahF ahF ahH @@ -26030,14 +28408,14 @@ ahF ahF ahF ahF -ahF +cCP ahF ane +fDT ahF ahF ahF -ahF -ahF +aYI ahF ahF ane @@ -26213,6 +28591,7 @@ gwP gwP gwP aca +ptm gwP gwP gwP @@ -26220,14 +28599,13 @@ gwP gwP gwP gwP +hjo +qhl +qhl +wHh gwP -gwP -gwP -gwP -gwP -gwP -gwP -gwP +ptm +yhT gwP mdQ mdQ @@ -26246,10 +28624,10 @@ ahF ahF ahV ahF -ahF -ahH -ahF -ahF +xYD +gTj +gTj +nys ahF ahF ahF @@ -26472,13 +28850,13 @@ ane ane ahF ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF +xYD +hmq +lYt +chi +fmW +rHV +nys ePu ahF ahF @@ -26493,9 +28871,9 @@ ane ahF ahF ahF -ahF -ahF -ahF +hRy +hRy +fDT afV ane ane @@ -26640,7 +29018,7 @@ mdQ mdQ mdQ mdQ -gwP +uRe gwP gwP gwP @@ -26699,19 +29077,19 @@ ane ane ane ane -ahF -ahF -ahF -ahF +xYD +lYt +fmW +fmW uWJ +ilF +fmW +rHV +nys ahF ahF ahF -ahF -ahF -ahF -ahF -ahF +aYI ahF ahH ahF @@ -26827,9 +29205,9 @@ abB abB abB abN -abN -abN -abN +pSe +kzn +tcF amk amk amk @@ -26838,7 +29216,7 @@ abM abM abM abM -abN +qVh abN abN abN @@ -26866,9 +29244,9 @@ amk onU onU mdQ -tOS -gwP -gwP +gRk +dmT +uRe gwP gwP gwP @@ -26927,16 +29305,16 @@ ane ane ane ahF -ahF -ahF -ahF +wAF +aIE +fmW uWJ uWJ uWJ -ahF -ahF -ahF -ahF +fmW +fmW +vGj +nys ahF ahF ahF @@ -27052,21 +29430,21 @@ abM abM abB abB -tiw -abN -abN -abN -abN +abB +tgL abN abN +lTv +pLv +sBY amk amk amk amk amk abM -abN -abN +qiL +qVh abQ abN abN @@ -27087,16 +29465,16 @@ abN abN abN abN -abN -abN -abN -abN +cMG +waw +cWs +sBY onU onU onU -gwP -gwP -gwP +lKl +tRM +uRe gwP gwP gwP @@ -27111,11 +29489,11 @@ gwP gwP gwP gwP -gwP -gwP -gwP -gwP -gwP +vle +jvQ +jvQ +jvQ +xKL gwP gwP gwP @@ -27155,20 +29533,20 @@ ane ane ahF ahF -ahF -ahF +wAF +fmW uWJ uWJ uWJ +eoW +fmW +fmW +fmW +rHV +vXP +nys ahF -ahF -ahH -ahF -ahF -ahF -ahF -ahF -ahF +aYI ahF ahF ahF @@ -27284,17 +29662,17 @@ abN abN abN abN -abN -abN -abN -abN -abN +pSe +kzn +sBY +sBY +sBY amk amk -abN -abN -abN -abN +gnt +qVN +sBY +qVh abN abN abN @@ -27314,17 +29692,17 @@ abN abN abN abQ -abN -abN -abN -abN -abN -aca -gwP -gwP -gwP -gwP -gwP +cMG +waw +sBY +sBY +sBY +iGf +dKl +dmT +dmT +owZ +wHh gwP gwP gwP @@ -27337,14 +29715,14 @@ gwP aYC gwP gwP -gwP -gwP -gwP -tOS -gwP -gwP -gwP -gwP +vle +jvQ +pkU +gRk +lLK +dmT +grW +xKL gwP gwP gwP @@ -27382,19 +29760,19 @@ ane ane ahF ahF -ahH -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF ahF +doe +pIl +eZg +fmW +fmW +fmW +fmW +fmW +fmW +fmW +fmW +rHV ahF ahF ane @@ -27513,16 +29891,16 @@ abN abN abN abN -abQ -abN -abN -abN -abN -abN -abN -abN -abN -abN +bak +kzn +iXX +sBY +sBY +iNJ +sBY +sBY +frV +klD abN abN abN @@ -27541,17 +29919,17 @@ abN abN abN abN -abN -abN -abN -abN -abQ -abN -aca -gwP -tOS -gwP -gwP +cMG +waw +sBY +sBY +fTN +sBY +iGf +dmT +gRk +owZ +wHh gwP gwP gwP @@ -27565,15 +29943,15 @@ gwP aca gwP gwP -gwP -xZE -xZE -xZE -gwP -gwP -gwP -gwP -gwP +jGU +hhs +hhs +hhs +htV +dOA +fRU +grW +xKL gwP gwP gwP @@ -27609,20 +29987,20 @@ ane ane ane ahF +aYI ahF ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF -ahF +doe +pIl +uqm +fmW +fmW +fmW +ikA +fmW +fmW +wty +chi ane ane ane @@ -27635,7 +30013,7 @@ ane ahF ahF ahH -ahF +cCP ahF ane ane @@ -27737,19 +30115,19 @@ abN abN abN abN -abQ -abN -abN -abN -abN -abN -abN -abN -abN -abN -abN -abQ -abN +vNs +bdu +bdu +bdu +jKc +pSe +jLY +jLY +jLY +jLY +jLY +kKa +klD abN abN abN @@ -27768,17 +30146,17 @@ abM abB abN abN -abN -abN -abN -abN -abN -abN -abN -aca -gwP -gwP -gwP +cMG +waw +gvr +uOu +sBY +iNJ +sBY +iGf +owZ +qhl +wHh gwP qaE gwP @@ -27798,11 +30176,11 @@ mdQ onU onU onU -xZE -xZE -xZE -gwP -gwP +hhs +hhs +hhs +grW +jvQ gwP gwP tOS @@ -27841,22 +30219,22 @@ ahF vZT ahF ahF -ahF -ahF -ahF +doe +qSS +pIl dWM -ahF -ahF -ahF -ahF -ahF -ahF +fmW +fmW +fmW +fmW +sAI +pBH ane ane afV afV -ahF -ahF +hRy +krs afV afV ane @@ -27962,16 +30340,16 @@ abN abN abN abN -abN -abN -abN -abN -abN -abN -abN -abN -abN -abN +cMG +bdu +bdu +waw +tcF +sBY +sBY +mgi +bdu +jKc abQ abN abN @@ -27995,11 +30373,11 @@ abN abN dhD abN -abQ -abN -abN -abN -abN +vNs +waw +sBY +sBY +sBY amk abM abM @@ -28028,11 +30406,11 @@ onU onU onU onU -xZE -xZE -xZE -gwP -gwP +hhs +hhs +hhs +grW +xKL gwP gwP gwP @@ -28069,13 +30447,13 @@ ane ane ane ahF +fDT ahF -ahF -ahF -ahF -ahF -ahF -ahF +wAF +fmW +fmW +snc +fmW uWJ uWJ uWJ @@ -28083,7 +30461,7 @@ ane ane afV ahF -ahF +aYI ahF ahF afV @@ -28189,17 +30567,17 @@ abM abN abN abN -abQ -abN -abN -abN -abN -abN -abN -abN -abN -abN -abN +vNs +waw +dIj +sBY +sBY +sBY +sBY +pLv +sBY +sBY +hKP abN abN abN @@ -28222,12 +30600,12 @@ abN abN abQ dhD -abN -abN -abN -abN -abN -abN +cMG +waw +sBY +sBY +sBY +sBY amk amk abM @@ -28258,9 +30636,9 @@ onU onU onU onU -xZE -xZE -gwP +hhs +hhs +uRe gwP gwP gwP @@ -28298,12 +30676,12 @@ afV afV afV ahF -ahF -ahH -ahF -ahF -ahF -ahF +cCP +wAF +fmW +fmW +jCO +uqm uWJ ane ane @@ -28417,17 +30795,17 @@ abM abN abN abN -abN -abN -abN -abN +vGy +sBY +whk +sBY amk amk amk amk -abN -abN -abN +sBY +sBY +hKP abN abN abN @@ -28450,11 +30828,11 @@ abN abN abN dhD -abN -abN -abN -abN -abN +vGy +sBY +sBY +gnt +sBY amk amk amk @@ -28522,14 +30900,14 @@ ahF ahF ahF ahF -ahF +cCP ahF afJ -ahF -ahF -ahF -ahF -ahF +xYD +vXP +lYt +dIu +fmW ane ane ane @@ -28542,7 +30920,7 @@ ahF ahF ahF ahF -ahF +cCP ahF ahF ahF @@ -28645,7 +31023,7 @@ abN abN abN abN -abN +vGy abM abM amk @@ -28678,10 +31056,10 @@ abN abN abN dhD -abN -abN -abN -abN +vGy +qVN +sBY +ksc amk amk amk @@ -28744,7 +31122,7 @@ acp ane ane ahF -ahF +fDT ahF ahF ahH @@ -28753,10 +31131,10 @@ ahF ahF ahF afJ -ahF -ahF -ahF -ahF +wAF +fmW +fmW +fmW ane ane ane @@ -28872,8 +31250,8 @@ abM abN abN abN -abN -abN +cMG +waw abM abM abM @@ -28976,13 +31354,13 @@ ahF ahF ahF ahF -ahF -ahF -ahF -ahF +gTj +gTj +gTj +nys afV -ahF -ahF +wAF +tQU uWJ uWJ ane @@ -28999,7 +31377,7 @@ ahF ahF ahF ahF -ahF +krs ahF ahF ahF @@ -29099,9 +31477,9 @@ abM abN abN abQ -abN -abN -abN +cMG +waw +tcF abM abM abM @@ -29203,11 +31581,11 @@ afV ahF isF ahF -ahF -ahF -ahF -ahF -ahF +lYt +fmW +gos +fmW +lWl afV afV uWJ @@ -29327,8 +31705,8 @@ abM abN abN abN -abN -abN +vGy +sBY abM abM abM @@ -29430,13 +31808,13 @@ ane vUx vMV vMV -vMV -vMV +lUQ +bJQ uWJ -ahF -ahF -ahF -ahF +nQH +fmW +lWl +krs afV ane ane @@ -29450,7 +31828,7 @@ ahF ahF ahF ahF -ahF +krs ahF ahV ahF @@ -29554,9 +31932,9 @@ abM abM abN abN -abN -abN -abN +cMG +waw +pLv abM abM abM @@ -29658,12 +32036,12 @@ ane afV ahF ahF -ahF -ahF +wAF +fmW uWJ -ahF -ahF -ahF +dIu +fmW +lWl ahF afV afV @@ -29674,7 +32052,7 @@ afV ahF ahF ahF -ahF +fDT ahF ahH ahF @@ -29684,7 +32062,7 @@ ahF ahF ahF ahF -ahF +aYI ahF ane ane @@ -29781,9 +32159,9 @@ abM abM abN abN -abN -abN -abN +cMG +waw +sBY amk abM abM @@ -29886,16 +32264,16 @@ ane ane ahF ahF -ahH -pmt +thI +cdw uWJ uWJ +dOb +lWl +aYI ahF ahF -ahF -ahF -ahF -ahF +krs ahF ahF ahF @@ -30009,9 +32387,9 @@ abM abM abN abN -abN -abQ -abN +vGy +fTN +sLT amk amk abM @@ -30112,20 +32490,20 @@ acp ane ane ane +krs ahF -ahF -ahF -ahF +wAF +fmW uWJ uWJ +kzw +kyt +nys ahF ahF ahF ahF -ahF -ahF -ahF -ahF +krs ahF ahF ahF @@ -30237,8 +32615,8 @@ abM abN abN abN -tgL -abN +xhc +sBY amk amk amk @@ -30342,15 +32720,14 @@ ane ane ahF ahF -ahF -ahF -ahF +wAF +tOV +fKc uWJ -ahF -ahF -ahF -ahF -ahH +jCO +fmW +rHV +nys ahF ahF ahF @@ -30358,6 +32735,7 @@ ahF ahF ahF ahF +krs ahF ahF ahF @@ -30465,8 +32843,8 @@ abM abN abN abN -abN -abN +vGy +sBY amk amk abM @@ -30570,17 +32948,17 @@ afV afV ahF ahF -ahF -ahF -ahF +doe +pIl +fmW uWJ ane uWJ +fmW +qSG ahF ahF -ahF -ahF -ahF +cCP ahF ahH ahF @@ -30693,9 +33071,9 @@ abM abN abN abN -abN -abN -abN +vGy +sBY +bPE amk abM abM @@ -30795,18 +33173,18 @@ acp ane ane ahF +cCP ahF ahF ahF -ahF -ahF -ahF +wYz +chi uWJ ane uWJ -ahF -ahF -ahF +fmW +rHV +nys ahF ahF ahF @@ -30921,11 +33299,11 @@ abM abN abN abN -abN -abN -abN -abN -abB +pSe +kzn +sBY +dBS +stt abM abM abM @@ -30996,8 +33374,8 @@ mdQ mdQ mdQ mdQ -gwP -gwP +qdx +xKL gwP gwP gwP @@ -31027,15 +33405,15 @@ ahF ane ane ahF -ahH ahF +pIl ane ane uWJ -ahF -ahF -ahF -ahF +tOV +fmW +rHV +nys ahF ahF ahF @@ -31150,12 +33528,12 @@ abM abN abN abN -abQ -abN -abN -abB -abB -abB +bak +kzn +qYS +stt +stt +stt abM abM abM @@ -31223,9 +33601,9 @@ mdQ mdQ mdQ mdQ -gwP -gwP -gwP +tlk +dmT +uRe gwP gwP acS @@ -31256,16 +33634,16 @@ ane ane ane ahF -ahF -ahF -ahF +doe +pIl +fmW uWJ uWJ ane -ahF -ahF -ahF -ahF +eZg +rHV +gTj +nys isF ahF ahF @@ -31379,12 +33757,12 @@ abM abN abN abN -abN -abN -abN -abN -abN -abB +pSe +jLY +jLY +jLY +jLY +qrH abM abM abM @@ -31452,8 +33830,8 @@ mdQ mdQ mdQ mdQ -gwP -tOS +dmT +igN gwP gwP gwP @@ -31485,20 +33863,20 @@ ane ane ahF ahF -ahF -ahF -ahF +doe +pIl +fcQ uWJ ane ane -ahF -ahH -ahF -ahF +fmW +fmW +lWl ahF ahF ahF ahF +krs ahF ahF ahF @@ -31679,9 +34057,9 @@ mdQ mdQ mdQ onU -gwP -gwP -gwP +dmT +dmT +uRe gwP gwP gwP @@ -31707,26 +34085,26 @@ mdQ ane afV ahF +aYI +krs ahF ahF ahF ahF ahF -ahF -ahF -ahF -ahF -ahF +wYz +fmW +fmW uWJ uWJ uWJ +fmW +lWl ahF -ahF -ahF -ahF -ahF -ahF -ahF +hRy +hRy +hRy +hRy ahF ahF ahF @@ -31907,9 +34285,9 @@ mdQ mdQ onU onU -gwP -gwP -sMx +dmT +dmT +kVG sMx gwP gwP @@ -31940,16 +34318,16 @@ ahF ahF ahF ahF +fDT ahF ahF -ahF -ahH -ahF +pIl +fmW uWJ uWJ -ahF -ahF -ahF +wHE +fmW +lWl ahF ahF ahF @@ -32135,9 +34513,9 @@ mdQ mdQ onU onU -gwP -gwP -sMx +dmT +xHW +kVG sMx gwP gwP @@ -32171,13 +34549,13 @@ ahF ahF ahF ahF -ahF -ahF +wYz +sgU uWJ ane -ahF -ahF -ahF +xBO +lWh +dYx ahF ahH ahF @@ -32362,10 +34740,10 @@ mdQ mdQ mdQ onU -gwP -gwP -gwP -gwP +lKl +dmT +dmT +uRe gwP gwP gwP @@ -32394,17 +34772,17 @@ ahF ane ane ane +hRy +hRy +hRy ahF ahF -ahF -ahF -ahF -ahF -ahF +doe +pIl ane ane -ahF -ahF +lWh +dYx ahH ahF ahF @@ -32585,15 +34963,15 @@ mdQ mdQ onU onU -gwP -gwP -xZE +ieN +kWV xZE -xZE -gwP -gwP -gwP -gwP +xyH +hhs +ndk +dmT +dmT +uRe tOS gwP sMx @@ -32622,7 +35000,7 @@ ahF ahF ane ane -ahF +krs afV afV afV @@ -32809,19 +35187,19 @@ mdQ mdQ mdQ mdQ -gwP -gwP +jGU +ndk onU +dmT +dmT +kWV gwP -gwP -gwP -gwP -gwP -aca -gwP -abO -gwP -gwP +hjo +qtK +qhl +clO +qhl +wHh gwP gwP sMx @@ -32850,20 +35228,20 @@ ahF ahF ane ane -ahF +cCP afV ahF ahF ahF ahF ane -ahF +aYI ahF ahF ane ahF -ahF -ahF +aYI +fDT ahF ane ane @@ -33037,20 +35415,20 @@ gwP mdQ gwP gwP -gwP -gwP -aca -gwP -gwP -gwP +jGU +dmT +iGf +dmT +owZ +wHh tOS gwP aca gwP gwP -gwP -gwP -gwP +vle +qdx +xKL gwP gwP gwP @@ -33265,22 +35643,22 @@ gwP gwP gwP gwP -gwP -tOS -aca -gwP -gwP +hjo +kML +ukY +soY +wHh gwP gwP gwP aca -gwP -gwP -gwP -gwP -gwP -gwP -gwP +vle +qdx +cHW +dmT +grW +qdx +xKL gwP gwP gwP @@ -33503,15 +35881,15 @@ gwP gwP mdQ mdQ -xZE -xZE -xZE -gwP -gwP -gwP +hhs +hhs +hhs +fLh +dmT +grW acp acp -gwP +xKL gwP gwP abO @@ -33733,14 +36111,14 @@ mdQ mdQ onU onU -xZE -xZE -xZE -gwP -gwP -xZE -xZE -gwP +hhs +hhs +hhs +dmT +dmT +hhs +eft +xKL gwP oMZ oMZ @@ -33963,13 +36341,13 @@ mdQ onU onU acK -gwP -gwP -gwP -gwP -xZE -aca -aca +dmT +dmT +kCD +dmT +hhs +soz +jqr dFz oMZ aca @@ -34191,15 +36569,15 @@ mdQ mdQ onU onU -gwP -gwP -gwP -gwP -aYC -eGD -eGD -eGD -eGD +htV +dmT +dmT +dmT +sNq +rTT +rTT +nLF +rbs eGD eGD eGD @@ -34423,11 +36801,11 @@ onU onU onU onU -xZE -eGD -eGD -eGD -acq +hhs +rTT +aIA +lhH +lkq eGD eGD eGD @@ -34653,10 +37031,10 @@ iIB iIB iIB iIB -eGD -eGD -eGD -ufG +rTT +rTT +nLF +liI eGD eGD ufG @@ -34881,10 +37259,10 @@ abS iIB iIB iIB -eGD -adc -eGD -ufG +rTT +dAu +hkT +shb eGD eGD gIe @@ -35072,8 +37450,8 @@ mdQ mdQ mdQ mdQ -aca -xZE +jqr +sxl xZE acp acu @@ -35109,10 +37487,10 @@ abS abS iIB iIB -eGD -eGD -eGD -ufG +rmt +rTT +tde +vtk eGD acq eGD @@ -35300,8 +37678,8 @@ mdQ mdQ mdQ mdQ -gwP -gwP +fLh +uRe acp acu acu @@ -35337,9 +37715,9 @@ abS abS abS iIB -eGD -eGD -eGD +rTT +rTT +onP ufG eGD eGD @@ -35528,8 +37906,8 @@ mdQ mdQ mdQ onU -tOS -gwP +gRk +uRe acu acu acu @@ -35565,9 +37943,9 @@ abS abS abS abS -eGD -eGD -eGD +wzI +tde +uwG eGD eGD eGD @@ -35756,8 +38134,8 @@ mdQ mdQ onU onU -gwP -gwP +dmT +uRe acp acu acy @@ -35793,8 +38171,8 @@ abS ady ady ady -eGD -eGD +tde +uwG ufG hzR eGD @@ -35984,8 +38362,8 @@ acf onU onU onU -gwP -gwP +dmT +grW xZE acp acu @@ -36020,8 +38398,8 @@ abS abS ady eGD -eGD -eGD +fqi +uwG eGD ufG hzR @@ -36212,8 +38590,8 @@ acf onU onU onU -gwP -gwP +dOA +dmT xZE xZE acp @@ -36440,10 +38818,10 @@ acf mdQ onU mdQ -gwP -gwP -gwP -gwP +htV +dmT +grW +xKL xZE xZE xZE @@ -36481,11 +38859,11 @@ adP eGD acq eGD -eGD -eGD -acq -eGD -eGD +bje +gVw +vih +gVw +rbs eGD eGD eGD @@ -36668,10 +39046,10 @@ acf mdQ mdQ mdQ -uSF -gwP -gwP -gwP +iGx +dmT +cQB +uRe gwP gwP gwP @@ -36707,14 +39085,14 @@ eGD adP adP adP -eGD -eGD -eGD -eGD -eGD -eGD -eGD -eGD +bje +gVw +tMQ +rTT +mJF +rTT +nLF +rbs eGD ady ady @@ -36896,14 +39274,14 @@ acf acf mdQ mdQ -xZE -xZE -gwP -tOS -gwP +hhs +hhs +uaL +iuf +jvQ abH -gwP -gwP +jvQ +xKL gwP gwP gwP @@ -36934,15 +39312,15 @@ eGD eGD eGD adP -adP -adP -eGD -eGD -eGD -eGD -eGD -eGD -eGD +daY +tPH +rTT +pIB +rTT +hpK +rTT +ohf +onP eGD ady abS @@ -37125,15 +39503,15 @@ acf acf mdQ mdQ -xZE -xZE -xZE -xZE -gwP -gwP -gwP -gwP -gwP +hhs +hhs +hhs +hhs +dmT +dmT +grW +jvQ +xKL gwP gwP gwP @@ -37162,15 +39540,15 @@ acq eGD eGD eGD -adP -adP -eGD -eGD +sVx +iDX +kdj +rTT iIB iIB iIB -eGD -eGD +uOD +onP abS abS abS @@ -37358,10 +39736,10 @@ mdQ onU onU onU -gwP -gwP -gwP -gwP +sXg +dmT +tlk +uRe gwP acf acf @@ -37389,10 +39767,10 @@ eGD eGD eGD eGD -eGD -eGD -eGD -eGD +bje +tMQ +rTT +rTT iIB iIB abS @@ -37588,8 +39966,8 @@ uxU uxU uxU uxU -dGQ -any +ryp +vbK dGQ acf acf @@ -37617,7 +39995,7 @@ eGD adc eGD eGD -eGD +fqi abS iIB iIB @@ -37812,12 +40190,12 @@ acf acf acf acf -abl -abl -abl -abl -abl -abl +fDE +pAE +fDE +vAB +fDE +nUZ abl acf acf @@ -38037,15 +40415,15 @@ acf acf acf acf -abl -abl -abl -abl -abl -abl -abl -abl -abl +pAE +fDE +fDE +sPK +ogJ +scs +scs +scs +jgy abl abl abl @@ -38264,12 +40642,12 @@ acf izh izh izh -izh -abl -abv -abl -abl -abl +ejp +scs +rIc +scs +scs +jgy abl abl abl @@ -38518,10 +40896,10 @@ abS abS eGD eGD -eGD -eGD -eGD -eGD +bje +gVw +gVw +rbs eGD acO eGD @@ -38744,13 +41122,13 @@ abl abl abl dGQ -eGD -eGD -acY -eGD -eGD -eGD -eGD +bje +gVw +lbt +rTT +rTT +nLF +rbs acO eGD acq @@ -38972,13 +41350,13 @@ abl abl abl dGQ -eGD -acq -eGD -eGD -eGD -eGD -eGD +wbg +xdb +rTT +mca +rTT +rTT +onP acO eGD eGD @@ -39200,13 +41578,13 @@ abl abl abl dGQ -eGD -eGD -eGD +wbg +rTT +rTT iIB iIB abS -eGD +onP acO eGD eGD @@ -40124,8 +42502,8 @@ abS abS abS abS -eGD -acq +gVw +jpX eGD abS abS @@ -40352,8 +42730,8 @@ abS abS abS abS -acO -acO +bBT +rze acO abS abS @@ -40580,9 +42958,9 @@ abS abS abS abS -eGD -eGD -eGD +rTT +nLF +rbs eGD xTa abS @@ -40807,10 +43185,10 @@ abS abS abS iIB -eGD -eGD -eGD -eGD +rTT +kdj +rTT +onP eGD eGD abS @@ -41035,10 +43413,10 @@ abS abS iIB iIB -eGD -eGD -eGD -eGD +rTT +rTT +rTT +onP eGD eGD abS @@ -41263,10 +43641,10 @@ abS iIB iIB iIB -eGD -eGD -eGD -eGD +mca +rTT +tde +uwG eGD eGD abS @@ -41489,11 +43867,11 @@ abS abS abS iIB -eGD -eGD -eGD -eGD -eGD +rTT +rTT +rTT +rTT +onP acq eGD eGD @@ -41718,11 +44096,11 @@ abS abS abS abS -eGD -acq -eGD +rTT +xdb +rTT acY -eGD +rbs eGD eGD abS @@ -41945,12 +44323,12 @@ abS abS abS abS -eGD -eGD -eGD -eGD -eGD -eGD +wzI +aIA +rTT +rTT +rTT +onP eGD eGD abS @@ -42175,10 +44553,10 @@ abS abS abS iIB -eGD -eGD -eGD -eGD +rTT +rTT +rTT +onP eGD eGD abS @@ -42404,9 +44782,9 @@ abS abS iIB iIB -eGD -eGD -eGD +rTT +uxL +onP eGD abS abS @@ -42632,9 +45010,9 @@ abS abS abS iIB -eGD -eGD -eGD +rTT +rTT +onP eGD abS abS @@ -42860,9 +45238,9 @@ abS abS abS iIB -eGD -eGD -eGD +rTT +cxi +onP eGD abS abS @@ -43088,10 +45466,10 @@ abS abS abS abS -eGD -eGD -eGD -eGD +rTT +rTT +nLF +rbs eGD abS abS @@ -43315,11 +45693,11 @@ abS abS abS abS -eGD -eGD -eGD -acq -eGD +rTT +rTT +hpK +xdb +onP eGD abS abS @@ -43542,12 +45920,12 @@ abS abS abS abS -xTa -eGD -eGD -eGD -eGD -eGD +brC +rTT +rTT +rTT +rTT +onP eGD abS abS @@ -43738,12 +46116,12 @@ abl abl abl abl -abl -abl -abl -abl -abl -abl +gPu +jcn +jcn +jcn +jcn +jcn acf acf acf @@ -43770,12 +46148,12 @@ abS abS abS abS -eGD -eGD -acq -eGD -eGD -eGD +rTT +rTT +xdb +rTT +lnr +onP eGD abS abS @@ -43966,12 +46344,12 @@ abv abl abl abl -abl -abl -abl -abl -abl -abl +xWy +cqH +fDE +bvX +fDE +fDE acf acf acf @@ -43999,11 +46377,11 @@ abS abS abS abS -eGD -eGD -eGD -eGD -eGD +rTT +mOL +rTT +tde +uwG eGD abS abS @@ -44197,9 +46575,9 @@ abl acf acf uxU -dGQ +ryp uMz -dGQ +ryp acf acf acf @@ -44227,10 +46605,10 @@ abS abS abS abS -eGD -eGD -eGD -eGD +ohf +rTT +rTT +onP eGD abS abS @@ -44426,9 +46804,9 @@ acf acf uxU uxU -abl -abl -abl +fDE +gcB +fDE acf acf acf @@ -44455,10 +46833,10 @@ abS abS abS iIB -eGD -eGD -acq -eGD +rTT +rTT +xdb +onP eGD abS abS @@ -44654,9 +47032,9 @@ acf acf acf uxU -abl -abl -abl +fDE +tti +fDE acf acf acf @@ -44683,10 +47061,10 @@ abS abS iIB iIB -eGD -eGD -eGD -eGD +rTT +rmt +rTT +onP abS abS abS @@ -44882,14 +47260,14 @@ acf acf acf uxU -abl -abv -abl -abl +fDE +otl +fDE +fDE acf acf uxU -abl +fDE acf acf acf @@ -44899,7 +47277,7 @@ abl abl abv abl -abl +gPu abS abS abS @@ -44911,10 +47289,10 @@ abS iIB iIB iIB -eGD -eGD -eGD -eGD +rTT +rTT +rTT +onP abS abS abS @@ -45110,16 +47488,16 @@ acf acf acf acf -abl -abl -abl -abl +fDE +fDE +fDE +fDE uxU uxU uxU -abl -abl -abl +hez +fDE +spK acf acf acf @@ -45127,7 +47505,7 @@ acf abl abl abl -abl +kxv abS abS abS @@ -45139,8 +47517,8 @@ abS abS iIB iIB -cIU -cIU +hav +hav cIU abS abS @@ -45339,15 +47717,15 @@ acf acf acf acf -abl -abl -abl +fDE +fDE +fDE czq uxU uxU -abl -abl -abl +rUX +fDE +spK abl acf acf @@ -45355,8 +47733,8 @@ acf abl abl abl -abl -abl +kxv +han abS abS abS @@ -45367,9 +47745,9 @@ abS abS abS abS -pDt -pDt -pDt +aTy +aTy +tYW abS pDt pDt @@ -45568,14 +47946,14 @@ acf acf acf acf -abl -abl -abl +fDE +fDE +fDE uxU -izh -abl -abv -abl +mrg +fDE +poX +jgy acf acf acf @@ -45583,8 +47961,8 @@ abl abl abl abl -abl -abl +uMd +bvX iIB abS abS @@ -45796,13 +48174,13 @@ acf acf acf acf -izh -abl -abl -abv -dGQ -abl -abl +mrg +fDE +fDE +otl +ryp +ogJ +jgy abl acf acf @@ -45810,8 +48188,8 @@ acf abl abl abl -abl -abl +kxv +fDE iIB iIB abS @@ -46024,12 +48402,12 @@ acf acf acf acf -izh -abl -abl -abl -izh -abl +mrg +sPK +fDE +fDE +mrg +spK abl abl abl @@ -46039,16 +48417,16 @@ abl abv abl abl -abl +uOl ydz -pDt -pDt -pDt -pDt +eQL +eQL +eQL +pgc iIB iIB -pDt -pDt +bOm +xhv abS pDt pDt @@ -46253,11 +48631,11 @@ acf acf acf acf -abl -abl -abl -izh -abl +fDE +fDE +fDE +mrg +spK abl abl abl @@ -46267,16 +48645,16 @@ abl abl abl abl -abl -ydz -pDt -qRj -pDt -pDt -pDt -pDt -pDt -pDt +bnM +lIL +aTy +xNi +aTy +bxb +eQL +eQL +eQL +xhv pDt pDt pDt @@ -46482,29 +48860,29 @@ acf acf acf uxU +tti +fDE +ryp +spK abl -abl -dGQ -abl -abl -abl -abl -dGQ -abl -abl -abl -abl -abl -abl -ydz -pDt -pDt -pDt -pDt -pDt -pDt +gPu +jcn +ner +jcn +jcn +jcn +jcn +jcn +jcn +dLm +kae pDt pDt +kpx +aTy +aTy +aTy +tYW pDt pDt pDt @@ -46710,29 +49088,29 @@ acf uxU uxU uxU -abl -abl -acf -abl -abl -abv -abl -dGQ -abl -abl -abl -abl -abl -abl +fDE +fDE +acf +xRe +kLl +cqN +fDE +ryp +fDE +fDE +fDE +fDE +osf +hNT ydz +xhv pDt pDt -pDt -pDt -pDt -pDt -pDt -qRj +dCD +hmJ +hmJ +hmJ +enn pDt pDt pDt @@ -46936,31 +49314,31 @@ acf acf uxU uxU -abl -abl -abl -abl +fDE +fDE +fDE +fDE acf acf -abl -abl -abl +fDE +icd +fDE uxU uxU -abl -abl -abl -abv -abl +fDE +fDE +han +otl +fDE acf +xhv pDt -pDt -pDt -pDt -pDt -pDt -pDt -pDt +dCD +cEi +wpY +eQL +eQL +xhv pDt oeN oeN @@ -47159,36 +49537,36 @@ abv abl abl acf -abl -abl +xWy +fDE acf uxU -abl -abl -abl -abl -abl +fDE +fDE +yjs +fDE +fDE acf acf -abl -abl -abl +fDE +cSL +fDE uxU acf acf -abl -abl +fDE +mVr uxU uxU acf +tYW pDt -pDt -pDt -pDt -pDt +crn +eQL +eQL ntr -iZG -pDt +hEe +xhv pDt oeN adC @@ -47387,36 +49765,36 @@ abl abl abl abl -abl -abl -dGQ -abl -abl -abl -abl -abl +xWy +cSL +ryp +fDE +fDE +pVZ +fDE +fDE acf acf uxU -abl -abl -abl -abl +fDE +fDE +fDE +fDE acf acf -abl -abl +fDE +fDE uxU acf acf nbw pDt -pDt +crn nbw ntr ntr -pDt -pDt +nNu +xhv pDt oeN adD @@ -47615,20 +49993,20 @@ abl abl abl abl -abl -abl -dGQ -abl -abl -abl -abl -abl -abl +bnM +uOl +ryp +fDE +fDE +fDE +fDE +ogJ +jgy acf uxU uxU -abl -abl +fDE +ogJ tYx acf acf @@ -47642,9 +50020,9 @@ nbw nbw nbw nbw -pDt -pDt -pDt +eQL +eQL +xhv pDt oeN adE @@ -47844,19 +50222,19 @@ abl abl abv abl -abl -dGQ -abl -abl -abl -abv -abl +bnM +oha +rWs +rWs +rWs +vBd +jgy abl acf uxU -abl -abl -abv +osf +fDE +qWI abl acf acf @@ -47869,10 +50247,10 @@ acf nbw nbw nbw -pDt -pDt -pDt -qRj +aTy +aTy +aTy +hRB pDt oeN abt @@ -48082,9 +50460,9 @@ abl abl acf acf -abl -abl -abl +fDE +ogJ +jgy abl acf acf @@ -48304,14 +50682,14 @@ acf acf acf acf -abl -abl -abl +kLl +kLl +kLl abl acf acf acf -abl +jgy abl abl acf @@ -48532,10 +50910,10 @@ acf acf acf uxU -abl -abl -abl -abl +fDE +roQ +fDE +spK abl acf abl @@ -48760,10 +51138,10 @@ acf acf uxU uxU -izh -abl -abl -abv +mrg +fDE +fDE +qWI abl abl abl @@ -48988,10 +51366,10 @@ acf acf uxU uxU -izh -abl -abl -abl +mrg +thk +ogJ +jgy abl abl abl @@ -49216,9 +51594,9 @@ acf acf uxU acf -izh -abl -abl +mrg +kIM +spK abl abl abv @@ -49444,9 +51822,9 @@ acf acf acf acf -izh -abl -abl +mrg +fDE +spK abl abl abl @@ -49671,10 +52049,10 @@ acf acf acf acf -izh -izh -abl -abl +mrg +mrg +ogJ +jgy abl abl abl @@ -49899,9 +52277,9 @@ acf acf acf acf -izh -abl -abl +iTQ +rWs +jgy abv abl abl @@ -50127,7 +52505,7 @@ acf acf acf acf -izh +jZX abl abl abl @@ -51268,8 +53646,8 @@ acf acf acf acf -dGQ -any +oFJ +sLU dGQ acf acf @@ -51496,9 +53874,9 @@ pUm pUm pUm vVC -acg -acg -acg +bvj +mHk +egU pUm whU whU @@ -51715,8 +54093,8 @@ acf vVC pUm pUm -acg -aaN +iye +dtr acg pUm pUm @@ -51724,9 +54102,9 @@ pUm pUm vVC vVC -acg -acg -acg +uop +bvj +xar pUm whU whU @@ -51942,19 +54320,19 @@ acf uxU vVC vVC -acg -acg -acg -acg +fYG +bvj +mHk +iye pUm pUm pUm pUm vVC vVC -acg -acg -acg +rhi +etU +xar pUm whU whU @@ -52170,29 +54548,29 @@ vVC vVC vVC vVC -acg -acg -acg -acg +bvj +jRL +bvj +bvj pUm pUm pUm pUm vVC -acg -acg -aaN -acg +bvj +bvj +jgj +dLW pUm whU whU whU whU fTM -fTM -fTM -fTM -fTM +lSA +yfe +yfe +uyn fTM fTM fTM @@ -52397,19 +54775,19 @@ pUm vVC vVC vVC -acg -acg -acg -acg +bvj +bvj +pQV +bvj pUm pUm pUm pUm pUm vVC -acg -acg -acg +xwN +wCs +dLW acg pUm whU @@ -52418,20 +54796,20 @@ whU whU whU whU -fTM -fTM -fTM -fTM -akL -fTM -fTM -fTM -fTM +vAT +wLT +lBl +yfe +bQz fTM fTM fTM fTM fTM +lSA +eMe +eMe +uyn vCG pDt pDt @@ -52625,9 +55003,9 @@ pUm vVC vVC vVC -acg -aaN -acg +bvj +oQm +bvj pUm pUm pUm @@ -52635,8 +55013,8 @@ pUm pUm pUm pUm -acg -acg +bvj +xar acg pUm pUm @@ -52647,19 +55025,19 @@ whU whU whU unp -fTM -fTM -fTM -fTM -fTM +vAT +lNG +vAT +lBl +uyn jMS jMS fTM -fTM -fTM -fTM -fTM -fTM +lSA +bkK +vAT +vAT +lBl vCG pDt pDt @@ -52852,10 +55230,10 @@ pUm pUm pUm vVC -acg -acg -acg -acg +bvj +mfn +bvj +bvj pUm pUm pUm @@ -52863,8 +55241,8 @@ pUm pUm pUm pUm -gkC -nzw +nha +tEm gkC pUm pUm @@ -52877,16 +55255,16 @@ whU unp unp unp -fTM -fTM -fTM -jMS -jMS -akL -fTM -fTM -fTM -fTM +wLT +vAT +lBl +vAg +pGL +tSi +bkK +vAT +jJg +nrR whU whU pDt @@ -53064,7 +55442,7 @@ aag pZb pZb pZb -aag +uYj xpR xpR xpR @@ -53080,10 +55458,10 @@ pUm pUm pUm pUm -acg -acg -acg -acg +bvj +bvj +bvj +ifr pUm nzw nzw @@ -53106,12 +55484,12 @@ whU whU unp unp -fTM -fTM -fTM -fTM -fTM -fTM +vAT +vAT +vAT +vAT +vAT +vAT whU unp unp @@ -53281,21 +55659,21 @@ aag aag aag aag -aag -aag -aag -aag -aag +tVw +srn +srn +srn +pRD aag aag aag pZb pZb pZb -aag -aag -aag -aag +uYj +eqS +uYj +tuJ xpR xpR xpR @@ -53307,12 +55685,12 @@ pZb pUm pUm pUm -acg -acg -acg -acg -acg -acg +rID +woT +woT +woT +woT +dLW acg acg acg @@ -53333,12 +55711,12 @@ whU whU whU whU -fTM -fTM -akL -fTM -fTM -fTM +vAT +sxo +rby +vAT +vAT +jMD whU whU unp @@ -53509,24 +55887,24 @@ aag aag aag aag -aag -aag -aag -aai -aag -aag +dzM +uYj +tuJ +gzH +qfK +pRD aag aag aag pZb pZb -aag -aag -aag -aag -aag -aag -aag +uYj +uYj +uYj +mWA +uYj +uYj +uYj pZb pZb pZb @@ -53560,13 +55938,13 @@ whU whU whU whU -fTM -fTM -fTM -fTM -fTM -fTM -fTM +jlt +jlt +jlt +jlt +jlt +jlt +pET whU whU whU @@ -53736,27 +56114,27 @@ aai aag aag aag -aag -aai -aag -aag -aag -aag -aag +tVw +vxj +uYj +uYj +dHg +uYj +rIm aag aai aag vly -aag -aag -aag -aag -aag -aag -aag -aag -aag -aag +wYB +pFB +pFB +fsc +uYj +uYj +uYj +dIv +uYj +uYj pZb pZb pZb @@ -53799,9 +56177,9 @@ whU whU whU whU -fTM -fTM -fTM +yfe +yfe +uyn fTM fTM fTM @@ -53963,14 +56341,14 @@ aag aag aag aag -aag -aag -aag -aag +tVw +uHc +uYj +uYj xpR -aag -aag -aag +uYj +uYj +rIm aag aag aag @@ -53978,15 +56356,15 @@ vly aag aai aag -aag -aag -aai -aag -aag -aag -aag -aag -aag +wYB +pFB +sET +pFB +pFB +pFB +pFB +pFB +mFZ vly acg acg @@ -54028,8 +56406,8 @@ whU whU whU whU -fTM -fTM +vAT +fIW fTM fTM fTM @@ -54190,15 +56568,15 @@ aag aag aag aag -aag -aag -aag -aag +tVw +uHc +uYj +eYb xpR xpR -aag -aag -aag +uYj +uYj +rIm aag aag aag @@ -54216,11 +56594,11 @@ aag aag aag vly -acg -acg -acg -acg -acg +cop +iye +iye +iye +egU acg acg acg @@ -54256,8 +56634,8 @@ whU whU whU whU -fTM -fTM +fUj +fIW aeT fTM fTM @@ -54418,15 +56796,15 @@ aag aag aag aag -aag -aag -aab +dzM +uYj +rYe xpR xpR xpR -aag -aag -aag +uYj +uYj +rIm aag aag aag @@ -54442,14 +56820,14 @@ aag aag aag aag -aag -vly -acg -acg -acg -acg -acg -acg +tVw +cqC +kmH +mLv +bvj +bvj +elp +egU acg acg acg @@ -54483,9 +56861,9 @@ whU whU whU unp -fTM -fTM -fTM +vAT +vAT +fIW fTM sIH fTM @@ -54646,15 +57024,15 @@ aag aag aag aai -aag -aab -aab +dzM +rYe +rYe xpR xpR -aab -aag -aag -aag +rYe +uYj +anM +rIm aag aag aag @@ -54670,15 +57048,15 @@ aag aag aai aag -aag -vly -acg -acg -aaN -acg -acg -acg -acg +jBl +vdt +bvj +bvj +oQm +bvj +mfn +mHk +egU acg acg acg @@ -54712,8 +57090,8 @@ whU whU unp unp -fTM -fTM +vAT +fIW fTM agd afE @@ -54874,15 +57252,15 @@ aag aag aag aag -aab -aab +eaI +rYe pZb xpR pZb -aab -aag -aag -aag +rYe +tuJ +uYj +rIm aag aag aag @@ -54898,15 +57276,15 @@ aag aag aag aag -aag -aci +jBl +xSk vVC vVC vVC vVC -acg -acg -acg +bvj +fmV +oDE acg acg pUm @@ -54940,8 +57318,8 @@ whU whU whU unp -fTM -fTM +rGE +fIW akL adZ fTM @@ -55102,15 +57480,15 @@ aag aag aag aag -aab +eaI pZb pZb pZb pZb -aab -aag -aag -aag +rYe +ktr +sFD +mFZ aag aag aag @@ -55126,15 +57504,15 @@ aag aag aag aag -aag +wYB pZb pUm vVC vVC vVC vVC -xSA -nzw +lyZ +lhE gkC pUm pUm @@ -55168,8 +57546,8 @@ whU whU whU unp -fTM -fTM +vAT +fIW fTM adH fTM @@ -55319,10 +57697,10 @@ pZb pZb pZb pZb -aab -aab -aag -aag +vPo +vPo +wRb +pRD aag aag aag @@ -55335,8 +57713,8 @@ pZb pZb pZb pZb -aag -aag +ktr +mFZ aag aag aai @@ -55361,8 +57739,8 @@ pUm vVC vVC pUm -acg -acg +fYG +oDE acg pUm pUm @@ -55395,9 +57773,9 @@ whU whU whU whU -fTM -fTM -fTM +vQR +vAT +fIW aeT aek agA @@ -55547,11 +57925,11 @@ pZb pZb pZb pZb -aab -aag -aag -aag -aag +rYe +fRD +uYj +lLU +pRD aag aag aag @@ -55563,7 +57941,7 @@ pZb pZb pZb pZb -aag +mFZ aag aag aag @@ -55589,8 +57967,8 @@ pUm pUm pUm pUm -acg -acg +wCs +dLW acg pUm pUm @@ -55623,9 +58001,9 @@ whU fTM whU whU -fTM -fTM -fTM +sAh +sAh +pET fTM adH fTM @@ -55775,11 +58153,11 @@ pZb pZb pZb xpR -aab -aag -aai -aag -aag +rYe +uYj +gzH +mEo +rpx aag aag aag @@ -55817,8 +58195,8 @@ pUm pUm pUm pUm -acg -acg +xGL +egU acg pUm pUm @@ -56004,10 +58382,10 @@ pZb pZb xpR xpR -aag -aag -aag -aag +uYj +wMr +uYj +rpx aag aag aag @@ -56046,8 +58424,8 @@ pUm pUm pUm pUm -acg -aaN +mHk +dtr pUm pUm pUm @@ -56232,10 +58610,10 @@ pZb pZb xpR xpR -aag -aag -aag -aag +uYj +uYj +uYj +rpx aag aai aag @@ -56274,9 +58652,9 @@ pUm pUm pUm vVC -acg -acg -acg +bvj +mHk +egU abj pUm acg @@ -56312,9 +58690,9 @@ vCG fTM akL fTM -fTM -aeT -agA +lSA +rgj +gWE ahv ahv slW @@ -56460,10 +58838,10 @@ pZb pZb pZb xpR -aag -aag -aag -aag +bvS +uYj +ktr +mFZ aag aag aag @@ -56502,10 +58880,10 @@ pUm pUm vVC vVC -acg -acg -acg -acg +xmK +bvj +mHk +egU abo acg acg @@ -56540,9 +58918,9 @@ vCG fTM fTM fTM -fTM -fTM -fTM +vNT +vAT +vkS ahv ahv slW @@ -56688,9 +59066,9 @@ pZb pZb pZb pZb -aag -aag -aag +uYj +ktr +mFZ aag aag aag @@ -56730,10 +59108,10 @@ pUm pUm vVC vVC -acg -acg -acg -acg +rhi +bvj +mNl +oDE acg acg acg @@ -56767,10 +59145,10 @@ fTM whU whU fTM -fTM -fTM -fTM -fTM +lSA +bkK +vAT +vAT ahv ahv aeg @@ -56916,8 +59294,8 @@ pZb pZb pZb pZb -aab -aag +aPM +mFZ aag aag aag @@ -56958,10 +59336,10 @@ pUm pUm vVC vVC -acg -acg -acg -acg +bvj +bvj +wCs +dLW acg vjL acg @@ -56985,10 +59363,10 @@ whU jMS jMS fTM -fTM -fTM -fTM -fTM +lSA +eMe +eMe +uyn jMS jMS fTM @@ -56996,8 +59374,8 @@ whU ajc vCG whU -fTM -fTM +vAT +hTR pRT ahv ahv @@ -57186,9 +59564,9 @@ pUm pUm pUm pUm -acg -acg -acg +bvj +rER +dLW iiK acg acg @@ -57212,13 +59590,13 @@ whU whU whU whU -fTM -fTM -fTM -fTM -fTM -fTM -akL +eMe +bkK +ldi +vAT +lBl +loP +bQz fTM wEO fTM @@ -57413,9 +59791,9 @@ pUm pUm pUm pUm -acg -acg -acg +woT +woT +dLW acg acg acg @@ -57441,13 +59819,13 @@ whU whU whU aco -fTM -fTM -fTM -fTM -fTM -fTM -fTM +vAT +vAT +bcU +vAT +whx +lBl +uyn wEO fTM fTM @@ -57672,10 +60050,10 @@ whU unp unp unp -fTM -fTM -fTM -fTM +vAT +vAT +vAT +tqQ eFS fTM fTM @@ -57902,8 +60280,8 @@ whU unp unp unp -wEO -wEO +gsq +viC wEO fTM fTM @@ -58129,9 +60507,9 @@ whU whU whU whU -jMS -fTM -fTM +vAg +vAT +lSN fTM akL fTM @@ -58287,12 +60665,12 @@ pZb pZb pZb pZb -aab -aab -aag -aag -aag -aag +vPo +vPo +lzf +wRb +wRb +pRD aag aag aai @@ -58357,9 +60735,9 @@ whU whU whU whU -jMS -fTM -fTM +ecn +jlt +pET fTM fTM diW @@ -58516,15 +60894,15 @@ pZb pZb pZb pZb -aab -aab -aag -aai -aag -aag -aag -aag -aag +rYe +rYe +uYj +gzH +qfK +wRb +wRb +wRb +pRD aag aag aag @@ -58745,15 +61123,15 @@ pZb pZb pZb pZb -aab -aab -aag -aag -aag -aag -aag -aag -aag +cfL +rYe +uYj +qVi +egc +uYj +mEo +isL +pRD aag aag aai @@ -58778,7 +61156,7 @@ pZb pZb vVC vVC -nzw +uBR aaQ aaR aaR @@ -58978,10 +61356,10 @@ xpR xpR xpR xpR -aab -aab -aag -aag +rYe +rYe +uYj +rpx aag aag aag @@ -59006,8 +61384,8 @@ pZb pZb vVC vVC -nzw -nzw +uBR +uBR aaQ aaQ aaQ @@ -59207,9 +61585,9 @@ xpR xpR xpR xpR -aab -aab -aab +rYe +rYe +gze aab aab aab @@ -59234,8 +61612,8 @@ pZb pZb vVC vVC -acg -nzw +bvj +uBR nzw nzw nzw @@ -59462,10 +61840,10 @@ pZb pZb vVC vVC -acg -acg -acg -acg +bvj +bvj +mHk +egU acg aaN acg @@ -59478,9 +61856,9 @@ acg acg acg acg -acg -acg -nzw +iye +iye +bEj acg aaN acg @@ -59691,10 +62069,10 @@ pZb vVC vVC vVC -acg -acg -acg -acg +bvj +bvj +mHk +egU acg nzw bfY @@ -59706,9 +62084,9 @@ nzw nzw nzw pUm -acg -acg -nzw +pQV +bvj +lhE acg acg acg @@ -59919,11 +62297,11 @@ pZb pUm vVC vVC -acg -acg -aaN -acg -acg +bvj +bvj +oQm +mHk +egU nzw nHq jAo @@ -59932,11 +62310,11 @@ acg umb iyr eZC -nzw +uBR pUm vVC -acg -nzw +rAU +lhE acg acg acg @@ -60148,11 +62526,11 @@ pUm vVC vVC vVC -acg -acg -acg -acg -nzw +bvj +bvj +bvj +mHk +bEj jAo acg gkC @@ -60160,12 +62538,12 @@ acg gkC acg jAo -nzw +uBR vVC vVC aaQ -nzw -acg +qPY +egU acg acg acg @@ -60378,9 +62756,9 @@ vVC vVC vVC pUm -acg -acg -nzw +bvj +bvj +gVR umb umb umb @@ -60388,12 +62766,12 @@ aaN umb umb umb -nzw +uBR vVC vVC vVC -nzw -acg +uBR +oDE acg acg acg @@ -60606,9 +62984,9 @@ pUm vVC vVC vVC -acg -acg -nzw +bvj +bvj +qPY rwx acg gkC @@ -60616,12 +62994,12 @@ acg gkC acg dfJ -nzw +uBR pUm vVC vVC -nzw -acg +uBR +oDE acg acg acg @@ -60836,21 +63214,21 @@ vVC vVC vVC pUm -nzw -rPK +uBR +jhj upQ umb acg umb fAD rPK -nzw +uBR pUm pUm vVC -nzw -acg -aaN +uBR +mHk +dtr acg acg acg @@ -61064,8 +63442,8 @@ pUm vVC pUm pUm -nzw -nzw +uBR +gVR nzw nzw nzw @@ -61076,9 +63454,9 @@ nzw pUm pUm pUm -nzw -acg -acg +uBR +bvj +fGn acg acg aaQ diff --git a/maps/map_files/LV624/centralcaves/10.T.dmm b/maps/map_files/LV624/centralcaves/10.T.dmm index 7433f2f6131d..56c54485e09e 100644 --- a/maps/map_files/LV624/centralcaves/10.T.dmm +++ b/maps/map_files/LV624/centralcaves/10.T.dmm @@ -1,4 +1,22 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 5 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) +"b" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 8 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"c" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "d" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/central_caves) @@ -16,7 +34,7 @@ /area/lv624/ground/caves/central_caves) "h" = ( /obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/dirt, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/central_caves) "i" = ( /obj/structure/blocker/forcefield/multitile_vehicles, @@ -24,6 +42,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"j" = ( +/obj/item/reagent_container/food/snacks/grown/mushroom/amanita, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) "k" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) @@ -53,48 +75,136 @@ icon_state = "warning" }, /area/lv624/ground/barrens/containers) +"s" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 10 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"t" = ( +/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) +"u" = ( +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) +"v" = ( +/obj/effect/decal/grass_overlay/grass1, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "w" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/lv624/ground/barrens/west_barrens) -"z" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/gm/dirt, -/area/lv624/ground/caves/central_caves) "A" = ( /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/central_caves) +"B" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "C" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"D" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 8 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"E" = ( +/turf/closed/wall/strata_ice/jungle, +/area/lv624/ground/caves/south_central_caves) +"F" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 10 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) "G" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"H" = ( +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/barrens/north_east_barrens) +"I" = ( +/obj/effect/decal/grass_overlay/grass1, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/north_east_barrens) +"K" = ( +/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) +"M" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/barrens/north_east_barrens) +"N" = ( +/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) +"O" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) "Q" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"R" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"S" = ( +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"U" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) "V" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"Z" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) (1,1,1) = {" f -z -V -V -V -V -G -V -V +g +B +b +N +S +S +s +F Q V V @@ -111,13 +221,13 @@ l (2,1,1) = {" f g -V -V -V -V -V -V -V +R +U +S +K +S +S +v Q V V @@ -134,14 +244,14 @@ l (3,1,1) = {" f g -V -G -V -V +R +S +S +E +E l -l -n -n +v +Q V G V @@ -157,10 +267,10 @@ w (4,1,1) = {" f A -V -C l l +E +E l l l @@ -709,9 +819,9 @@ o (28,1,1) = {" f e -V -V -V +D +D +D l l l @@ -731,9 +841,9 @@ p "} (29,1,1) = {" f -f -V -V +O +S +S l l l @@ -754,8 +864,8 @@ p "} (30,1,1) = {" f -f -f +O +j l l l @@ -777,9 +887,9 @@ p "} (31,1,1) = {" f -f -f -l +c +Z +E l l l @@ -799,16 +909,16 @@ k p "} (32,1,1) = {" -f -f -l -l -l -l +O +u +E +E l l l l +E +E l l l @@ -823,16 +933,16 @@ p "} (33,1,1) = {" f -f +a h -k -k -k -k -l -l -k -k +H +H +H +M +E +E +t +I l k k diff --git a/maps/map_files/LV624/centralcaves/10.qc.dmm b/maps/map_files/LV624/centralcaves/10.qc.dmm index 1e84fde00653..5f63ae797e02 100644 --- a/maps/map_files/LV624/centralcaves/10.qc.dmm +++ b/maps/map_files/LV624/centralcaves/10.qc.dmm @@ -1,838 +1,1065 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"e" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, +"aD" = ( +/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/south_central_caves) +"bV" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 6 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"dd" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 9 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"gU" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 9 + }, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) -"f" = ( +"hJ" = ( +/obj/effect/decal/grass_overlay/grass1, /turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"hP" = ( +/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) +"hW" = ( +/obj/structure/fence, +/turf/open/floor{ + dir = 9; + icon_state = "warning" + }, +/area/lv624/ground/barrens/containers) +"iS" = ( +/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) +"kc" = ( +/obj/structure/flora/bush/ausbushes/pointybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"ks" = ( +/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) +"lp" = ( +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/central_caves) -"g" = ( +"lq" = ( +/turf/closed/wall/rock/brown, +/area/lv624/ground/barrens/west_barrens) +"mN" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, +/area/lv624/ground/barrens/north_east_barrens) +"oB" = ( +/obj/item/reagent_container/food/snacks/grown/mushroom/amanita, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_central_caves) -"h" = ( +"oJ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) -"k" = ( -/turf/open/gm/dirt, +"pd" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"pC" = ( +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/barrens/north_east_barrens) -"l" = ( -/turf/closed/wall/rock/brown, +"pR" = ( +/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) +"qK" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"ry" = ( +/obj/structure/flora/bush/ausbushes/var3/leafybush, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_central_caves) -"m" = ( +"sL" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"sO" = ( +/turf/closed/wall/strata_ice/jungle, +/area/lv624/ground/caves/south_central_caves) +"vC" = ( /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/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"vR" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"wk" = ( +/turf/closed/wall/rock/brown, +/area/lv624/ground/caves/south_central_caves) +"wL" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 10 + }, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) -"n" = ( +"yv" = ( /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) -"o" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +"yD" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) -"q" = ( -/obj/structure/fence, -/turf/open/floor{ - dir = 9; - icon_state = "warning" +"yO" = ( +/obj/effect/decal/grass_overlay/grass1, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/north_east_barrens) +"zh" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 6 }, -/area/lv624/ground/barrens/containers) -"r" = ( +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"An" = ( +/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) +"AL" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"DG" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 8 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"ER" = ( +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"GE" = ( +/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) +"GR" = ( +/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) +"Is" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) +"Jf" = ( +/obj/structure/flora/bush/ausbushes/var3/brflowers, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"JB" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"JX" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/south_central_caves) +"JZ" = ( /obj/structure/fence, /turf/open/floor{ dir = 1; icon_state = "warning" }, /area/lv624/ground/barrens/containers) -"w" = ( +"KX" = ( +/turf/open/gm/dirt, +/area/lv624/ground/barrens/west_barrens) +"Od" = ( +/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 = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/south_central_caves) +"Oe" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/auto_turf/strata_grass/layer1, +/area/lv624/ground/caves/central_caves) +"Pd" = ( /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/south_central_caves) -"x" = ( -/obj/effect/landmark/objective_landmark/close, +"PB" = ( /turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) +"Rx" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_central_caves) -"y" = ( -/turf/closed/wall/rock/brown, -/area/lv624/ground/barrens/west_barrens) -"C" = ( -/turf/open/gm/dirt, +"Tu" = ( +/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) -"O" = ( +"Uu" = ( +/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_central_caves) +"UB" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) +"Vd" = ( /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) -"P" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_membrane, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_membrane, +"VY" = ( +/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) +"Xj" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 10 + }, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) -"Y" = ( +"XV" = ( /turf/open/gm/dirt, -/area/lv624/ground/barrens/west_barrens) +/area/lv624/ground/caves/south_central_caves) +"ZM" = ( +/obj/effect/decal/grass_overlay/grass1{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/north_east_barrens) +"ZU" = ( +/obj/effect/decal/grass_overlay/grass1/inner{ + dir = 5 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/central_caves) (1,1,1) = {" -f -n -C -C -O -C -C -C -C -n -C -g -C -C -l -l -l -l -l -l -l +PB +qK +dd +DG +Vd +ER +ER +wL +Xj +qK +XV +sL +XV +XV +wk +wk +wk +wk +wk +wk +wk "} (2,1,1) = {" -f -n -C -g -C -C -C -g -C -n -C -C -C -C -C -l -l -l -l -y -Y +PB +qK +JB +Rx +ER +ks +ER +ER +hJ +qK +XV +XV +XV +XV +XV +wk +wk +wk +wk +lq +KX "} (3,1,1) = {" -f -n -C -C -l -l -l -w -w -w -C -C -C -C -C -C -l -l -l -Y -Y +PB +qK +JB +ER +ER +sO +sO +wk +hJ +qK +XV +XV +XV +XV +XV +XV +wk +wk +wk +KX +KX "} (4,1,1) = {" -f -w -l -l -l -l -l -l -l -l -l -C -C -C -C -C -l -l -l -Y -Y +PB +aD +wk +wk +sO +sO +wk +wk +wk +wk +wk +XV +XV +XV +XV +XV +wk +wk +wk +KX +KX "} (5,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -C -C -C -C -C -C -l -l -y -Y +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +XV +XV +XV +XV +XV +XV +wk +wk +lq +KX "} (6,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -l -l -C -C -C -C -C -l -y -Y +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +XV +XV +XV +XV +XV +wk +lq +KX "} (7,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -l -l -l -C -g -C -C -l -l -y +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +Tu +yv +qK +qK +wk +wk +lq "} (8,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -l -l -l -n -n -n -n -l -l -l +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +ER +wL +Xj +XV +AL +wk +wk "} (9,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -l -l -l -C -C -C -C -C -l -l +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +ER +kc +ER +hJ +XV +XV +wk +wk "} (10,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -l -l -P -C -C -C -C -C -l -l +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +sO +ER +ER +ER +hJ +XV +XV +wk +wk "} (11,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -l -P -P -C -C -C -C -l -l -l +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +sO +sO +ks +ER +bV +zh +XV +XV +wk +wk "} (12,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -P -P -C -C -C -C -l -l -l -l +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +sO +sO +sO +ER +ER +hJ +sL +XV +XV +wk +wk "} (13,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -P -C -C -C -C -g -l -l -l -l +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +sO +ER +ER +Rx +ER +GR +Xj +XV +XV +wk +wk "} (14,1,1) = {" -l -l -l -l -l -l -l -l -l -l -l -l -C -C -C -O -C -l -l -l -l +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +sO +ER +ER +ER +ER +hJ +XV +XV +wk +wk "} (15,1,1) = {" -l -l -l -l -l -l -C -C -l -l -l -l -l -C -C -C -C -C -l -l -l +wk +wk +wk +wk +wk +wk +XV +XV +wk +wk +wk +pd +iS +ER +ER +ER +hJ +XV +XV +wk +wk "} (16,1,1) = {" -l -l -l -l -l -C -C -C -C -l -l -l -l -l -C -C -C -C -C -l -l +wk +wk +wk +wk +wk +XV +XV +XV +XV +wk +wk +wk +sO +sO +ER +hP +hJ +XV +wk +wk +wk "} (17,1,1) = {" -l -l -l -C -C -C -C -C -C -C -l -l -l -C -C -g -C -x -l -l -l +wk +wk +wk +XV +XV +XV +XV +XV +XV +XV +wk +wk +wk +sO +ER +ER +hJ +XV +wk +wk +wk "} (18,1,1) = {" -l -l -l -C -C -g -C -C -C -g -C -C -l -C -C -C -C -P -l -l -l +wk +wk +wk +XV +XV +sL +XV +XV +XV +sL +XV +XV +wk +sO +ER +Jf +hJ +XV +wk +wk +wk "} (19,1,1) = {" -l -l -C -C -C -C -C -C -C -C -C -C -n -C -C -C -C -P -l -l -l +wk +wk +XV +XV +XV +XV +XV +XV +XV +XV +XV +XV +Od +ER +ER +ER +wL +Xj +XV +wk +wk "} (20,1,1) = {" -l -C -C -C -C -C -l -l -C -C -C -C -n -C -C -C -C -P -P -l -l +wk +XV +XV +XV +XV +XV +wk +wk +XV +XV +XV +XV +Od +ER +ER +VY +Rx +hJ +XV +wk +wk "} (21,1,1) = {" -f -C -C -C -C -C -l -l -C -C -C -g -w -C -C -C -g -C -P -l -l +PB +XV +XV +XV +XV +XV +wk +wk +XV +XV +XV +sL +Pd +ER +ER +ER +ER +hJ +XV +wk +wk "} (22,1,1) = {" -f -C -g -C -C -l -l -l -l -C -C -C -n -C -C -C -C -C -P -l -l +PB +XV +sL +XV +XV +wk +wk +wk +wk +XV +XV +XV +Od +ER +Rx +ER +JX +hJ +XV +wk +wk "} (23,1,1) = {" -f -f -C -C -l -l -l -l -l -l -C -C -n -C -C -C -C -C -P -l -l +PB +PB +XV +XV +wk +wk +wk +wk +wk +wk +XV +XV +Od +ER +ry +ER +bV +zh +XV +wk +wk "} (24,1,1) = {" -f -f -C -C -l -l -l -l -l -l -l -l -l -C -C -C -C -C -C -l -l +PB +PB +XV +XV +wk +wk +wk +wk +wk +wk +wk +wk +wk +pR +ER +ER +hJ +XV +wk +wk +wk "} (25,1,1) = {" -f -f -C -l -l -l -l -l -l -l -l -l -C -C -C -C -C -C -l -l -l +PB +PB +XV +wk +wk +wk +wk +wk +wk +wk +sO +sO +ER +ER +ER +Rx +hJ +XV +wk +wk +wk "} (26,1,1) = {" -f -f -C -l -l -l -l -l -l -l -l -x -C -C -C -g -C -C -l -l -l +PB +PB +XV +wk +wk +wk +wk +wk +wk +wk +sO +ER +ER +ER +Uu +ER +hJ +wk +wk +wk +wk "} (27,1,1) = {" -f -f -l -l -l -l -l -l -l -l -l -l -C -C -C -C -C -l -l -l -q +PB +PB +wk +wk +wk +wk +wk +wk +wk +wk +sO +sO +ER +ER +ER +ER +hJ +wk +wk +wk +hW "} (28,1,1) = {" -f -h -l -l -l -l -l -l -l -l -l -l -l -C -C -C -C -l -l -l -r +PB +oJ +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +ER +ER +ER +wk +wk +wk +wk +JZ "} (29,1,1) = {" -f -f -l -l -l -l -l -l -l -l -l -l -l -m -m -m -l -l -l -l -r +PB +UB +wk +wk +wk +wk +wk +wk +wk +wk +wk +sO +sO +An +An +vC +wk +wk +wk +wk +JZ "} (30,1,1) = {" -f -f -l -l -l -l -l -l -l -l -l -l -l -k -k -k -l -l -k -k -r +PB +UB +oB +wk +wk +wk +wk +wk +wk +wk +wk +wk +wk +ZM +ZM +ZM +wk +wk +yD +yD +JZ "} (31,1,1) = {" -f -f -f -l -l -l -l -l -l -l -l -l -k -k -k -k -k -k -k -k -r +PB +gU +Oe +sO +wk +wk +wk +wk +wk +wk +wk +wk +yD +yD +yD +yD +yD +yD +yD +yD +JZ "} (32,1,1) = {" -h -f -l -l -l -l -l -l -l -l -l -l -l -k -k -k -k -k -o -k -r +UB +lp +sO +sO +wk +wk +wk +wk +sO +sO +wk +wk +wk +yD +yD +yD +yD +yD +mN +yD +JZ "} (33,1,1) = {" -f -e -e -k -k -k -l -l -l -k -k -l -k -k -k -k -k -k -k -k -r +PB +ZU +Is +pC +pC +pC +vR +sO +sO +GE +yO +wk +yD +yD +yD +yD +yD +yD +yD +yD +JZ "} diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 62a748d9ecd0..528e0a02f7e3 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -36331,11 +36331,9 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, -/obj/structure/sign/poster{ - desc = "A large piece of cheap printed paper. This one proudly demands that you REMEMBER IO!"; - icon_state = "poster14"; - name = "propaganda poster"; - pixel_y = 32 +/obj/structure/sign/poster/io{ + pixel_y = 32; + name = "propaganda poster" }, /obj/structure/sign/safety/escapepod{ pixel_x = -17 @@ -39271,11 +39269,9 @@ /obj/structure/machinery/photocopier{ anchored = 0 }, -/obj/structure/sign/poster{ - desc = "A large piece of cheap printed paper. This one proudly demands that you REMEMBER IO!"; - icon_state = "poster14"; - name = "propaganda poster"; - pixel_y = 32 +/obj/structure/sign/poster/io{ + pixel_y = 32; + name = "propaganda poster" }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) diff --git a/tgui/packages/tgui/interfaces/CanvasLayer.js b/tgui/packages/tgui/interfaces/CanvasLayer.js new file mode 100644 index 000000000000..e647ae765b1c --- /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 && ( + + + + )} + this.handleMouseDown(e)} + onMouseUp={(e) => this.handleMouseUp(e)} + onMouseMove={(e) => this.handleMouseMove(e)} + /> +
+ ); + } + + 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 000000000000..cd5a9539f847 --- /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 && ( + + {parsedSvgData.map((line, index) => ( + + ))} + + )} +
+ ); + } +} diff --git a/tgui/packages/tgui/interfaces/OverwatchConsole.js b/tgui/packages/tgui/interfaces/OverwatchConsole.js index 1a6f67ac7ccd..1805f231fb16 100644 --- a/tgui/packages/tgui/interfaces/OverwatchConsole.js +++ b/tgui/packages/tgui/interfaces/OverwatchConsole.js @@ -61,7 +61,6 @@ const SquadPanel = (props, context) => { const { act, data } = useBackend(context); const [category, setCategory] = useLocalState(context, 'selected', 'monitor'); - let hello = 2; return ( <> diff --git a/tgui/packages/tgui/interfaces/TacmapAdminPanel.js b/tgui/packages/tgui/interfaces/TacmapAdminPanel.js new file mode 100644 index 000000000000..a5d00c688a2f --- /dev/null +++ b/tgui/packages/tgui/interfaces/TacmapAdminPanel.js @@ -0,0 +1,164 @@ +import { useBackend, useLocalState } from '../backend'; +import { Tabs, Section, Button, Stack, Flex } from '../components'; +import { DrawnMap } from './DrawnMap'; +import { Window } from '../layouts'; + +const PAGES = [ + { + title: 'USCM', + component: () => FactionPage, + color: 'blue', + icon: 'medal', + }, + { + title: 'Hive', + component: () => FactionPage, + color: 'purple', + icon: 'star', + }, +]; + +export const TacmapAdminPanel = (props, context) => { + const { data } = useBackend(context); + const { + uscm_map, + xeno_map, + uscm_svg, + xeno_svg, + uscm_ckeys, + xeno_ckeys, + uscm_names, + xeno_names, + uscm_times, + xeno_times, + uscm_selection, + xeno_selection, + map_fallback, + last_update_time, + } = data; + + const [pageIndex, setPageIndex] = useLocalState(context, 'pageIndex', 0); + + const PageComponent = PAGES[pageIndex].component(); + + return ( + + + + + + {PAGES.map((page, i) => { + if (page.canAccess && !page.canAccess(data)) { + return; + } + + return ( + setPageIndex(i)}> + {page.title} + + ); + })} + + + + + + +
+ +
+ + + + + ); +}; + +const FactionPage = (props, context) => { + const { act } = useBackend(context); + const { svg, ckeys, names, times, selected_map, is_uscm } = props; + + return ( +
+ act('recache', { + uscm: is_uscm, + }) + } + /> + }> + {Object(ckeys).map((ckey, ckey_index) => ( + + + + act('change_selection', { + uscm: is_uscm, + index: ckey_index, + }) + } + /> + + + {names[ckey_index]} ({ckey}) - {times[ckey_index]} + + + + act('delete', { + uscm: is_uscm, + index: ckey_index, + }) + } + /> + + + ))} +
+ ); +}; diff --git a/tgui/packages/tgui/interfaces/TacticalMap.tsx b/tgui/packages/tgui/interfaces/TacticalMap.tsx index 01ba483acf27..92996038719f 100644 --- a/tgui/packages/tgui/interfaces/TacticalMap.tsx +++ b/tgui/packages/tgui/interfaces/TacticalMap.tsx @@ -1,24 +1,330 @@ -import { useBackend } from '../backend'; -import { ByondUi } from '../components'; +import { useBackend, useLocalState } from '../backend'; +import { Button, Dropdown, Section, Stack, ProgressBar, Box, Tabs } from '../components'; import { Window } from '../layouts'; +import { CanvasLayer } from './CanvasLayer'; +import { DrawnMap } from './DrawnMap'; +import { ByondUi } from '../components'; interface TacMapProps { + toolbarColorSelection: string; + toolbarUpdatedSelection: string; + updatedCanvas: boolean; + themeId: number; + svgData: any; + canViewTacmap: number; + canDraw: number; + isXeno: boolean; + canViewCanvas: number; + newCanvasFlatImage: string; + oldCanvasFlatImage: string; + actionQueueChange: number; + exportedColor: string; + mapFallback: string; mapRef: string; + currentMenu: string; + lastUpdateTime: any; + nextCanvasTime: any; + canvasCooldown: any; + exportedTacMapImage: any; + tacmapReady: number; } +const PAGES = [ + { + title: 'tacmap', + canOpen: (data) => { + return 1; + }, + component: () => ViewMapPanel, + icon: 'map', + canAccess: (data) => { + return data.canViewTacmap; + }, + }, + { + title: 'old canvas', + canOpen: (data) => { + return 1; + }, + component: () => OldMapPanel, + icon: 'eye', + canAccess: (data) => { + return data.canViewCanvas; + }, + }, + { + title: 'new canvas', + canOpen: (data) => { + return data.tacmapReady; + }, + component: () => DrawMapPanel, + icon: 'paintbrush', + canAccess: (data) => { + return data.canDraw; + }, + }, +]; + +const colorOptions = [ + 'black', + 'red', + 'orange', + 'blue', + 'purple', + 'green', + 'brown', +]; + +const colors: Record = { + 'black': '#000000', + 'red': '#fc0000', + 'orange': '#f59a07', + 'blue': '#0561f5', + 'purple': '#c002fa', + 'green': '#02c245', + 'brown': '#5c351e', +}; + export const TacticalMap = (props, context) => { const { data, act } = useBackend(context); + const [pageIndex, setPageIndex] = useLocalState( + context, + 'pageIndex', + data.canViewTacmap ? 0 : 1 + ); + const PageComponent = PAGES[pageIndex].component(); + + const handleTacmapOnClick = (i, pageTitle) => { + setPageIndex(i); + act('menuSelect', { + selection: pageTitle, + }); + }; + return ( - + - +
+ + + + {PAGES.map((page, i) => { + if (page.canAccess(data) === 0) { + return; + } + return ( + handleTacmapOnClick(i, page.title)}> + {page.canOpen(data) === 0 ? 'loading' : page.title} + + ); + })} + + + +
+ ); }; + +const ViewMapPanel = (props, context) => { + const { data } = useBackend(context); + + // byond ui can't resist trying to render + if (data.canViewTacmap === 0 || data.mapRef === null) { + return ; + } + + return ( +
+ +
+ ); +}; + +const OldMapPanel = (props, context) => { + const { data } = useBackend(context); + return ( +
+ {data.canViewCanvas ? ( + + ) : ( + +

Unauthorized.

+ + )} +
+ ); +}; + +const DrawMapPanel = (props, context) => { + const { data, act } = useBackend(context); + + const timeLeftPct = data.canvasCooldown / data.nextCanvasTime; + const canUpdate = data.canvasCooldown <= 0 && !data.updatedCanvas; + + const handleTacMapExport = (image: any) => { + data.exportedTacMapImage = image; + }; + + const handleColorSelection = (dataSelection) => { + if (colors[dataSelection] !== null && colors[dataSelection] !== undefined) { + return colors[dataSelection]; + } else { + return dataSelection; + } + }; + const findColorValue = (oldValue: string) => { + return (Object.keys(colors) as Array).find( + (key) => colors[key] === (oldValue as string) + ); + }; + + return ( + <> +
+ + + {(!data.updatedCanvas && ( +
+
+ + act('selectColor', { color: findColorValue(value) }) + } + onDraw={() => act('onDraw')} + /> +
+ + ); +}; diff --git a/tgui/packages/tgui/styles/interfaces/TacticalMap.scss b/tgui/packages/tgui/styles/interfaces/TacticalMap.scss index 312c9ce262ff..a4ab13451772 100644 --- a/tgui/packages/tgui/styles/interfaces/TacticalMap.scss +++ b/tgui/packages/tgui/styles/interfaces/TacticalMap.scss @@ -9,3 +9,7 @@ margin: 0.5em; text-align: center; } + +.progress-stack { + margin-top: 15px; +}