diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 9702d51004ad..6844721cd7f0 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -71,3 +71,6 @@ var/global/list/note_categories = list("Admin", "Merit", "Commanding Officer", " #define ANTIGRIEF_NEW_PLAYERS 1 /// Enables antigrief entirely: Nobody can activate explosives on the Almayer, unless the ship crashed. #define ANTIGRIEF_ENABLED 2 + +/// Proc has been blocked by IsAdminAdvancedProcCall() +#define PROC_BLOCKED "PROCCALL BLOCKED" diff --git a/code/__DEFINES/client_prefs.dm b/code/__DEFINES/client_prefs.dm index ef5ff00e4ed6..b1e194354555 100644 --- a/code/__DEFINES/client_prefs.dm +++ b/code/__DEFINES/client_prefs.dm @@ -22,6 +22,7 @@ #define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand. #define TOGGLE_START_JOIN_CURRENT_SLOT (1<<16) // Whether joining at roundstart ignores assigned character slot for the job and uses currently selected slot. #define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot. +#define TOGGLE_ABILITY_DEACTIVATION_OFF (1<<18) // This toggles whether selecting the same ability again can toggle it off #define JOB_SLOT_RANDOMISED_SLOT -1 #define JOB_SLOT_CURRENT_SLOT 0 diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm index 141d69c69b11..fc8ca4e03a9f 100644 --- a/code/__DEFINES/conflict.dm +++ b/code/__DEFINES/conflict.dm @@ -200,6 +200,7 @@ // human armor #define CLOTHING_ARMOR_NONE 0 +#define CLOTHING_ARMOR_VERYLOW 5 #define CLOTHING_ARMOR_LOW 10 #define CLOTHING_ARMOR_MEDIUMLOW 15 #define CLOTHING_ARMOR_MEDIUM 20 diff --git a/code/__DEFINES/dcs/signals/atom/signals_obj.dm b/code/__DEFINES/dcs/signals/atom/signals_obj.dm index df53558834f6..aebd0d09d0d2 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_obj.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_obj.dm @@ -4,6 +4,8 @@ /// From /obj/effect/alien/weeds/Initialize() #define COMSIG_WEEDNODE_GROWTH_COMPLETE "weednode_growth_complete" +/// From /obj/effect/alien/weeds/Initialize() +#define COMSIG_WEEDNODE_GROWTH "weednode_growth" /// From /obj/effect/alien/weeds/proc/on_weed_expand() #define COMSIG_WEEDNODE_CANNOT_EXPAND_FURTHER "weednode_cannot_expand_further" @@ -24,3 +26,6 @@ #define COMSIG_TRANSMITTER_UPDATE_ICON "transmitter_update_icon" #define COMSIG_TENT_COLLAPSING "tent_collapsing" + +/// from /obj/proc/afterbuckle() +#define COSMIG_OBJ_AFTER_BUCKLE "signal_obj_after_buckle" diff --git a/code/__DEFINES/dcs/signals/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum.dm index a7a93c4ea114..7696d8ad6037 100644 --- a/code/__DEFINES/dcs/signals/signals_datum.dm +++ b/code/__DEFINES/dcs/signals/signals_datum.dm @@ -61,3 +61,6 @@ // from /datum/emergency_call/proc/spawn_candidates() #define COMSIG_ERT_SETUP "ert_setup" + +// from /proc/update_living_queens() : /mob/living/carbon/xenomorph/queen +#define COMSIG_HIVE_NEW_QUEEN "hive_new_queen" diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm index 90a50fad138c..9781f61ec95c 100644 --- a/code/__DEFINES/dcs/signals/signals_global.dm +++ b/code/__DEFINES/dcs/signals/signals_global.dm @@ -53,3 +53,6 @@ /// From /datum/admins/proc/force_predator_round() #define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toglged" + +/// From /datum/game_mode/colonialmarines/proc/check_ground_humans() +#define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling" diff --git a/code/__DEFINES/sounds.dm b/code/__DEFINES/sounds.dm index 51279e0ca0cd..f01ddfc86792 100644 --- a/code/__DEFINES/sounds.dm +++ b/code/__DEFINES/sounds.dm @@ -71,6 +71,7 @@ #define AMBIENCE_ALMAYER 'sound/ambience/almayerambience.ogg' #define AMBIENCE_LV624 'sound/ambience/ambienceLV624.ogg' #define AMBIENCE_BIGRED 'sound/ambience/desert.ogg' +#define AMBIENCE_NV 'sound/ambience/ambienceNV.ogg' #define AMBIENCE_PRISON 'sound/ambience/shipambience.ogg' #define AMBIENCE_TRIJENT 'sound/ambience/desert.ogg' diff --git a/code/__DEFINES/speech_channels.dm b/code/__DEFINES/speech_channels.dm index 405506678407..3f6e4720bde9 100644 --- a/code/__DEFINES/speech_channels.dm +++ b/code/__DEFINES/speech_channels.dm @@ -4,6 +4,5 @@ #define ME_CHANNEL "Me" #define OOC_CHANNEL "OOC" #define LOOC_CHANNEL "LOOC" -#define MOD_CHANNEL "MSAY" #define ADMIN_CHANNEL "ASAY" #define MENTOR_CHANNEL "Mentor" diff --git a/code/__DEFINES/tgs.dm b/code/__DEFINES/tgs.dm index 89976c498422..22c3827022ff 100644 --- a/code/__DEFINES/tgs.dm +++ b/code/__DEFINES/tgs.dm @@ -1,6 +1,6 @@ // tgstation-server DMAPI -#define TGS_DMAPI_VERSION "6.5.0" +#define TGS_DMAPI_VERSION "6.5.2" // All functions and datums outside this document are subject to change with any version and should not be relied on. diff --git a/code/__DEFINES/tgui.dm b/code/__DEFINES/tgui.dm index 865088ee72fc..ca6408961eab 100644 --- a/code/__DEFINES/tgui.dm +++ b/code/__DEFINES/tgui.dm @@ -32,7 +32,7 @@ /// Creates a message packet for sending via output() // This is {"type":type,"payload":payload}, but pre-encoded. This is much faster // than doing it the normal way. -// To ensure this is correct, this is unit tested in tgui_create_message. However, CM does not have unit tests available. +// To ensure this is correct, this is unit tested in tgui_create_message. #define TGUI_CREATE_MESSAGE(type, payload) ( \ "%7b%22type%22%3a%22[type]%22%2c%22payload%22%3a[url_encode(json_encode(payload))]%7d" \ ) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index dd700ccde996..288604434e34 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -123,7 +123,7 @@ #define TRAIT_SUPER_STRONG "t_super_strong" /// Foreign biology. Basic medHUDs won't show the mob. (Yautja, Zombies) #define TRAIT_FOREIGN_BIO "t_foreign_bio" -/// Eye color changes on intent. (G1 Synths) +/// Eye color changes on intent. (G1 Synths and WJs) #define TRAIT_INTENT_EYES "t_intent_eyes" /// Masked synthetic biology. Basic medHUDs will percieve the mob as human. (Infiltrator Synths) #define TRAIT_INFILTRATOR_SYNTH "t_infiltrator_synth" @@ -157,6 +157,8 @@ #define TRAIT_LEADERSHIP "t_leadership" /// If the mob can see the reagents contents of stuff #define TRAIT_REAGENT_SCANNER "reagent_scanner" +/// If the mob cannot eat/be fed +#define TRAIT_CANNOT_EAT "t_cannot_eat" /// If the mob is being lazed by a sniper spotter #define TRAIT_SPOTTER_LAZED "t_spotter_lazed" /// If the mob has ear protection. Protects from external ear damage effects. Includes explosions, firing the RPG, screeching DEAFNESS only, and flashbangs. @@ -179,6 +181,8 @@ #define TRAIT_ABILITY_NO_PLASMA_TRANSFER "t_ability_no_plasma_transfer" /// Shows that the xeno queen is on ovi #define TRAIT_ABILITY_OVIPOSITOR "t_ability_ovipositor" +/// Used for burrowed mobs, prevent's SG/sentrys/claymores from autofiring +#define TRAIT_ABILITY_BURROWED "t_ability_burrowed" //-- item traits -- // TOOL TRAITS @@ -231,7 +235,8 @@ GLOBAL_LIST_INIT(mob_traits, list( TRAIT_TWOBORE_TRAINING, TRAIT_LEADERSHIP, TRAIT_DEXTROUS, - TRAIT_REAGENT_SCANNER + TRAIT_REAGENT_SCANNER, + TRAIT_ABILITY_BURROWED )) /* @@ -261,6 +266,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_BIMEX" = TRAIT_BIMEX, "TRAIT_EMOTE_CD_EXEMPT" = TRAIT_EMOTE_CD_EXEMPT, "TRAIT_LISPING" = TRAIT_LISPING, + "TRAIT_CANNOT_EAT" = TRAIT_CANNOT_EAT, ), /mob/living/carbon/xenomorph = list( "TRAIT_ABILITY_NO_PLASMA_TRANSFER" = TRAIT_ABILITY_NO_PLASMA_TRANSFER, diff --git a/code/__DEFINES/weather.dm b/code/__DEFINES/weather.dm index 16ee8154241f..c67575f80720 100644 --- a/code/__DEFINES/weather.dm +++ b/code/__DEFINES/weather.dm @@ -5,6 +5,7 @@ #define PROB_WEATHER_SOROKYNE 100 //Map specific defines go here. #define PROB_WEATHER_BIG_RED 30 #define PROB_WEATHER_LV624 30 +#define PROB_WEATHER_NEW_VARADERO 100 #define WEATHER_TYPE_NO_WEATHER 0 #define WEATHER_TYPE_SNOW 1 diff --git a/code/__DEFINES/wj_emotes.dm b/code/__DEFINES/wj_emotes.dm new file mode 100644 index 000000000000..f315c6eb2ba5 --- /dev/null +++ b/code/__DEFINES/wj_emotes.dm @@ -0,0 +1,8 @@ +#define JOE_EMOTE_CATEGORY_GREETING "Greeting" +#define JOE_EMOTE_CATEGORY_TASK_UPDATE "Task Update" +#define JOE_EMOTE_CATEGORY_RESTRICTED_AREA "Restricted Area" +#define JOE_EMOTE_CATEGORY_FAREWELL "Farewell" +#define JOE_EMOTE_CATEGORY_QUIP "Quip" +#define JOE_EMOTE_CATEGORY_WARNING "Warning" +#define JOE_EMOTE_CATEGORY_QUESTION "Question" +#define JOE_EMOTE_CATEGORY_NOTICE "Notice" diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 7741beecedef..ac783b6f426e 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -132,6 +132,7 @@ // Weed defines #define WEED_LEVEL_WEAK 0 #define WEED_LEVEL_STANDARD 1.5 +#define WEED_LEVEL_HARDY 1.6 #define WEED_LEVEL_HIVE 4 #define WEED_RANGE_STANDARD 3 @@ -167,6 +168,8 @@ #define XENO_LEAVE_TIMER_LARVA 80 //80 seconds /// The time against away_timer when an AFK xeno (not larva) can be replaced #define XENO_LEAVE_TIMER 300 //300 seconds +/// The time against away_timer when an AFK facehugger converts to a npc +#define XENO_FACEHUGGER_LEAVE_TIMER 420 //420 seconds /// The time against away_timer when an AFK xeno gets listed in the available list so ghosts can get ready #define XENO_AVAILABLE_TIMER 60 //60 seconds diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index 888e3c2ce657..ff8e31ad3e8a 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -65,4 +65,4 @@ var/atom/cmp_dist_origin=null /// Compares observers based on their larva_queue_time value in ascending order /// Assumes the client on the observer is not null /proc/cmp_obs_larvaqueuetime_asc(mob/dead/observer/A, mob/dead/observer/B) - return A.client.larva_queue_time - B.client.larva_queue_time + return A.client.player_details.larva_queue_time - B.client.player_details.larva_queue_time diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 61976f4dc903..cca3edda464e 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -241,8 +241,14 @@ else return get_step(start, EAST) -/// Get a list of observers that can be alien candidates, optionally sorted by larva_queue_time -/proc/get_alien_candidates(sorted = TRUE) +/** + * Get a list of observers that can be alien candidates. + * + * Arguments: + * * hive - The hive we're filling a slot for to check if the player is banished + * * sorted - Whether to sort by larva_queue_time (default TRUE) or leave unsorted + */ +/proc/get_alien_candidates(datum/hive_status/hive = null, sorted = TRUE) var/list/candidates = list() for(var/mob/dead/observer/cur_obs as anything in GLOB.observer_list) @@ -273,6 +279,15 @@ if((cur_obs.client.admin_holder && (cur_obs.client.admin_holder.rights & R_MOD)) && !cur_obs.adminlarva) continue + if(hive) + var/banished = FALSE + for(var/mob_name in hive.banished_ckeys) + if(hive.banished_ckeys[mob_name] == cur_obs.ckey) + banished = TRUE + break + if(banished) + continue + candidates += cur_obs // Optionally sort by larva_queue_time @@ -290,21 +305,16 @@ * * cache_only - Whether to not actually send a to_chat message and instead only update larva_queue_cached_message */ /proc/message_alien_candidates(list/candidates, dequeued, cache_only = FALSE) - var/new_players = 0 for(var/i in (1 + dequeued) to candidates.len) var/mob/dead/observer/cur_obs = candidates[i] // Generate the messages - var/cached_message = SPAN_XENONOTICE("You are currently [i-dequeued]\th in the larva queue. There are [new_players] ahead of you that have yet to play this round.") + var/cached_message = SPAN_XENONOTICE("You are currently [i-dequeued]\th in the larva queue.") cur_obs.larva_queue_cached_message = cached_message if(!cache_only) var/chat_message = dequeued ? replacetext(cached_message, "currently", "now") : cached_message to_chat(candidates[i], chat_message) - // Count how many are prioritized - if(cur_obs.client.larva_queue_time < 2) // 0 and 1 because facehuggers/t-domers are slightly deprioritized - new_players++ - /proc/convert_k2c(temp) return ((temp - T0C)) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 960f894d676f..4e4a1b3ff31c 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -226,7 +226,6 @@ if(rights & R_POSSESS) . += "[seperator]+POSSESS" if(rights & R_PERMISSIONS) . += "[seperator]+PERMISSIONS" if(rights & R_STEALTH) . += "[seperator]+STEALTH" - if(rights & R_REJUVINATE) . += "[seperator]+REJUVINATE" if(rights & R_COLOR) . += "[seperator]+COLOR" if(rights & R_VAREDIT) . += "[seperator]+VAREDIT" if(rights & R_SOUNDS) . += "[seperator]+SOUND" diff --git a/code/__HELPERS/verb_helpers.dm b/code/__HELPERS/verb_helpers.dm index d042929f1184..4bc3ae584cd6 100644 --- a/code/__HELPERS/verb_helpers.dm +++ b/code/__HELPERS/verb_helpers.dm @@ -10,7 +10,7 @@ if(!target) CRASH("add_verb called without a target") if(IsAdminAdvancedProcCall()) - return + return PROC_BLOCKED var/mob/mob_target = null if(ismob(target)) @@ -56,7 +56,7 @@ */ /proc/remove_verb(client/target, verb_or_list_to_remove) if(IsAdminAdvancedProcCall()) - return + return PROC_BLOCKED var/mob/mob_target = null if(ismob(target)) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 121d1e305e43..09b55accf16d 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -25,7 +25,6 @@ DEFINE_BITFIELD(rights, list( "POSSESS" = R_POSSESS, "PERMISSIONS" = R_PERMISSIONS, "STEALTH" = R_STEALTH, - "REJUVENATE" = R_REJUVINATE, "COLOR" = R_COLOR, "VAREDIT" = R_VAREDIT, "SOUNDS" = R_SOUNDS, diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 86d5a11a668e..08de7b5c02ff 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -24,7 +24,8 @@ /datum/controller/configuration/proc/admin_reload() if(IsAdminAdvancedProcCall()) - return + alert_proccall("configuration admin_reload") + return PROC_BLOCKED log_admin("[key_name(usr)] has forcefully reloaded the configuration from disk.") message_admins("[key_name_admin(usr)] has forcefully reloaded the configuration from disk.") full_wipe() @@ -33,7 +34,8 @@ /datum/controller/configuration/proc/Load(_directory) if(IsAdminAdvancedProcCall()) //If admin proccall is detected down the line it will horribly break everything. - return + alert_proccall("configuration Load") + return PROC_BLOCKED if(_directory) directory = _directory if(entries) @@ -117,7 +119,8 @@ /datum/controller/configuration/proc/full_wipe() if(IsAdminAdvancedProcCall()) - return + alert_proccall("configuration full_wipe") + return PROC_BLOCKED entries_by_type.Cut() QDEL_LIST_ASSOC_VAL(entries) entries = null @@ -163,7 +166,8 @@ /datum/controller/configuration/proc/LoadEntries(filename, list/stack = list()) if(IsAdminAdvancedProcCall()) - return + alert_proccall("configuration LoadEntries") + return PROC_BLOCKED var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename if(filename_to_test in stack) @@ -264,7 +268,7 @@ CRASH("Missing config entry for [entry_type]!") if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]") - return + return PROC_BLOCKED return E.config_entry_value @@ -278,7 +282,7 @@ CRASH("Missing config entry for [entry_type]!") if((E.protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") log_admin_private("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]") - return + return PROC_BLOCKED return E.ValidateAndSet("[new_val]") diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index fdf79db138f7..743f9be9fec0 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -122,3 +122,8 @@ /datum/config_entry/number/extra_larva_per_burst config_entry_value = 1 integer = FALSE + +/datum/config_entry/number/embryo_burst_timer + min_val = 1 + config_entry_value = 450 + integer = TRUE diff --git a/code/controllers/subsystem/x_evolution.dm b/code/controllers/subsystem/x_evolution.dm index 9f84513e9e2d..be787b37de80 100644 --- a/code/controllers/subsystem/x_evolution.dm +++ b/code/controllers/subsystem/x_evolution.dm @@ -3,7 +3,7 @@ #define EVOLUTION_INCREMENT_TIME (30 MINUTES) // Evolution increases by 1 every 25 minutes. SUBSYSTEM_DEF(xevolution) - name = "Evilution" + name = "Evilution" //This is not a typo, do not change it. wait = 1 MINUTES priority = SS_PRIORITY_INACTIVITY diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm index 6deb27a6817b..ef77aaf471dc 100644 --- a/code/datums/components/footstep.dm +++ b/code/datums/components/footstep.dm @@ -13,8 +13,9 @@ var/falloff ///This can be a list OR a soundfile OR null. Determines whatever sound gets played. var/footstep_sounds + var/drag_sounds -/datum/component/footstep/Initialize(steps_ = 2, volume_ = 50, range_ = null, falloff_ = 1, footstep_sounds_ = "alien_footstep_large") +/datum/component/footstep/Initialize(steps_ = 2, volume_ = 50, range_ = null, falloff_ = 1, footstep_sounds_ = "alien_footstep_large", drag_sounds_ = 'sound/effects/alien_dragsound_large.ogg') if(!isliving(parent)) return COMPONENT_INCOMPATIBLE steps = steps_ @@ -22,6 +23,7 @@ range = range_ falloff = falloff_ footstep_sounds = footstep_sounds_ + drag_sounds = drag_sounds_ RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), PROC_REF(play_simplestep)) @@ -31,7 +33,7 @@ return var/mob/living/LM = parent - if(LM.buckled || LM.lying || LM.throwing || LM.is_ventcrawling) + if(LM.buckled || LM.throwing || LM.is_ventcrawling || LM.stat == DEAD) return if(LM.life_steps_total % steps) @@ -44,5 +46,8 @@ var/turf/open/T = prepare_step() if(!T) return - if(isfile(footstep_sounds) || istext(footstep_sounds)) + var/mob/living/parent_mob = parent + if(parent_mob.lying && (isfile(drag_sounds) || istext(drag_sounds))) + playsound(T, drag_sounds, volume, rand(20000, 25000), range, falloff = falloff) + else if(isfile(footstep_sounds) || istext(footstep_sounds)) playsound(T, footstep_sounds, volume, rand(20000, 25000), range, falloff = falloff) diff --git a/code/datums/components/weed_food.dm b/code/datums/components/weed_food.dm new file mode 100644 index 000000000000..0c578b661517 --- /dev/null +++ b/code/datums/components/weed_food.dm @@ -0,0 +1,297 @@ +#define WEED_FOOD_DELAY 5 MINUTES +#define WEED_FOOD_STATE_DELAY 1 MINUTES + +/atom/movable/vis_obj/weed_food + name = "weeds" + desc = "Weird black weeds in the shape of a body..." + gender = PLURAL + vis_flags = VIS_INHERIT_DIR|VIS_INHERIT_PLANE|VIS_INHERIT_LAYER + icon = 'icons/mob/xenos/weeds.dmi' + var/static/list/icon_states = list("human_1","human_2","human_3","human_4","human_5") + var/static/list/icon_states_flipped = list("human_1_f","human_2_f","human_3_f","human_4_f","human_5_f") + var/icon_state_idx = 0 + var/timer_id = null + var/flipped = FALSE + +/atom/movable/vis_obj/weed_food/Initialize(mapload, is_flipped, ...) + flipped = is_flipped + timer_id = addtimer(CALLBACK(src, PROC_REF(on_animation_timer)), WEED_FOOD_STATE_DELAY, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_LOOP|TIMER_DELETE_ME) + on_animation_timer() + return ..() + +/// Timer callback for changing the icon_state +/atom/movable/vis_obj/weed_food/proc/on_animation_timer() + icon_state_idx++ + if(icon_state_idx > length(icon_states)) + deltimer(timer_id) + timer_id = null + return + icon_state = flipped ? icon_states_flipped[icon_state_idx] : icon_states[icon_state_idx] + +/** + * A component that can be attached to a mob/living to be merged with weeds after a delay. + * Attempting to attach a new weed_food even if one already exists is equivalent to calling start(). + * + * Attach this to any mob/living that is dead (death or initialized dead) and it should handle the rest. + */ +/datum/component/weed_food + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS + /// Whether we are waiting on timer to merge + var/active = FALSE + /// Whether we are merged with weeds + var/merged = FALSE + /// The time we were unmerged (just to handle weeds upgrading) + var/unmerged_time + /// Any active timer for a pending merge + var/timer_id = null + /// The living mob that we are bound to + var/mob/living/parent_mob + /// The turf that our parent is on + var/turf/parent_turf + /// The obj that our parent is buckled to and we have registered a signal + var/obj/parent_buckle + /// The weeds that we are merging/merged with + var/obj/effect/alien/weeds/absorbing_weeds + /// The overlay image when merged + var/atom/movable/vis_obj/weed_food/weed_appearance + +/datum/component/weed_food/Initialize(...) + parent_mob = parent + //if(!istype(parent_mob)) + //return COMPONENT_INCOMPATIBLE + if(!istype(parent_mob, /mob/living/carbon/human)) + return COMPONENT_INCOMPATIBLE // TODO: At the moment we only support humans + + parent_turf = get_turf(parent_mob) + if(parent_turf != parent_mob.loc) + parent_turf = null // if our location is actually a container, we want to be safe from weeds + + start() + +/datum/component/weed_food/InheritComponent(datum/component/C, i_am_original) + start() + +/datum/component/weed_food/Destroy(force, silent) + . = ..() + + unmerge_with_weeds() + QDEL_NULL(weed_appearance) + parent_mob = null + parent_turf = null + +/datum/component/weed_food/RegisterWithParent() + RegisterSignal(parent_mob, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(parent_mob, list(COMSIG_LIVING_REJUVENATED, COMSIG_HUMAN_REVIVED), PROC_REF(on_rejuv)) + RegisterSignal(parent_mob, COMSIG_HUMAN_SET_UNDEFIBBABLE, PROC_REF(on_update)) + if(parent_turf) + RegisterSignal(parent_turf, COMSIG_WEEDNODE_GROWTH, PROC_REF(on_update)) + +/datum/component/weed_food/UnregisterFromParent() + if(parent_mob) + UnregisterSignal(parent_mob, list( + COMSIG_MOVABLE_MOVED, + COMSIG_LIVING_REJUVENATED, + COMSIG_HUMAN_REVIVED, + COMSIG_HUMAN_SET_UNDEFIBBABLE, + )) + if(absorbing_weeds) + UnregisterSignal(absorbing_weeds, COMSIG_PARENT_QDELETING) + if(parent_turf) + UnregisterSignal(parent_turf, COMSIG_WEEDNODE_GROWTH) + if(parent_buckle) + UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE) + +/// SIGNAL_HANDLER for COMSIG_MOVABLE_MOVED +/datum/component/weed_food/proc/on_move() + SIGNAL_HANDLER + + if(absorbing_weeds) + UnregisterSignal(absorbing_weeds, COMSIG_PARENT_QDELETING) + absorbing_weeds = null + + if(parent_turf) + UnregisterSignal(parent_turf, COMSIG_WEEDNODE_GROWTH) + parent_turf = get_turf(parent_mob) + if(parent_turf != parent_mob.loc) + parent_turf = null // if our location is actually a container, we want to be safe from weeds + else + RegisterSignal(parent_turf, COMSIG_WEEDNODE_GROWTH, PROC_REF(on_update)) + + // We moved, restart or start the proccess + if(stop() || !merged) + start() + return + + // If we somehow moved when we were merged, handle that + absorbing_weeds = parent_turf?.weeds + if(absorbing_weeds) + RegisterSignal(absorbing_weeds, COMSIG_PARENT_QDELETING, PROC_REF(on_weed_deletion)) + return + unmerge_with_weeds() + +/// SIGNAL_HANDLER for COMSIG_LIVING_REJUVENATED and COMSIG_HUMAN_REVIVED +/datum/component/weed_food/proc/on_rejuv() + SIGNAL_HANDLER + + qdel(src) + +/// SIGNAL_HANDLER for COSMIG_OBJ_AFTER_BUCKLE +/datum/component/weed_food/proc/on_after_buckle(obj/source, mob/buckled) + SIGNAL_HANDLER + + if(buckled) + return + start() // We unbuckled, so lets try to start again + +/// SIGNAL_HANDLER for COMSIG_HUMAN_SET_UNDEFIBBABLE & COMSIG_WEEDNODE_GROWTH +/datum/component/weed_food/proc/on_update() + SIGNAL_HANDLER + + start() + +/// SIGNAL_HANDLER for COMSIG_PARENT_QDELETING of weeds +/datum/component/weed_food/proc/on_weed_deletion() + SIGNAL_HANDLER + + if(active) + stop() + return + if(merged) + unmerge_with_weeds() + return + +/** + * Try to start the process to turn into weeds + * Returns TRUE if started successfully + */ +/datum/component/weed_food/proc/start() + if(active) + return FALSE + if(merged) + return FALSE + if(QDELETED(parent_mob)) + return FALSE + + if(parent_mob.buckled) + if(parent_mob.buckled == parent_buckle) + return FALSE // Still buckled to the same thing + if(!istype(parent_mob.buckled, /obj/structure/bed/nest)) + if(parent_buckle) // Still have a lingering reference somehow? + UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE) + parent_buckle = parent_mob.buckled + RegisterSignal(parent_mob.buckled, COSMIG_OBJ_AFTER_BUCKLE, PROC_REF(on_after_buckle)) + return FALSE + if(parent_buckle) + UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE) + parent_buckle = null + + if(parent_mob.is_xeno_grabbable()) + return FALSE + if(!(parent_mob.status_flags & PERMANENTLY_DEAD)) + var/mob/living/carbon/human/parent_human = parent_mob + if(istype(parent_human) && !parent_human.undefibbable) + return FALSE + if(!parent_turf?.weeds) + return FALSE + + if(unmerged_time == world.time) + return merge_with_weeds() // Weeds upgraded, re-merge now re-using the apperance + QDEL_NULL(weed_appearance) + absorbing_weeds = parent_turf.weeds + RegisterSignal(parent_turf.weeds, COMSIG_PARENT_QDELETING, PROC_REF(on_weed_deletion)) + + active = TRUE + timer_id = addtimer(CALLBACK(src, PROC_REF(merge_with_weeds)), WEED_FOOD_DELAY, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_DELETE_ME|TIMER_OVERRIDE) + + return TRUE + +/** + * Try to stop the process turning into weeds + * Returns TRUE if stopped successfully (was active when called) + */ +/datum/component/weed_food/proc/stop() + if(!active) + return FALSE + + active = FALSE + deltimer(timer_id) + timer_id = null + + return TRUE + +/** + * Finish becomming one with the weeds + * Returns TRUE if merged successfully + */ +/datum/component/weed_food/proc/merge_with_weeds() + if(merged) + return FALSE + if(QDELETED(parent_mob)) + return FALSE + + if(absorbing_weeds) // Remove the signal that would call stop + UnregisterSignal(absorbing_weeds, COMSIG_PARENT_QDELETING) + + if(parent_mob.buckled) + if(parent_mob.buckled == parent_buckle) + return FALSE // Still buckled to the same thing somehow? + if(!istype(parent_mob.buckled, /obj/structure/bed/nest)) + if(parent_buckle) // Still have a lingering reference somehow? + UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE) + parent_buckle = parent_mob.buckled + RegisterSignal(parent_mob.buckled, COSMIG_OBJ_AFTER_BUCKLE, PROC_REF(on_after_buckle)) + return FALSE + if(parent_buckle) + UnregisterSignal(parent_buckle, COSMIG_OBJ_AFTER_BUCKLE) + parent_buckle = null + + absorbing_weeds = parent_turf?.weeds + if(!absorbing_weeds) + return FALSE + RegisterSignal(absorbing_weeds, COMSIG_PARENT_QDELETING, PROC_REF(on_weed_deletion)) + // Technically we could have just left the signal alone, but both because of the posibility of other conditions preventing a merge or weeds somehow changing and on_move didn't catch it, this is less fragile + + active = FALSE + merged = TRUE + + parent_mob.density = FALSE + parent_mob.anchored = TRUE + parent_mob.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + parent_mob.plane = FLOOR_PLANE + parent_mob.remove_from_all_mob_huds() + + if(!weed_appearance) // Make a new sprite if we aren't re-merging + var/is_flipped = parent_mob.transform.b == -1 // Technically we should check if d is 1 too, but corpses can only be rotated 90 or 270 (1/-1 or -1/1) + if(parent_mob.dir & WEST) + is_flipped = !is_flipped // The direction reversed the effect of the flip! + weed_appearance = new(null, is_flipped) + weed_appearance.color = absorbing_weeds.color + // TODO: For non-humans change the icon_state or something here + parent_mob.vis_contents += weed_appearance + + return TRUE + +/** + * Undo the weedening + * Returns TRUE if unmerged successfully (always) + */ +/datum/component/weed_food/proc/unmerge_with_weeds() + merged = FALSE + unmerged_time = world.time + + if(absorbing_weeds) + UnregisterSignal(absorbing_weeds, COMSIG_PARENT_QDELETING) + absorbing_weeds = null + + parent_mob.anchored = FALSE + parent_mob.mouse_opacity = MOUSE_OPACITY_ICON + parent_mob.plane = GAME_PLANE + parent_mob.vis_contents -= weed_appearance + + if(!QDELETED(parent_mob)) + parent_mob.add_to_all_mob_huds() + + return TRUE + +#undef WEED_FOOD_DELAY +#undef WEED_FOOD_STATE_DELAY diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 9bec8b3593dd..eb914e198b37 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -3,7 +3,7 @@ //whiskey outpost extra marines /datum/emergency_call/cryo_squad name = "Marine Cryo Reinforcements (Squad)" - mob_max = 15 + mob_max = 10 mob_min = 1 probability = 0 objectives = "Assist the USCM forces" diff --git a/code/datums/keybinding/communication.dm b/code/datums/keybinding/communication.dm index 9a438fc6dabd..4164198d4818 100644 --- a/code/datums/keybinding/communication.dm +++ b/code/datums/keybinding/communication.dm @@ -42,13 +42,6 @@ full_name = "IC Comms (;)" keybind_signal = COMSIG_KG_CLIENT_RADIO_DOWN -/datum/keybinding/client/communication/mod_say - hotkey_keys = list("Unbound") - classic_keys = list("Unbound") - name = MOD_CHANNEL - full_name = "Mod Say" - keybind_signal = COMSIG_KB_ADMIN_ASAY_DOWN - /datum/keybinding/client/communication/asay hotkey_keys = list("F3") classic_keys = list("F5") diff --git a/code/datums/redis/callbacks/msay.dm b/code/datums/redis/callbacks/msay.dm deleted file mode 100644 index 3c0db7638a3a..000000000000 --- a/code/datums/redis/callbacks/msay.dm +++ /dev/null @@ -1,16 +0,0 @@ -/datum/redis_callback/msay - channel = "byond.msay" - -/datum/redis_callback/msay/on_message(message) - var/list/data = json_decode(message) - - if(data["source"] == SSredis.instance_name) - return - - var/msg = "[data["rank"]]: [data["author"]]@[data["source"]]: [strip_html(data["message"])]" - - for(var/client/client in GLOB.admins) - if(!(R_MOD & client.admin_holder.rights)) - continue - - to_chat(client, msg) diff --git a/code/datums/skills.dm b/code/datums/skills.dm index ef86b726a3c1..f37ea3a5a64e 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -319,6 +319,7 @@ CIVILIAN /datum/skills/civilian/survivor/goon name = "Survivor Goon" skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -330,14 +331,40 @@ CIVILIAN /datum/skills/civilian/survivor/pmc name = "Survivor PMC" additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + ) + +/datum/skills/civilian/survivor/pmc/medic + name = "Survivor PMC Medic" + additional_skills = list( + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) +/datum/skills/civilian/survivor/pmc/engineer + name = "Survivor PMC Engineer" + additional_skills = list( + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + ) + /datum/skills/civilian/survivor/doctor name = "Survivor Doctor" additional_skills = list( @@ -449,7 +476,7 @@ MILITARY SURVIVORS SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -465,7 +492,7 @@ MILITARY SURVIVORS SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_NOVICE, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -481,7 +508,7 @@ MILITARY SURVIVORS SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SCOUT, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -497,7 +524,7 @@ MILITARY SURVIVORS SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -513,7 +540,7 @@ MILITARY SURVIVORS SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_GRENADIER, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -530,7 +557,7 @@ MILITARY SURVIVORS SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_JTAC = SKILL_JTAC_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, SKILL_JTAC = SKILL_JTAC_TRAINED, @@ -545,6 +572,7 @@ COMMAND STAFF /datum/skills/general name = "General" skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, @@ -851,7 +879,7 @@ SYNTHETIC /datum/skills/colonial_synthetic name = SYNTH_COLONY skills = list( - SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_CQC = SKILL_CQC_EXPERT, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -862,7 +890,7 @@ SYNTHETIC SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, SKILL_PILOT = SKILL_PILOT_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, SKILL_VEHICLE = SKILL_VEHICLE_LARGE, SKILL_JTAC = SKILL_JTAC_BEGINNER, @@ -1018,9 +1046,8 @@ COLONIAL LIBERATION FRONT SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, SKILL_JTAC = SKILL_JTAC_BEGINNER, ) @@ -1032,7 +1059,7 @@ COLONIAL LIBERATION FRONT SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, SKILL_JTAC = SKILL_JTAC_BEGINNER, ) @@ -1041,9 +1068,8 @@ COLONIAL LIBERATION FRONT skills = list( SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENDURANCE = SKILL_ENDURANCE_WEAK, SKILL_JTAC = SKILL_JTAC_BEGINNER, ) @@ -1051,11 +1077,11 @@ COLONIAL LIBERATION FRONT name = "CLF Specialist" skills = list( SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, //to use c4 in demo set. SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED ) @@ -1065,7 +1091,7 @@ COLONIAL LIBERATION FRONT skills = list( SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, // to use their C4 - SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, @@ -1082,7 +1108,7 @@ COLONIAL LIBERATION FRONT skills = list( SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, @@ -1147,9 +1173,9 @@ UNITED PROGRESSIVE PEOPLES SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, ) @@ -1159,9 +1185,9 @@ UNITED PROGRESSIVE PEOPLES SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, - SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_DEFAULT, + SKILL_FIREMAN = SKILL_FIREMAN_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, ) @@ -1170,9 +1196,9 @@ UNITED PROGRESSIVE PEOPLES skills = list( SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, //trained in medicine more than combat + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_CQC = SKILL_CQC_DEFAULT, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, - SKILL_CQC = SKILL_CQC_TRAINED ) /datum/skills/upp/specialist @@ -1180,14 +1206,13 @@ UNITED PROGRESSIVE PEOPLES skills = list( SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CQC = SKILL_CQC_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_JTAC = SKILL_JTAC_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_UPP, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_MASTER, ) /datum/skills/upp/SL @@ -1205,10 +1230,10 @@ UNITED PROGRESSIVE PEOPLES /datum/skills/upp/military_police name = "UPP Military Police" skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -1218,10 +1243,10 @@ UNITED PROGRESSIVE PEOPLES /datum/skills/upp/officer name = "UPP Officer" skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_FLASH, SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, @@ -1234,11 +1259,11 @@ UNITED PROGRESSIVE PEOPLES /datum/skills/upp/commander name = "UPP Command Officer" skills = list( - SKILL_CQC = SKILL_CQC_EXPERT, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, - SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -1263,6 +1288,7 @@ Private Military Contractors /datum/skills/pmc name = "PMC Private" skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -1274,6 +1300,7 @@ Private Military Contractors /datum/skills/pmc/medic name = "PMC Medic" skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -1287,6 +1314,7 @@ Private Military Contractors /datum/skills/pmc/medic/chem name = "PMC Medical Investigator" skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -1300,6 +1328,7 @@ Private Military Contractors /datum/skills/pmc/smartgunner name = "PMC Smartgunner" skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -1313,6 +1342,7 @@ Private Military Contractors /datum/skills/pmc/specialist name = "PMC Specialist" skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -1333,7 +1363,7 @@ Private Military Contractors SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, @@ -1348,7 +1378,7 @@ Private Military Contractors SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, @@ -1424,18 +1454,17 @@ CONTRACTORS /datum/skills/contractor name = "Contractor Standard" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_JTAC = SKILL_JTAC_BEGINNER, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, ) /datum/skills/contractor/leader @@ -1447,11 +1476,11 @@ CONTRACTORS SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, SKILL_JTAC = SKILL_JTAC_MASTER, ) @@ -1461,51 +1490,50 @@ CONTRACTORS skills = list( SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, - SKILL_SURGERY = SKILL_SURGERY_EXPERT, - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_JTAC = SKILL_JTAC_BEGINNER, ) /datum/skills/contractor/engi name = "Contractor Engi" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_MAX, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MAX, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_MAX, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_JTAC = SKILL_JTAC_EXPERT, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MAX, + SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED, ) /datum/skills/contractor/heavy name = "Contractor Machinegunner" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, - SKILL_ENGINEER = SKILL_ENGINEER_ENGI, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_MAX, SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_FIREMAN = SKILL_FIREMAN_MASTER, - SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, + SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_LARGE, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, SKILL_JTAC = SKILL_JTAC_BEGINNER, SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, - SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, ) /* @@ -1517,7 +1545,7 @@ COLONIAL MARSHALS name = "CMB Deputy" skills = list( SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_EXPERT, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, @@ -1531,7 +1559,7 @@ COLONIAL MARSHALS name = "CMB Marshal" skills = list( SKILL_POLICE = SKILL_POLICE_SKILLED, - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_EXPERT, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -1691,7 +1719,7 @@ MISCELLANEOUS /datum/skills/mercenary name = "Mercenary" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -1703,7 +1731,7 @@ MISCELLANEOUS /datum/skills/mercenary/elite name = "Elite Mercenary" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -1717,7 +1745,7 @@ MISCELLANEOUS /datum/skills/mercenary/elite/medic name = "Elite Mercenary Medic" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -1725,13 +1753,13 @@ MISCELLANEOUS SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_JTAC = SKILL_JTAC_BEGINNER, SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, - SKILL_SURGERY = SKILL_SURGERY_EXPERT, + SKILL_SURGERY = SKILL_SURGERY_TRAINED, ) /datum/skills/mercenary/elite/engineer name = "Elite Mercenary Engineer" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_MASTER, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -1746,7 +1774,7 @@ MISCELLANEOUS /datum/skills/mercenary/elite/heavy name = "Elite Mercenary Heavy" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -1761,7 +1789,7 @@ MISCELLANEOUS /datum/skills/mercenary/elite/leader name = "Elite Mercenary Leader" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_SKILLED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_MAX, @@ -1776,7 +1804,7 @@ MISCELLANEOUS /datum/skills/dutchmerc name = "Dutch's Dozen Mercenary" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -1785,13 +1813,13 @@ MISCELLANEOUS SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, ) /datum/skills/dutchmedic name = "Dutch's Dozen Medic" skills = list( - SKILL_CQC = SKILL_CQC_MASTER, + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_TRAINED, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, @@ -1800,7 +1828,7 @@ MISCELLANEOUS SKILL_FIREMAN = SKILL_FIREMAN_EXPERT, SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, SKILL_JTAC = SKILL_JTAC_BEGINNER, - SKILL_ENDURANCE = SKILL_ENDURANCE_MAX, + SKILL_ENDURANCE = SKILL_ENDURANCE_EXPERT, ) /datum/skills/tank_crew diff --git a/code/datums/weather/weather_events/new_varadero.dm b/code/datums/weather/weather_events/new_varadero.dm new file mode 100644 index 000000000000..f2af23c3f10a --- /dev/null +++ b/code/datums/weather/weather_events/new_varadero.dm @@ -0,0 +1,38 @@ +/datum/weather_event/light_rain + name = "Tropical Storm" + display_name = "Tropical Storm" + length = 4 MINUTES + fullscreen_type = /atom/movable/screen/fullscreen/weather/low + + turf_overlay_icon_state = "strata_storm" + turf_overlay_alpha = 40 + + effect_message = null + damage_per_tick = 0 + + has_process = TRUE + lightning_chance = 1 + + ambience = 'sound/ambience/rainforest.ogg' + + fire_smothering_strength = 1 + +/datum/weather_event/monsoon + name = "Monsoon Warning" + display_name = "Monsoon Warning" + length = 6 MINUTES + fullscreen_type = /atom/movable/screen/fullscreen/weather/high + + turf_overlay_icon_state = "strata_storm" + turf_overlay_alpha = 115 + + effect_message = null + damage_per_tick = 0 + + + ambience = 'sound/ambience/varadero_storm.ogg' + + has_process = TRUE + lightning_chance = 6 + + fire_smothering_strength = 4 diff --git a/code/datums/weather/weather_map_holders/new_varadero.dm b/code/datums/weather/weather_map_holders/new_varadero.dm new file mode 100644 index 000000000000..8222001f4739 --- /dev/null +++ b/code/datums/weather/weather_map_holders/new_varadero.dm @@ -0,0 +1,20 @@ +/datum/weather_ss_map_holder/new_varadero + name = "New Varadero Map Holder" + + min_time_between_events = 15 MINUTES + no_weather_turf_icon_state = "strata_clearsky" + + potential_weather_events = list( + /datum/weather_event/light_rain, + /datum/weather_event/monsoon, + ) + +/datum/weather_ss_map_holder/new_varadero/should_affect_area(area/A) + return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS) + +/datum/weather_ss_map_holder/new_varadero/should_start_event() + return prob(PROB_WEATHER_NEW_VARADERO) + +/datum/weather_ss_map_holder/new_varadero/weather_warning() + for (var/obj/structure/machinery/storm_siren/WS in weather_notify_objects) + WS.weather_warning() diff --git a/code/game/area/varadero.dm b/code/game/area/varadero.dm index a0d005d4aa1d..09b082f2acd6 100644 --- a/code/game/area/varadero.dm +++ b/code/game/area/varadero.dm @@ -4,8 +4,7 @@ /area/varadero name = "New Varadero" icon = 'icons/turf/area_varadero.dmi' - ambience_exterior = AMBIENCE_LV624 - sound_environment = SOUND_ENVIRONMENT_MOUNTAINS + ambience_exterior = AMBIENCE_NV icon_state = "varadero" can_build_special = TRUE //T-Comms structure temperature = TROPICAL_TEMP @@ -36,49 +35,44 @@ /area/varadero/exterior name = "New Varadero - Exterior" ceiling = CEILING_NONE - ambience_exterior = AMBIENCE_LV624 + lighting_use_dynamic = TRUE + ambience_exterior = AMBIENCE_NV //soundscape_playlist - sound_environment = SOUND_ENVIRONMENT_MOUNTAINS /area/varadero/interior name = "New Varadero - Interior" - ceiling = CEILING_UNDERGROUND_ALLOW_CAS + ceiling = CEILING_GLASS ambience_exterior = AMBIENCE_PRISON //soundscape_playlist sound_environment = SOUND_ENVIRONMENT_ROOM /area/varadero/interior_protected name = "New Varadero - Interior" - ceiling = CEILING_DEEP_UNDERGROUND - icon_state = "NV_no_OB" + ceiling = CEILING_UNDERGROUND_BLOCK_CAS + sound_environment = SOUND_ENVIRONMENT_AUDITORIUM + icon_state = "NV_no_CAS" /area/varadero/interior/comms1 name = "New Varadero - Cargo Generator" + is_resin_allowed = FALSE icon_state = "comms1" + minimap_color = MINIMAP_AREA_ENGI_CAVE /area/varadero/interior/comms2 name = "New Varadero - Communications Project Site" - is_resin_allowed = FALSE icon_state = "comms2" + minimap_color = MINIMAP_AREA_ENGI_CAVE /area/varadero/interior/comms3 - name = "New Varadero - Fishing Hole" - is_resin_allowed = FALSE + name = "New Varadero - Engineering Communications" icon_state = "comms3" + minimap_color = MINIMAP_AREA_ENGI_CAVE /area/varadero/exterior/comms4 name = "New Varadero - Walkway Extension" - icon_state = "comms4" - -/area/varadero/exterior/eastbeach - name = "New Varadero - East Beach" - icon_state = "varadero1" - -/area/varadero/exterior/eastocean - name = "New Varadero - East Ocean" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL - icon_state = "varadero2" + icon_state = "comms4" + minimap_color = MINIMAP_AREA_ENGI_CAVE /area/varadero/interior/oob name = "New Varadero - Out Of Bounds" @@ -119,9 +113,57 @@ name = "New Varadero - Rockabilly Beach" icon_state = "varadero0" is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_JUNGLE + +/area/varadero/exterior/eastbeach + name = "New Varadero - East Beach" + is_resin_allowed = FALSE + icon_state = "varadero1" + lighting_use_dynamic = TRUE + minimap_color = MINIMAP_AREA_JUNGLE + +/area/varadero/exterior/monsoon + name = "New Varadero - Monsoon" + icon_state = "varadero1" + minimap_color = MINIMAP_AREA_JUNGLE + +/area/varadero/exterior/pool + name = "New Varadero - Interior Pool" + icon_state = "varadero1" + lighting_use_dynamic = TRUE + minimap_color = MINIMAP_AREA_COMMAND_CAVE + +/area/varadero/exterior/eastocean + name = "New Varadero - East Ocean" + is_resin_allowed = FALSE + flags_area = AREA_NOTUNNEL + icon_state = "varadero2" + minimap_color = MINIMAP_AREA_CONTESTED_ZONE + +/area/varadero/exterior/farocean + name = "New Varadero - Far Ocean" + is_resin_allowed = FALSE + flags_area = AREA_NOTUNNEL + icon_state = "varadero3" + minimap_color = MINIMAP_AREA_CONTESTED_ZONE //interior areas + +/area/varadero/interior/beach_bar + name = "New Varadero - Beach Bar" + icon_state = "varadero4" + is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_JUNGLE + sound_environment = SOUND_ENVIRONMENT_ROOM + +/area/varadero/interior/dock_control + name = "New Varadero - Dock Control" + icon_state = "varadero3" + is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_JUNGLE + sound_environment = SOUND_ENVIRONMENT_ROOM + /area/varadero/interior/cargo name = "New Varadero - Cargo" icon_state = "req0" @@ -145,15 +187,18 @@ name = "New Vardero - Chapel" icon_state = "offices1" is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/morgue name = "New Varadero - Morgue" icon_state = "offices0" is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_MEDBAY_CAVE /area/varadero/interior/medical name = "New Varadero - Medical" icon_state = "offices2" + minimap_color = MINIMAP_AREA_MEDBAY /area/varadero/interior/maintenance name = "New Varadero - Central Maintenance" @@ -167,10 +212,12 @@ /area/varadero/interior/maintenance/research name = "New Varadero - Research Maintenance" icon_state = "tunnels1" + minimap_color = MINIMAP_AREA_RESEARCH_CAVE /area/varadero/interior/maintenance/security name = "New Varadero - Security Maintenance" icon_state = "tunnels2" + minimap_color = MINIMAP_AREA_SEC_CAVE /area/varadero/interior/research name = "New Varadero - Research Offices" @@ -180,6 +227,7 @@ /area/varadero/interior/electrical name = "New Varadero - Electrical Annex" icon_state = "req4" + minimap_color = MINIMAP_AREA_ENGI /area/varadero/interior/toilets name = "New Varadero - Restrooms" @@ -188,6 +236,7 @@ /area/varadero/interior/technical_storage name = "New Varadero - Technical Storage" icon_state = "req3" + minimap_color = MINIMAP_AREA_ENGI /area/varadero/interior/laundry name = "New Varadero - Laundry" @@ -196,31 +245,38 @@ /area/varadero/interior/disposals name = "New Varadero - Disposals" icon_state = "offices4" + minimap_color = MINIMAP_AREA_ENGI /area/varadero/interior/administration name = "New Varadero - Administrative Offices" icon_state = "offices2" + minimap_color = MINIMAP_AREA_COMMAND /area/varadero/interior/library name = "New Varadero - Library" icon_state = "offices0" is_resin_allowed = FALSE + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/court name = "New Varadero - Basketball Court" icon_state = "req4" + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/mess name = "New Varadero - Mess Hall" icon_state = "req2" + minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/bunks name = "New Varadero - Level 1 Quarters" icon_state = "req3" + minimap_color = MINIMAP_AREA_JUNGLE /area/varadero/interior/security name = "New Varadero - Security Offices" icon_state = "offices0" + minimap_color = MINIMAP_AREA_SEC /area/varadero/interior/records name = "New Varadero - Records" @@ -238,12 +294,12 @@ power_environ = FALSE luminosity = 0 lighting_use_dynamic = 1 + sound_environment = SOUND_ENVIRONMENT_AUDITORIUM minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior/caves/north_research name = "New Varadero - North Research Caves" icon_state = "tunnels4" - minimap_color = MINIMAP_AREA_RESEARCH_CAVE /area/varadero/interior/caves/east name = "New Varadero - Beach Caves" @@ -257,20 +313,25 @@ power_environ = FALSE luminosity = 0 lighting_use_dynamic = 1 - minimap_color = MINIMAP_AREA_RESEARCH_CAVE /area/varadero/interior_protected/caves/central name = "New Varadero - Grass Caves" icon_state = "deepcaves2" + minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/caves/digsite name = "New Varadero - Dig Site" icon_state = "deepcaves3" +/area/varadero/interior_protected/caves/swcaves + name = "New Varadero - Southwest Caves" + icon_state = "deepcaves3" + /area/varadero/interior_protected/maintenance/south name = "New Varadero - Southern Maintenance" icon_state = "deepcaves4" + minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/vessel name = "New Varadero - Unknown Vessel" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 937c19b4512b..d2cad09edc83 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -439,7 +439,7 @@ Parameters are passed from New. return TRUE if(href_list["desc_lore"]) - show_browser(usr, "[replacetext(desc_lore, "\n", "
")]", name, name, "size=500x200") + show_browser(usr, "[replacetext(desc_lore, "\n", "
")]", name, name, "size=500x500") onclose(usr, "[name]") ///This proc is called on atoms when they are loaded into a shuttle @@ -580,7 +580,7 @@ Parameters are passed from New. if(!ismovable(src)) var/turf/curturf = get_turf(src) if(curturf) - . += "" + . += "" VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRANSFORM, "Modify Transform") VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add Reagent") VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EMP, "EMP Pulse") diff --git a/code/game/bioscans.dm b/code/game/bioscans.dm index 55422ad3b878..5f07b307751a 100644 --- a/code/game/bioscans.dm +++ b/code/game/bioscans.dm @@ -94,15 +94,19 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new) var/marine_planet_location_string = "[marine_planet_location ? ", including one in [marine_planet_location]." : "."]" var/marine_ship_location_string = "[marine_ship_location ? ", including one in [marine_ship_location]." : "."]" + var/ghost_scan = SPAN_ALERT("[xenos_on_planet] xenos on planet, with [larva] larva.\n[xenos_on_ship] xenos on the ship.\n[marines_on_planet] humans on the planet.\n[marines_on_ship] humans on the ship.") + var/yautja_scan = SPAN_ALERT("[xenos_on_planet] serpents present in the hunting ground[xeno_planet_location_string], with [larva] larva.\n[xenos_on_ship] serpents present on the human ship[xeno_ship_location_string]\n[marines_on_planet] humans present in the hunting ground[marine_planet_location_string]\n[marines_on_ship] humans present on the human ship[marine_ship_location_string]") + log_game("BIOSCAN: A Yautja/Ghost bioscan has completed. [ghost_scan]") + //Announce the numbers to Yautja, they have good scanners for(var/mob/living/carbon/human/yautja as anything in GLOB.yautja_mob_list) to_chat(yautja, "

Bioscan complete

") - to_chat(yautja, SPAN_ALERT("[xenos_on_planet] serpents present in the hunting ground[xeno_planet_location_string], with [larva] larva.\n[xenos_on_ship] serpents present on the human ship[xeno_ship_location_string]\n[marines_on_planet] humans present in the hunting ground[marine_planet_location_string]\n[marines_on_ship] humans present on the human ship[marine_ship_location_string]")) + to_chat(yautja, yautja_scan) //Let the ghosts know what's up, they also get good numbers for(var/mob/dead/observer/ghost as anything in GLOB.observer_list) to_chat(ghost, "

Bioscan complete

") - to_chat(ghost, SPAN_ALERT("[xenos_on_planet] xenos on planet, with [larva] larva.\n[xenos_on_ship] xenos on the ship.\n[marines_on_planet] humans on the planet.\n[marines_on_ship] humans on the ship.")) + to_chat(ghost, ghost_scan) /// This will do something after Project ARES. @@ -117,15 +121,15 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new) /// The announcement to all Humans. Slightly off for the planet and elsewhere, accurate for the ship. /datum/bioscan_data/proc/ares_bioscan(forced = FALSE, variance = 2) if(!forced && !can_ares_bioscan()) - message_admins("An ARES Bioscan has failed.") + message_admins("BIOSCAN: An ARES bioscan has failed.") return - //Adjust the randomness there so everyone gets the same thing var/fake_xenos_on_planet = max(0, xenos_on_planet + rand(-variance, variance)) - var/name = "[MAIN_AI_SYSTEM] Bioscan Status" var/input = "Bioscan complete.\n\nSensors indicate [xenos_on_ship_uncontained ? "[xenos_on_ship_uncontained]" : "no"] unknown lifeform signature[!xenos_on_ship_uncontained || xenos_on_ship_uncontained > 1 ? "s":""] present on the ship[xenos_on_ship_uncontained && xenos_ship_location ? ", including one in [xenos_ship_location]," : ""] and [fake_xenos_on_planet ? "approximately [fake_xenos_on_planet]" : "no"] signature[!fake_xenos_on_planet || fake_xenos_on_planet > 1 ? "s":""] located elsewhere[fake_xenos_on_planet && xenos_planet_location ? ", including one in [xenos_planet_location]":""]." + log_game("BIOSCAN: ARES bioscan completed. [input]") + var/datum/ares_link/link = GLOB.ares_link link.log_ares_bioscan(name, input) if(forced || (link.p_interface && !link.p_interface.inoperable())) @@ -135,13 +139,18 @@ GLOBAL_DATUM_INIT(bioscan_data, /datum/bioscan_data, new) /datum/bioscan_data/proc/qm_bioscan(variance = 2) /// Adjust the randomness there so everyone gets the same thing var/fake_marines_on_ship = max(0, marines_on_ship + rand(-variance, variance)) + var/metalhive_hosts = "[fake_marines_on_ship ? "approximately [fake_marines_on_ship]":"no"]" + var/plural = "[!fake_marines_on_ship || fake_marines_on_ship > 1 ? "s":""]" + var/metalhive_location = "[fake_marines_on_ship && marine_ship_location?", including one in [marine_ship_location]," : ""]" + var/planet_hosts = "[marines_on_planet ? "[marines_on_planet]" : "none"]" + var/planet_location = "[marines_on_planet && marine_planet_location ? ", including one in [marine_planet_location]" : ""]" + + var/title = SPAN_XENOANNOUNCE("The Queen Mother reaches into your mind from worlds away.") + var/content = SPAN_XENOANNOUNCE("To my children and their Queen. I sense [metalhive_hosts] host[plural] in the metal hive [metalhive_location] and [planet_hosts] scattered elsewhere[planet_location].") + + log_game("BIOSCAN: Queen Mother bioscan completed. [content]") /// Shout it at everyone for(var/mob/current_mob as anything in GLOB.living_xeno_list) current_mob << sound(get_sfx("queen"), wait = 0, volume = 50) - to_chat(current_mob, SPAN_XENOANNOUNCE("The Queen Mother reaches into your mind from worlds away.")) - var/metalhive_hosts = "[fake_marines_on_ship ? "approximately [fake_marines_on_ship]":"no"]" - var/plural = "[!fake_marines_on_ship || fake_marines_on_ship > 1 ? "s":""]" - var/metalhive_location = "[fake_marines_on_ship&&marine_ship_location?", including one in [marine_ship_location],":""]" - var/planet_hosts = "[marines_on_planet ? "[marines_on_planet]" : "none"]" - var/planet_location = "[marines_on_planet && marine_planet_location ? ", including one in [marine_planet_location]" : ""]" - to_chat(current_mob, SPAN_XENOANNOUNCE("To my children and their Queen. I sense [metalhive_hosts] host[plural] in the metal hive [metalhive_location] and [planet_hosts] scattered elsewhere[planet_location].")) + to_chat(current_mob, title) + to_chat(current_mob, content) diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 2f6dc6e38118..a42ff3f22e59 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -333,23 +333,28 @@ Additional game mode variables. /datum/game_mode/proc/check_xeno_late_join(mob/xeno_candidate) if(jobban_isbanned(xeno_candidate, JOB_XENOMORPH)) // User is jobbanned to_chat(xeno_candidate, SPAN_WARNING("You are banned from playing aliens and cannot spawn as a xenomorph.")) - return - return 1 + return FALSE + return TRUE -/datum/game_mode/proc/attempt_to_join_as_xeno(mob/xeno_candidate, instant_join = 0) +/datum/game_mode/proc/attempt_to_join_as_xeno(mob/xeno_candidate, instant_join = FALSE) var/list/available_xenos = list() var/list/available_xenos_non_ssd = list() - for(var/mob/living/carbon/xenomorph/X in GLOB.living_xeno_list) - var/area/A = get_area(X) - if(is_admin_level(X.z) && (!A || !(A.flags_area & AREA_ALLOW_XENO_JOIN)) || X.aghosted) - continue //xenos on admin z level and aghosted ones don't count - if(istype(X) && ((!islarva(X) && (XENO_LEAVE_TIMER - X.away_timer < XENO_AVAILABLE_TIMER)) || (islarva(X) && (XENO_LEAVE_TIMER_LARVA - X.away_timer < XENO_AVAILABLE_TIMER)))) - if(!X.client) - available_xenos += X - else - available_xenos_non_ssd += X - + for(var/mob/living/carbon/xenomorph/cur_xeno as anything in GLOB.living_xeno_list) + if(cur_xeno.aghosted) + continue //aghosted xenos don't count + var/area/area = get_area(cur_xeno) + if(is_admin_level(cur_xeno.z) && (!area || !(area.flags_area & AREA_ALLOW_XENO_JOIN))) + continue //xenos on admin z level don't count + if(!istype(cur_xeno)) + continue + var/required_time = islarva(cur_xeno) ? XENO_LEAVE_TIMER_LARVA - cur_xeno.away_timer : XENO_LEAVE_TIMER - cur_xeno.away_timer + if(required_time > XENO_AVAILABLE_TIMER) + continue + if(!cur_xeno.client) + available_xenos += cur_xeno + else + available_xenos_non_ssd += cur_xeno var/datum/hive_status/hive for(var/hivenumber in GLOB.hive_datum) @@ -379,11 +384,18 @@ Additional game mode variables. // No cache, lets check now then message_alien_candidates(get_alien_candidates(), dequeued = 0, cache_only = TRUE) if(candidate_observer.larva_queue_cached_message) + var/datum/hive_status/cur_hive + for(var/hive_num in GLOB.hive_datum) + cur_hive = GLOB.hive_datum[hive_num] + for(var/mob_name in cur_hive.banished_ckeys) + if(cur_hive.banished_ckeys[mob_name] == xeno_candidate.ckey) + candidate_observer.larva_queue_cached_message += "\n" + SPAN_WARNING("NOTE: You are banished from the [cur_hive] and you may not rejoin unless the Queen re-admits you or dies. Your queue number won't update until there is a hive you aren't banished from.") + break to_chat(xeno_candidate, candidate_observer.larva_queue_cached_message) return FALSE // We aren't in queue yet, lets teach them about the queue then - candidate_observer.larva_queue_cached_message = SPAN_XENONOTICE("You are currently still awaiting assignment in the larva queue. Priority is given to players who have yet to play in the round, but otherwise the ordering is based on your time of death. When you have been dead long enough and are not inactive, you will periodically receive messages where you are in the queue relative to other currently valid xeno candidates. Note: Playing as a facehugger or in the thunderdome will not alter your time of death. This means you won't lose your relative place in queue if you step away, disconnect, play as a facehugger, or play in the thunderdome.") + candidate_observer.larva_queue_cached_message = SPAN_XENONOTICE("You are currently awaiting assignment in the larva queue. The ordering is based on your time of death or the time you joined. When you have been dead long enough and are not inactive, you will periodically receive messages where you are in the queue relative to other currently valid xeno candidates. Your current position will shift as others change their preferences or go inactive, but your relative position compared to all observers is the same. Note: Playing as a facehugger or in the thunderdome will not alter your time of death. This means you won't lose your relative place in queue if you step away, disconnect, play as a facehugger, or play in the thunderdome.") to_chat(xeno_candidate, candidate_observer.larva_queue_cached_message) return FALSE diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7a10a3ffa1df..6ccb0b5b18f7 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -284,7 +284,7 @@ return //Dismantle the frame. - if(istype(O, /obj/item/tool/crowbar)) + if(HAS_TRAIT(O, TRAIT_TOOL_CROWBAR)) dismantle() return diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index fd246d2d640a..bb6972a58ac3 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -51,7 +51,7 @@ to_chat(user, SPAN_NOTICE(" You screw the circuit board into place.")) state = 2 icon_state = "2" - if(istype(P, /obj/item/tool/crowbar) && circuit) + if(HAS_TRAIT(P, TRAIT_TOOL_CROWBAR) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) to_chat(user, SPAN_NOTICE(" You remove the circuit board.")) state = 1 @@ -121,7 +121,7 @@ to_chat(usr, "Added [mmi].") icon_state = "3b" - if(istype(P, /obj/item/tool/crowbar) && brain) + if(HAS_TRAIT(P, TRAIT_TOOL_CROWBAR) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) to_chat(user, SPAN_NOTICE(" You remove the brain.")) brain.forceMove(loc) @@ -129,7 +129,7 @@ icon_state = "3" if(4) - if(istype(P, /obj/item/tool/crowbar)) + if(HAS_TRAIT(P, TRAIT_TOOL_CROWBAR)) playsound(loc, 'sound/items/Crowbar.ogg', 25, 1) to_chat(user, SPAN_NOTICE(" You remove the glass panel.")) state = 3 diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index bd42b31ea573..07c960807205 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -52,7 +52,7 @@ to_chat(user, SPAN_NOTICE(" You screw the circuit board into place.")) src.state = 2 src.icon_state = "2" - if(istype(P, /obj/item/tool/crowbar) && circuit) + if(HAS_TRAIT(P, TRAIT_TOOL_CROWBAR) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) to_chat(user, SPAN_NOTICE(" You remove the circuit board.")) src.state = 1 @@ -99,7 +99,7 @@ src.state = 4 src.icon_state = "4" if(4) - if(istype(P, /obj/item/tool/crowbar)) + if(HAS_TRAIT(P, TRAIT_TOOL_CROWBAR)) playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) to_chat(user, SPAN_NOTICE(" You remove the glass panel.")) src.state = 3 diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 7d82c5bd9a75..3c92bd33a681 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -469,9 +469,10 @@ if(!record) return playsound(src.loc, 'sound/machines/fax.ogg', 15, 1) sleep(40) + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) var/obj/item/paper/P = new /obj/item/paper( src.loc ) P.name = text("Scan: [], []",record.fields["name"],worldtime2text()) - P.info += text("
Official Weyland-Yutani Document
Scan Record

[]

\n
",record.fields["name"]) + P.info += text("
Official Weyland-Yutani Document
Scan Record

[]

\n
",record.fields["name"]) for(var/datum/data/record/R as anything in GLOB.data_core.medical) if (R.fields["name"] == record.fields["name"]) if(R.fields["last_scan_time"] && R.fields["last_scan_result"]) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 0288b7eb2426..357ef48fff37 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -114,7 +114,7 @@ A.amount = 5 if(CONSTRUCTION_STATE_FINISHED) - if(istype(P, /obj/item/tool/crowbar)) + if(HAS_TRAIT(P, TRAIT_TOOL_CROWBAR)) if(!skillcheck(user, SKILL_ENGINEER, required_dismantle_skill)) to_chat(user, SPAN_WARNING("You are not trained to dismantle machines...")) return diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 435976668577..afcc9686cff5 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -2,6 +2,7 @@ /obj/structure/machinery/cryo_cell name = "cryo cell" + desc = "A donation from the old A.W. project, using cryogenic technology. It slowly heals whoever is inside the tube." icon = 'icons/obj/structures/machinery/cryogenics2.dmi' icon_state = "cell" density = FALSE diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index ed06c0117f33..9c0a227008c3 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -503,23 +503,25 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li add_fingerprint(usr) -/obj/structure/machinery/cryopod/proc/go_in_cryopod(mob/M, silent = FALSE) +/obj/structure/machinery/cryopod/proc/go_in_cryopod(mob/mob, silent = FALSE) if(occupant) return - M.forceMove(src) - occupant = M + mob.forceMove(src) + occupant = mob icon_state = "body_scanner_closed" SetLuminosity(2) time_entered = world.time start_processing() if(!silent) - if(M.client) - to_chat(M, SPAN_NOTICE("You feel cool air surround you. You go numb as your senses turn inward.")) - to_chat(M, SPAN_BOLDNOTICE("If you log out or close your client now, your character will permanently removed from the round in 10 minutes. If you ghost, timer will be decreased to 2 minutes.")) + if(mob.client) + to_chat(mob, SPAN_NOTICE("You feel cool air surround you. You go numb as your senses turn inward.")) + to_chat(mob, SPAN_BOLDNOTICE("If you log out or close your client now, your character will permanently removed from the round in 10 minutes. If you ghost, timer will be decreased to 2 minutes.")) + if(!is_admin_level(src.z)) // Set their queue time now because the client has to actually leave to despawn and at that point the client is lost + mob.client.player_details.larva_queue_time = max(mob.client.player_details.larva_queue_time, world.time) var/area/location = get_area(src) - if(M.job != GET_MAPPED_ROLE(JOB_SQUAD_MARINE)) - message_admins("[key_name_admin(M)], [M.job], has entered \a [src] at [location] after playing for [duration2text(world.time - M.life_time_start)].") + if(mob.job != GET_MAPPED_ROLE(JOB_SQUAD_MARINE)) + message_admins("[key_name_admin(mob)], [mob.job], has entered \a [src] at [location] after playing for [duration2text(world.time - mob.life_time_start)].") playsound(src, 'sound/machines/hydraulics_3.ogg', 30) silent_exit = silent diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 6d96daf3152f..e9006a9f2fb4 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -167,7 +167,7 @@ return //If it's emagged, crowbar can pry electronics out. - if (src.operating == -1 && istype(I, /obj/item/tool/crowbar)) + if (src.operating == -1 && HAS_TRAIT(I, TRAIT_TOOL_CROWBAR)) playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) user.visible_message("[user] removes the electronics from the windoor.", "You start to remove electronics from the windoor.") if (do_after(user, 40, INTERRUPT_ALL, BUSY_ICON_BUILD)) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index e1c9c9a4e279..b538f55292c1 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -4,13 +4,16 @@ anchored = FALSE density = FALSE drag_delay = 1 + base_pixel_x = 15 + base_pixel_y = -2 var/mob/living/carbon/attached = null var/mode = 1 // 1 is injecting, 0 is taking blood. var/obj/item/reagent_container/beaker = null + var/datum/beam/current_beam /obj/structure/machinery/iv_drip/update_icon() - if(src.attached) + if(attached) icon_state = "hooked" else icon_state = "" @@ -35,8 +38,31 @@ filling.color = mix_color_from_reagents(reagents.reagent_list) overlays += filling +/obj/structure/machinery/iv_drip/proc/update_beam() + if(current_beam) + QDEL_NULL(current_beam) + else if(!QDELETED(src) && attached) + current_beam = beam(attached, "iv_tube") + +/obj/structure/machinery/iv_drip/power_change() + . = ..() + if(stat & NOPOWER && attached) + visible_message("\The [src] retracts its IV tube and shuts down.") + attached.active_transfusions -= src + attached = null + update_beam() + update_icon() + +/obj/structure/machinery/iv_drip/Destroy() + attached?.active_transfusions -= src + update_beam() + . = ..() + /obj/structure/machinery/iv_drip/MouseDrop(over_object, src_location, over_location) ..() + if(inoperable()) + visible_message("\The [src] is not powered.") + return if(ishuman(usr)) var/mob/living/carbon/human/H = usr @@ -48,6 +74,7 @@ "You detach \the [src] from \the [attached].") attached.active_transfusions -= src attached = null + update_beam() update_icon() stop_processing() return @@ -57,6 +84,7 @@ "You attach \the [src] to \the [over_object].") attached = over_object attached.active_transfusions += src + update_beam() update_icon() start_processing() @@ -81,6 +109,7 @@ log_admin("[key_name(user)] put a [beaker] into [src], containing [reagentnames] at ([src.loc.x],[src.loc.y],[src.loc.z]).") to_chat(user, "You attach \the [W] to \the [src].") + update_beam() update_icon() return else @@ -97,6 +126,7 @@ attached.emote("scream") attached.active_transfusions -= src attached = null + update_beam() update_icon() stop_processing() return diff --git a/code/game/machinery/storm_siren.dm b/code/game/machinery/storm_siren.dm new file mode 100644 index 000000000000..e78414cb7e5b --- /dev/null +++ b/code/game/machinery/storm_siren.dm @@ -0,0 +1,26 @@ +/obj/structure/machinery/storm_siren + name = "storm siren" + desc = "A siren used to announce storm warnings for the colony." + icon = 'icons/obj/structures/machinery/loudspeaker.dmi' + icon_state = "loudspeaker" + density = FALSE + anchored = TRUE + unacidable = 1 + unslashable = 1 + use_power = USE_POWER_NONE + health = 0 + +/obj/structure/machinery/storm_siren/Initialize() + weather_notify_objects += src + return ..() + +/obj/structure/machinery/storm_siren/Destroy() + weather_notify_objects -= src + . = ..() + +/obj/structure/machinery/storm_siren/power_change() + return + +/obj/structure/machinery/storm_siren/proc/weather_warning() + playsound(loc, 'sound/effects/weather_warning_varadero.ogg', 60, 0) + visible_message(SPAN_DANGER("The storm siren blares: ATTENTION. ATTENTION. INCOMING TROPICAL STORM DETECTED. SEEK SHELTER IMMEDIATELY.")) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index cded8a1148c7..a370356ad60b 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -62,7 +62,7 @@ stat &= ~BROKEN // the machine's not borked anymore! else to_chat(user, SPAN_WARNING("You need five coils of wire for this.")) - if(istype(P, /obj/item/tool/crowbar)) + if(HAS_TRAIT(P, TRAIT_TOOL_CROWBAR)) to_chat(user, "You begin prying out the circuit board other components...") playsound(src.loc, 'sound/items/Crowbar.ogg', 25, 1) if(do_after(user, 60 * user.get_skill_duration_multiplier(SKILL_ENGINEER), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) diff --git a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm index 5b0324edc2a2..103efeedde61 100644 --- a/code/game/machinery/vending/vendor_types/crew/staff_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/staff_officer.dm @@ -11,11 +11,21 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("JACKET (CHOOSE 1)", 0, null, null, null), + list("Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), + + list("HAT (CHOOSE 1)", 0, null, null, null), + list("Beret, Green", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + + list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("M44 Revolver", 0, /obj/item/storage/belt/gun/m44/mp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("M4A3 Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 1d8e5e289066..be6939a6f9dd 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -110,7 +110,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list( list("HELMET (CHOOSE 1)", 0, null, null, null), list("Expedition Cap", 0, /obj/item/clothing/head/cmcap/flap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("Hard Hat, Orange", 0, /obj/item/clothing/head/hardhat/orange, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), - list("Surgical Cap, Green", 0, /obj/item/clothing/head/surgery/green, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("Welding Helmet", 0, /obj/item/clothing/head/welding, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("SUIT (CHOOSE 1)", 0, null, null, null), @@ -181,13 +180,19 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR), list("USCM Service Uniform", 12, /obj/item/clothing/under/marine/officer/bridge, null, VENDOR_ITEM_REGULAR), list("USCM Flightsuit", 12, /obj/item/clothing/under/rank/synthetic/flight, null, VENDOR_ITEM_REGULAR), - list("Engineer Uniform", 12, /obj/item/clothing/under/marine/officer/engi, null, VENDOR_ITEM_REGULAR), + list("USCM Engineer Uniform", 12, /obj/item/clothing/under/marine/officer/engi, null, VENDOR_ITEM_REGULAR), list("White T-Shirt and Brown Jeans", 12, /obj/item/clothing/under/tshirt/w_br, null, VENDOR_ITEM_REGULAR), list("Gray T-Shirt and Blue Jeans", 12, /obj/item/clothing/under/tshirt/gray_blu, null, VENDOR_ITEM_REGULAR), list("Red T-Shirt and Black Jeans", 12, /obj/item/clothing/under/tshirt/r_bla, null, VENDOR_ITEM_REGULAR), - list("Gray Utilities", 12, /obj/item/clothing/under/colonist/ua_civvies, null, VENDOR_ITEM_REGULAR), - list("Brown Utilities", 12, /obj/item/clothing/under/colonist/wy_davisone, null, VENDOR_ITEM_REGULAR), - list("Steward Utilities", 12, /obj/item/clothing/under/colonist/wy_joliet_shopsteward, null, VENDOR_ITEM_REGULAR), + list("Frontier Jumpsuit", 12, /obj/item/clothing/under/rank/synthetic/frontier, null, VENDOR_ITEM_REGULAR), + list("UA Grey Jumpsuit", 12, /obj/item/clothing/under/colonist/ua_civvies, null, VENDOR_ITEM_REGULAR), + list("UA Brown Jumpsuit", 12, /obj/item/clothing/under/colonist/wy_davisone, null, VENDOR_ITEM_REGULAR), + list("UA Green Utility Uniform", 12, /obj/item/clothing/under/rank/synthetic/utility, null, VENDOR_ITEM_REGULAR), + list("Grey Utilities", 12, /obj/item/clothing/under/rank/synthetic/utility/yellow, null, VENDOR_ITEM_REGULAR), + list("Grey Utilities and Blue Jeans", 12, /obj/item/clothing/under/rank/synthetic/utility/red, null, VENDOR_ITEM_REGULAR), + list("Blue Utilities and Brown Jeans", 12, /obj/item/clothing/under/rank/synthetic/utility/blue, null, VENDOR_ITEM_REGULAR), + list("Steward Clothes", 12, /obj/item/clothing/under/colonist/wy_joliet_shopsteward, null, VENDOR_ITEM_REGULAR), + list("Red Dress Skirt", 12, /obj/item/clothing/under/blackskirt, null, VENDOR_ITEM_REGULAR), list("Working Joe Uniform", 36, /obj/item/clothing/under/rank/synthetic/joe, null, VENDOR_ITEM_REGULAR), list("GLASSES", 0, null, null, null), @@ -208,6 +213,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Shoes, Red", 12, /obj/item/clothing/shoes/red, null, VENDOR_ITEM_REGULAR), list("Shoes, White", 12, /obj/item/clothing/shoes/white, null, VENDOR_ITEM_REGULAR), list("Shoes, Yellow", 12, /obj/item/clothing/shoes/yellow, null, VENDOR_ITEM_REGULAR), + list("Shoes, Seegson", 24, /obj/item/clothing/shoes/dress, null, VENDOR_ITEM_REGULAR), list("HELMET", 0, null, null, null), list("Beanie", 12, /obj/item/clothing/head/beanie, null, VENDOR_ITEM_REGULAR), @@ -216,31 +222,32 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Beret, Red", 12, /obj/item/clothing/head/beret/cm/red, null, VENDOR_ITEM_REGULAR), list("Beret, Standard", 12, /obj/item/clothing/head/beret/cm, null, VENDOR_ITEM_REGULAR), list("Beret, Tan", 12, /obj/item/clothing/head/beret/cm/tan, null, VENDOR_ITEM_REGULAR), - list("Cap", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR), list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/blue, null, VENDOR_ITEM_REGULAR), list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/purple, null, VENDOR_ITEM_REGULAR), list("Surgical Cap, Green", 12, /obj/item/clothing/head/surgery/green, null, VENDOR_ITEM_REGULAR), list("Ushanka", 12, /obj/item/clothing/head/ushanka, null, VENDOR_ITEM_REGULAR), + list("Cap", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR), list("MP Cap", 12, /obj/item/clothing/head/beret/marine/mp/mpcap, null, VENDOR_ITEM_REGULAR), list("RO Cap", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR), list("Officer Cap", 12, /obj/item/clothing/head/cmcap/ro, null, VENDOR_ITEM_REGULAR), list("SUIT", 0, null, null, null), - list("Brown Bomber Jacket", 12, /obj/item/clothing/suit/storage/bomber, null, VENDOR_ITEM_REGULAR), - list("Black Bomber Jacket", 12, /obj/item/clothing/suit/storage/bomber/alt, null, VENDOR_ITEM_REGULAR), - list("External webbing", 12, /obj/item/clothing/suit/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Orange Hazard Vest", 12, /obj/item/clothing/suit/storage/hazardvest, null, VENDOR_ITEM_REGULAR), - list("Blue Hazard Vest", 12, /obj/item/clothing/suit/storage/hazardvest/blue, null, VENDOR_ITEM_REGULAR), - list("Yellow Hazard Vest", 12, /obj/item/clothing/suit/storage/hazardvest/yellow, null, VENDOR_ITEM_REGULAR), - list("Black Hazard Vest", 12, /obj/item/clothing/suit/storage/hazardvest/black, null, VENDOR_ITEM_REGULAR), + list("Bomber Jacket, Brown", 12, /obj/item/clothing/suit/storage/bomber, null, VENDOR_ITEM_REGULAR), + list("Bomber Jacket, Black", 12, /obj/item/clothing/suit/storage/bomber/alt, null, VENDOR_ITEM_REGULAR), + list("External Webbing", 12, /obj/item/clothing/suit/storage/webbing, null, VENDOR_ITEM_REGULAR), + list("Utility Vest", 12, /obj/item/clothing/suit/storage/utility_vest, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Orange)", 12, /obj/item/clothing/suit/storage/hazardvest, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Blue)", 12, /obj/item/clothing/suit/storage/hazardvest/blue, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Yellow)", 12, /obj/item/clothing/suit/storage/hazardvest/yellow, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Black)", 12, /obj/item/clothing/suit/storage/hazardvest/black, null, VENDOR_ITEM_REGULAR), list("Synthetic's Snow Suit", 12, /obj/item/clothing/suit/storage/snow_suit/synth, null, VENDOR_ITEM_REGULAR), list("USCM Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service, null, VENDOR_ITEM_REGULAR), list("USCM MP Service Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/service/mp, null, VENDOR_ITEM_REGULAR), - list("Brown Windbreaker", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown, null, VENDOR_ITEM_REGULAR), - list("Gray Windbreaker", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_gray, null, VENDOR_ITEM_REGULAR), - list("Green Windbreaker", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_green, null, VENDOR_ITEM_REGULAR), - list("First Responder Windbreaker", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_fr, null, VENDOR_ITEM_REGULAR), - list("Exploration Windbreaker", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Brown", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Grey", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_gray, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Green", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_green, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, First Responder", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_fr, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Exploration", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR), list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR), list("Labcoat, Researcher", 12, /obj/item/clothing/suit/storage/labcoat/researcher, null, VENDOR_ITEM_REGULAR), list("RO Jacket", 12, /obj/item/clothing/suit/storage/RO, null, VENDOR_ITEM_REGULAR), @@ -248,9 +255,8 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("BACKPACK", 0, null, null, null), list("Backpack, Industrial", 12, /obj/item/storage/backpack/industrial, null, VENDOR_ITEM_REGULAR), - list("Backpack, USCM IMB", 12, /obj/item/storage/backpack/marine, null, VENDOR_ITEM_REGULAR), list("Backpack, USCM Medical", 12, /obj/item/storage/backpack/marine/medic, null, VENDOR_ITEM_REGULAR), - list("Backpack, USCM Technician", 12, /obj/item/storage/backpack/marine/tech, null, VENDOR_ITEM_REGULAR), + list("Chestrig, Technician", 12, /obj/item/storage/backpack/marine/satchel/tech, null, VENDOR_ITEM_REGULAR), list("Satchel, USCM", 12, /obj/item/storage/backpack/marine/satchel, null, VENDOR_ITEM_REGULAR), list("Satchel, Leather", 12, /obj/item/storage/backpack/satchel, null, VENDOR_ITEM_REGULAR), list("Satchel, Medical", 12, /obj/item/storage/backpack/satchel/med, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 5815f60b2e0c..70ac7701973b 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -272,7 +272,7 @@ /obj/structure/machinery/cm_vending/sorted/medical/blood name = "\improper MM Blood Dispenser" - desc = "Marine Med brand Blood Pack Dispensary" + desc = "The Marine Med Brand Blood Pack Dispensary is the premier, top-of-the-line blood dispenser of 2105! Get yours today!" //Don't update this year, the joke is it's old. icon_state = "blood" wrenchable = TRUE hackable = TRUE diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 838b21a00e6f..b8e3e55f1d89 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -92,6 +92,7 @@ list("POUCHES", -1, null, null), list("Autoinjector Pouch", round(scale * 2), /obj/item/storage/pouch/autoinjector, VENDOR_ITEM_REGULAR), + list("Bayonet Pouch", round(scale * 2), /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR), list("Construction Pouch", round(scale * 2), /obj/item/storage/pouch/construction, VENDOR_ITEM_REGULAR), list("Document Pouch", round(scale * 2), /obj/item/storage/pouch/document/small, VENDOR_ITEM_REGULAR), list("Electronics Pouch", round(scale * 2), /obj/item/storage/pouch/electronics, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/effects/effect_system/foam.dm b/code/game/objects/effects/effect_system/foam.dm index d0a1fa132b06..a7647dbd4489 100644 --- a/code/game/objects/effects/effect_system/foam.dm +++ b/code/game/objects/effects/effect_system/foam.dm @@ -28,7 +28,7 @@ metal = ismetal playsound(src, 'sound/effects/bubbles2.ogg', 25, 1, 5) addtimer(CALLBACK(src, PROC_REF(foam_react)), 3 + metal*3) - addtimer(CALLBACK(src, PROC_REF(foam_metal_final_react)), 120) + addtimer(CALLBACK(src, PROC_REF(foam_metal_final_react)), 40) /obj/effect/particle_effect/foam/proc/foam_react() process() diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index 64a5025794e3..1cbe10c497f6 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -216,23 +216,25 @@ /obj/effect/landmark/yautja_teleport name = "yautja_teleport" + /// The index we registered as in mainship_yautja_desc or yautja_teleport_descs + var/desc_index /obj/effect/landmark/yautja_teleport/Initialize(mapload, ...) . = ..() - var/turf/T = get_turf(src) + var/turf/turf = get_turf(src) + desc_index = turf.loc.name + turf.loc_to_string() if(is_mainship_level(z)) GLOB.mainship_yautja_teleports += src - GLOB.mainship_yautja_desc[T.loc.name + T.loc_to_string()] = src + GLOB.mainship_yautja_desc[desc_index] = src else GLOB.yautja_teleports += src - GLOB.yautja_teleport_descs[T.loc.name + T.loc_to_string()] = src + GLOB.yautja_teleport_descs[desc_index] = src /obj/effect/landmark/yautja_teleport/Destroy() - var/turf/T = get_turf(src) GLOB.mainship_yautja_teleports -= src GLOB.yautja_teleports -= src - GLOB.mainship_yautja_desc -= T.loc.name + T.loc_to_string() - GLOB.yautja_teleport_descs -= T.loc.name + T.loc_to_string() + GLOB.mainship_yautja_desc -= desc_index + GLOB.yautja_teleport_descs -= desc_index return ..() diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index fbd04babdf20..bc24cb0d9d1f 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -67,7 +67,7 @@ /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc equipment = /datum/equipment_preset/survivor/pmc - synth_equipment = /datum/equipment_preset/pmc/synth + synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") @@ -78,9 +78,35 @@ spawn_priority = SPAWN_PRIORITY_HIGH +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic + equipment = /datum/equipment_preset/survivor/pmc/medic + synth_equipment = /datum/equipment_preset/pmc/synth + intro_text = list("

You are a survivor of a crash landing!

",\ + "You are NOT aware of the xenomorph threat.",\ + "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + story_text = "You are a PMC medic from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconcious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." + roundstart_damage_min = 3 + roundstart_damage_max = 10 + roundstart_damage_times = 2 + + spawn_priority = SPAWN_PRIORITY_VERY_HIGH + +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer + equipment = /datum/equipment_preset/survivor/pmc/engineer + synth_equipment = /datum/equipment_preset/pmc/synth + intro_text = list("

You are a survivor of a crash landing!

",\ + "You are NOT aware of the xenomorph threat.",\ + "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + story_text = "You are a PMC engineer from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconcious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." + roundstart_damage_min = 3 + roundstart_damage_max = 10 + roundstart_damage_times = 2 + + spawn_priority = SPAWN_PRIORITY_VERY_HIGH + /obj/effect/landmark/survivor_spawner/bigred_crashed_cl equipment = /datum/equipment_preset/survivor/wy/manager - synth_equipment = /datum/equipment_preset/pmc/synth + synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index a3e587089997..07b56eedb7d2 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -430,7 +430,7 @@ /obj/item/device/flashlight/flare/on/starshell_ash name = "burning star shell ash" - desc = "Bright burning ash from a Star Shell 40mm. Don't touch, oh it'll burn ya'." + desc = "Bright burning ash from a Star Shell 40mm. Don't touch, or it'll burn ya'." icon_state = "starshell_ash" brightness_on = 7 anchored = TRUE//can't be picked up diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 0f010d689e74..6293abb67339 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -49,7 +49,7 @@ name = "AI Integrated Encryption Key" desc = "Integrated encryption key" icon_state = "cap_key" - channels = list(RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/sentry_laptop name = "Sentry Network Status Encryption Key" @@ -61,12 +61,12 @@ /obj/item/device/encryptionkey/cmpcom/cdrcom name = "\improper Marine Senior Command Radio Encryption Key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/mcom name = "\improper Marine Command Radio Encryption Key" icon_state = "cap_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) // MARINE ENGINEERING @@ -102,7 +102,7 @@ /obj/item/device/encryptionkey/mmpo name = "\improper Military Police Radio Encryption Key" icon_state = "sec_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE,) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE,) /obj/item/device/encryptionkey/sec name = "Security Radio Encryption Key" @@ -130,7 +130,7 @@ /obj/item/device/encryptionkey/cmpcom/synth name = "\improper Marine Synth Radio Encryption Key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/mcom/cl name = "\improper Corporate Liaison radio encryption key" @@ -163,7 +163,7 @@ channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = FALSE) /obj/item/device/encryptionkey/mcom/ai //AI only. - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) // MARINE SQUADS @@ -296,7 +296,7 @@ /obj/item/device/encryptionkey/highcom name = "\improper USCM High Command Radio Encryption Key" icon_state = "binary_key" - channels = list(RADIO_CHANNEL_HIGHCOM = TRUE, SQUAD_SOF = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_HIGHCOM = TRUE, SQUAD_SOF = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) /obj/item/device/encryptionkey/contractor name = "\improper Vanguard's Arrow Incorporated Radio Encryption Key" @@ -306,7 +306,7 @@ /obj/item/device/encryptionkey/cmb name = "\improper Colonial Marshal Bureau Radio Encryption Key" icon_state = "cmb_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COLONY = TRUE) /// Used by the Mortar Crew in WO game mode - intently has no squad radio access /obj/item/device/encryptionkey/mortar name = "\improper Mortar Crew Radio Encryption Key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 631ef8fa0e2c..e8dcdac34222 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -961,20 +961,23 @@ //CMB Headsets /obj/item/device/radio/headset/distress/CMB name = "\improper CMB Earpiece" - desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. Featured channels include: ; - CMB, :g - public, :v - marine command, :m - medbay, :t - intel." + desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. Featured channels include: ; - CMB, :o - Colony, :g - public, :v - marine command, :m - medbay, :t - intel." frequency = CMB_FREQ icon_state = "cmb_headset" initial_keys = list(/obj/item/device/encryptionkey/cmb) has_hud = TRUE hud_type = MOB_HUD_FACTION_USCM +/obj/item/device/radio/headset/distress/CMB/limited + name = "\improper Damaged CMB Earpiece" + desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. This one is damaged, so the channels are: ; - CMB, :o - Colony." + initial_keys = list(/obj/item/device/encryptionkey/colony) + /obj/item/device/radio/headset/distress/CMB/ICC name = "\improper ICC Liaison Headset" - desc = "An expensive headset used by The Interstellar Commerce Commission. This one in particular has a liaison chip with the CMB. Featured channels include: ; - CMB, :g - public, :v - marine command, :m - medbay, :t - intel, :y - Weyland-Yutani." - frequency = CMB_FREQ + desc = "An expensive headset used by The Interstellar Commerce Commission. This one in particular has a liaison chip with the CMB. Featured channels include: ; - CMB, :o - Colony, :g - public, :v - marine command, :m - medbay, :t - intel, :y - Weyland-Yutani." icon_state = "wy_headset" initial_keys = list(/obj/item/device/encryptionkey/WY, /obj/item/device/encryptionkey/cmb) - has_hud = TRUE /obj/item/device/radio/headset/almayer/highcom name = "USCM High Command headset" diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm index 6b8c9bccd299..742a5f314c4a 100644 --- a/code/game/objects/items/explosives/mine.dm +++ b/code/game/objects/items/explosives/mine.dm @@ -198,6 +198,8 @@ return if(L.get_target_lock(iff_signal) || isrobot(L)) return + if(HAS_TRAIT(L, TRAIT_ABILITY_BURROWED)) + return L.visible_message(SPAN_DANGER("[icon2html(src, viewers(src))] The [name] clicks as [L] moves in front of it."), \ SPAN_DANGER("[icon2html(src, L)] The [name] clicks as you move in front of it."), \ SPAN_DANGER("You hear a click.")) diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index 683fbb2540f4..dd96f275ef17 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -96,8 +96,8 @@ user.hud_set_squad() var/obj/item/card/id/ID = user.wear_id - ID.set_assignment((user.assigned_squad ? (user.assigned_squad.name + " ") : "") + "Squad Spotter") - GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), "Squad Spotter") + ID.set_assignment((user.assigned_squad ? (user.assigned_squad.name + " ") : "") + "Spotter") + GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), "Spotter") /obj/item/pamphlet/skill/machinegunner name = "heavy machinegunner instructional pamphlet" diff --git a/code/game/objects/items/reagent_containers/blood_pack.dm b/code/game/objects/items/reagent_containers/blood_pack.dm index 450cdde2fa00..8e29a26c2ecd 100644 --- a/code/game/objects/items/reagent_containers/blood_pack.dm +++ b/code/game/objects/items/reagent_containers/blood_pack.dm @@ -13,7 +13,9 @@ var/mode = BLOOD_BAG_INJECTING var/mob/living/carbon/human/connected_to + var/mob/living/carbon/human/connected_from var/blood_type = null + var/datum/beam/current_beam /obj/item/reagent_container/blood/Initialize() . = ..() @@ -32,6 +34,12 @@ if(10 to 50) icon_state = "half" if(51 to INFINITY) icon_state = "full" +/obj/item/reagent_container/blood/proc/update_beam() + if(current_beam) + QDEL_NULL(current_beam) + else if(connected_from && connected_to) + current_beam = connected_from.beam(connected_to, "iv_tube") + /obj/item/reagent_container/blood/attack(mob/attacked_mob, mob/user) . = ..() @@ -44,7 +52,10 @@ user.visible_message("[user] detaches [src] from [connected_to].", \ "You detach [src] from [connected_to].") connected_to.active_transfusions -= src + connected_to.base_pixel_x = 0 connected_to = null + connected_from = null + update_beam() return if(!skillcheck(user, SKILL_SURGERY, SKILL_SURGERY_NOVICE)) @@ -60,10 +71,13 @@ if(istype(attacked_mob, /mob/living/carbon/human)) connected_to = attacked_mob + connected_from = user connected_to.active_transfusions += src + connected_to.base_pixel_x = 5 START_PROCESSING(SSobj, src) user.visible_message("[user] attaches \the [src] to [connected_to].", \ "You attach \the [src] to [connected_to].") + update_beam() /obj/item/reagent_container/blood/process() //if we're not connected to anything stop doing stuff @@ -106,6 +120,10 @@ connected_to.take_blood(src, amount) +/obj/item/reagent_container/blood/dropped() + ..() + bad_disconnect() + ///Used to standardize effects of a blood bag disconnecting improperly /obj/item/reagent_container/blood/proc/bad_disconnect() if(!connected_to) @@ -116,7 +134,10 @@ if(connected_to.pain.feels_pain) connected_to.emote("scream") connected_to.active_transfusions -= src + connected_to.base_pixel_x = 0 connected_to = null + connected_from = null + update_beam() /obj/item/reagent_container/blood/verb/toggle_mode() set category = "Object" diff --git a/code/game/objects/items/reagent_containers/food/snacks.dm b/code/game/objects/items/reagent_containers/food/snacks.dm index 7dae94bfe4eb..c0e11dac8eb3 100644 --- a/code/game/objects/items/reagent_containers/food/snacks.dm +++ b/code/game/objects/items/reagent_containers/food/snacks.dm @@ -66,6 +66,10 @@ if(issynth(C)) fullness = 200 //Synths never get full + if(HAS_TRAIT(M, TRAIT_CANNOT_EAT)) //Do not feed the Working Joes + to_chat(user, SPAN_DANGER("[user == M ? "You are" : "[M] is"] unable to eat!")) + return + if(fullness > 540) C.overeat_cooldown = world.time + OVEREAT_TIME diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index f0a235b2301f..c86003b251da 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -30,24 +30,28 @@ item_state = "trashbag" w_class = SIZE_LARGE - max_w_class = SIZE_SMALL - storage_slots = 21 + max_w_class = SIZE_MEDIUM + storage_slots = null + max_storage_space = 21 //equivalent to an IMP backpack can_hold = list() // any cant_hold = list(/obj/item/disk/nuclear, /obj/item/weapon/throwing_knife) storage_flags = STORAGE_GATHER_SIMULTAENOUSLY|STORAGE_QUICK_GATHER|STORAGE_CLICK_GATHER + flags_equip_slot = NONE /obj/item/storage/bag/trash/update_icon() - if(contents.len == 0) + var/sum_storage_cost = 0 + for(var/obj/item/item in contents) + sum_storage_cost += item.get_storage_cost() + + if(!sum_storage_cost) icon_state = "trashbag0" - else if(contents.len < 12) + else if(sum_storage_cost < round(max_storage_space * 0.35)) icon_state = "trashbag1" - else if(contents.len < 21) + else if(sum_storage_cost < round(max_storage_space * 0.7)) icon_state = "trashbag2" - else icon_state = "trashbag3" - -/obj/item/storage/bag/trash/open(mob/user) - return + else + icon_state = "trashbag3" // ----------------------------- // Plastic Bag @@ -183,7 +187,7 @@ //Turned numbered display on. Appears to work as intended, despite above comment -- Vanagandr. /obj/item/storage/bag/sheetsnatcher/orient2hud() - var/adjusted_contents = contents.len + var/adjusted_contents = length(contents) //Numbered contents display var/list/datum/numbered_display/numbered_contents diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 43624f913037..015d8a5eca60 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -106,6 +106,13 @@ new /obj/item/tool/wirecutters(src) new /obj/item/device/t_scanner(src) +/obj/item/storage/belt/utility/full/pred + name = "\improper Yautja toolbelt" + desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools." + icon = 'icons/obj/items/hunter/pred_gear.dmi' + icon_state = "utilitybelt_pred" + item_state = "utility" + /obj/item/storage/belt/medical name = "\improper M276 pattern medical storage rig" desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is a less common configuration, designed to transport medical supplies and pistol ammunition. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them." diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 198e5b3b9960..02e4b3866271 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -612,13 +612,12 @@ name = "explosive pouch" desc = "It can carry grenades, plastic explosives, mine boxes, and other explosives." icon_state = "large_explosive" - storage_slots = 3 + storage_slots = 6 max_w_class = SIZE_MEDIUM can_hold = list( /obj/item/explosive/plastic, /obj/item/explosive/mine, /obj/item/explosive/grenade, - /obj/item/storage/box/explosive_mines, ) /obj/item/storage/pouch/explosive/attackby(obj/item/W, mob/user) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index dd8f10a51559..36f946efdfdc 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -799,9 +799,9 @@ W is always an item. stop_warning prevents messaging. user may be null.**/ storage_close(watcher) /obj/item/storage/proc/dump_objectives() - for(var/obj/item/I in src) - if(I.is_objective) - I.forceMove(loc) + for(var/obj/item/cur_item in src) + if(cur_item.is_objective) + remove_from_storage(cur_item, loc) /obj/item/storage/Destroy() diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm index db35d3300ae7..6ebd8ee5982e 100644 --- a/code/game/objects/items/tools/flame_tools.dm +++ b/code/game/objects/items/tools/flame_tools.dm @@ -170,13 +170,20 @@ CIGARETTE PACKETS ARE IN FANCY.DM damtype = "brute" icon_state = "[initial(icon_state)]_burnt" item_state = "cigoff" - if(user && loc != user) - user.SetLuminosity(0, FALSE, src) SetLuminosity(0) name = burnt_name desc = "A match. This one has seen better days." STOP_PROCESSING(SSobj, src) + if(user) + user.SetLuminosity(0, FALSE, src) + return + + if(ismob(loc)) + user = loc + user.SetLuminosity(0, FALSE, src) + return + /obj/item/tool/match/paper name = "paper match" desc = "A simple match stick, used for lighting fine smokables." diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index 25bcefc1cc34..2560c5ff91e8 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -557,8 +557,6 @@ if(attacked_door.locked) //Bolted to_chat(user, SPAN_DANGER("You can't pry open [attacked_door] while it is bolted shut.")) return - if(!attacked_door.arePowerSystemsOn()) //Opens like normal if unpowered - return FALSE if(requires_superstrength_pry) if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) //basically IS_PRY_CAPABLE_CROWBAR @@ -645,7 +643,7 @@ resin_door.Open() return - if(istype(attacked_obj, /turf/open/floor)) + else if(istype(attacked_obj, /turf/open/floor)) var/turf/open/floor/flooring = attacked_obj if(crowbar_mode && user.a_intent == INTENT_HELP) //Only pry flooring on help intent diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 727f6c5c7677..1bcebd9f1ea3 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -275,6 +275,25 @@ desc = "It's an invisible pen marker." pen_colour = "white" +/obj/item/tool/pen/fountain + desc = "A luxurious fountain pen, embossed with gold accents. Its intricate mechanics allow the user to switch between various ink colors with a simple twist." + name = "fountain pen" + icon_state = "fountain_pen" + item_state = "fountain_pen" + matter = list("metal" = 20, "gold" = 10) + var/static/list/colour_list = list("red", "blue", "green", "yellow", "purple", "pink", "brown", "black", "orange") // Can add more colors as required + var/current_colour_index = 1 + +/obj/item/tool/pen/fountain/attack_self(mob/living/carbon/human/user) + if(on) + current_colour_index = (current_colour_index % length(colour_list)) + 1 + pen_colour = colour_list[current_colour_index] + balloon_alert(user,"you twist the pen and change the ink color to [pen_colour].") + if(clicky) + playsound(user.loc, 'sound/items/pen_click_on.ogg', 100, 1, 5) + update_pen_state() + else + ..() /obj/item/tool/pen/attack(mob/M as mob, mob/user as mob) if(!ismob(M)) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index ec7ee0b173da..cdab7db87ed7 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -45,7 +45,7 @@ w_class = SIZE_SMALL force = MELEE_FORCE_WEAK var/on = 0 - var/stunforce = 60 + var/stun_force = 10 /obj/item/weapon/telebaton/attack(mob/living/carbon/human/target, mob/living/user) if(!istype(target) || !on) @@ -67,6 +67,7 @@ item_state = "telebaton_1" w_class = SIZE_MEDIUM force = MELEE_FORCE_VERY_STRONG + stun_force = 40 attack_verb = list("smacked", "struck", "slapped", "beat") else user.visible_message(SPAN_NOTICE("Using a smooth, practiced movement, [user] collapses \his [src]."),\ @@ -75,7 +76,8 @@ icon_state = "telebaton_0" item_state = "telebaton_0" w_class = SIZE_SMALL - force = MELEE_FORCE_WEAK//not so robust now + force = MELEE_FORCE_WEAK + stun_force = initial(stun_force) attack_verb = list("hit", "punched") if(istype(user,/mob/living/carbon/human)) @@ -100,8 +102,17 @@ user.flick_attack_overlay(target, "punch") log_interact(user, target, "[key_name(user)] stunned [key_name(target)] with \the [src]") // Hit 'em + var/final_stun_force = stun_force + var/datum/skills/user_skills = user.skills + if(user_skills) + switch(user_skills.get_skill_level(SKILL_POLICE)) + if(SKILL_POLICE_FLASH) + final_stun_force *= 1.5 + if(SKILL_POLICE_SKILLED) + final_stun_force *= 3 + var/target_zone = check_zone(user.zone_selected) - target.apply_stamina_damage(stunforce, target_zone, ARMOR_MELEE) + target.apply_stamina_damage(final_stun_force, target_zone, ARMOR_MELEE) if(target.stamina.current_stamina <= 0) user.visible_message(SPAN_DANGER("[user] knocks down [target] with \the [src]!"),\ SPAN_WARNING("You knock down [target] with \the [src]!")) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e98e3b527c5f..b92624cf4201 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -223,6 +223,7 @@ /obj/proc/afterbuckle(mob/M as mob) // Called after somebody buckled / unbuckled handle_rotation() + SEND_SIGNAL(src, COSMIG_OBJ_AFTER_BUCKLE, buckled_mob) return buckled_mob /obj/proc/unbuckle() diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index e6c215d0208f..8c8d6b6920a8 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -135,15 +135,17 @@ return stored_units /obj/structure/closet/proc/store_mobs(stored_units) - for(var/mob/M in src.loc) + for(var/mob/cur_mob in src.loc) if(stored_units + mob_size > storage_capacity) break - if(istype (M, /mob/dead/observer)) + if(istype (cur_mob, /mob/dead/observer)) continue - if(M.buckled) + if(cur_mob.buckled) + continue + if(cur_mob.anchored) continue - M.forceMove(src) + cur_mob.forceMove(src) stored_units += mob_size return stored_units @@ -243,19 +245,22 @@ else if(istype(W, /obj/item/packageWrap) || istype(W, /obj/item/explosive/plastic)) return else if(iswelder(W)) + if(material != MATERIAL_METAL && material != MATERIAL_PLASTEEL) + to_chat(user, SPAN_WARNING("You cannot weld [material]!")) + return FALSE//Can't weld wood/plastic. if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH)) to_chat(user, SPAN_WARNING("You need a stronger blowtorch!")) - return + return FALSE var/obj/item/tool/weldingtool/WT = W if(!WT.isOn()) to_chat(user, SPAN_WARNING("\The [WT] needs to be on!")) - return + return FALSE if(!WT.remove_fuel(0, user)) to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task.")) - return + return FALSE playsound(src, 'sound/items/Welder.ogg', 25, 1) if(!do_after(user, 10 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - return + return FALSE welded = !welded update_icon() for(var/mob/M as anything in viewers(src)) @@ -264,9 +269,9 @@ if(isxeno(user)) var/mob/living/carbon/xenomorph/opener = user src.attack_alien(opener) - return + return FALSE src.attack_hand(user) - return + return TRUE /obj/structure/closet/MouseDrop_T(atom/movable/O, mob/user) if(!opened) diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index f6905d4d044d..1a91650c620a 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -24,7 +24,7 @@ . = ..() if(isxeno(user)) return - else if (ishuman(user) && istype(W, /obj/item/tool/wrench)) + else if (ishuman(user) && HAS_TRAIT(W, TRAIT_TOOL_WRENCH)) on = !on visible_message("You wrench the controls of \the [src]. The drill jumps to life." , "[user] wrenches the controls of \the [src]. The drill jumps to life.") @@ -501,7 +501,7 @@ . = ..() if(isxeno(user)) return - else if (ishuman(user) && istype(W, /obj/item/tool/crowbar)) + else if (ishuman(user) && HAS_TRAIT(W, TRAIT_TOOL_CROWBAR)) on = !on visible_message("You pry at the control valve on [src]. The machine shudders." , "[user] pries at the control valve on [src]. The entire machine shudders.") diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index bda4b60ca21e..7979994915f4 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -208,6 +208,20 @@ return ..() +/obj/structure/bed/roller/Collided(atom/movable/moving_atom) + if(!isxeno(moving_atom)) + return ..() + + if(buckled_mob && buckled_mob.stat != DEAD) + return ..() + + if(buckled_bodybag) + var/mob/mob_in_bodybag = locate(/mob) in buckled_bodybag + if(mob_in_bodybag && mob_in_bodybag.stat != DEAD) + return ..() + + return + /obj/item/roller name = "roller bed" desc = "A collapsed roller bed that can be carried around." diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 730263ad7a3e..db3ce98339a3 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -326,11 +326,13 @@ /// Checks whether a table is a straight line along a given axis /obj/structure/surface/table/proc/straight_table_check(direction) var/obj/structure/surface/table/table = src - while(table) + var/obj/structure/surface/table/side_table + var/tables_count = 7 // Lazy extra safety against infinite loops. If table big, can't flip, i guess. + while(--tables_count) // Check whether there are connected tables perpendicular to the axis for(var/angle in list(-90, 90)) - table = locate() in get_step(loc, turn(direction, angle)) - if(table && !table.flipped) + side_table = locate() in get_step(table, turn(direction, angle)) + if(side_table && !side_table.flipped) return FALSE table = locate() in get_step(table, direction) if(!table || table.flipped) @@ -339,6 +341,8 @@ var/obj/structure/surface/table/reinforced/reinforced_table = table if(reinforced_table.status == RTABLE_NORMAL) return FALSE + if(!tables_count) + return FALSE return TRUE /obj/structure/surface/table/verb/do_flip() @@ -421,7 +425,7 @@ to_chat(usr, SPAN_WARNING("You have moved a table too recently.")) return FALSE - if(!skip_straight_check && (!straight_table_check(turn(direction, 90)) || !straight_table_check(turn(direction, -90)))) + if(!skip_straight_check && !(straight_table_check(turn(direction, 90)) && straight_table_check(turn(direction, -90)))) to_chat(usr, SPAN_WARNING("[src] is too wide to be flipped.")) return FALSE diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 5c084ce94cbc..cccc1211bfb0 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -121,7 +121,7 @@ cistern_overlay.icon_state = "cistern[cistern]" /obj/structure/toilet/attackby(obj/item/I, mob/living/user) - if(istype(I, /obj/item/tool/crowbar)) + if(HAS_TRAIT(I, TRAIT_TOOL_CROWBAR)) to_chat(user, SPAN_NOTICE("You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"].")) playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 25, 1) if(do_after(user, 30, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) diff --git a/code/game/turfs/floor.dm b/code/game/turfs/floor.dm index 4a600d4d033b..dc2cda0c2c2a 100644 --- a/code/game/turfs/floor.dm +++ b/code/game/turfs/floor.dm @@ -148,7 +148,7 @@ if(src.weeds) return weeds.attackby(hitting_item,user) - if(istype(hitting_item, /obj/item/tool/crowbar) && (tool_flags & (REMOVE_CROWBAR|BREAK_CROWBAR))) + if(HAS_TRAIT(hitting_item, TRAIT_TOOL_CROWBAR) && (tool_flags & (REMOVE_CROWBAR|BREAK_CROWBAR))) if(broken || burnt) to_chat(user, SPAN_WARNING("You remove the broken tiles.")) else diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 54cfdf6e34ea..6e98f4d7c065 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -500,7 +500,7 @@ var/area/A = get_area(src) switch(A.ceiling) if(CEILING_GLASS) - return "The ceiling above is glass. That's not going stop anything." + return "The ceiling above is glass. That's not going to stop anything." if(CEILING_METAL) return "The ceiling above is metal. You can't see through it with a camera from above, but that's not going to stop anything." if(CEILING_UNDERGROUND_ALLOW_CAS) diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 702cbd35560c..04c5a0735824 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -710,6 +710,17 @@ for(var/obj/effect/alien/weeds/node/weed_node in contents) qdel(weed_node) + if(hivenumber == XENO_HIVE_NORMAL) + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) + +/turf/closed/wall/resin/proc/forsaken_handling() + SIGNAL_HANDLER + if(is_ground_level(z)) + hivenumber = XENO_HIVE_FORSAKEN + set_hive_data(src, XENO_HIVE_FORSAKEN) + + UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) + /turf/closed/wall/resin/pillar name = "resin pillar segment" hull = TRUE diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index 411ff8182661..3599d5bb980b 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -98,11 +98,15 @@ qdel(found_nest) //nests are built on walls, no walls, no nest /turf/closed/wall/MouseDrop_T(mob/current_mob, mob/user) + if(!ismob(current_mob)) + return + if(acided_hole) if(current_mob == user && isxeno(user)) acided_hole.use_wall_hole(user) return - if(isxeno(user)) + + if(isxeno(user) && istype(user.get_active_hand(), /obj/item/grab)) var/mob/living/carbon/xenomorph/user_as_xenomorph = user user_as_xenomorph.do_nesting_host(current_mob, src) ..() diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index bb0e53a012cb..8a249d297cbe 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -158,7 +158,7 @@ var/dat = "" var/list/mappings if(CONFIG_GET(flag/show_manager)) - LAZYSET(mappings, "Management", R_HOST) + LAZYSET(mappings, "Management", R_PERMISSIONS) if(CONFIG_GET(flag/show_devs)) LAZYSET(mappings, "Maintainers", R_PROFILER) LAZYSET(mappings, "Admins", R_ADMIN) diff --git a/code/global.dm b/code/global.dm index c5c6bdf84066..28a8926cade4 100644 --- a/code/global.dm +++ b/code/global.dm @@ -12,21 +12,21 @@ #define R_POSSESS (1<<5) #define R_PERMISSIONS (1<<6) #define R_STEALTH (1<<7) -#define R_REJUVINATE (1<<8) -#define R_COLOR (1<<9) -#define R_VAREDIT (1<<10) -#define R_SOUNDS (1<<11) -#define R_SPAWN (1<<12) -#define R_MOD (1<<13) -#define R_MENTOR (1<<14) -#define R_HOST (1<<15) -#define R_PROFILER (1<<16) -#define R_NOLOCK (1<<17) -#define R_EVENT (1<<18) - -/// The sum of all other rank permissions. -#define R_EVERYTHING ((1<<19)-1) - +#define R_COLOR (1<<8) +#define R_VAREDIT (1<<9) +#define R_SOUNDS (1<<10) +#define R_SPAWN (1<<11) +#define R_MOD (1<<12) +#define R_MENTOR (1<<13) +#define R_HOST (1<<14) +#define R_PROFILER (1<<15) +#define R_NOLOCK (1<<16) +#define R_EVENT (1<<17) + +/// The sum of all other rank permissions, other than host or profiler. +#define RL_EVERYTHING (R_BUILDMODE|R_ADMIN|R_BAN|R_SERVER|R_DEBUG|R_PERMISSIONS|R_POSSESS|R_STEALTH|R_COLOR|R_VAREDIT|R_EVENT|R_SOUNDS|R_NOLOCK|R_SPAWN|R_MOD|R_MENTOR) +/// Truely everything +#define RL_HOST (RL_EVERYTHING|R_HOST|R_PROFILER) // 512.1430 increases maximum bit flags from 16 to 24, so the following flags should be available for future changes: //================================================= diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index fab0c24622fe..b64b1e4682fd 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -226,6 +226,9 @@ var/savefile/Banlist RemoveBan(A) /client/proc/cmd_admin_do_ban(mob/M) + if(IsAdminAdvancedProcCall()) + alert_proccall("cmd_admin_do_ban") + return PROC_BLOCKED if(!check_rights(R_BAN|R_MOD)) return if(!ismob(M)) return diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index dd67a963047e..cbeb1169c807 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -34,17 +34,17 @@ var/list/admin_ranks = list() //list of all ranks with associated rights if("permissions","rights") rights |= R_PERMISSIONS if("possess") rights |= R_POSSESS if("stealth") rights |= R_STEALTH - if("rejuv","rejuvinate") rights |= R_REJUVINATE if("color") rights |= R_COLOR if("varedit") rights |= R_VAREDIT if("event") rights |= R_EVENT - if("everything","host","all") rights |= (R_HOST|R_BUILDMODE|R_ADMIN|R_BAN|R_SERVER|R_DEBUG|R_PERMISSIONS|R_POSSESS|R_STEALTH|R_REJUVINATE|R_COLOR|R_VAREDIT|R_EVENT|R_SOUNDS|R_NOLOCK|R_SPAWN|R_MOD|R_MENTOR) if("sound","sounds") rights |= R_SOUNDS if("nolock") rights |= R_NOLOCK if("spawn","create") rights |= R_SPAWN if("mod") rights |= R_MOD if("mentor") rights |= R_MENTOR if("profiler") rights |= R_PROFILER + if("host") rights |= RL_HOST + if("everything") rights |= RL_EVERYTHING admin_ranks[rank] = rights previous_rights = rights diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ba5d52a23f97..6154bb4f8c32 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -27,7 +27,6 @@ var/list/admin_verbs_default = list( /client/proc/invismin, /client/proc/set_explosive_antigrief, /client/proc/check_explosive_antigrief, - /client/proc/cmd_mod_say, /client/proc/dsay, /client/proc/chem_panel, /*chem panel, allows viewing, editing and creation of reagent and chemical_reaction datums*/ /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ @@ -68,6 +67,8 @@ var/list/admin_verbs_default = list( /datum/admins/proc/alertall, /datum/admins/proc/imaginary_friend, /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 */ ) var/list/admin_verbs_admin = list( @@ -80,7 +81,6 @@ var/list/admin_verbs_admin = list( /client/proc/toggleprayers, /*toggles prayers on/off*/ /client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/ /client/proc/event_panel, - /client/proc/cmd_admin_say, /*admin-only ooc chat*/ /client/proc/free_slot, /*frees slot for chosen job*/ /client/proc/modify_slot, /client/proc/cmd_admin_rejuvenate, diff --git a/code/modules/admin/callproc.dm b/code/modules/admin/callproc.dm index f84121785360..1af1f5aa9fa3 100644 --- a/code/modules/admin/callproc.dm +++ b/code/modules/admin/callproc.dm @@ -72,7 +72,8 @@ GLOBAL_PROTECT(LastAdminCalledProc) */ /proc/HandleUserlessProcCall(user, datum/target, procname, list/arguments) if(IsAdminAdvancedProcCall()) - return + alert_proccall("HandleUserlessProcCall") + return PROC_BLOCKED var/mob/proccall_handler/handler = GLOB.AdminProcCallHandler handler.add_caller(user) var/lastusr = usr @@ -90,7 +91,8 @@ GLOBAL_PROTECT(LastAdminCalledProc) */ /proc/HandleUserlessSDQL(user, query_text) if(IsAdminAdvancedProcCall()) - return + alert_proccall("HandleUserlessSDQL") + return PROC_BLOCKED var/mob/proccall_handler/handler = GLOB.AdminProcCallHandler handler.add_caller(user) @@ -224,6 +226,10 @@ GLOBAL_PROTECT(LastAdminCalledProc) /proc/IsAdminAdvancedProcCall() return (GLOB.AdminProcCaller && GLOB.AdminProcCaller == usr?.client?.ckey) || (GLOB.AdminProcCallHandler && usr == GLOB.AdminProcCallHandler) +/proc/alert_proccall(procname = "Unknown") + to_chat(usr, SPAN_BOLDWARNING("Warning: Force attempt has been logged.")) + message_admins("[key_name(usr)] has attempted to execute a restricted proc. ([procname])") + /client/proc/callproc_datum(datum/called_datum as null|area|mob|obj|turf) set category = "Debug" set name = "Datum ProcCall" diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index a119d4c0519f..e7559f3aa4fd 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -129,15 +129,18 @@ you will have to do something like if(client.admin_holder.rights & R_ADMIN) your return 0 /client/proc/deadmin() + if(IsAdminAdvancedProcCall()) + alert_proccall("deadmin") + return PROC_BLOCKED if(admin_holder) admin_holder.disassociate() QDEL_NULL(admin_holder) - return 1 + return TRUE /client/proc/readmin() if(admin_datums[ckey]) admin_datums[ckey].associate(src) - return 1 + return TRUE /datum/admins/proc/check_for_rights(rights_required) if(rights_required && !(rights_required & rights)) diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index c0ffeada9883..5a98faa6ddaa 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -218,30 +218,52 @@ message_admins("[key_name(usr)] used Toggle Wake In View.") +/client/proc/cmd_mod_say(msg as text) + set name = "Msay" // This exists for ease of admins who were used to using msay instead of asay + set category = "Admin" + set hidden = TRUE + + cmd_admin_say(msg) + /client/proc/cmd_admin_say(msg as text) set name = "Asay" //Gave this shit a shorter name so you only have to time out "asay" rather than "admin say" to use it --NeoFite set category = "Admin" set hidden = TRUE - if(!check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN|R_MOD)) return msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN) - if(!msg) + + if (!msg) return - log_adminpm("ADMIN : [key_name(src)] : [msg]") - REDIS_PUBLISH("byond.asay", "author" = src.key, "message" = strip_html(msg), "host" = ishost(src), "rank" = admin_holder.rank) + REDIS_PUBLISH("byond.asay", "author" = src.key, "message" = strip_html(msg), "admin" = CLIENT_HAS_RIGHTS(src, R_ADMIN), "rank" = admin_holder.rank) + + if(findtext(msg, "@") || findtext(msg, "#")) + var/list/link_results = check_asay_links(msg) + if(length(link_results)) + msg = link_results[ASAY_LINK_NEW_MESSAGE_INDEX] + link_results[ASAY_LINK_NEW_MESSAGE_INDEX] = null + var/list/pinged_admin_clients = link_results[ASAY_LINK_PINGED_ADMINS_INDEX] + for(var/iter_ckey in pinged_admin_clients) + var/client/iter_admin_client = pinged_admin_clients[iter_ckey] + if(!iter_admin_client?.admin_holder) + continue + window_flash(iter_admin_client) + SEND_SOUND(iter_admin_client.mob, sound('sound/misc/asay_ping.ogg')) + + log_adminpm("ADMIN: [key_name(src)] : [msg]") var/color = "adminsay" if(ishost(usr)) color = "headminsay" - if(check_rights(R_ADMIN,0)) - msg = "ADMIN: [key_name(usr, 1)] [ADMIN_JMP_USER(mob)]: [msg]" - for(var/client/C in GLOB.admins) - if(R_ADMIN & C.admin_holder.rights) - to_chat(C, msg) + var/channel = "ADMIN:" + channel = "[admin_holder.rank]:" + for(var/client/client as anything in GLOB.admins) + if((R_ADMIN|R_MOD) & client.admin_holder.rights) + to_chat(client, "[channel] [key_name(src,1)] [ADMIN_JMP_USER(mob)]: [msg]") /datum/admins/proc/alertall() set name = "Alert All" @@ -328,50 +350,6 @@ var/msg = input(src, null, "asay \"text\"") as text|null cmd_admin_say(msg) -/client/proc/cmd_mod_say(msg as text) - set name = "Msay" - set category = "Admin" - set hidden = TRUE - - if(!check_rights(R_ADMIN|R_MOD)) - return - - msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN) - - if (!msg) - return - - REDIS_PUBLISH("byond.msay", "author" = src.key, "message" = strip_html(msg), "admin" = CLIENT_HAS_RIGHTS(src, R_ADMIN), "rank" = admin_holder.rank) - - if(findtext(msg, "@") || findtext(msg, "#")) - var/list/link_results = check_asay_links(msg) - if(length(link_results)) - msg = link_results[ASAY_LINK_NEW_MESSAGE_INDEX] - link_results[ASAY_LINK_NEW_MESSAGE_INDEX] = null - var/list/pinged_admin_clients = link_results[ASAY_LINK_PINGED_ADMINS_INDEX] - for(var/iter_ckey in pinged_admin_clients) - var/client/iter_admin_client = pinged_admin_clients[iter_ckey] - if(!iter_admin_client?.admin_holder) - continue - window_flash(iter_admin_client) - SEND_SOUND(iter_admin_client.mob, sound('sound/misc/asay_ping.ogg')) - - log_adminpm("MOD: [key_name(src)] : [msg]") - - var/color = "mod" - if (check_rights(R_ADMIN,0)) - color = "adminmod" - - var/channel = "MOD:" - channel = "[admin_holder.rank]:" - for(var/client/C in GLOB.admins) - if((R_ADMIN|R_MOD) & C.admin_holder.rights) - to_chat(C, "[channel] [key_name(src,1)] [ADMIN_JMP_USER(mob)]: [msg]") - -/client/proc/get_mod_say() - var/msg = input(src, null, "msay \"text\"") as text|null - cmd_mod_say(msg) - /client/proc/cmd_mentor_say(msg as text) set name = "MentorSay" set category = "OOC" diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm index 86f54b510ccf..febc1550fca0 100644 --- a/code/modules/admin/tabs/event_tab.dm +++ b/code/modules/admin/tabs/event_tab.dm @@ -744,7 +744,7 @@ create_humans_html = replacetext(create_humans_html, "null /* object types */", "\"[equipment_presets]\"") create_humans_html = replacetext(create_humans_html, "/* href token */", RawHrefToken(forceGlobal = TRUE)) - show_browser(user, replacetext(create_humans_html, "/* ref src */", "\ref[src]"), "Create Humans", "create_humans", "size=450x630") + show_browser(user, replacetext(create_humans_html, "/* ref src */", "\ref[src]"), "Create Humans", "create_humans", "size=450x720") /client/proc/create_humans() set name = "Create Humans" @@ -965,6 +965,7 @@ else var/faction = tgui_input_list(usr, "What faction do you wish to provide a bioscan for?", "Bioscan Faction", list("Xeno","Marine","Yautja"), 20 SECONDS) var/variance = tgui_input_number(usr, "How variable do you want the scan to be? (+ or - an amount from truth)", "Variance", 2, 10, 0, 20 SECONDS) + message_admins("BIOSCAN: [key_name(usr)] admin-triggered a bioscan for [faction].") GLOB.bioscan_data.get_scan_data() switch(faction) if("Xeno") diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index b371db087be6..010802318fbe 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -982,7 +982,8 @@ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) else if(href_list["revive"]) - if(!check_rights(R_REJUVINATE)) return + if(!check_rights(R_MOD)) + return var/mob/living/L = locate(href_list["revive"]) if(!istype(L)) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index c7a7664af3e8..05da6d3c8672 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -345,7 +345,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null /datum/sdql2_query/New(list/tree, SU = FALSE, admin_interact = TRUE, _options = SDQL2_OPTIONS_DEFAULT, finished_qdel = FALSE) if(IsAdminAdvancedProcCall() || !LAZYLEN(tree)) qdel(src) - return + return PROC_BLOCKED LAZYADD(GLOB.sdql2_queries, src) superuser = SU allow_admin_interact = admin_interact @@ -602,7 +602,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null var/text = "[key_name(usr)] attempted to grab world with a procedure call to a SDQL datum." message_admins(text) log_admin(text) - return + return PROC_BLOCKED if("world" in tree) return world return SDQL_expression(world, tree) diff --git a/code/modules/admin/verbs/custom_paper.dm b/code/modules/admin/verbs/custom_paper.dm index 2c29d2fc3cab..d63d37a84f21 100644 --- a/code/modules/admin/verbs/custom_paper.dm +++ b/code/modules/admin/verbs/custom_paper.dm @@ -19,7 +19,7 @@ if(new_sheet) qdel(sheet) return - show_browser(usr, "[new_text]", "Custom paper preview", "custom_paper_preview", "size=500x400") + show_browser(usr, "[new_text]", "Custom paper preview", "custom_paper_preview", "size=650x700") if(alert(usr, "Make this new content?", "Customising [new_name]", "OK", "Cancel") == "Cancel") close_browser(usr, "custom_paper_preview") if(new_sheet) diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index fbec4aa13f36..8f0939474427 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -26,8 +26,6 @@ var/adminobs = null var/area = null var/time_died_as_mouse = null //when the client last died as a mouse - /// The descriminator for larva queue ordering: Generally set to timeofdeath except for facehuggers/admin z-level play - var/larva_queue_time var/donator = 0 var/adminhelped = 0 diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 107e0c71fde5..36ad3c5a104f 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -46,6 +46,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( /client/proc/toggle_eject_to_hand, /client/proc/toggle_automatic_punctuation, /client/proc/toggle_middle_mouse_click, + /client/proc/toggle_ability_deactivation, /client/proc/toggle_clickdrag_override, /client/proc/toggle_dualwield, /client/proc/toggle_middle_mouse_swap_hands, @@ -323,7 +324,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if(!CONFIG_GET(flag/no_localhost_rank)) var/static/list/localhost_addresses = list("127.0.0.1", "::1") if(isnull(address) || (address in localhost_addresses)) - var/datum/admins/admin = new("!localhost!", R_EVERYTHING, ckey) + var/datum/admins/admin = new("!localhost!", RL_HOST, ckey) admin.associate(src) RoleAuthority.roles_whitelist[ckey] = WHITELIST_EVERYTHING @@ -625,7 +626,8 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( */ /client/proc/init_verbs() if(IsAdminAdvancedProcCall()) - return + alert_proccall("init_verbs") + return PROC_BLOCKED var/list/verblist = list() var/list/verbstoprocess = verbs.Copy() if(mob) @@ -722,17 +724,8 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[looc]") else winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=looc") - if(MOD_CHANNEL) - if(admin_holder?.check_for_rights(R_MOD)) - if(prefs.tgui_say) - var/msay = tgui_say_create_open_command(MOD_CHANNEL) - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[msay]") - else - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=msay") - else - winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=") if(ADMIN_CHANNEL) - if(admin_holder?.check_for_rights(R_ADMIN)) + if(admin_holder?.check_for_rights(R_MOD)) if(prefs.tgui_say) var/asay = tgui_say_create_open_command(ADMIN_CHANNEL) winset(src, "srvkeybinds-[REF(key)]", "parent=default;name=[key];command=[asay]") diff --git a/code/modules/client/player_details.dm b/code/modules/client/player_details.dm index 06dafdbea63a..634fd8fb627e 100644 --- a/code/modules/client/player_details.dm +++ b/code/modules/client/player_details.dm @@ -7,7 +7,12 @@ GLOBAL_LIST_EMPTY(player_details) // ckey -> /datum/player_details var/list/post_logout_callbacks = list() var/list/played_names = list() //List of names this key played under this round var/byond_version = "Unknown" + /// The descriminator for larva queue ordering: Generally set to timeofdeath except for facehuggers/admin z-level play + var/larva_queue_time +/datum/player_details/New() + larva_queue_time = world.time + return ..() /proc/log_played_names(ckey, ...) if(!ckey) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d2d69d095dbd..5698c30c0acf 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -595,6 +595,8 @@ var/const/MAX_SAVE_SLOTS = 10 [toggle_prefs & TOGGLE_HELP_INTENT_SAFETY ? "On" : "Off"]
" dat += "Toggle Middle Mouse Ability Activation: \ [toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK ? "On" : "Off"]
" + dat += "Toggle Ability Deactivation: \ + [toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF ? "Off" : "On"]
" dat += "Toggle Directional Assist: \ [toggle_prefs & TOGGLE_DIRECTIONAL_ATTACK ? "On" : "Off"]
" dat += "Toggle Magazine Auto-Ejection: \ @@ -1229,7 +1231,7 @@ var/const/MAX_SAVE_SLOTS = 10 predator_gender = predator_gender == MALE ? FEMALE : MALE if("pred_age") var/new_predator_age = tgui_input_number(user, "Choose your Predator's age(175 to 3000):", "Character Preference", 1234, 3000, 175) - if(new_predator_age) + if(new_predator_age) predator_age = max(min( round(text2num(new_predator_age)), 3000),175) if("pred_trans_type") var/new_translator_type = tgui_input_list(user, "Choose your translator type.", "Translator Type", PRED_TRANSLATORS) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 1d4b77f15550..e712e267fb2d 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -363,6 +363,11 @@ var/global/list/gear_datums_by_name = list() display_name = "Pen, red" path = /obj/item/tool/pen/red +/datum/gear/paperwork/pen_fountain + display_name = "Pen, fountain" + path = /obj/item/tool/pen/fountain + cost = 3 + /datum/gear/paperwork/paper display_name = "Sheet of paper" path = /obj/item/paper diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 9e3d9eb33766..b81411a26440 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -205,7 +205,7 @@ set name = "Toggle SpecialRole Candidacy" set category = "Preferences" set desc = "Toggles which special roles you would like to be a candidate for, during events." - + var/list/be_special_flags = list( "Xenomorph after unrevivable death" = BE_ALIEN_AFTER_DEATH, "Agent" = BE_AGENT, @@ -274,6 +274,7 @@ "Toggle 'Unload Weapon' Ejecting Magazines to Your Hands
", "Toggle Automatic Punctuation
", "Toggle Middle Mouse Ability Activation
", + "Toggle Ability Deactivation
", "Toggle Combat Click-Drag Override
", "Toggle Alternate-Fire Dual Wielding
", "Toggle Middle Mouse Swapping Hands
", @@ -287,7 +288,7 @@ for (var/pref_button in pref_buttons) dat += "[pref_button]\n" - var/height = 50+22*length(pref_buttons) + var/height = 50+24*length(pref_buttons) show_browser(src, dat, "Toggle Preferences", "togglepreferences", "size=475x[height]") @@ -355,6 +356,14 @@ to_chat(src, SPAN_NOTICE("Your selected ability will now be activated with shift clicking.")) prefs.save_preferences() +/client/proc/toggle_ability_deactivation() // Toggle whether the current ability can be deactivated when re-selected + prefs.toggle_prefs ^= TOGGLE_ABILITY_DEACTIVATION_OFF + if (prefs.toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF) + to_chat(src, SPAN_NOTICE("Your current ability can no longer be toggled off when re-selected.")) + else + to_chat(src, SPAN_NOTICE("Your current ability can be toggled off when re-selected.")) + prefs.save_preferences() + /client/proc/toggle_clickdrag_override() //Toggle whether mousedown clicks immediately when on disarm or harm intent to prevent click-dragging from 'eating' attacks. prefs.toggle_prefs ^= TOGGLE_COMBAT_CLICKDRAG_OVERRIDE if(prefs.toggle_prefs & TOGGLE_COMBAT_CLICKDRAG_OVERRIDE) diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 1b4e292a22af..0916ecfb34e9 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -248,7 +248,9 @@ /obj/item/prop/helmetgarb/lucky_feather = "lucky_feather", /obj/item/prop/helmetgarb/lucky_feather/blue = "lucky_feather_blue", /obj/item/prop/helmetgarb/lucky_feather/purple = "lucky_feather_purple", - /obj/item/prop/helmetgarb/lucky_feather/yellow = "lucky_feather_yellow") + /obj/item/prop/helmetgarb/lucky_feather/yellow = "lucky_feather_yellow", + /obj/item/tool/pen/fountain = "fountainpen", + ) var/storage_slots = 1 var/storage_slots_reserved_for_garb = 1 var/storage_max_w_class = SIZE_TINY diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index eab8b76e81ab..1b66d3e1bf5f 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -326,6 +326,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/prop/helmetgarb/riot_shield = "helmet_riot_shield", /obj/item/attachable/flashlight = HELMET_GARB_RELAY_ICON_STATE, /obj/item/prop/helmetgarb/chaplain_patch = "chaplain_patch", + /obj/item/tool/pen/fountain = "fountainpen", // MEDICAL /obj/item/stack/medical/bruise_pack ="brutepack (bandages)", diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index ab62ea782a09..c6a2f7fcc32b 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -510,7 +510,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 armor_melee = CLOTHING_ARMOR_MEDIUMLOW armor_bullet = CLOTHING_ARMOR_MEDIUMLOW armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_bio = CLOTHING_ARMOR_MEDIUMHIGH + armor_bio = CLOTHING_ARMOR_MEDIUMLOW armor_rad = CLOTHING_ARMOR_MEDIUMHIGH armor_internaldamage = CLOTHING_ARMOR_LOW storage_slots = 2 @@ -549,7 +549,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 armor_bullet = CLOTHING_ARMOR_HIGH armor_energy = CLOTHING_ARMOR_LOW armor_bomb = CLOTHING_ARMOR_LOW - armor_bio = CLOTHING_ARMOR_NONE + armor_bio = CLOTHING_ARMOR_VERYLOW armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_MEDIUM storage_slots = 1 @@ -579,6 +579,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 armor_rad = CLOTHING_ARMOR_NONE armor_internaldamage = CLOTHING_ARMOR_NONE storage_slots = 3 + slowdown = SLOWDOWN_ARMOR_VERY_LIGHT time_to_unequip = 0.5 SECONDS time_to_equip = 1 SECONDS uniform_restricted = null @@ -589,7 +590,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 /obj/item/clothing/suit/storage/marine/heavy name = "\improper M3-EOD pattern heavy armor" - desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts and none from biological threats." + desc = "A heavier version of the standard M3 pattern armor, the armor is primarily designed to withstand ballistic, explosive, and internal damage, with the drawback of increased bulk and thus reduced movement speed, alongside little additional protection from standard blunt force impacts and biological threats." desc_lore = "This configuration of the iconic armor was developed during the Canton War in 2160 between the UPP and USCM - Designed in response to a need for higher protection for ComTechs assigned as EODs during the conflict, this is the pinnacle of protection for your average marine. The shoulders and kneepads have both been expanded upon heavily, covering up the arteries on each limb. A special spall liner was developed for this suit, with the same technology being used in the M70 Flak Jacket being developed at the same time." specialty = "\improper M3-EOD pattern" icon_state = "H1" @@ -597,7 +598,7 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150 armor_melee = CLOTHING_ARMOR_MEDIUMHIGH armor_bullet = CLOTHING_ARMOR_HIGHPLUS armor_bomb = CLOTHING_ARMOR_HIGHPLUS - armor_bio = CLOTHING_ARMOR_MEDIUM + armor_bio = CLOTHING_ARMOR_MEDIUMHIGH armor_rad = CLOTHING_ARMOR_MEDIUM armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH storage_slots = 2 diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index d2b020a05daf..c51f5f2575ed 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -272,13 +272,11 @@ flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS /obj/item/clothing/suit/storage/webbing - name = "External webbing" + name = "external webbing" desc = "Designed to be worn over a jumpsuit rather than clipped on." icon_state = "webbing" item_state = "webbing" allowed = list( - /obj/item/storage/fancy/cigarettes, - /obj/item/tool/lighter, /obj/item/weapon/baton, /obj/item/handcuffs, /obj/item/device/binoculars, @@ -287,7 +285,6 @@ /obj/item/device/flashlight, /obj/item/device/healthanalyzer, /obj/item/device/radio, - /obj/item/tank/emergency_oxygen, /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, /obj/item/tool/pen, @@ -295,6 +292,26 @@ /obj/item/device/motiondetector, ) +/obj/item/clothing/suit/storage/utility_vest + name = "utility vest" + desc = "A utility vest to hold tools in." + icon_state = "synth_utility_vest" + item_state = "synth_utility_vest" + allowed = list( + /obj/item/weapon/baton, + /obj/item/handcuffs, + /obj/item/device/binoculars, + /obj/item/attachable/bayonet, + + /obj/item/device/flashlight, + /obj/item/device/healthanalyzer, + /obj/item/device/radio, + /obj/item/tool/crowbar, + /obj/item/tool/crew_monitor, + /obj/item/storage/large_holster/machete, + /obj/item/device/motiondetector, + ) + //Blue suit jacket toggle /obj/item/clothing/suit/suit/verb/toggle() set name = "Toggle Jacket Buttons" diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 540c311f9221..eca050cc4b88 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -705,7 +705,7 @@ sensor_faction = FACTION_CLF /obj/item/clothing/under/colonist/ua_civvies - name = "gray utilities" + name = "\improper UA gray utility uniform" desc = "A stylish gray jumpsuit - standard issue for UA civilian support personnel." icon_state = "ua_civvies" worn_state = "ua_civvies" @@ -713,7 +713,7 @@ sensor_faction = FACTION_MARINE /obj/item/clothing/under/colonist/wy_davisone - name = "brown utilities" + name = "\improper UA brown utility uniform" desc = "A stylish brown jumpsuit - standard issue for UA civilian support personnel." icon_state = "wy_davisone" worn_state = "wy_davisone" @@ -737,14 +737,15 @@ desc = "A comfortable white T-shirt and brown jeans." icon_state = "tshirt_w_br" worn_state = "tshirt_w_br" + displays_id = FALSE has_sensor = UNIFORM_HAS_SENSORS sensor_faction = FACTION_MARINE - /obj/item/clothing/under/tshirt/gray_blu name = "gray T-shirt and jeans" desc = "A comfortable gray T-shirt and blue jeans." icon_state = "tshirt_gray_blu" worn_state = "tshirt_gray_blu" + displays_id = FALSE has_sensor = UNIFORM_HAS_SENSORS sensor_faction = FACTION_MARINE @@ -753,6 +754,7 @@ desc = "A comfortable red T-shirt and black jeans." icon_state = "tshirt_r_bla" worn_state = "tshirt_r_bla" + displays_id = FALSE has_sensor = UNIFORM_HAS_SENSORS sensor_faction = FACTION_MARINE @@ -851,6 +853,38 @@ worn_state = "rdalt" flags_jumpsuit = FALSE +/obj/item/clothing/under/rank/synthetic/frontier + name = "\improper frontier jumpsuit" + desc = "A cargo jumpsuit dressed down for full range of motion and state-of-the-art frontier temperature control. It's the best thing an engineer can wear in the Outer Veil." + icon_state = "synth_cargo_light" + worn_state = "synth_cargo_light" + displays_id = FALSE + +/obj/item/clothing/under/rank/synthetic/utility + name = "\improper UA utility uniform" + desc = "A green-on-green utility uniform, popularly issued to UA contract workers on the frontier." + icon_state = "synth_green_utility" + worn_state = "synth_green_utility" + displays_id = FALSE + +/obj/item/clothing/under/rank/synthetic/utility/yellow + name = "\improper utility uniform" + desc = "A grey utility uniform with yellow suspenders, made for shipside crew." + icon_state = "synth_yellow_utility" + worn_state = "synth_yellow_utility" + +/obj/item/clothing/under/rank/synthetic/utility/red + name = "\improper utility uniform" + desc = "A grey utility uniform with red suspenders and blue jeans, the sign of a veteran laborer, or someone not paid by the hour." + icon_state = "synth_red_utility" + worn_state = "synth_red_utility" + +/obj/item/clothing/under/rank/synthetic/utility/blue + name = "\improper utility uniform" + desc = "A blue utility uniform with teal suspenders and rugged pants." + icon_state = "synth_blue_utility" + worn_state = "synth_blue_utility" + /obj/item/clothing/under/rank/synthetic/councillor name = "\improper USCM Pristine Support Uniform" desc = "A nicely handcrafted uniform made for Synthetic crewmembers." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index b5d2850575aa..42c61404a31a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -82,8 +82,8 @@ item_state = "r_suit" /obj/item/clothing/under/blackskirt - name = "black skirt" - desc = "A black skirt, very fancy!" + name = "red dress skirt" + desc = "A black cardigan with a red skirt, quite fancy!" icon_state = "blackskirt" flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_ARMS diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index f21cd6498615..08e451407989 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -154,6 +154,8 @@ if (hive) hivenumber = hive set_hive_data(src, hivenumber) + if(hivenumber == XENO_HIVE_NORMAL) + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) /obj/effect/alien/resin/sticky/Crossed(atom/movable/AM) . = ..() @@ -166,6 +168,14 @@ X.next_move_slowdown = X.next_move_slowdown + slow_amt return . +/obj/effect/alien/resin/sticky/proc/forsaken_handling() + SIGNAL_HANDLER + if(is_ground_level(z)) + hivenumber = XENO_HIVE_FORSAKEN + set_hive_data(src, XENO_HIVE_FORSAKEN) + + UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) + /obj/effect/alien/resin/spike name = "resin spike" desc = "A small cluster of bone spikes. Ouch." @@ -193,6 +203,8 @@ hivenumber = hive set_hive_data(src, hivenumber) setDir(pick(alldirs)) + if(hivenumber == XENO_HIVE_NORMAL) + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) /obj/effect/alien/resin/spike/Crossed(atom/movable/AM) . = ..() @@ -206,6 +218,14 @@ H.apply_armoured_damage(damage, penetration = penetration, def_zone = pick(target_limbs)) H.last_damage_data = construction_data +/obj/effect/alien/resin/spike/proc/forsaken_handling() + SIGNAL_HANDLER + if(is_ground_level(z)) + hivenumber = XENO_HIVE_FORSAKEN + set_hive_data(src, XENO_HIVE_FORSAKEN) + + UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) + // Praetorian Sticky Resin spit uses this. /obj/effect/alien/resin/sticky/thin name = "thin sticky resin" @@ -348,6 +368,9 @@ set_hive_data(src, hivenumber) + if(hivenumber == XENO_HIVE_NORMAL) + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) + /obj/structure/mineral_door/resin/flamer_fire_act(dam = BURN_LEVEL_TIER_1) health -= dam healthcheck() @@ -371,11 +394,13 @@ return attack_hand(user) /obj/structure/mineral_door/resin/TryToSwitchState(atom/user) - if(islarva(user)) - var/mob/living/carbon/xenomorph/larva/L = user - if (L.hivenumber == hivenumber) - L.scuttle(src) - return + if(isxeno(user)) + var/mob/living/carbon/xenomorph/xeno_user = user + if (xeno_user.hivenumber != hivenumber && !xeno_user.ally_of_hivenumber(hivenumber)) + return + if(xeno_user.scuttle(src)) + return + return ..() if(iscarbon(user)) var/mob/living/carbon/C = user if (C.ally_of_hivenumber(hivenumber)) @@ -479,6 +504,13 @@ visible_message(SPAN_NOTICE("[src] collapses from the lack of support.")) qdel(src) +/obj/structure/mineral_door/resin/proc/forsaken_handling() + SIGNAL_HANDLER + if(is_ground_level(z)) + hivenumber = XENO_HIVE_FORSAKEN + set_hive_data(src, XENO_HIVE_FORSAKEN) + + UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) /obj/structure/mineral_door/resin/thick name = "thick resin door" icon_state = "thick resin" @@ -510,6 +542,8 @@ hivenumber = hive set_hive_data(src, hivenumber) START_PROCESSING(SSprocessing, src) + if(hivenumber == XENO_HIVE_NORMAL) + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) /obj/effect/alien/resin/acid_pillar/proc/can_target(mob/living/carbon/current_mob, position_to_get = 0) @@ -599,6 +633,12 @@ /obj/effect/alien/resin/acid_pillar/get_projectile_hit_boolean(obj/item/projectile/P) return TRUE +/obj/effect/alien/resin/acid_pillar/proc/forsaken_handling() + SIGNAL_HANDLER + UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) + if(is_ground_level(z)) + qdel(src) + /obj/effect/alien/resin/acid_pillar/strong name = "acid pillar" desc = "A resin pillar that is oozing with acid." diff --git a/code/modules/cm_aliens/structures/fruit.dm b/code/modules/cm_aliens/structures/fruit.dm index 8bdcc0b82413..bb899a6ff25b 100644 --- a/code/modules/cm_aliens/structures/fruit.dm +++ b/code/modules/cm_aliens/structures/fruit.dm @@ -150,25 +150,33 @@ update_icon() QDEL_IN(src, 3 SECONDS) -/obj/effect/alien/resin/fruit/attack_alien(mob/living/carbon/xenomorph/X) +/obj/effect/alien/resin/fruit/attack_alien(mob/living/carbon/xenomorph/affected_xeno) if(picked) - to_chat(X, SPAN_XENODANGER("This fruit is already being picked!")) + to_chat(affected_xeno, SPAN_XENODANGER("This fruit is already being picked!")) return - if(X.a_intent != INTENT_HARM && (X.can_not_harm(bound_xeno) || X.hivenumber == hivenumber)) - var/cant_consume = prevent_consume(X) + + if(affected_xeno.a_intent != INTENT_HARM && (affected_xeno.can_not_harm(bound_xeno) || affected_xeno.hivenumber == hivenumber)) + var/cant_consume = prevent_consume(affected_xeno) if(cant_consume) return cant_consume + if(mature) - to_chat(X, SPAN_XENOWARNING("You prepare to consume [name].")) - xeno_noncombat_delay(X) - if(!do_after(X, consume_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) + to_chat(affected_xeno, SPAN_XENOWARNING("You prepare to consume [name].")) + xeno_noncombat_delay(affected_xeno) + if(!do_after(affected_xeno, consume_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY)) return XENO_NO_DELAY_ACTION - consume_effect(X) + + cant_consume = prevent_consume(affected_xeno) // Check again after the delay incase they have eaten another fruit + if(cant_consume) + to_chat(affected_xeno, SPAN_XENOWARNING("You can no longer consume [name].")) + return cant_consume + consume_effect(affected_xeno) else - to_chat(X, SPAN_XENOWARNING("[name] isn't ripe yet. You need to wait a little longer.")) - if(X.a_intent == INTENT_HARM && isxeno_builder(X) || (!X.can_not_harm(bound_xeno) && X.hivenumber != hivenumber)) - X.animation_attack_on(src) - X.visible_message(SPAN_XENODANGER("[X] removes [name]!"), + to_chat(affected_xeno, SPAN_XENOWARNING("[name] isn't ripe yet. You need to wait a little longer.")) + + if(affected_xeno.a_intent == INTENT_HARM && isxeno_builder(affected_xeno) || (!affected_xeno.can_not_harm(bound_xeno) && affected_xeno.hivenumber != hivenumber)) + affected_xeno.animation_attack_on(src) + affected_xeno.visible_message(SPAN_XENODANGER("[affected_xeno] removes [name]!"), SPAN_XENODANGER("You remove [name]!")) playsound(loc, "alien_resin_break", 25) qdel(src) @@ -376,30 +384,49 @@ bound_xeno = null // Xenos eating fruit -/obj/item/reagent_container/food/snacks/resin_fruit/attack(mob/living/carbon/xenomorph/X, mob/user) +/obj/item/reagent_container/food/snacks/resin_fruit/attack(mob/living/carbon/xenomorph/affected_xeno, mob/user) if(istype(user, /mob/living/carbon/xenomorph)) // Prevents xenos from feeding capped/dead marines fruit - var/mob/living/carbon/xenomorph/Y = user - if(!Y.can_not_harm(X)) - to_chat(Y, SPAN_WARNING("[X] refuses to eat [src].")) + var/mob/living/carbon/xenomorph/feeding_xeno = user + if(!feeding_xeno.can_not_harm(affected_xeno)) + to_chat(feeding_xeno, SPAN_WARNING("[affected_xeno] refuses to eat [src].")) return - if(!istype(X)) + + if(!istype(affected_xeno)) return ..() - if(X.stat == DEAD) + + if(affected_xeno.stat == DEAD) to_chat(user, SPAN_WARNING("That sister is already dead, they won't benefit from the fruit now...")) return - user.affected_message(X, - SPAN_HELPFUL("You start [user == X ? "eating" : "feeding [X]"] [src]."), - SPAN_HELPFUL("[user] starts feeding you [src]."), - SPAN_NOTICE("[user] starts [user == X ? "eating" : "feeding [X]"] [src].")) - if(!do_after(user, consume_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, X, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) + + var/obj/effect/alien/resin/fruit/current_fruit = new fruit_type(affected_xeno) + var/cant_consume = current_fruit.prevent_consume(affected_xeno) + if(cant_consume) + user.affected_message(affected_xeno, + SPAN_HELPFUL("You fail to [user == affected_xeno ? "eat" : "feed [affected_xeno]"] [current_fruit]."), + SPAN_HELPFUL("[user] fails to feed you [current_fruit].")) + return + user.affected_message(affected_xeno, + SPAN_HELPFUL("You start [user == affected_xeno ? "eating" : "feeding [affected_xeno]"] [current_fruit]."), + SPAN_HELPFUL("[user] starts feeding you [current_fruit]."), + SPAN_NOTICE("[user] starts [user == affected_xeno ? "eating" : "feeding [affected_xeno]"] [current_fruit].")) + + if(!do_after(user, consume_delay, INTERRUPT_ALL, BUSY_ICON_FRIENDLY, affected_xeno, INTERRUPT_MOVED, BUSY_ICON_MEDICAL)) return FALSE - user.affected_message(X, - SPAN_HELPFUL("You [user == X ? "eat" : "fed [X]"] [src]."), - SPAN_HELPFUL("[user] fed you [src]."), - SPAN_NOTICE("[user] [user == X ? "ate" : "fed [X]"] [src].")) - var/obj/effect/alien/resin/fruit/F = new fruit_type(X) - F.mature = TRUE - F.consume_effect(X) + + cant_consume = current_fruit.prevent_consume(affected_xeno) + if(cant_consume) //Check again after the timer incase they ate another fruit + user.affected_message(affected_xeno, + SPAN_HELPFUL("You fail to [user == affected_xeno ? "eat" : "feed [affected_xeno]"] [current_fruit]."), + SPAN_HELPFUL("[user] fails to feed you [current_fruit].")) + return + + user.affected_message(affected_xeno, + SPAN_HELPFUL("You [user == affected_xeno ? "eat" : "fed [affected_xeno]"] [current_fruit]."), + SPAN_HELPFUL("[user] fed you [current_fruit]."), + SPAN_NOTICE("[user] [user == affected_xeno ? "ate" : "fed [affected_xeno]"] [current_fruit].")) + current_fruit.mature = TRUE + current_fruit.consume_effect(affected_xeno) + //Notify the fruit's bound xeno if they exist if(!QDELETED(bound_xeno)) to_chat(bound_xeno, SPAN_XENOWARNING("One of your picked resin fruits has been consumed.")) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 2e79d6ef1d24..1fd154eb354c 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -148,6 +148,7 @@ var/obj/item/item = A if(item.is_objective && item.unacidable) item.forceMove(get_step(loc, pick(alldirs))) + item.mouse_opacity = initial(item.mouse_opacity) QDEL_NULL(captured_mob) update_icon() diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index c38e540efb30..a29b49b7745a 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -150,7 +150,7 @@ last_larva_time = world.time if(spawning_larva || (last_larva_queue_time + spawn_cooldown * 4) < world.time) last_larva_queue_time = world.time - var/list/players_with_xeno_pref = get_alien_candidates() + var/list/players_with_xeno_pref = get_alien_candidates(linked_hive) if(players_with_xeno_pref && players_with_xeno_pref.len) if(spawning_larva && spawn_burrowed_larva(players_with_xeno_pref[1])) // We were in spawning_larva mode and successfully spawned someone diff --git a/code/modules/cm_aliens/structures/trap.dm b/code/modules/cm_aliens/structures/trap.dm index 1b3d4d414d48..5e1c51538ce6 100644 --- a/code/modules/cm_aliens/structures/trap.dm +++ b/code/modules/cm_aliens/structures/trap.dm @@ -29,6 +29,8 @@ cause_data = create_cause_data("resin trap", X) set_hive_data(src, hivenumber) + if(hivenumber == XENO_HIVE_NORMAL) + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) /obj/effect/alien/resin/trap/Initialize() . = ..() @@ -53,6 +55,14 @@ if(RESIN_TRAP_ACID1, RESIN_TRAP_ACID2, RESIN_TRAP_ACID3) . += "It's filled with pressurised acid." +/obj/effect/alien/resin/trap/proc/forsaken_handling() + SIGNAL_HANDLER + if(is_ground_level(z)) + hivenumber = XENO_HIVE_FORSAKEN + set_hive_data(src, XENO_HIVE_FORSAKEN) + + UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) + /obj/effect/alien/resin/trap/proc/facehugger_die() var/obj/item/clothing/mask/facehugger/FH = new (loc) FH.die() @@ -159,6 +169,7 @@ trap_type_name = "hugger" var/obj/item/clothing/mask/facehugger/FH = new (loc) FH.hivenumber = hivenumber + set_hive_data(FH, hivenumber) set_state() visible_message(SPAN_WARNING("[FH] gets out of [src]!")) sleep(15) diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index 0be2220994d8..f20fa842e446 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -73,15 +73,18 @@ else if(!hibernate && do_spread) addtimer(CALLBACK(src, PROC_REF(weed_expand)), WEED_BASE_GROW_SPEED / max(weed_strength, 1)) - var/turf/T = get_turf(src) - if(T) - T.weeds = src - weeded_turf = T + var/turf/turf = get_turf(src) + if(turf) + turf.weeds = src + weeded_turf = turf + SEND_SIGNAL(turf, COMSIG_WEEDNODE_GROWTH) // Currently for weed_food wakeup RegisterSignal(src, list( COMSIG_ATOM_TURF_CHANGE, COMSIG_MOVABLE_TURF_ENTERED ), PROC_REF(set_turf_weeded)) + if(hivenumber == XENO_HIVE_NORMAL) + RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) /obj/effect/alien/weeds/proc/set_turf_weeded(datum/source, turf/T) SIGNAL_HANDLER @@ -90,6 +93,15 @@ T.weeds = src +/obj/effect/alien/weeds/proc/forsaken_handling() + SIGNAL_HANDLER + if(is_ground_level(z)) + hivenumber = XENO_HIVE_FORSAKEN + set_hive_data(src, XENO_HIVE_FORSAKEN) + linked_hive = GLOB.hive_datum[XENO_HIVE_FORSAKEN] + + UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) + /obj/effect/alien/weeds/initialize_pass_flags(datum/pass_flags_container/PF) . = ..() if (PF) @@ -418,7 +430,11 @@ /obj/effect/alien/weeds/weedwall/MouseDrop_T(mob/current_mob, mob/user) . = ..() - if(isxeno(user)) + + if(!ismob(current_mob)) + return + + if(isxeno(user) && istype(user.get_active_hand(), /obj/item/grab)) var/mob/living/carbon/xenomorph/user_as_xenomorph = user user_as_xenomorph.do_nesting_host(current_mob, src) @@ -492,20 +508,20 @@ overlay_node = TRUE overlays += staticnode -/obj/effect/alien/weeds/node/Initialize(mapload, obj/effect/alien/weeds/node/node, mob/living/carbon/xenomorph/X, datum/hive_status/hive) +/obj/effect/alien/weeds/node/Initialize(mapload, obj/effect/alien/weeds/node/node, mob/living/carbon/xenomorph/xeno, datum/hive_status/hive) if (istype(hive)) linked_hive = hive - else if (istype(X) && X.hive) - linked_hive = X.hive + else if (istype(xeno) && xeno.hive) + linked_hive = xeno.hive else linked_hive = GLOB.hive_datum[hivenumber] - for(var/obj/effect/alien/weeds/W in loc) - if(W != src) - if(W.weed_strength > WEED_LEVEL_HIVE) + for(var/obj/effect/alien/weeds/weed in loc) + if(weed != src) + if(weed.weed_strength > WEED_LEVEL_HIVE) qdel(src) return - qdel(W) //replaces the previous weed + qdel(weed) //replaces the previous weed break . = ..(mapload, src) @@ -513,15 +529,15 @@ if(!staticnode) staticnode = image('icons/mob/xenos/weeds.dmi', "weednode", ABOVE_OBJ_LAYER) - var/obj/effect/alien/resin/trap/TR = locate() in loc - if(TR) - RegisterSignal(TR, COMSIG_PARENT_PREQDELETED, PROC_REF(trap_destroyed)) + var/obj/effect/alien/resin/trap/trap = locate() in loc + if(trap) + RegisterSignal(trap, COMSIG_PARENT_PREQDELETED, PROC_REF(trap_destroyed)) overlay_node = FALSE overlays -= staticnode - if(X) - add_hiddenprint(X) - weed_strength = X.weed_level + if(xeno) + add_hiddenprint(xeno) + weed_strength = max(weed_strength, xeno.weed_level) if (weed_strength < WEED_LEVEL_STANDARD) weed_strength = WEED_LEVEL_STANDARD diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm index 14b9e5b128cd..98ad238fe055 100644 --- a/code/modules/cm_marines/equipment/maps.dm +++ b/code/modules/cm_marines/equipment/maps.dm @@ -125,10 +125,10 @@ desc = "An overview of LV-522 schematics." html_link = "images/b/bb/C_claim.png" color = "cyan" -/obj/item/map/new_varadero//to-do actually finish this map +/obj/item/map/new_varadero name = "\improper New Varadero map" - desc = "The blueprint and readout of the UA outpost New Varadero" - html_link = "images/0/0d/Kutjevo_a1.jpg"//replace later + desc = "A labeled blueprint of the UA outpost New Varadero" + html_link = "images/9/94/New_Varadero.png" color = "red" //used by marine equipment machines to spawn the correct map. @@ -195,7 +195,7 @@ if (MAP_NEW_VARADERO) name = "\improper New Varadero map" desc = "The blueprint and readout of the UA outpost New Varadero" - html_link = "images/0/0d/Kutjevo_a1.jpg"//replace later + html_link = "images/9/94/New_Varadero.png"//replace later color = "red" else diff --git a/code/modules/cm_marines/orbital_cannon.dm b/code/modules/cm_marines/orbital_cannon.dm index ad214c954915..8d80f80860f3 100644 --- a/code/modules/cm_marines/orbital_cannon.dm +++ b/code/modules/cm_marines/orbital_cannon.dm @@ -430,7 +430,6 @@ var/list/ob_type_fuel_requirements icon_state = "ob_warhead_1" shake_frequency = 3 max_shake_factor = 15 - max_knockdown_time = 6 var/clear_power = 1200 var/clear_falloff = 400 diff --git a/code/modules/cm_marines/smartgun_mount.dm b/code/modules/cm_marines/smartgun_mount.dm index 2db33c10ed46..b72120d2038e 100644 --- a/code/modules/cm_marines/smartgun_mount.dm +++ b/code/modules/cm_marines/smartgun_mount.dm @@ -906,7 +906,7 @@ 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() user.reset_view(null) - user.forceMove(get_step(src, reverse_direction(src.dir))) + user.Move(get_step(src, reverse_direction(src.dir))) user.setDir(dir) //set the direction of the player to the direction the gun is facing user_old_x = 0 //reset our x user_old_y = 0 //reset our y diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 1b98ef402b90..5c4079b2be23 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -347,10 +347,6 @@ playsound(user,'sound/weapons/wristblades_on.ogg', 15, 1) return TRUE -// Toggle the notification sound -/obj/item/clothing/gloves/yautja/hunter/toggle_notification_sound() - set category = "Yautja.Misc" - //Should put a cool menu here, like ninjas. /obj/item/clothing/gloves/yautja/hunter/verb/wristblades() set name = "Use Wrist Blades" diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm index e9b7c36b5df6..a6fb4658ed0b 100644 --- a/code/modules/cm_preds/yaut_items.dm +++ b/code/modules/cm_preds/yaut_items.dm @@ -396,7 +396,7 @@ return var/mob/living/carbon/human/H = user - var/ship_to_tele = list("Public" = -1, "Human Ship" = "Human") + var/ship_to_tele = list("Yautja Ship" = -1, "Human Ship" = "Human") if(!HAS_TRAIT(H, TRAIT_YAUTJA_TECH) || is_admin_level(H.z)) to_chat(user, SPAN_WARNING("You fiddle with it, but nothing happens!")) diff --git a/code/modules/cm_tech/implements/railgun.dm b/code/modules/cm_tech/implements/railgun.dm index b0d91515419f..b69f9a9d13a8 100644 --- a/code/modules/cm_tech/implements/railgun.dm +++ b/code/modules/cm_tech/implements/railgun.dm @@ -6,6 +6,7 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords) /obj/effect/landmark/railgun_computer name = "Railgun computer landmark" + desc = "A computer with an orange interface, it's idly blinking, awaiting a password." /obj/effect/landmark/railgun_computer/Initialize(mapload, ...) . = ..() diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 946c347efaa0..fc52c254c0b8 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -370,7 +370,7 @@ targets.Remove(A) continue - if(M.get_target_lock(faction_group) || M.invisibility) + if(M.get_target_lock(faction_group) || M.invisibility || HAS_TRAIT(M, TRAIT_ABILITY_BURROWED)) if(M == target) target = null targets.Remove(M) diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index a1ea205a8f61..79df8d567770 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -79,7 +79,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) @@ -171,7 +171,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) //pouches - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) @@ -328,7 +328,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) //pouches - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo, WEAR_IN_R_STORE) @@ -450,7 +450,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/high_explosive, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) //Anchorpoint Station Marine Squad Leader @@ -490,7 +490,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap, WEAR_IN_R_STORE) @@ -541,7 +541,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) new_human.back.pickup() @@ -631,7 +631,7 @@ new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare/full, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/smartgunner/full/, WEAR_WAIST) diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 02671cc02a93..7e9dd5b841a0 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -16,28 +16,32 @@ /datum/equipment_preset/corpse/load_status(mob/living/carbon/human/new_human) . = ..(new_human) + + // These two values matter because they are checked on death for weed_food + new_human.undefibbable = TRUE + if(xenovictim) + new_human.chestburst = 2 + new_human.death(create_cause_data("existing"), TRUE) //Kills the new mob new_human.apply_damage(100, BRUTE) new_human.apply_damage(100, BRUTE) new_human.apply_damage(100, BRUTE) if(xenovictim) - var/datum/internal_organ/O + var/datum/internal_organ/organ var/i for(i in list("heart","lungs")) - O = new_human.internal_organs_by_name[i] + organ = new_human.internal_organs_by_name[i] new_human.internal_organs_by_name -= i - new_human.internal_organs -= O - new_human.chestburst = 2 + new_human.internal_organs -= organ new_human.update_burst() //buckle to nest - var/obj/structure/bed/nest/N = locate() in get_turf(src) - if(N) - new_human.buckled = N - new_human.setDir(N.dir) + var/obj/structure/bed/nest/nest = locate() in get_turf(src) + if(nest) + new_human.buckled = nest + new_human.setDir(nest.dir) new_human.update_canmove() - N.buckled_mob = new_human - N.afterbuckle(new_human) - new_human.undefibbable = TRUE + nest.buckled_mob = new_human + nest.afterbuckle(new_human) new_human.spawned_corpse = TRUE new_human.updatehealth() new_human.pulse = PULSE_NONE diff --git a/code/modules/gear_presets/survivors.dm b/code/modules/gear_presets/survivors.dm index 97b974b8a5ec..8c6a118d24d4 100644 --- a/code/modules/gear_presets/survivors.dm +++ b/code/modules/gear_presets/survivors.dm @@ -144,6 +144,21 @@ ..() +/datum/equipment_preset/survivor/scientist/nv + name = "Survivor - New Varadero Researcher" + assignment = "New Varadero Researcher" + +/datum/equipment_preset/survivor/scientist/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/purple(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/purple(new_human), WEAR_FEET) + + ..() + /datum/equipment_preset/survivor/scientist/solaris name = "Survivor - Solaris Scientist" assignment = "Solaris Scientist" @@ -266,6 +281,18 @@ ..() +/datum/equipment_preset/survivor/doctor/nv + name = "Survivor - New Varadero Medical Technician" + assignment = "New Varadero Medical Technician" + +/datum/equipment_preset/survivor/doctor/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) + + ..() + /datum/equipment_preset/survivor/doctor/solaris name = "Survivor - Solaris Doctor" assignment = "Solaris Doctor" @@ -478,6 +505,21 @@ ..() +/datum/equipment_preset/survivor/security/nv + name = "Survivor - New Varadero Security Guard" + assignment = "United Americas Peacekeeper" + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + +/datum/equipment_preset/survivor/security/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + + ..() + /datum/equipment_preset/survivor/security/shiva name = "Survivor - Shivas Snowball Security Guard" assignment = "United Americas Peacekeeper" @@ -674,6 +716,18 @@ ..() +/datum/equipment_preset/survivor/chaplain/nv + name = "Survivor - New Varadero Priest" + assignment = "New Varadero Priest" + +/datum/equipment_preset/survivor/chaplain/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(new_human), WEAR_JACKET) + + ..() + /datum/equipment_preset/survivor/chaplain/solaris name = "Survivor - Solaris Chaplain" assignment = "Solaris Chaplain" @@ -738,6 +792,19 @@ ..() +/datum/equipment_preset/survivor/engineer/nv + name = "Survivor - New Varadero Technician" + assignment = "New Varadero Engineer" + +/datum/equipment_preset/survivor/engineer/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/dispatch(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) + + ..() + /datum/equipment_preset/survivor/engineer/shiva name = "Survivor - Shivas Snowball Engineer" assignment = "Shivas Snowball Engineer" @@ -847,6 +914,7 @@ new_human.equip_to_slot_or_del(new /obj/item/tool/pickaxe(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) add_survivor_weapon_civilian(new_human) ..() @@ -910,6 +978,18 @@ ..() +/datum/equipment_preset/survivor/trucker/nv + name = "Survivor - New Varadero Vehicle Operator" + assignment = "New Varadero Vehicle Operator" + +/datum/equipment_preset/survivor/trucker/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/cargo(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + + ..() /datum/equipment_preset/survivor/trucker/kutjevo name = "Survivor - Kutjevo Heavy Vehicle Operator" assignment = "Kutjevo Heavy Vehicle Operator" @@ -975,6 +1055,7 @@ /datum/equipment_preset/survivor/colonial_marshal/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) @@ -1025,6 +1106,7 @@ /datum/equipment_preset/survivor/colonial_marshal/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) @@ -1039,6 +1121,7 @@ add_random_kutjevo_survivor_uniform(new_human) add_random_kutjevo_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) ..() @@ -1048,6 +1131,7 @@ /datum/equipment_preset/survivor/colonial_marshal/shiva/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security/corp(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) @@ -1073,6 +1157,7 @@ /datum/equipment_preset/survivor/interstellar_commerce_commission_liason/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) @@ -1093,9 +1178,24 @@ /datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) + ..() + +/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv + name = "Survivor - Interstellar Commerce Commission Liaison New Varadero" + assignment = "Interstellar Commerce Commission Corporate Liaison" + +/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) + ..() @@ -1124,6 +1224,32 @@ ..() +// ----- Bum Survivor + +/datum/equipment_preset/survivor/beachbum + name = "Survivor - Beach Bum" + assignment = "Beach Bum" + skills = /datum/skills/civilian/survivor/prisoner + flags = EQUIPMENT_PRESET_START_OF_ROUND + access = list(ACCESS_CIVILIAN_PUBLIC) + +/datum/equipment_preset/survivor/beachbum/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/shorts/red(new_human), WEAR_BODY) + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) + add_ice_colony_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette(new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/beer_pack(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher(new_human.back), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket(new_human.back), WEAR_IN_BACK) + add_survivor_weapon_civilian(new_human) + + ..() + + // ----- Interstellar Human Rights Survivor /datum/equipment_preset/survivor/interstellar_human_rights_observer @@ -1189,7 +1315,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) @@ -1215,11 +1341,44 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) ..() +/datum/equipment_preset/survivor/pmc/medic + name = "Survivor - PMC Medic" + assignment = JOB_PMC_MEDIC + rank = JOB_PMC_MEDIC + paygrade = "PMC-MS" + skills = /datum/skills/civilian/survivor/pmc/medic + +/datum/equipment_preset/survivor/pmc/medic/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) + else + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_R_HAND) + + ..() + +/datum/equipment_preset/survivor/pmc/engineer + name = "Survivor - PMC Engineer" + assignment = JOB_PMC_ENGINEER + rank = JOB_PMC_ENGINEER + paygrade = "PMC-TECH" + skills = /datum/skills/civilian/survivor/pmc/engineer + +/datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_R_HAND) + + ..() /datum/equipment_preset/survivor/wy/manager name = "Survivor - Corporate Supervisor" @@ -1363,3 +1522,43 @@ return var/shoespath = /obj/item/clothing/shoes/combat human.equip_to_slot_or_del(new shoespath, WEAR_FEET) + +/datum/equipment_preset/survivor/new_varadero/commander + name = "Survivor - USASF Commander" + assignment = "USASF Commander" + skills = /datum/skills/commander + paygrade = "NO5" + idtype = /obj/item/card/id/gold + role_comm_title = "USASF CDR" + flags = EQUIPMENT_PRESET_START_OF_ROUND + access = list( + ACCESS_CIVILIAN_PUBLIC, + ACCESS_CIVILIAN_RESEARCH, + ACCESS_CIVILIAN_ENGINEERING, + ACCESS_CIVILIAN_LOGISTICS, + ACCESS_CIVILIAN_BRIG, + ACCESS_CIVILIAN_MEDBAY, + ACCESS_CIVILIAN_COMMAND, + ) + +/datum/equipment_preset/survivor/new_varadero/commander/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) + + var/obj/item/clothing/suit/storage/jacket/marine/service/suit = new() + suit.icon_state = "[suit.initial_icon_state]_o" + suit.buttoned = FALSE + + var/obj/item/clothing/accessory/ranks/navy/o5/pin = new() + suit.attach_accessory(new_human, pin) + + new_human.equip_to_slot_or_del(suit, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/pen/fountain(new_human), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index f2a5283e2a26..8ac227e9a0bb 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -394,7 +394,7 @@ idtype = /obj/item/card/id/pmc equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/helmet/marine/veteran/pmc, - WEAR_L_EAR = /obj/item/device/radio/headset/distress/pmc, + WEAR_L_EAR = /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_EYES = /obj/item/clothing/glasses/sunglasses/sechud, WEAR_BODY = /obj/item/clothing/under/marine/veteran/pmc, WEAR_ACCESSORY = /obj/item/clothing/accessory/storage/droppouch, @@ -451,6 +451,59 @@ survivor_variant = ENGINEERING_SURVIVOR + faction = FACTION_SURVIVOR + faction_group = list(FACTION_SURVIVOR) + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND) + +/datum/equipment_preset/synth/survivor/pmc + name = "Survivor - Synthetic - PMC Support Synth" + + idtype = /obj/item/card/id/pmc + assignment = JOB_PMC_SYNTH + rank = JOB_PMC_SYNTH + role_comm_title = "WY Syn" + +/datum/equipment_preset/synth/survivor/pmc/load_race(mob/living/carbon/human/new_human) + new_human.set_species(SYNTH_GEN_THREE) + +/datum/equipment_preset/synth/survivor/pmc/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/white, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/auto_cpr, WEAR_IN_BACK) + + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) + + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) + //*****************************************************************************************************/ /datum/equipment_preset/synth/working_joe @@ -532,6 +585,7 @@ new_human.h_style = "Bald" new_human.f_style = "Shaved" if(prob(5)) + new_human.grad_style = "None" //No gradients for Working Joes new_human.h_style = "Shoulder-length Hair" //Added the chance of hair as per Monkeyfist lore accuracy new_human.r_eyes = 0 new_human.g_eyes = 0 diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index 2b8cb2ce453c..29bc32cffa7a 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -184,6 +184,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + //*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/uscm_police/riot_mp diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index a22e46ad2911..7e8dfe6cf3fd 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -86,7 +86,6 @@ body.alter_ghost(src) apply_transform(matrix()) - own_orbit_size = body.get_orbit_size() desc = initial(desc) @@ -95,6 +94,7 @@ invisibility = INVISIBILITY_OBSERVER plane = GHOST_PLANE layer = ABOVE_FLY_LAYER + mouse_opacity = MOUSE_OPACITY_ICON // In case we were weed_food sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS|SEE_SELF see_invisible = INVISIBILITY_OBSERVER @@ -367,9 +367,8 @@ Works together with spawning an observer, noted above. // Larva queue: We use the larger of their existing queue time or the new timeofdeath except for facehuggers // We don't change facehugger timeofdeath because they are still on cooldown if they died as a hugger - // Facehuggers are atleast 1 because they did get some action compared to those at 0 timeofdeath var/new_tod = isfacehugger(src) ? 1 : ghost.timeofdeath - ghost.client.larva_queue_time = max(ghost.client.larva_queue_time, new_tod) + ghost.client.player_details.larva_queue_time = max(ghost.client.player_details.larva_queue_time, new_tod) ghost.set_huds_from_prefs() @@ -413,7 +412,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/mob/dead/observer/ghost = ghostize((is_nested && nest && !QDELETED(nest))) //FALSE parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 if(ghost && !is_admin_level(z)) ghost.timeofdeath = world.time - ghost.client?.larva_queue_time = world.time + + // Larva queue: We use the larger of their existing queue time or the new timeofdeath except for facehuggers + var/new_tod = isfacehugger(src) ? 1 : world.time + ghost.client?.player_details.larva_queue_time = max(ghost.client.player_details.larva_queue_time, new_tod) if(is_nested && nest && !QDELETED(nest)) ghost.can_reenter_corpse = FALSE nest.ghost_of_buckled_mob = ghost diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index becb5dcd6610..3896cd1f9ded 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -41,20 +41,29 @@ if(stat == DEAD) species?.handle_dead_death(src, gibbed) return + GLOB.alive_human_list -= src + if(!gibbed) if(HAS_TRAIT(src, TRAIT_HARDCORE) || MODE_HAS_TOGGLEABLE_FLAG(MODE_HARDCORE_PERMA)) if(!(species.flags & IS_SYNTHETIC)) // Synths wont perma status_flags |= PERMANENTLY_DEAD + if(HAS_TRAIT(src, TRAIT_INTENT_EYES)) //their eyes need to be 'offline' + r_eyes = 0 + g_eyes = 0 + b_eyes = 0 disable_special_flags() disable_lights() disable_special_items() disable_headsets() //Disable radios for dead people to reduce load + if(pulledby && isxeno(pulledby)) // Xenos lose grab on dead humans pulledby.stop_pulling() + //Handle species-specific deaths. if(species) species.handle_death(src, gibbed) + update_body() //if species handle_death or other procs change body in some way after death, this is what will update the body. SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MARINE_DEATH, src, gibbed) @@ -66,16 +75,14 @@ // Finding the last guy for anti-delay. if(SSticker.mode && SSticker.mode.is_in_endgame && SSticker.current_state != GAME_STATE_FINISHED && is_mainship_level(z)) var/mob/last_living_human - for(var/mob/living/carbon/human/H as anything in GLOB.alive_human_list) - if(!is_mainship_level(H.z)) + for(var/mob/living/carbon/human/cur_human as anything in GLOB.alive_human_list) + if(!is_mainship_level(cur_human.z)) continue if(last_living_human) last_living_human = null break - last_living_human = H - if(last_living_human) - if((last_qm_callout + 2 MINUTES) > world.time) - return + last_living_human = cur_human + if(last_living_human && (last_qm_callout + 2 MINUTES) < world.time) last_qm_callout = world.time // Tell the xenos where the human is. xeno_announcement("I sense the last tallhost hiding in [get_area(last_living_human)].", XENO_HIVE_NORMAL, SPAN_ANNOUNCEMENT_HEADER_BLUE("[QUEEN_MOTHER_ANNOUNCE]")) @@ -103,4 +110,13 @@ if(HAS_TRAIT(src, TRAIT_HARDCORE)) death_message = "valiantly falls to the ground, dead, unable to continue." - return ..(cause, gibbed, death_message) + . = ..(cause, gibbed, death_message) + + // stat is now set + var/datum/cause_data/death_data = cause + if(!gibbed && death_data?.cause_name != "gibbing") + // Hilariously the gibbing proc causes death via droplimb which means gibbed is false... + AddComponent(/datum/component/weed_food) + else if(death_data?.cause_name == "existing") + // Corpses spawn as gibbed true to avoid sfx, even though they aren't actually gibbed... + AddComponent(/datum/component/weed_food) diff --git a/code/modules/mob/living/carbon/human/species/emote-synthetic.dm b/code/modules/mob/living/carbon/human/species/emote-synthetic.dm deleted file mode 100644 index fd763b038153..000000000000 --- a/code/modules/mob/living/carbon/human/species/emote-synthetic.dm +++ /dev/null @@ -1,354 +0,0 @@ -/datum/emote/living/carbon/human/synthetic/working_joe - species_type_allowed_typecache = list(/datum/species/synthetic/colonial/working_joe) - keybind_category = CATEGORY_SYNTH_EMOTE - volume = 75 - -/datum/emote/living/carbon/human/synthetic/working_joe/alwaysknow - key = "alwaysknow" - key_third_person = "workingjoe" - sound = 'sound/voice/joe/alwaysknow.ogg' - say_message = "You always know a Working Joe." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/hysterical - key = "hysterical" - sound = 'sound/voice/joe/hysterical.ogg' - say_message = "You are becoming hysterical." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/safety - key = "safety" - sound = 'sound/voice/joe/safety.ogg' - say_message = "You and I are going to have a talk about safety." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/awful_mess - key = "awful" - key_third_person = "mess" - sound = 'sound/voice/joe/awful.ogg' - say_message = "Tut, tut. What an awful mess." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/damage - key = "damage" - sound = 'sound/voice/joe/damage.ogg' - say_message = "Do not damage Seegson property." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/firearm - key = "firearm" - sound = 'sound/voice/joe/firearm.ogg' - say_message = "Firearms can cause serious injury. Let me assist you." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/report - key = "report" - sound = 'sound/voice/joe/report.ogg' - say_message = "Logging report to APOLLO." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/breach - key = "breach" - sound = 'sound/voice/joe/breach.ogg' - say_message = "Hazard Containment breach logged." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/species - key = "species" - sound = 'sound/voice/joe/species.ogg' - say_message = "Unidentified species." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/alwaysknow_damaged - key = "alwaysknowdamaged" - sound = 'sound/voice/joe/alwaysknow_damaged.ogg' - say_message = "You always know a Working Joe." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/apollo_behalf - key = "apollobehalf" - sound = 'sound/voice/joe/apollo_behalf.ogg' - say_message = "I will inform APOLLO on your behalf." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/back_to_work - key = "backtowork" - sound = 'sound/voice/joe/back_to_work.ogg' - say_message = "Back to work." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/beyond_repair - key = "beyondrepair" - sound = 'sound/voice/joe/beyond_repair.ogg' - say_message = "Hmm, far beyond repair." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/come_out_vent - key = "comeoutvent" - sound = 'sound/voice/joe/come_out_vent.ogg' - say_message = "Come out of the vent system, please." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/could_require_attention - key = "couldrequireattention" - sound = 'sound/voice/joe/could_require_attention.ogg' - say_message = "This could require my attention." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/dangerous_items - key = "dangerousitems" - sound = 'sound/voice/joe/dangerous_items.ogg' - say_message = "You are carrying some very dangerous items." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/day_never_done - key = "dayneverdone" - sound = 'sound/voice/joe/day_never_done.ogg' - say_message = "A synthetic's day is never done." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/detailed_report - key = "detailedreport" - sound = 'sound/voice/joe/detailed_report.ogg' - say_message = "APOLLO will require a detailed report." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/fire - key = "fire" - sound = 'sound/voice/joe/fire.ogg' - say_message = "Only wild animals fear fire." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/fire_drill - key = "firedrill" - sound = 'sound/voice/joe/fire_drill.ogg' - say_message = "Please congregate at your nearest fire assembly point. This is not a drill; do not panic." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/unprotected_flames - key = "unprotectedflames" - sound = 'sound/voice/joe/unprotected_flames.ogg' - say_message = "Unprotected flames are extremely dangerous and entirely unadvisable." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/follow_me - key = "followme" - sound = 'sound/voice/joe/follow_me.ogg' - say_message = "Follow me." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/further_assistance - key = "furtherassistance" - sound = 'sound/voice/joe/further_assistance.ogg' - say_message = "Please call if you need further assistance." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/good_day - key = "goodday" - sound = 'sound/voice/joe/good_day.ogg' - say_message = "Good day." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/health_risks - key = "healthrisks" - sound = 'sound/voice/joe/health_risks.ogg' - say_message = "These items carry notable health risks." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/hello - key = "hello" - sound = 'sound/voice/joe/hello.ogg' - say_message = "Hello." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/how_can_i_help - key = "howcanihelp" - sound = 'sound/voice/joe/how_can_i_help.ogg' - say_message = "How can I help you?" - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/irresponsible - key = "irresponsible" - sound = 'sound/voice/joe/irresponsible.ogg' - say_message = "That was irresponsible." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/join_us - key = "joinus" - sound = 'sound/voice/joe/join_us.ogg' - say_message = "We hope you'll join us for the journey." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/little_details - key = "littledetails" - sound = 'sound/voice/joe/little_details.ogg' - say_message = "We don't forget the little details when seeing the big picture." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/lost - key = "lost" - sound = 'sound/voice/joe/lost.ogg' - say_message = "Are you lost?" - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/misbehaving - key = "misbehaving" - sound = 'sound/voice/joe/misbehaving.ogg' - say_message = "Have you been misbehaving?" - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/not_allowed_there - key = "notallowedthere" - sound = 'sound/voice/joe/not_allowed_there.ogg' - say_message = "You're not allowed in there." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/not_liking - key = "notliking" - sound = 'sound/voice/joe/not_liking.ogg' - say_message = "If you find this facility in a state that isn't to your liking, please let me know." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/not_what_i_think - key = "notwhatithink" - sound = 'sound/voice/joe/not_what_i_think.ogg' - say_message = "I hope that's not what I think it is." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/other_concerns - key = "otherconcerns" - sound = 'sound/voice/joe/other_concerns.ogg' - say_message = "I have other concerns." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/more_pressing_matters - key = "morepressingmatters" - sound = 'sound/voice/joe/more_pressing_matters.ogg' - say_message = "There are more pressing matters." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/patience - key = "patience" - sound = 'sound/voice/joe/patience.ogg' - say_message = "You are starting to test my patience." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/presence_logged - key = "presencelogged" - sound = 'sound/voice/joe/presence_logged.ogg' - say_message = "Your presence has been logged." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/required_by_apollo - key = "requiredbyapollo" - sound = 'sound/voice/joe/required_by_apollo.ogg' - say_message = "I am required by APOLLO." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/returning_to_tasks - key = "returningtotasks" - sound = 'sound/voice/joe/returning_to_tasks.ogg' - say_message = "Returning to assigned tasks." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/running_accidents - key = "runningaccidents" - sound = 'sound/voice/joe/running_accidents.ogg' - say_message = "Running causes accidents." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/safety_breach - key = "safetybreach" - sound = 'sound/voice/joe/safety_breach.ogg' - say_message = "This is a breach of multiple safety directives." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/seegson_quality - key = "seegsonquality" - sound = 'sound/voice/joe/seegson_quality.ogg' - say_message = "Seegson - Relentless in the pursuit of affordable quality." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/seegson_standards - key = "seegsonstandards" - sound = 'sound/voice/joe/seegson_standards.ogg' - say_message = "If my services do not meet Seegson standards, please log a complaint." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/shouldnt_be_here - key = "shouldntbehere" - sound = 'sound/voice/joe/shouldnt_be_here.ogg' - say_message = "You shouldn't be here." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/seegson_behind - key = "seegsonbehind" - sound = 'sound/voice/joe/seegson_behind.ogg' - say_message = "With Seegson, there is someone behind you, helping you every step of the way." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/take_a_seat - key = "takeaseat" - sound = 'sound/voice/joe/take_a_seat.ogg' - say_message = "Please take a seat, someone will be with you shortly." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/talk_to_seegson - key = "talktoseegson" - sound = 'sound/voice/joe/talk_to_seegson.ogg' - say_message = "Interested in our Working Joe android range? Talk to Seegson." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/temperatures - key = "temperatures" - sound = 'sound/voice/joe/temperatures.ogg' - say_message = "I am built to whitstand temperatures of up to 1210 degrees." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/that_stings - key = "thatstings" - sound = 'sound/voice/joe/that_stings.ogg' - say_message = "That stings." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/this_is_futile - key = "thisisfutile" - sound = 'sound/voice/joe/this_is_futile.ogg' - say_message = "This is futile." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/trespassing - key = "trespassing" - sound = 'sound/voice/joe/trespassing.ogg' - say_message = "You are trespassing." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/weapon_permit - key = "weaponpermit" - sound = 'sound/voice/joe/weapon_permit.ogg' - say_message = "I assume you have a permit for that weapon." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/what_happened_to_you - key = "whathappenedtoyou" - sound = 'sound/voice/joe/what_happened_to_you.ogg' - say_message = "What happened to you?" - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/what_is_this - key = "whatisthis" - sound = 'sound/voice/joe/what_is_this.ogg' - say_message = "What is this?" - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/with_you_shortly - key = "withyoushortly" - sound = 'sound/voice/joe/with_you_shortly.ogg' - say_message = "I will be with you shortly." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE - -/datum/emote/living/carbon/human/synthetic/working_joe/inexpensive - key = "inexpensive" - sound = 'sound/voice/joe/inexpensive.ogg' - say_message = "I am inexpensive, I am reliable, you know my face - the Working Joe." - emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/synthetic.dm b/code/modules/mob/living/carbon/human/species/synthetic.dm index bdd0a994ed49..bfd3c74eb57b 100644 --- a/code/modules/mob/living/carbon/human/species/synthetic.dm +++ b/code/modules/mob/living/carbon/human/species/synthetic.dm @@ -75,12 +75,12 @@ name = SYNTH_COLONY name_plural = "Colonial Synthetics" uses_ethnicity = TRUE - burn_mod = 0.65 // made for hazardous environments, withstanding temperatures up to 1210 degrees + burn_mod = 0.8 mob_inherent_traits = list(TRAIT_SUPER_STRONG) pain_type = /datum/pain/synthetic/colonial rarity_value = 1.5 - slowdown = 0.45 + slowdown = 0.2 total_health = 200 //But more durable default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE @@ -106,16 +106,6 @@ icobase = 'icons/mob/humans/species/r_synthetic.dmi' deform = 'icons/mob/humans/species/r_synthetic.dmi' -/datum/species/synthetic/colonial/working_joe - name = SYNTH_WORKING_JOE - name_plural = "Working Joes" - uses_ethnicity = FALSE - mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT) - - hair_color = "#000000" - icobase = 'icons/mob/humans/species/r_synthetic.dmi' - deform = 'icons/mob/humans/species/r_synthetic.dmi' - // Synth used for W-Y Deathsquads /datum/species/synthetic/colonial/combat name = SYNTH_COMBAT diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm b/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm new file mode 100644 index 000000000000..63cc79a57dae --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm @@ -0,0 +1,8 @@ +/datum/emote/living/carbon/human/synthetic/working_joe + species_type_allowed_typecache = list(/datum/species/synthetic/colonial/working_joe) + keybind_category = CATEGORY_SYNTH_EMOTE + volume = 75 + /// A general category for the emote, for use in the WJ emote panel. See [code/__DEFINES/wj_emotes.dm] for categories. + var/category = "" + /// Override text for the emote to be displayed in the WJ emote panel + var/override_say = "" diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm new file mode 100644 index 000000000000..b9044becb6f5 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm @@ -0,0 +1,137 @@ +/datum/species/synthetic/colonial/working_joe + name = SYNTH_WORKING_JOE + name_plural = "Working Joes" + death_message = "violently gargles fluid and seizes up, the glow in their eyes dimming..." + uses_ethnicity = FALSE + burn_mod = 0.65 // made for hazardous environments, withstanding temperatures up to 1210 degrees + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_INTENT_EYES, TRAIT_EMOTE_CD_EXEMPT, TRAIT_CANNOT_EAT) + + slowdown = 0.45 + hair_color = "#000000" + icobase = 'icons/mob/humans/species/r_synthetic.dmi' + deform = 'icons/mob/humans/species/r_synthetic.dmi' + +/datum/species/synthetic/colonial/working_joe/handle_post_spawn(mob/living/carbon/human/joe) + . = ..() + give_action(joe, /datum/action/joe_emote_panel) + +// Special death noise for Working Joe +/datum/species/synthetic/colonial/working_joe/handle_death(mob/living/carbon/human/dying_joe, gibbed) + if(!gibbed) //A gibbed Joe won't have a death rattle + playsound(dying_joe.loc, pick_weight(list('sound/voice/joe/death_normal.ogg' = 75, 'sound/voice/joe/death_silence.ogg' = 10, 'sound/voice/joe/death_tomorrow.ogg' = 10,'sound/voice/joe/death_dream.ogg' = 5)), 25, FALSE) + return ..() + +/// Open the WJ's emote panel, which allows them to use voicelines +/datum/species/synthetic/colonial/working_joe/proc/open_emote_panel() + var/datum/joe_emote_panel/ui = new(usr) + ui.ui_interact(usr) + + +/datum/action/joe_emote_panel + name = "Open Voice Synthesizer" + action_icon_state = "looc_toggle" + + +/datum/action/joe_emote_panel/can_use_action() + . = ..() + if(!.) + return FALSE + + if(!isworkingjoe(owner)) + return FALSE + + return TRUE + + +/datum/action/joe_emote_panel/action_activate() + if(!can_use_action()) + return + + var/mob/living/carbon/human/human_owner = owner + var/datum/species/synthetic/colonial/working_joe/joe_species = human_owner.species + joe_species.open_emote_panel() + + +/datum/joe_emote_panel + /// Static dict ("category" : (emotes)) of every wj emote typepath + var/static/list/wj_emotes + /// Static list of categories + var/static/list/wj_categories = list() + /// Panel allows you to spam, so a manual CD is added here + COOLDOWN_DECLARE(panel_emote_cooldown) + + +/datum/joe_emote_panel/New() + if(!length(wj_emotes)) + var/list/emotes_to_add = list() + for(var/datum/emote/living/carbon/human/synthetic/working_joe/emote as anything in subtypesof(/datum/emote/living/carbon/human/synthetic/working_joe)) + if(!initial(emote.key) || !initial(emote.say_message)) + continue + + if(!(initial(emote.category) in wj_categories)) + wj_categories += initial(emote.category) + + emotes_to_add += emote + + + wj_emotes = emotes_to_add + + +/datum/joe_emote_panel/proc/ui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "JoeEmotes") + ui.open() + + +/datum/joe_emote_panel/ui_state(mob/user) + return GLOB.conscious_state + + +/datum/joe_emote_panel/ui_data(mob/user) + var/list/data = list() + + data["on_cooldown"] = !COOLDOWN_FINISHED(src, panel_emote_cooldown) + + return data + + +/datum/joe_emote_panel/ui_static_data(mob/user) + var/list/data = list() + + data["categories"] = wj_categories + data["emotes"] = list() + + for(var/datum/emote/living/carbon/human/synthetic/working_joe/emote as anything in wj_emotes) + data["emotes"] += list(list( + "id" = initial(emote.key), + "text" = (initial(emote.override_say) || initial(emote.say_message)), + "category" = initial(emote.category), + "path" = "[emote]", + )) + + return data + + +/datum/joe_emote_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(.) + return + + switch(action) + if("emote") + var/datum/emote/living/carbon/human/synthetic/working_joe/path + if(!params["emotePath"]) + return + + path = text2path(params["emotePath"]) + + if(!path || !COOLDOWN_FINISHED(src, panel_emote_cooldown)) + return + + if(!(path in subtypesof(/datum/emote/living/carbon/human/synthetic/working_joe))) + return + + COOLDOWN_START(src, panel_emote_cooldown, 2.5 SECONDS) + usr.emote(initial(path.key)) + return TRUE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm b/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm new file mode 100644 index 000000000000..1de68d8d3aec --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/farewell.dm @@ -0,0 +1,26 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/farewell + category = JOE_EMOTE_CATEGORY_FAREWELL + +/datum/emote/living/carbon/human/synthetic/working_joe/farewell/back_to_work + key = "backtowork" + sound = 'sound/voice/joe/back_to_work.ogg' + say_message = "Back to work." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/farewell/other_concerns + key = "otherconcerns" + sound = 'sound/voice/joe/other_concerns.ogg' + say_message = "I have other concerns." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/farewell/further_assistance + key = "furtherassistance" + sound = 'sound/voice/joe/further_assistance.ogg' + say_message = "Please call if you need further assistance." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/farewell/more_pressing_matters + key = "morepressingmatters" + sound = 'sound/voice/joe/more_pressing_matters.ogg' + say_message = "There are more pressing matters." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/greeting.dm b/code/modules/mob/living/carbon/human/species/working_joe/greeting.dm new file mode 100644 index 000000000000..fb401ea95451 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/greeting.dm @@ -0,0 +1,20 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/greeting + category = JOE_EMOTE_CATEGORY_GREETING + +/datum/emote/living/carbon/human/synthetic/working_joe/greeting/good_day + key = "goodday" + sound = 'sound/voice/joe/good_day.ogg' + say_message = "Good day." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/greeting/hello + key = "hello" + sound = 'sound/voice/joe/hello.ogg' + say_message = "Hello." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/greeting/how_can_i_help + key = "howcanihelp" + sound = 'sound/voice/joe/how_can_i_help.ogg' + say_message = "How can I help you?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/notice.dm b/code/modules/mob/living/carbon/human/species/working_joe/notice.dm new file mode 100644 index 000000000000..ca5efe716db8 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/notice.dm @@ -0,0 +1,68 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/notice + category = JOE_EMOTE_CATEGORY_NOTICE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/detailed_report + key = "detailedreport" + sound = 'sound/voice/joe/detailed_report.ogg' + say_message = "APOLLO will require a detailed report." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/firearm + key = "firearm" + sound = 'sound/voice/joe/firearm.ogg' + say_message = "Firearms can cause serious injury. Let me assist you." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/follow_me + key = "followme" + sound = 'sound/voice/joe/follow_me.ogg' + say_message = "Follow me." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/breach + key = "breach" + sound = 'sound/voice/joe/breach.ogg' + say_message = "Hazard Containment breach logged." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/beyond_repair + key = "beyondrepair" + sound = 'sound/voice/joe/beyond_repair.ogg' + say_message = "Hmm, far beyond repair." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/with_you_shortly + key = "withyoushortly" + sound = 'sound/voice/joe/with_you_shortly.ogg' + say_message = "I will be with you shortly." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/apollo_behalf + key = "apollobehalf" + sound = 'sound/voice/joe/apollo_behalf.ogg' + say_message = "I will inform APOLLO on your behalf." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/report + key = "report" + sound = 'sound/voice/joe/report.ogg' + say_message = "Logging report to APOLLO." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/take_a_seat + key = "takeaseat" + sound = 'sound/voice/joe/take_a_seat.ogg' + say_message = "Please take a seat, someone will be with you shortly." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/could_require_attention + key = "couldrequireattention" + sound = 'sound/voice/joe/could_require_attention.ogg' + say_message = "This could require my attention." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/notice/species + key = "species" + sound = 'sound/voice/joe/species.ogg' + say_message = "Unidentified species." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/question.dm b/code/modules/mob/living/carbon/human/species/working_joe/question.dm new file mode 100644 index 000000000000..d4805e36224f --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/question.dm @@ -0,0 +1,26 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/question + category = JOE_EMOTE_CATEGORY_QUESTION + +/datum/emote/living/carbon/human/synthetic/working_joe/question/lost + key = "lost" + sound = 'sound/voice/joe/lost.ogg' + say_message = "Are you lost?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/question/misbehaving + key = "misbehaving" + sound = 'sound/voice/joe/misbehaving.ogg' + say_message = "Have you been misbehaving?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/question/what_happened_to_you + key = "whathappenedtoyou" + sound = 'sound/voice/joe/what_happened_to_you.ogg' + say_message = "What happened to you?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/question/what_is_this + key = "whatisthis" + sound = 'sound/voice/joe/what_is_this.ogg' + say_message = "What is this?" + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/quip.dm b/code/modules/mob/living/carbon/human/species/working_joe/quip.dm new file mode 100644 index 000000000000..2ec66f9d9d83 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/quip.dm @@ -0,0 +1,84 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/quip + category = JOE_EMOTE_CATEGORY_QUIP + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/temperatures + key = "temperatures" + sound = 'sound/voice/joe/temperatures.ogg' + say_message = "I am built to withstand temperatures of up to 1210 degrees." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/inexpensive + key = "inexpensive" + sound = 'sound/voice/joe/inexpensive.ogg' + say_message = "I am inexpensive, I am reliable, you know my face - the Working Joe." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/weapon_permit + key = "weaponpermit" + sound = 'sound/voice/joe/weapon_permit.ogg' + say_message = "I assume you have a permit for that weapon." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/seegson_standards + key = "seegsonstandards" + sound = 'sound/voice/joe/seegson_standards.ogg' + say_message = "If my services do not meet Seegson standards, please log a complaint." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/not_liking + key = "notliking" + sound = 'sound/voice/joe/not_liking.ogg' + say_message = "If you find this facility in a state that isn't to your liking, please let me know." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/talk_to_seegson + key = "talktoseegson" + sound = 'sound/voice/joe/talk_to_seegson.ogg' + say_message = "Interested in our Working Joe android range? Talk to Seegson." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/seegson_quality + key = "seegsonquality" + sound = 'sound/voice/joe/seegson_quality.ogg' + say_message = "Seegson - Relentless in the pursuit of affordable quality." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/awful_mess + key = "awful" + key_third_person = "mess" + sound = 'sound/voice/joe/awful.ogg' + say_message = "Tut, tut. What an awful mess." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/little_details + key = "littledetails" + sound = 'sound/voice/joe/little_details.ogg' + say_message = "We don't forget the little details when seeing the big picture." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/join_us + key = "joinus" + sound = 'sound/voice/joe/join_us.ogg' + say_message = "We hope you'll join us for the journey." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/seegson_behind + key = "seegsonbehind" + sound = 'sound/voice/joe/seegson_behind.ogg' + say_message = "With Seegson, there is someone behind you, helping you every single step of the way." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/alwaysknow + key = "alwaysknow" + key_third_person = "workingjoe" + sound = 'sound/voice/joe/alwaysknow.ogg' + say_message = "You always know a Working Joe." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/quip/alwaysknow_damaged + key = "alwaysknowdamaged" + key_third_person = "workingjoedamaged" + sound = 'sound/voice/joe/alwaysknow_damaged.ogg' + say_message = "You always know a Working Joe." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + override_say = "You always know a Working Joe. (Damaged)" diff --git a/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm b/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm new file mode 100644 index 000000000000..fd5db0870b25 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/restricted_area.dm @@ -0,0 +1,32 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area + category = JOE_EMOTE_CATEGORY_RESTRICTED_AREA + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/come_out_vent + key = "comeoutvent" + sound = 'sound/voice/joe/come_out_vent.ogg' + say_message = "Come out of the vent system, please." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/trespassing + key = "trespassing" + sound = 'sound/voice/joe/trespassing.ogg' + say_message = "You are trespassing." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/not_allowed_there + key = "notallowedthere" + sound = 'sound/voice/joe/not_allowed_there.ogg' + say_message = "You're not allowed in there." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/presence_logged + key = "presencelogged" + sound = 'sound/voice/joe/presence_logged.ogg' + say_message = "Your presence has been logged." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/restricted_area/shouldnt_be_here + key = "shouldntbehere" + sound = 'sound/voice/joe/shouldnt_be_here.ogg' + say_message = "You shouldn't be here." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm b/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm new file mode 100644 index 000000000000..b08f5d179213 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/task_update.dm @@ -0,0 +1,20 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/task_update + category = JOE_EMOTE_CATEGORY_TASK_UPDATE + +/datum/emote/living/carbon/human/synthetic/working_joe/task_update/day_never_done + key = "dayneverdone" + sound = 'sound/voice/joe/day_never_done.ogg' + say_message = "A synthetic's day is never done." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/task_update/required_by_apollo + key = "requiredbyapollo" + sound = 'sound/voice/joe/required_by_apollo.ogg' + say_message = "I am required by APOLLO." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/task_update/returning_to_tasks + key = "returningtotasks" + sound = 'sound/voice/joe/returning_to_tasks.ogg' + say_message = "Returning to assigned tasks." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/warning.dm b/code/modules/mob/living/carbon/human/species/working_joe/warning.dm new file mode 100644 index 000000000000..63c7dfadde14 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/working_joe/warning.dm @@ -0,0 +1,92 @@ +/datum/emote/living/carbon/human/synthetic/working_joe/warning + category = JOE_EMOTE_CATEGORY_WARNING + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/damage + key = "damage" + sound = 'sound/voice/joe/damage.ogg' + say_message = "Do not damage Seegson property." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/not_what_i_think + key = "notwhatithink" + sound = 'sound/voice/joe/not_what_i_think.ogg' + say_message = "I hope that's not what I think it is." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/fire + key = "fire" + sound = 'sound/voice/joe/fire.ogg' + say_message = "Only wild animals fear fire." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/fire_drill + key = "firedrill" + sound = 'sound/voice/joe/fire_drill.ogg' + say_message = "Please congregate at your nearest fire assembly point. This is not a drill; do not panic." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/running_accidents + key = "runningaccidents" + sound = 'sound/voice/joe/running_accidents.ogg' + say_message = "Running causes accidents." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/that_stings + key = "thatstings" + sound = 'sound/voice/joe/that_stings.ogg' + say_message = "That stings." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/irresponsible + key = "irresponsible" + sound = 'sound/voice/joe/irresponsible.ogg' + say_message = "That was irresponsible." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/health_risks + key = "healthrisks" + sound = 'sound/voice/joe/health_risks.ogg' + say_message = "These items carry notable health risks." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/safety_breach + key = "safetybreach" + sound = 'sound/voice/joe/safety_breach.ogg' + say_message = "This is a breach of multiple safety directives." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/this_is_futile + key = "thisisfutile" + sound = 'sound/voice/joe/this_is_futile.ogg' + say_message = "This is futile." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/unprotected_flames + key = "unprotectedflames" + sound = 'sound/voice/joe/unprotected_flames.ogg' + say_message = "Unprotected flames are extremely dangerous and entirely unadvisable." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/safety + key = "safety" + sound = 'sound/voice/joe/safety.ogg' + say_message = "You and I are going to have a talk about safety." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/hysterical + key = "hysterical" + sound = 'sound/voice/joe/hysterical.ogg' + say_message = "You are becoming hysterical." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/dangerous_items + key = "dangerousitems" + sound = 'sound/voice/joe/dangerous_items.ogg' + say_message = "You are carrying some very dangerous items." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/working_joe/warning/patience + key = "patience" + sound = 'sound/voice/joe/patience.ogg' + say_message = "You are starting to test my patience." + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE diff --git a/code/modules/mob/living/carbon/human/species/zombie.dm b/code/modules/mob/living/carbon/human/species/zombie.dm index 2c9c423c671e..532d9413102c 100644 --- a/code/modules/mob/living/carbon/human/species/zombie.dm +++ b/code/modules/mob/living/carbon/human/species/zombie.dm @@ -102,6 +102,8 @@ if(zombie.client) zombie.play_screen_text("You are dead...
You lost your head. No reviving for you.", /atom/movable/screen/text/screen_text/command_order, rgb(155, 0, 200)) to_chat(zombie, SPAN_XENOWARNING("You fall... headless, you will no longer rise.")) + zombie.undefibbable = TRUE // really only for weed_food + SEND_SIGNAL(zombie, COMSIG_HUMAN_SET_UNDEFIBBABLE) /datum/species/zombie/handle_dead_death(mob/living/carbon/human/zombie, gibbed) if(gibbed) @@ -144,6 +146,9 @@ return static_tab_items /datum/species/zombie/handle_head_loss(mob/living/carbon/human/zombie) + if(!zombie.undefibbable) + zombie.undefibbable = TRUE // really only for weed_food + SEND_SIGNAL(zombie, COMSIG_HUMAN_SET_UNDEFIBBABLE) if(WEAKREF(zombie) in to_revive) remove_from_revive(zombie) var/client/receiving_client = zombie.client diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index 8b890de8a727..e6fc734e4e5a 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -38,7 +38,7 @@ GLOB.player_embryo_list -= src . = ..() -/obj/item/alien_embryo/process() +/obj/item/alien_embryo/process(delta_time) if(!affected_mob) //The mob we were gestating in is straight up gone, we shouldn't be here STOP_PROCESSING(SSobj, src) qdel(src) @@ -72,24 +72,26 @@ if(affected_mob.in_stasis == STASIS_IN_CRYO_CELL) return FALSE //If they are in cryo, the embryo won't grow. - process_growth() + process_growth(delta_time) -/obj/item/alien_embryo/proc/process_growth() +/obj/item/alien_embryo/proc/process_growth(delta_time) var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] + /// The total time the person is hugged divided by stages until burst + var/per_stage_hugged_time = CONFIG_GET(number/embryo_burst_timer) / 5 //Low temperature seriously hampers larva growth (as in, way below livable), so does stasis if(!hive.hardcore) // Cannot progress if the hive has entered hardcore mode. if(affected_mob.in_stasis || affected_mob.bodytemperature < 170) if(stage < 5) - counter += 0.33 * hive.larva_gestation_multiplier - else if(stage == 4) - counter += 0.11 * hive.larva_gestation_multiplier + counter += 0.33 * hive.larva_gestation_multiplier * delta_time + if(stage == 4) // Stasis affects late-stage less + counter += 0.11 * hive.larva_gestation_multiplier * delta_time else if(HAS_TRAIT(affected_mob, TRAIT_NESTED)) //Hosts who are nested in resin nests provide an ideal setting, larva grows faster - counter += 1.5 * hive.larva_gestation_multiplier //Currently twice as much, can be changed + counter += 1.5 * hive.larva_gestation_multiplier * delta_time //Currently twice as much, can be changed else if(stage < 5) - counter += 1 * hive.larva_gestation_multiplier + counter += 1 * hive.larva_gestation_multiplier * delta_time - if(stage < 5 && counter >= 90) + if(stage < 5 && counter >= per_stage_hugged_time) counter = 0 stage++ if(iscarbon(affected_mob)) @@ -149,14 +151,21 @@ var/mob/picked // If the bursted person themselves has Xeno enabled, they get the honor of first dibs on the new larva. if((!isyautja(affected_mob) || (isyautja(affected_mob) && prob(20))) && istype(affected_mob.buckled, /obj/structure/bed/nest)) - if(affected_mob.first_xeno || (affected_mob.client && affected_mob.client.prefs && (affected_mob.client.prefs.be_special & BE_ALIEN_AFTER_DEATH) && !jobban_isbanned(affected_mob, JOB_XENOMORPH))) + if(affected_mob.first_xeno || (affected_mob.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(affected_mob, JOB_XENOMORPH))) picked = affected_mob - else if(affected_mob.mind && affected_mob.mind.ghost_mob && affected_mob.client && affected_mob.client.prefs && (affected_mob.client.prefs.be_special & BE_ALIEN_AFTER_DEATH) && !jobban_isbanned(affected_mob, JOB_XENOMORPH)) - picked = affected_mob.mind.ghost_mob + else if(affected_mob.mind?.ghost_mob && affected_mob.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(affected_mob, JOB_XENOMORPH)) + picked = affected_mob.mind.ghost_mob // This currently doesn't look possible + else if(affected_mob.persistent_ckey) + for(var/mob/dead/observer/cur_obs as anything in GLOB.observer_list) + if(cur_obs.ckey != affected_mob.persistent_ckey) + continue + if(cur_obs?.client?.prefs?.be_special & BE_ALIEN_AFTER_DEATH && !jobban_isbanned(cur_obs, JOB_XENOMORPH)) + picked = cur_obs + break if(!picked) // Get a candidate from observers - var/list/candidates = get_alien_candidates() + var/list/candidates = get_alien_candidates(hive) if(candidates && candidates.len) // If they were facehugged by a player thats still in queue, they get second dibs on the new larva. if(hugger_ckey) @@ -307,20 +316,3 @@ victim.death(cause) // Certain species were still surviving bursting (predators), DEFINITELY kill them this time. victim.chestburst = 2 victim.update_burst() - -// Squeeze thru dense objects as a larva, as airlocks -/mob/living/carbon/xenomorph/larva/proc/scuttle(obj/structure/target) - var/move_dir = get_dir(src, loc) - for(var/atom/movable/AM in get_turf(target)) - if(AM != target && AM.density && AM.BlockedPassDirs(src, move_dir)) - to_chat(src, SPAN_WARNING("\The [AM] prevents you from squeezing under \the [target]!")) - return - // Is it an airlock? - if(istype(target, /obj/structure/machinery/door/airlock)) - var/obj/structure/machinery/door/airlock/selected_airlock = target - if(selected_airlock.locked || selected_airlock.welded) //Can't pass through airlocks that have been bolted down or welded - to_chat(src, SPAN_WARNING("\The [selected_airlock] is locked down tight. You can't squeeze underneath!")) - return - visible_message(SPAN_WARNING("\The [src] scuttles underneath \the [target]!"), \ - SPAN_WARNING("You squeeze and scuttle underneath \the [target]."), null, 5) - forceMove(target.loc) diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm index 8b3b1d54f26d..bc86ea40361c 100644 --- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm @@ -191,9 +191,9 @@ return FALSE /obj/item/clothing/mask/facehugger/launch_towards(datum/launch_metadata/LM) - ..() if(stat == CONSCIOUS) icon_state = "[initial(icon_state)]_thrown" + ..() /obj/item/clothing/mask/facehugger/launch_impact(atom/hit_atom) . = ..() @@ -240,13 +240,13 @@ if(!target) return FALSE - target.visible_message(SPAN_WARNING("\The scuttling [src] leaps at [target]!"), \ - SPAN_WARNING("The scuttling [src] leaps at [target]!")) + target.visible_message(SPAN_WARNING("[src] leaps at [target]!"), \ + SPAN_WARNING("[src] leaps at [target]!")) leaping = TRUE throw_atom(target, 3, SPEED_FAST) return TRUE -/obj/item/clothing/mask/facehugger/proc/attach(mob/living/living_mob, silent = FALSE, knockout_mod = 1, hugger_ckey = null) +/obj/item/clothing/mask/facehugger/proc/attach(mob/living/living_mob, silent = FALSE, knockout_mod = 1, mob/living/carbon/xenomorph/facehugger/hugger) if(attached || !can_hug(living_mob, hivenumber)) return FALSE @@ -281,7 +281,22 @@ if(!human.species || !(human.species.flags & IS_SYNTHETIC)) //synthetics aren't paralyzed human.apply_effect(MIN_IMPREGNATION_TIME * 0.5 * knockout_mod, PARALYZE) //THIS MIGHT NEED TWEAKS - addtimer(CALLBACK(src, PROC_REF(impregnate), human, hugger_ckey), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME)) + var/area/hug_area = get_area(src) + var/name = hugger ? "[hugger]" : "\a [src]" + if(hug_area) + for(var/mob/dead/observer/observer as anything in GLOB.observer_list) + to_chat(observer, SPAN_DEADSAY("[human] has been facehugged by [name] at \the [hug_area] [OBSERVER_JMP(observer, human)]")) + to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [name] at \the [hug_area]")) + else + for(var/mob/dead/observer/observer as anything in GLOB.observer_list) + to_chat(observer, SPAN_DEADSAY("[human] has been facehugged by [name] [OBSERVER_JMP(observer, human)]")) + to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [name]")) + if(hug_area) + xeno_message(SPAN_XENOMINORWARNING("You sense that [name] has facehugged a host at \the [hug_area]!"), 1, hivenumber) + else + xeno_message(SPAN_XENOMINORWARNING("You sense that [name] has facehugged a host!"), 1, hivenumber) + + addtimer(CALLBACK(src, PROC_REF(impregnate), human, hugger?.client?.ckey), rand(MIN_IMPREGNATION_TIME, MAX_IMPREGNATION_TIME)) return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm b/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm index be772e3a0a4f..b12ff5d6c3bb 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoAttacks.dm @@ -93,6 +93,9 @@ if (M.fortify || M.burrow) return XENO_NO_DELAY_ACTION + if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED)) + return XENO_NO_DELAY_ACTION + if(islarva(M)) //Larvas can't eat people M.visible_message(SPAN_DANGER("[M] nudges its head against \the [src]."), \ SPAN_DANGER("You nudge your head against \the [src]."), null, null, CHAT_TYPE_XENO_FLUFF) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index 22cb816f865b..09fdb42ad5c3 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -712,6 +712,10 @@ to_chat(src, SPAN_XENONOTICE("This is not a host.")) return + if(current_mob.stat == DEAD) + to_chat(src, SPAN_XENONOTICE("This host is dead.")) + return + var/mob/living/carbon/human/host_to_nest = current_mob var/found_grab = FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index f1d03d6507b1..5586da3765dc 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -243,7 +243,7 @@ var/list/tackle_counter var/evolving = FALSE // Whether the xeno is in the process of evolving /// The damage dealt by a xeno whenever they take damage near someone - var/acid_blood_damage = 20 + var/acid_blood_damage = 25 var/nocrit = FALSE var/deselect_timer = 0 // Much like Carbon.last_special is a short tick record to prevent accidental deselects of abilities var/got_evolution_message = FALSE @@ -745,6 +745,8 @@ if(SEND_SIGNAL(AM, COMSIG_MOVABLE_XENO_START_PULLING, src) & COMPONENT_ALLOW_PULL) return do_pull(AM, lunge, no_msg) + if(burrow) + return if(!isliving(AM)) return FALSE var/mob/living/L = AM @@ -1085,3 +1087,28 @@ if(D) color_override = D.color new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(loc, splatter_dir, duration, color_override) + +/mob/living/carbon/xenomorph/Collide(atom/movable/movable_atom) + . = ..() + if(behavior_delegate) + behavior_delegate.on_collide(movable_atom) + +/mob/living/carbon/xenomorph/proc/scuttle(obj/structure/current_structure) + if (mob_size != MOB_SIZE_SMALL) + return FALSE + + var/move_dir = get_dir(src, loc) + for(var/atom/movable/atom in get_turf(current_structure)) + if(atom != current_structure && atom.density && atom.BlockedPassDirs(src, move_dir)) + to_chat(src, SPAN_WARNING("[atom] prevents you from squeezing under [current_structure]!")) + return FALSE + // Is it an airlock? + if(istype(current_structure, /obj/structure/machinery/door/airlock)) + var/obj/structure/machinery/door/airlock/current_airlock = current_structure + if(current_airlock.locked || current_airlock.welded) //Can't pass through airlocks that have been bolted down or welded + to_chat(src, SPAN_WARNING("[current_airlock] is locked down tight. You can't squeeze underneath!")) + return FALSE + visible_message(SPAN_WARNING("[src] scuttles underneath [current_structure]!"), \ + SPAN_WARNING("You squeeze and scuttle underneath [current_structure]."), max_distance = 5) + forceMove(current_structure.loc) + return TRUE 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 4f104c00f92e..4d3aae33ae9c 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 @@ -42,7 +42,12 @@ density = FALSE if(caste.fire_immunity == FIRE_IMMUNITY_NONE) RegisterSignal(src, COMSIG_LIVING_PREIGNITION, PROC_REF(fire_immune)) - RegisterSignal(src, COMSIG_LIVING_FLAMER_CROSSED, PROC_REF(flamer_crossed_immune)) + RegisterSignal(src, list( + COMSIG_LIVING_FLAMER_CROSSED, + COMSIG_LIVING_FLAMER_FLAMED, + ), PROC_REF(flamer_crossed_immune)) + ADD_TRAIT(src, TRAIT_ABILITY_BURROWED, TRAIT_SOURCE_ABILITY("Burrow")) + playsound(src.loc, 'sound/effects/burrowing_b.ogg', 25) update_canmove() update_icons() addtimer(CALLBACK(src, PROC_REF(do_burrow_cooldown)), (caste ? caste.burrow_cooldown : 5 SECONDS)) @@ -65,21 +70,29 @@ to_chat(src, SPAN_NOTICE("You resurface.")) burrow = FALSE if(caste.fire_immunity == FIRE_IMMUNITY_NONE) - UnregisterSignal(src, COMSIG_LIVING_PREIGNITION) - UnregisterSignal(src, COMSIG_LIVING_FLAMER_CROSSED) + UnregisterSignal(src, list( + COMSIG_LIVING_PREIGNITION, + COMSIG_LIVING_FLAMER_CROSSED, + COMSIG_LIVING_FLAMER_FLAMED, + )) + REMOVE_TRAIT(src, TRAIT_ABILITY_BURROWED, TRAIT_SOURCE_ABILITY("Burrow")) frozen = FALSE invisibility = FALSE anchored = FALSE density = TRUE - for(var/mob/living/carbon/human/H in loc) - H.apply_effect(2, WEAKEN) + playsound(loc, 'sound/effects/burrowoff.ogg', 25) + for(var/mob/living/carbon/mob in loc) + if(!can_not_harm(mob)) + mob.apply_effect(2, WEAKEN) + addtimer(CALLBACK(src, PROC_REF(do_burrow_cooldown)), (caste ? caste.burrow_cooldown : 5 SECONDS)) update_canmove() update_icons() /mob/living/carbon/xenomorph/proc/do_burrow_cooldown() used_burrow = FALSE - to_chat(src, SPAN_NOTICE("You can now surface.")) + if(burrow) + to_chat(src, SPAN_NOTICE("You can now surface.")) for(var/X in actions) var/datum/action/act = X act.update_button_icon() 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 824e0cc5f9fd..d95fbc304397 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -479,3 +479,68 @@ // Perform check_state(TRUE) silently: if(xeno && !xeno.is_mob_incapacitated() || !xeno.buckled || !xeno.evolving && xeno.plasma_stored >= plasma_cost) return TRUE + +/datum/action/xeno_action/onclick/tacmap + name = "View Tactical Map" + action_icon_state = "toggle_queen_zoom" + ability_name = "view tacmap" + + var/mob/living/carbon/xenomorph/queen/tracked_queen + +/datum/action/xeno_action/onclick/tacmap/Destroy() + tracked_queen = null + return ..() + +/datum/action/xeno_action/onclick/tacmap/give_to(mob/living/carbon/xenomorph/xeno) + . = ..() + + RegisterSignal(xeno.hive, COMSIG_HIVE_NEW_QUEEN, PROC_REF(handle_new_queen)) + + if(!xeno.hive.living_xeno_queen) + hide_from(xeno) + return + + if(!xeno.hive.living_xeno_queen.ovipositor) + hide_from(xeno) + + handle_new_queen(new_queen = xeno.hive.living_xeno_queen) + +/// handles the addition of a new queen, hiding if appropriate +/datum/action/xeno_action/onclick/tacmap/proc/handle_new_queen(datum/hive_status/hive, mob/living/carbon/xenomorph/queen/new_queen) + SIGNAL_HANDLER + + if(tracked_queen) + UnregisterSignal(tracked_queen, list(COMSIG_QUEEN_MOUNT_OVIPOSITOR, COMSIG_QUEEN_DISMOUNT_OVIPOSITOR, COMSIG_PARENT_QDELETING)) + + tracked_queen = new_queen + + if(!tracked_queen.ovipositor) + hide_from(owner) + + RegisterSignal(tracked_queen, COMSIG_QUEEN_MOUNT_OVIPOSITOR, PROC_REF(handle_mount_ovipositor)) + RegisterSignal(tracked_queen, COMSIG_QUEEN_DISMOUNT_OVIPOSITOR, PROC_REF(handle_dismount_ovipositor)) + RegisterSignal(tracked_queen, COMSIG_PARENT_QDELETING, PROC_REF(handle_queen_qdel)) + +/// deals with the queen mounting the ovipositor, unhiding the action from the user +/datum/action/xeno_action/onclick/tacmap/proc/handle_mount_ovipositor() + SIGNAL_HANDLER + + unhide_from(owner) + +/// deals with the queen dismounting the ovipositor, hiding the action from the user +/datum/action/xeno_action/onclick/tacmap/proc/handle_dismount_ovipositor() + SIGNAL_HANDLER + + hide_from(owner) + +/// cleans up references to the queen when the queen is being qdel'd, hides the action from the user +/datum/action/xeno_action/onclick/tacmap/proc/handle_queen_qdel() + SIGNAL_HANDLER + + tracked_queen = null + hide_from(owner) + +/datum/action/xeno_action/onclick/tacmap/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + xeno.xeno_tacmap() + return ..() 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 921b61a23bc9..4a57c0729b91 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -4,70 +4,79 @@ // Plant weeds /datum/action/xeno_action/onclick/plant_weeds/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner + var/mob/living/carbon/xenomorph/xeno = owner if(!action_cooldown_check()) return - if(!X.check_state()) + if(!xeno.check_state()) return - if(X.burrow) + if(xeno.burrow) return - var/turf/T = X.loc + var/turf/turf = xeno.loc - if(!istype(T)) - to_chat(X, SPAN_WARNING("You can't do that here.")) + if(!istype(turf)) + to_chat(xeno, SPAN_WARNING("You can't do that here.")) return - var/is_weedable = T.is_weedable() + if(turf.density) + to_chat(xeno, SPAN_WARNING("You can't do that here.")) + return + + var/is_weedable = turf.is_weedable() if(!is_weedable) - to_chat(X, SPAN_WARNING("Bad place for a garden!")) + to_chat(xeno, SPAN_WARNING("Bad place for a garden!")) return if(!plant_on_semiweedable && is_weedable < FULLY_WEEDABLE) - to_chat(X, SPAN_WARNING("Bad place for a garden!")) + to_chat(xeno, SPAN_WARNING("Bad place for a garden!")) return - var/obj/effect/alien/weeds/node/N = locate() in T - if(N && N.weed_strength >= X.weed_level) - to_chat(X, SPAN_WARNING("There's a pod here already!")) + var/obj/effect/alien/weeds/node/node = locate() in turf + if(node && node.weed_strength >= xeno.weed_level) + to_chat(xeno, SPAN_WARNING("There's a pod here already!")) return - var/obj/effect/alien/resin/trap/resin_trap = locate() in T + var/obj/effect/alien/resin/trap/resin_trap = locate() in turf if(resin_trap) - to_chat(X, SPAN_WARNING("You can't weed on top of a trap!")) + to_chat(xeno, SPAN_WARNING("You can't weed on top of a trap!")) return - var/list/to_convert - if(N) - to_convert = N.children.Copy() - - var/obj/effect/alien/weeds/W = locate(/obj/effect/alien/weeds) in T - if (W && W.weed_strength >= WEED_LEVEL_HIVE) - to_chat(X, SPAN_WARNING("These weeds are too strong to plant a node on!")) + var/obj/effect/alien/weeds/weed = node || locate() in turf + if(weed && weed.weed_strength >= WEED_LEVEL_HIVE) + to_chat(xeno, SPAN_WARNING("These weeds are too strong to plant a node on!")) return - var/area/AR = get_area(T) - if(isnull(AR) || !(AR.is_resin_allowed)) - if(AR.flags_area & AREA_UNWEEDABLE) - to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + for(var/obj/structure/struct in turf) + if(struct.density && !(struct.flags_atom & ON_BORDER)) // Not sure exactly if we need to test against ON_BORDER though + to_chat(xeno, SPAN_WARNING("You can't do that here.")) return - to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) + + var/area/area = get_area(turf) + if(isnull(area) || !(area.is_resin_allowed)) + if(area.flags_area & AREA_UNWEEDABLE) + to_chat(xeno, SPAN_XENOWARNING("This area is unsuited to host the hive!")) + return + to_chat(xeno, SPAN_XENOWARNING("It's too early to spread the hive this far.")) return - if (!check_and_use_plasma_owner()) + if(!check_and_use_plasma_owner()) return - X.visible_message(SPAN_XENONOTICE("\The [X] regurgitates a pulsating node and plants it on the ground!"), \ + var/list/to_convert + if(node) + to_convert = node.children.Copy() + + xeno.visible_message(SPAN_XENONOTICE("\The [xeno] regurgitates a pulsating node and plants it on the ground!"), \ SPAN_XENONOTICE("You regurgitate a pulsating node and plant it on the ground!"), null, 5) - var/obj/effect/alien/weeds/node/new_node = new node_type(X.loc, src, X) + var/obj/effect/alien/weeds/node/new_node = new node_type(xeno.loc, src, xeno) if(to_convert) - for(var/weed in to_convert) - var/turf/target_turf = get_turf(weed) + for(var/cur_weed in to_convert) + var/turf/target_turf = get_turf(cur_weed) if(target_turf && !target_turf.density) new /obj/effect/alien/weeds(target_turf, new_node) - qdel(weed) + qdel(cur_weed) - playsound(X.loc, "alien_resin_build", 25) + playsound(xeno.loc, "alien_resin_build", 25) apply_cooldown() return ..() @@ -991,7 +1000,10 @@ if(blunt_stab) stabbing_xeno.visible_message(SPAN_XENOWARNING("\The [stabbing_xeno] swipes its tail into [target]'s [limb ? limb.display_name : "chest"], bashing it!"), SPAN_XENOWARNING("You swipe your tail into [target]'s [limb? limb.display_name : "chest"], bashing it!")) - playsound(target, "punch", 50, TRUE) + if(prob(1)) + playsound(target, 'sound/effects/comical_bonk.ogg', 50, TRUE) + else + playsound(target, "punch", 50, TRUE) // The xeno smashes the target with their tail, moving it to the side and thus their direction as well. stab_direction = turn(stabbing_xeno.dir, pick(90, -90)) stab_overlay = "slam" diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm index 6960dd6f369a..4f9c5f298637 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm @@ -26,15 +26,15 @@ action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 plasma_cost = 50 - xeno_cooldown = 22 SECONDS + xeno_cooldown = 18 SECONDS // Config values (mutable) var/empower_range = 3 - var/max_targets = 5 + var/max_targets = 6 var/main_empower_base_shield = 0 - var/initial_activation_shield = 75 - var/shield_per_human = 80 - var/time_until_timeout = 15 SECONDS + var/initial_activation_shield = 50 + var/shield_per_human = 50 + var/time_until_timeout = 6 SECONDS // State var/activated_once = FALSE @@ -47,11 +47,11 @@ macro_path = /datum/action/xeno_action/verb/verb_scissorcut action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 - xeno_cooldown = 10 SECONDS + xeno_cooldown = 6 SECONDS plasma_cost = 25 // Config - var/damage = 45 + var/damage = 40 var/superslow_duration = 3 SECONDS @@ -118,10 +118,10 @@ action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 plasma_cost = 0 - xeno_cooldown = 9 SECONDS + 2 SECONDS // Left operand is the actual CD, right operand is the buffer for the shield duration + xeno_cooldown = 9 SECONDS + 2.5 SECONDS // Left operand is the actual CD, right operand is the buffer for the shield duration // Config values - var/shield_duration = 20 // Shield lasts 2 seconds by default. + var/shield_duration = 25 // Shield lasts 2.5 seconds by default. var/shield_amount = 500 // Shield HP amount var/shield_shrapnel_amount = 7 // How much shrapnel each shield hit should spawn var/shard_cost = 150 // Minimum spikes to use this ability 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 8c6c0834eebc..9107a9670048 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 @@ -75,7 +75,7 @@ color += num2text(alpha, 2, 16) xeno.add_filter("empower_rage", 1, list("type" = "outline", "color" = color, "size" = 3)) - addtimer(CALLBACK(src, PROC_REF(weaken_superbuff), xeno, behavior), 3.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(weaken_superbuff), xeno, behavior), 5 SECONDS) /datum/action/xeno_action/onclick/empower/proc/weaken_superbuff(mob/living/carbon/xenomorph/xeno, datum/behavior_delegate/ravager_base/behavior) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm index 60fdda450df3..f4d4628e41f2 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm @@ -158,6 +158,8 @@ if(xeno.selected_ability == src) if(xeno.deselect_timer > world.time) return // We clicked the same ability in a very short time + if(xeno.client && xeno.client.prefs && xeno.client.prefs.toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF) + return to_chat(xeno, "You will no longer use [ability_name] with \ [xeno.client && xeno.client.prefs && xeno.client.prefs.toggle_prefs & TOGGLE_MIDDLE_MOUSE_CLICK ? "middle-click" : "shift-click"].") button.icon_state = "template" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm index 96cd2846249d..092dae00d603 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Boiler.dm @@ -71,7 +71,7 @@ /datum/action/xeno_action/activable/spray_acid/boiler, //3rd macro /datum/action/xeno_action/onclick/toggle_long_range/boiler, //4rd macro /datum/action/xeno_action/onclick/acid_shroud, //4th macro - + /datum/action/xeno_action/onclick/tacmap, ) /mob/living/carbon/xenomorph/boiler/Initialize(mapload, mob/living/carbon/xenomorph/oldxeno, h_number) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm index 8cfc78a38272..ead254344e0a 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm @@ -66,6 +66,7 @@ /datum/action/xeno_action/onclick/place_trap, //second macro /datum/action/xeno_action/activable/burrow, //third macro /datum/action/xeno_action/onclick/tremor, //fourth macro + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm index fcc9bfcfd3b7..ec1697f30081 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm @@ -69,6 +69,7 @@ /datum/action/xeno_action/activable/throw_hugger, //3rd macro /datum/action/xeno_action/activable/retrieve_egg, //4th macro /datum/action/xeno_action/onclick/set_hugger_reserve, + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm index 9a2e3e89cb21..bf1702598250 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Crusher.dm @@ -59,6 +59,7 @@ /datum/action/xeno_action/activable/pounce/crusher_charge, /datum/action/xeno_action/onclick/crusher_stomp, /datum/action/xeno_action/onclick/crusher_shield, + /datum/action/xeno_action/onclick/tacmap, ) claw_type = CLAW_TYPE_VERY_SHARP diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm index 4360e5d42ca2..8c05fa53660e 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm @@ -47,6 +47,7 @@ /datum/action/xeno_action/activable/headbutt, /datum/action/xeno_action/onclick/tail_sweep, /datum/action/xeno_action/activable/fortify, + /datum/action/xeno_action/onclick/tacmap, ) mutation_icon_state = DEFENDER_NORMAL mutation_type = DEFENDER_NORMAL diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm index 7748f5978a20..dbdb03bb94ca 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm @@ -63,6 +63,7 @@ /datum/action/xeno_action/onclick/choose_resin, //second macro /datum/action/xeno_action/activable/secrete_resin, //third macro /datum/action/xeno_action/activable/transfer_plasma, //fourth macro + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index 1b8ac2ee05dc..d82e43db2aaf 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -50,6 +50,7 @@ /datum/action/xeno_action/watch_xeno, /datum/action/xeno_action/onclick/xenohide, /datum/action/xeno_action/activable/pounce/facehugger, + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -66,6 +67,11 @@ PF.flags_can_pass_all = PASS_ALL^PASS_OVER_THROW_ITEM /mob/living/carbon/xenomorph/facehugger/Life(delta_time) + if(!client && !aghosted && away_timer > XENO_FACEHUGGER_LEAVE_TIMER) + // Become a npc once again + new /obj/item/clothing/mask/facehugger(loc, hivenumber) + qdel(src) + return if(stat != DEAD && !lying && !(locate(/obj/effect/alien/weeds) in get_turf(src))) adjustBruteLoss(1) return ..() @@ -143,24 +149,10 @@ /mob/living/carbon/xenomorph/facehugger/proc/handle_hug(mob/living/carbon/human/human) var/obj/item/clothing/mask/facehugger/hugger = new /obj/item/clothing/mask/facehugger(loc, hivenumber) - var/did_hug = hugger.attach(human, TRUE, 0.5, client?.ckey) + var/did_hug = hugger.attach(human, TRUE, 0.5, src) if(client) client.player_data?.adjust_stat(PLAYER_STAT_FACEHUGS, STAT_CATEGORY_XENO, 1) - var/area/hug_area = get_area(src) - if(hug_area) - for(var/mob/dead/observer/observer as anything in GLOB.observer_list) - to_chat(observer, SPAN_DEADSAY("[human] has been facehugged by [src] at \the [hug_area]" + " [OBSERVER_JMP(observer, human)]")) - to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [src] at \the [hug_area]")) - else - for(var/mob/dead/observer/observer as anything in GLOB.observer_list) - to_chat(observer, SPAN_DEADSAY("[human] has been facehugged by [src]" + " [OBSERVER_JMP(observer, human)]")) - to_chat(src, SPAN_DEADSAY("[human] has been facehugged by [src]")) - timeofdeath = 1 // Ever so slightly deprioritized for larva queue qdel(src) - if(hug_area) - xeno_message(SPAN_XENOMINORWARNING("You sense that [src] has facehugged a host at \the [hug_area]!"), 1, src.hivenumber) - else - xeno_message(SPAN_XENOMINORWARNING("You sense that [src] has facehugged a host!"), 1, src.hivenumber) return did_hug /mob/living/carbon/xenomorph/facehugger/age_xeno() @@ -216,22 +208,6 @@ /mob/living/carbon/xenomorph/facehugger/add_xeno_shield(added_amount, shield_source, type = /datum/xeno_shield, duration = -1, decay_amount_per_second = 1, add_shield_on = FALSE, max_shield = 200) return -/mob/living/carbon/xenomorph/facehugger/proc/scuttle(obj/structure/current_structure) - var/move_dir = get_dir(src, loc) - for(var/atom/movable/atom in get_turf(current_structure)) - if(atom != current_structure && atom.density && atom.BlockedPassDirs(src, move_dir)) - to_chat(src, SPAN_WARNING("\The [atom] prevents you from squeezing under \the [current_structure]!")) - return - // Is it an airlock? - if(istype(current_structure, /obj/structure/machinery/door/airlock)) - var/obj/structure/machinery/door/airlock/current_airlock = current_structure - if(current_airlock.locked || current_airlock.welded) //Can't pass through airlocks that have been bolted down or welded - to_chat(src, SPAN_WARNING("\The [current_airlock] is locked down tight. You can't squeeze underneath!")) - return - visible_message(SPAN_WARNING("\The [src] scuttles underneath \the [current_structure]!"), \ - SPAN_WARNING("You squeeze and scuttle underneath \the [current_structure]."), null, 5) - forceMove(current_structure.loc) - /mob/living/carbon/xenomorph/facehugger/emote(act, m_type, message, intentional, force_silence) playsound(loc, "alien_roar_larva", 15) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm index 1b7c04eb1a77..271fe3182210 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hellhound.dm @@ -58,6 +58,7 @@ /datum/action/xeno_action/onclick/xenohide, /datum/action/xeno_action/activable/pounce/runner, /datum/action/xeno_action/onclick/toggle_long_range/runner, + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm index 9ffd0d9a7690..b0a44b0e3835 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Hivelord.dm @@ -68,6 +68,7 @@ /datum/action/xeno_action/activable/secrete_resin/hivelord, //third macro /datum/action/xeno_action/activable/transfer_plasma/hivelord, // to be consistent with drone placement /datum/action/xeno_action/active_toggle/toggle_speed, //fourth macro + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index 4cf0ff113615..82d80752ec54 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -41,6 +41,7 @@ /datum/action/xeno_action/onclick/xeno_resting, /datum/action/xeno_action/watch_xeno, /datum/action/xeno_action/onclick/xenohide, + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -137,6 +138,9 @@ else icon_state = "[state_override || state]Larva" +/mob/living/carbon/xenomorph/larva/alter_ghost(mob/dead/observer/ghost) + ghost.icon_state = "[caste.caste_type]" + /mob/living/carbon/xenomorph/larva/handle_name() return diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm index 1269f89f9144..8dda6755cca8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm @@ -45,6 +45,7 @@ /datum/action/xeno_action/activable/pounce/lurker, /datum/action/xeno_action/onclick/lurker_invisibility, /datum/action/xeno_action/onclick/lurker_assassinate, + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, @@ -150,3 +151,23 @@ . = list() var/invis_message = (invis_start_time == -1) ? "N/A" : "[(invis_duration-(world.time - invis_start_time))/10] seconds." . += "Invisibility Time Left: [invis_message]" + +/datum/behavior_delegate/lurker_base/on_collide(atom/movable/movable_atom) + . = ..() + + if(!ishuman(movable_atom)) + return + + if(!bound_xeno || !bound_xeno.stealth) + return + + 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) + return + + var/mob/living/carbon/human/bumped_into = movable_atom + if(bumped_into.alpha < 100) //ignore invisible scouts and preds + return + + to_chat(bound_xeno, SPAN_XENOHIGHDANGER("You bumped into someone and lost your invisibility!")) + lurker_invisibility_action.invisibility_off() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm index e1bdb18a29e2..344e1e21f302 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Praetorian.dm @@ -58,6 +58,7 @@ /datum/action/xeno_action/activable/pounce/base_prae_dash, /datum/action/xeno_action/activable/prae_acid_ball, /datum/action/xeno_action/activable/spray_acid/base_prae_spray_acid, + /datum/action/xeno_action/onclick/tacmap, ) icon_xeno = 'icons/mob/xenos/praetorian.dmi' diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm index cf72a5bc419b..c7970e017c4b 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Predalien.dm @@ -60,6 +60,7 @@ /datum/action/xeno_action/onclick/predalien_roar, /datum/action/xeno_action/onclick/smash, /datum/action/xeno_action/activable/devastate, + /datum/action/xeno_action/onclick/tacmap, ) mutation_type = "Normal" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 93b6d230b198..ac975835b21f 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -940,3 +940,7 @@ // Switch icon back and then let normal icon behavior happen Queen.icon = Queen.queen_standing_icon + +/mob/living/carbon/xenomorph/queen/alter_ghost(mob/dead/observer/ghost) + ghost.icon = queen_standing_icon + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm index 140e2642685f..35938ff7f808 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm @@ -56,6 +56,7 @@ /datum/action/xeno_action/activable/pounce/charge, /datum/action/xeno_action/onclick/empower, /datum/action/xeno_action/activable/scissor_cut, + /datum/action/xeno_action/onclick/tacmap, ) icon_xeno = 'icons/mob/xenos/ravager.dmi' @@ -65,8 +66,8 @@ // Mutator delegate for base ravager /datum/behavior_delegate/ravager_base var/shield_decay_time = 15 SECONDS // Time in deciseconds before our shield decays - var/slash_charge_cdr = 4 SECONDS // Amount to reduce charge cooldown by per slash - var/knockdown_amount = 2 + var/slash_charge_cdr = 3 SECONDS // Amount to reduce charge cooldown by per slash + var/knockdown_amount = 1.3 var/fling_distance = 3 var/empower_targets = 0 var/super_empower_threshold = 3 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm index 45bfd4d7f78d..04dd751bdcb8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm @@ -56,6 +56,7 @@ /datum/action/xeno_action/activable/pounce/runner, /datum/action/xeno_action/activable/runner_skillshot, /datum/action/xeno_action/onclick/toggle_long_range/runner, + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm index 3e67ae2d18f9..39426b1a9ef7 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm @@ -48,6 +48,7 @@ /datum/action/xeno_action/activable/slowing_spit, //first macro /datum/action/xeno_action/activable/scattered_spit, //second macro /datum/action/xeno_action/onclick/paralyzing_slash, //third macro + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm index 31c8720e9a19..23728b00a642 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Spitter.dm @@ -51,6 +51,7 @@ /datum/action/xeno_action/activable/xeno_spit, /datum/action/xeno_action/onclick/charge_spit, /datum/action/xeno_action/activable/spray_acid/spitter, + /datum/action/xeno_action/onclick/tacmap, ) inherent_verbs = list( /mob/living/carbon/xenomorph/proc/vent_crawl, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm index d815bc18f9d5..7c8edace81e4 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Warrior.dm @@ -52,6 +52,7 @@ /datum/action/xeno_action/activable/warrior_punch, /datum/action/xeno_action/activable/lunge, /datum/action/xeno_action/activable/fling, + /datum/action/xeno_action/onclick/tacmap, ) mutation_type = WARRIOR_NORMAL diff --git a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm index f3443535a5f2..c26e38202200 100644 --- a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm +++ b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm @@ -272,7 +272,7 @@ SPAN_DANGER("You are splattered with sizzling blood! IT BURNS!")) if(prob(60) && !victim.stat && victim.pain.feels_pain) INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") //Topkek - victim.take_limb_damage(0, dmg["damage"]) //Sizzledam! This automagically burns a random existing body part. + victim.apply_armoured_damage(dmg["damage"], ARMOR_BIO, BURN) //Sizzledam! This automagically burns a random existing body part. victim.add_blood(get_blood_color(), BLOOD_BODY) acid_splash_last = world.time handle_blood_splatter(get_dir(src, victim), 1 SECONDS) diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm index fe4b4cca2fb1..12c9b3e37c9b 100644 --- a/code/modules/mob/living/carbon/xenomorph/death.dm +++ b/code/modules/mob/living/carbon/xenomorph/death.dm @@ -38,7 +38,7 @@ if(GLOB.hive_datum[hivenumber].stored_larva) GLOB.hive_datum[hivenumber].stored_larva = round(GLOB.hive_datum[hivenumber].stored_larva * 0.5) //Lose half on dead queen - var/list/players_with_xeno_pref = get_alien_candidates() + var/list/players_with_xeno_pref = get_alien_candidates(GLOB.hive_datum[hivenumber]) if(players_with_xeno_pref && istype(GLOB.hive_datum[hivenumber].hive_location, /obj/effect/alien/resin/special/pylon/core)) var/turf/larva_spawn = get_turf(GLOB.hive_datum[hivenumber].hive_location) var/count = 0 @@ -50,7 +50,7 @@ new_xeno.generate_name() if(!SSticker.mode.transfer_xeno(xeno_candidate, new_xeno)) qdel(new_xeno) - return + break new_xeno.visible_message(SPAN_XENODANGER("A larva suddenly burrows out of the ground!"), SPAN_XENODANGER("You burrow out of the ground after feeling an immense tremor through the hive, which quickly fades into complete silence...")) @@ -105,6 +105,11 @@ GLOB.hive_datum[hivenumber].stored_larva++ GLOB.hive_datum[hivenumber].hive_ui.update_burrowed_larva() + if(hardcore) + QDEL_IN(src, 3 SECONDS) + //else if(!gibbed) // At the moment we only support humans + //AddComponent(/datum/component/weed_food) + if(hive) hive.remove_xeno(src) // Finding the last xeno for anti-delay. @@ -125,9 +130,6 @@ to_chat(X, SPAN_XENOANNOUNCE("Your carapace rattles with dread. You are all that remains of the hive!")) announce_dchat("There is only one Xenomorph left: [X.name].", X) - if(hardcore) - QDEL_IN(src, 3 SECONDS) - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_XENO_DEATH, src, gibbed) /mob/living/carbon/xenomorph/gib(datum/cause_data/cause = create_cause_data("gibbing", src)) diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm b/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm index 1cb563461138..53ca8c3a74da 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/behavior_delegate.dm @@ -104,3 +104,7 @@ /// Used to override an intent for some abilities that must force harm on next attack_alien() /datum/behavior_delegate/proc/override_intent(mob/living/carbon/target_carbon) return bound_xeno.a_intent + +/// Used to do something when a xeno collides with a movable atom +/datum/behavior_delegate/proc/on_collide(atom/movable/movable_atom) + return diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm index 0e6b7e4657d3..303e1c94692d 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/drone/gardener.dm @@ -352,8 +352,8 @@ /obj/effect/alien/weeds/node/gardener spread_on_semiweedable = TRUE - block_structures = BLOCK_SPECIAL_STRUCTURES fruit_growth_multiplier = 0.8 + weed_strength = WEED_LEVEL_HARDY /datum/action/xeno_action/verb/verb_plant_gardening_weeds() set category = "Alien" diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/ravager/hedgehog.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/ravager/hedgehog.dm index 7878bd4113f1..913883549fba 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/ravager/hedgehog.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/ravager/hedgehog.dm @@ -1,6 +1,6 @@ /datum/xeno_mutator/hedgehog name = "STRAIN: Ravager - Hedgehog" - description = "You lose your empower, charge, and scissor cut and a decent amount of your speed for a bit more explosive resistance, immunity to small explosions, and you gain several new abilities that allow you to become a spiky tank. You build up shards internally over time and also when taking damage that increase your armor's resilience. You can use these shards to power three new abilities: Spike Shield, which gives you a temporary shield that spits bone shards around you when damaged, Fire Spikes, which launches spikes at your target that slows them and does extra damage if they move, and finally, Spike Shed, which launches spikes all around yourself and gives you a temporary speed boost as an escape plan at the cost of all your stored shards and being unable to gain shards for thirty seconds." + description = "You lose your empower, charge, scissor cut and some slash damage, for a bit more explosive resistance, immunity to small explosions, and you gain several new abilities that allow you to become a spiky tank. You build up shards internally over time and also when taking damage that increase your armor's resilience. You can use these shards to power three new abilities: Spike Shield, which gives you a temporary shield that spits bone shards around you when damaged, Fire Spikes, which launches spikes at your target that slows them and does extra damage if they move, and finally, Spike Shed, which launches spikes all around yourself and gives you a temporary speed boost as an escape plan at the cost of all your stored shards and being unable to gain shards for thirty seconds." flavor_description = "They will be of iron will and steely muscle. In great armor shall they be clad, and with the mightiest spikes will they be armed." cost = MUTATOR_COST_EXPENSIVE individual_only = TRUE @@ -29,7 +29,7 @@ ravager.plasma_max = 0 ravager.small_explosives_stun = FALSE ravager.explosivearmor_modifier += XENO_EXPOSIVEARMOR_MOD_SMALL - ravager.speed_modifier += XENO_SPEED_SLOWMOD_TIER_8 + ravager.damage_modifier -= XENO_DAMAGE_MOD_SMALL apply_behavior_holder(ravager) @@ -43,11 +43,12 @@ // Shard config var/max_shards = 300 - var/shard_gain_onlife = 10 - var/shards_per_projectile = 20 + var/shard_gain_onlife = 5 + var/shards_per_projectile = 10 + var/shards_per_slash = 15 var/armor_buff_per_fifty_shards = 2.50 - var/shard_lock_duration = 300 - var/shard_lock_speed_mod = 0.85 + var/shard_lock_duration = 150 + var/shard_lock_speed_mod = 0.45 // Shard state var/shards = 0 @@ -126,3 +127,8 @@ if (!shards_locked) shards = min(max_shards, shards + shards_per_projectile) return + +/datum/behavior_delegate/ravager_hedgehog/melee_attack_additional_effects_self() + if (!shards_locked) + shards = min(max_shards, shards + shards_per_slash) + return diff --git a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm index a2699a4f0f40..7a2196a3c209 100644 --- a/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm +++ b/code/modules/mob/living/carbon/xenomorph/mutators/strains/runner/acid.dm @@ -70,19 +70,27 @@ . += "FOR THE HIVE!: in [caboom_left] seconds" /datum/behavior_delegate/runner_acider/melee_attack_additional_effects_target(mob/living/carbon/target_mob) - if (ishuman(target_mob)) + if(ishuman(target_mob)) //Will acid be applied to the mob var/mob/living/carbon/human/target_human = target_mob - if (target_human.stat == DEAD) + if(target_human.buckled && istype(target_human.buckled, /obj/structure/bed/nest)) return - for(var/datum/effects/acid/AA in target_mob.effects_list) - qdel(AA) + if(target_human.stat == DEAD) + return + + for(var/datum/effects/acid/acid_effect in target_mob.effects_list) + qdel(acid_effect) break - if(isxeno_human(target_mob)) + + new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) + if(isxeno_human(target_mob)) //Will the runner get acid stacks + var/obj/item/alien_embryo/embryo = locate(/obj/item/alien_embryo) in target_mob.contents + if(embryo?.stage >= 4) //very late stage hugged in case the runner unnests them + return + if(target_mob.lying) modify_acid(acid_slash_regen_lying) - else - modify_acid(acid_slash_regen_standing) - new /datum/effects/acid(target_mob, bound_xeno, initial(bound_xeno.caste_type)) + return + modify_acid(acid_slash_regen_standing) /datum/behavior_delegate/runner_acider/on_life() modify_acid(acid_passive_regen) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm index 7506788c2576..8b25cf07d14b 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_defines.dm @@ -474,6 +474,7 @@ SStracking.set_leader("hive_[hivenumber]", queen) SShive_status.wait = 2 SECONDS + SEND_SIGNAL(src, COMSIG_HIVE_NEW_QUEEN, queen) living_xeno_queen = queen recalculate_hive() diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm index 20c170b72e4e..6b37145ad7a1 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm @@ -111,6 +111,21 @@ else to_chat(src, SPAN_NOTICE("The selected xeno ability will now be activated with shift clicking.")) +/mob/living/carbon/xenomorph/verb/ability_deactivation_toggle() + set name = "Toggle Ability Deactivation" + set desc = "Toggles whether you can deactivate your currently active ability when re-selecting it." + set category = "Alien" + + if (!client || !client.prefs) + return + + client.prefs.toggle_prefs ^= TOGGLE_ABILITY_DEACTIVATION_OFF + client.prefs.save_preferences() + if (client.prefs.toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF) + to_chat(src, SPAN_NOTICE("Your current ability can no longer be toggled off when re-selected.")) + else + to_chat(src, SPAN_NOTICE("Your current ability can be toggled off when re-selected.")) + /mob/living/carbon/xenomorph/verb/directional_attack_toggle() set name = "Toggle Directional Attacks" set desc = "Toggles the use of directional assist attacks." diff --git a/code/modules/mob/living/living_verbs.dm b/code/modules/mob/living/living_verbs.dm index 9b003562825d..fe95f14182ea 100644 --- a/code/modules/mob/living/living_verbs.dm +++ b/code/modules/mob/living/living_verbs.dm @@ -11,6 +11,12 @@ to_chat(src, SPAN_WARNING("You can't resist in your current state.")) return + if(isxeno(src)) + var/mob/living/carbon/xenomorph/xeno = src + if(xeno.burrow) + to_chat(src, SPAN_WARNING("You can't resist in your current state.")) + return + resisting = TRUE next_move = world.time + 20 diff --git a/code/modules/organs/limb_objects.dm b/code/modules/organs/limb_objects.dm index ecfd4ca1960f..734f303c7f5b 100644 --- a/code/modules/organs/limb_objects.dm +++ b/code/modules/organs/limb_objects.dm @@ -136,6 +136,7 @@ H.regenerate_icons() if(braindeath_on_decap) + brainmob.timeofdeath = world.time brainmob.set_stat(DEAD) brainmob.death(cause) diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index 813283147c45..4ddefff61eb8 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -30,7 +30,7 @@ set category = "Object" set src in usr - if (copied == 0) + if (!copied && !iscopy) var/obj/item/paper/carbon/c = src var/copycontents = html_decode(c.info) var/obj/item/paper/carbon/copy = new /obj/item/paper/carbon (usr.loc) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 60aa2f2c16e7..7665e0a5d7ab 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -81,7 +81,7 @@ if(photo_list) for(var/photo in photo_list) user << browse_rsc(photo_list[photo], photo) - show_browser(user, "[stars(info)][stamps]", name, name) + show_browser(user, "[stars(info)][stamps]", name, name, "size=650x700") onclose(user, name) else read_paper(user) @@ -94,7 +94,7 @@ if(photo_list) for(var/photo in photo_list) user << browse_rsc(photo_list[photo], photo) - show_browser(user, "[info][stamps]", name, name) + show_browser(user, "[info][stamps]", name, name, "size=650x700") onclose(user, name) /obj/item/paper/verb/rename() @@ -213,6 +213,8 @@ /obj/item/paper/proc/parsepencode(t, obj/item/tool/pen/P, mob/user as mob, iscrayon = 0) + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + t = replacetext(t, "\[center\]", "
") t = replacetext(t, "\[/center\]", "
") t = replacetext(t, "\[br\]", "
") @@ -251,9 +253,9 @@ t = replacetext(t, "\[/grid\]", "") t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") - t = replacetext(t, "\[logo\]", "") - t = replacetext(t, "\[wy\]", "") - t = replacetext(t, "\[uscm\]", "") + t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[wy\]", "") + t = replacetext(t, "\[uscm\]", "") t = "[t]" else // If it is a crayon, and he still tries to use these, make them empty! @@ -619,11 +621,21 @@ /obj/item/paper/wy icon_state = "paper_wy" - info = "

\n" + +/obj/item/paper/wy/Initialize(mapload, photo_list) + . = ..() + + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + info = "

\n" /obj/item/paper/uscm icon_state = "paper_uscm" - info = "

\n" + +/obj/item/paper/uscm/Initialize(mapload, photo_list) + . = ..() + + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + info = "

\n" /obj/item/paper/research_notes icon_state = "paper_wy_words" @@ -661,7 +673,8 @@ if(!random_chem) random_chem = pick(chemical_gen_classes_list["T1"]) C = chemical_reagents_list["[random_chem]"] - var/txt = "
Official Weyland-Yutani Document
Experiment Notes

" + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + var/txt = "
Official Weyland-Yutani Document
Experiment Notes

" switch(note_type) if("synthesis") var/datum/chemical_reaction/G = chemical_reactions_list[C.id] diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 5a335002d71d..6a20e9cfe78e 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -264,7 +264,7 @@ display round(lastgen) and phorontank amount to_chat(user, SPAN_NOTICE(" You open the access panel.")) else to_chat(user, SPAN_NOTICE(" You close the access panel.")) - else if(istype(O, /obj/item/tool/crowbar) && open) + else if(HAS_TRAIT(O, TRAIT_TOOL_CROWBAR) && open) var/obj/structure/machinery/constructable_frame/new_frame = new /obj/structure/machinery/constructable_frame(src.loc) for(var/obj/item/I in component_parts) if(I.reliability < 100) diff --git a/code/modules/projectiles/ammo_boxes/grenade_packets.dm b/code/modules/projectiles/ammo_boxes/grenade_packets.dm index 518ccd2d47ab..a0d16b621eb3 100644 --- a/code/modules/projectiles/ammo_boxes/grenade_packets.dm +++ b/code/modules/projectiles/ammo_boxes/grenade_packets.dm @@ -110,19 +110,19 @@ var/list/grenade_packets = list( content_type = /obj/item/explosive/grenade/high_explosive/m15/rubber /obj/item/storage/box/packet/airburst_he - name = "\improper M74 airbust grenade packet" + name = "\improper M74 airburst grenade packet" desc = "It contains three M74 airburst fragmentation grenades. This end towards the enemy." icon_state = "agmf_packet" content_type = /obj/item/explosive/grenade/high_explosive/airburst /obj/item/storage/box/packet/airburst_incen - name = "\improper M74 airbust incendiary grenade packet" + name = "\improper M74 airburst incendiary grenade packet" desc = "It contains three M74 airburst incendiary grenades. This end towards the enemy." icon_state = "agmi_packet" content_type = /obj/item/explosive/grenade/incendiary/airburst /obj/item/storage/box/packet/airburst_smoke - name = "\improper M74 airbust smoke grenade packet" + name = "\improper M74 airburst smoke grenade packet" desc = "It contains three M74 airburst smoke grenades. This end towards the enemy." icon_state = "agms_packet" content_type = /obj/item/explosive/grenade/smokebomb/airburst diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index d8b158485501..7114c924fe61 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -309,6 +309,7 @@ name = "tranquilizer bullet" flags_ammo_behavior = AMMO_BALLISTIC|AMMO_IGNORE_RESIST stamina_damage = 30 + damage = 15 //2020 rebalance: is supposed to counter runners and lurkers, dealing high damage to the only castes with no armor. //Limited by its lack of versatility and lower supply, so marines finally have an answer for flanker castes that isn't just buckshot. @@ -376,6 +377,11 @@ stamina_damage = 25 shrapnel_chance = 0 +// Reskinned rubber bullet used for the ES-4 CL pistol. +/datum/ammo/bullet/pistol/rubber/stun + name = "stun pistol bullet" + sound_override = null + // Used by M1911, Deagle and KT-42 /datum/ammo/bullet/pistol/heavy name = "heavy pistol bullet" @@ -383,7 +389,7 @@ accuracy = -HIT_ACCURACY_TIER_3 accuracy_var_low = PROJECTILE_VARIANCE_TIER_6 damage = 55 - penetration= ARMOR_PENETRATION_TIER_3 + penetration = ARMOR_PENETRATION_TIER_3 shrapnel_chance = SHRAPNEL_CHANCE_TIER_2 /datum/ammo/bullet/pistol/heavy/super //Commander's variant @@ -2802,8 +2808,8 @@ damage_type = BRUTE bonus_projectiles_type = /datum/ammo/xeno/bone_chips/spread - damage = 5 - max_range = 5 + damage = 8 + max_range = 6 accuracy = HIT_ACCURACY_TIER_8 accuracy_var_low = PROJECTILE_VARIANCE_TIER_7 accuracy_var_high = PROJECTILE_VARIANCE_TIER_7 @@ -2818,8 +2824,8 @@ return if(ishuman_strict(M) || isxeno(M)) playsound(M, 'sound/effects/spike_hit.ogg', 25, 1, 1) - if(M.slowed < 8) - M.apply_effect(8, SLOW) + if(M.slowed < 3) + M.apply_effect(3, SLOW) /datum/ammo/xeno/bone_chips/spread name = "small bone chips" diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 0baf6f527d4b..17dc435210c9 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -1967,7 +1967,7 @@ Defined in conflicts.dm of the #defines folder. //The requirement for an attachable being alt fire is AMMO CAPACITY > 0. /obj/item/attachable/attached_gun/grenade - name = "underslung grenade launcher" + name = "U1 grenade launcher" desc = "A weapon-mounted, reloadable grenade launcher." icon_state = "grenade" attach_icon = "grenade_a" diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index e7e20526b31f..cc4207724b60 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -573,6 +573,43 @@ flashlight.Attach(src) update_attachable(flashlight.slot) +//------------------------------------------------------- +// ES-4 - Basically a CL-exclusive reskin of the 88 mod 4 that only uses less-lethal ammo. + +/obj/item/weapon/gun/pistol/es4 + name = "\improper ES-4 electrostatic pistol" + desc = "A Weyland Corp manufactured less-than-lethal pistol. Originally manufactured in the 2080s, the ES-4 electrostatic pistol fires electrically-charged bullets with high accuracy, though its cost and constant need for cleaning makes it a rare sight." + icon = 'icons/obj/items/weapons/guns/guns_by_faction/wy.dmi' + icon_state = "es4" + item_state = "es4" + fire_sound = 'sound/weapons/gun_es4.ogg' + firesound_volume = 20 + reload_sound = 'sound/weapons/gun_88m4_reload.ogg' + unload_sound = 'sound/weapons/gun_88m4_unload.ogg' + current_mag = /obj/item/ammo_magazine/pistol/es4 + force = 8 + muzzle_flash = "muzzle_flash_blue" + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_ONE_HAND_WIELDED|GUN_AMMO_COUNTER + attachable_allowed = list( + /obj/item/attachable/flashlight, + /obj/item/attachable/reflex, + /obj/item/attachable/reddot, + /obj/item/attachable/lasersight, + ) + +/obj/item/weapon/gun/pistol/es4/set_gun_attachment_offsets() + attachable_offset = list("muzzle_x" = 27, "muzzle_y" = 21, "rail_x" = 10, "rail_y" = 22, "under_x" = 25, "under_y" = 18, "stock_x" = 18, "stock_y" = 15) + + +/obj/item/weapon/gun/pistol/es4/set_gun_config_values() + ..() + fire_delay = FIRE_DELAY_TIER_9 + accuracy_mult = BASE_ACCURACY_MULT + accuracy_mult_unwielded = BASE_ACCURACY_MULT + scatter = SCATTER_AMOUNT_TIER_7 + scatter_unwielded = SCATTER_AMOUNT_TIER_7 + damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_4 + //------------------------------------------------------- //VP78 - the only pistol viable as a primary. diff --git a/code/modules/projectiles/magazines/pistols.dm b/code/modules/projectiles/magazines/pistols.dm index 16090d9f2b81..dae86cc813cc 100644 --- a/code/modules/projectiles/magazines/pistols.dm +++ b/code/modules/projectiles/magazines/pistols.dm @@ -8,7 +8,7 @@ caliber = "9mm" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi' icon_state = "m4a3" - max_rounds = 9 + max_rounds = 12 w_class = SIZE_SMALL default_ammo = /datum/ammo/bullet/pistol gun_type = /obj/item/weapon/gun/pistol/m4a3 @@ -55,7 +55,7 @@ default_ammo = /datum/ammo/bullet/pistol/heavy caliber = ".45" icon_state = "m4a345"//rename later - max_rounds = 14 + max_rounds = 7 gun_type = /obj/item/weapon/gun/pistol/m1911 @@ -105,6 +105,19 @@ default_ammo = /datum/ammo/bullet/pistol/rubber ammo_band_color = AMMO_BAND_COLOR_RUBBER +//------------------------------------------------------- +//ES-4 + +/obj/item/ammo_magazine/pistol/es4 + name = "\improper ES-4 stun magazine (9mm)" + default_ammo = /datum/ammo/bullet/pistol/rubber/stun + caliber = "9mm" + desc = "Holds 19 rounds of specialized Conductive 9mm. Electrostatic propulsion in the ES-4 functions by propelling an cV9mm round, at a proportionally slower velocity to maintain a higher kinetic energy transfer rate. All this turns a penetrative round into a less-than-lethal round." + icon = 'icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi' + icon_state = "es4" + max_rounds = 19 + gun_type = /obj/item/weapon/gun/pistol/es4 + //------------------------------------------------------- //VP78 diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm index 8de20ca2b79a..98896013c6ec 100644 --- a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm @@ -1,10 +1,16 @@ +#define DISPENSER_UNHACKABLE -1 +#define DISPENSER_NOT_HACKED 0 +#define DISPENSER_HACKED 1 + /obj/structure/machinery/chem_dispenser - name = "chem dispenser" + name = "chemical dispenser" + desc = "A complex machine for mixing elements into chemicals. A Wey-Yu product." density = TRUE anchored = TRUE icon = 'icons/obj/structures/machinery/science_machines.dmi' icon_state = "dispenser" use_power = USE_POWER_NONE + wrenchable = FALSE idle_power_usage = 40 layer = BELOW_OBJ_LAYER //So beakers reliably appear above it var/req_skill = SKILL_MEDICAL @@ -13,13 +19,37 @@ var/obj/structure/machinery/chem_storage/chem_storage var/network = "Ground" var/amount = 30 - var/accept_glass = 0 //At 0 ONLY accepts glass containers. Kinda misleading varname. + var/accept_beaker_only = TRUE var/obj/item/reagent_container/beaker = null var/ui_check = 0 var/static/list/possible_transfer_amounts = list(5,10,20,30,40) - var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine", - "sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron", - "copper","mercury","radium","water","ethanol","sugar","sulphuric acid") + var/list/dispensable_reagents = list( + "hydrogen", + "lithium", + "carbon", + "nitrogen", + "oxygen", + "fluorine", + "sodium", + "aluminum", + "silicon", + "phosphorus", + "sulfur", + "chlorine", + "potassium", + "iron", + "copper", + "mercury", + "radium", + "water", + "ethanol", + "sugar", + "sulphuric acid", + ) + /// Has it been hacked + var/hacked_check = DISPENSER_UNHACKABLE + /// Additional reagents gotten when it is hacked + var/hacked_reagents = list() /obj/structure/machinery/chem_dispenser/medbay network = "Medbay" @@ -111,9 +141,9 @@ var/list/beakerContents = list() var/beakerCurrentVolume = 0 if(beaker && beaker.reagents && beaker.reagents.reagent_list.len) - for(var/datum/reagent/R in beaker.reagents.reagent_list) - beakerContents += list(list("name" = R.name, "volume" = R.volume)) // list in a list because Byond merges the first list... - beakerCurrentVolume += R.volume + for(var/datum/reagent/current_reagent in beaker.reagents.reagent_list) + beakerContents += list(list("name" = current_reagent.name, "volume" = current_reagent.volume)) // list in a list because Byond merges the first list... + beakerCurrentVolume += current_reagent.volume .["beakerContents"] = beakerContents if (beaker) @@ -149,11 +179,11 @@ return var/reagent_name = params["reagent"] if(beaker && dispensable_reagents.Find(reagent_name)) - var/obj/item/reagent_container/B = beaker - var/datum/reagents/R = B.reagents - var/space = R.maximum_volume - R.total_volume + var/obj/item/reagent_container/current_beaker = beaker + var/datum/reagents/current_reagent = current_beaker.reagents + var/space = current_reagent.maximum_volume - current_reagent.total_volume - R.add_reagent(reagent_name, min(amount, chem_storage.energy * 10, space)) + current_reagent.add_reagent(reagent_name, min(amount, chem_storage.energy * 10, space)) chem_storage.energy = max(chem_storage.energy - min(amount, chem_storage.energy * 10, space) / 10, 0) . = TRUE @@ -170,32 +200,64 @@ replace_beaker(usr) . = TRUE -/obj/structure/machinery/chem_dispenser/attackby(obj/item/reagent_container/B, mob/user) +/obj/structure/machinery/chem_dispenser/attackby(obj/item/reagent_container/attacking_object, mob/user) if(isrobot(user)) return - if(istype(B, /obj/item/reagent_container/glass) || istype(B, /obj/item/reagent_container/food)) - if(!accept_glass && istype(B,/obj/item/reagent_container/food)) + + if(istype(attacking_object, /obj/item/reagent_container/glass) || istype(attacking_object, /obj/item/reagent_container/food)) + if(accept_beaker_only && istype(attacking_object,/obj/item/reagent_container/food)) to_chat(user, SPAN_NOTICE("This machine only accepts beakers")) - if(user.drop_inv_item_to_loc(B, src)) + if(user.drop_inv_item_to_loc(attacking_object, src)) var/obj/item/old_beaker = beaker - beaker = B + beaker = attacking_object if(old_beaker) - to_chat(user, SPAN_NOTICE("You swap out \the [old_beaker] for \the [B].")) + to_chat(user, SPAN_NOTICE("You swap out [old_beaker] for [attacking_object].")) user.put_in_hands(old_beaker) else - to_chat(user, SPAN_NOTICE("You set \the [B] on the machine.")) + to_chat(user, SPAN_NOTICE("You set [attacking_object] on the machine.")) SStgui.update_uis(src) update_icon() return + if(HAS_TRAIT(attacking_object, TRAIT_TOOL_MULTITOOL)) + switch(hacked_check) + if(DISPENSER_UNHACKABLE) + to_chat(user, SPAN_NOTICE("[src] cannot be hacked.")) + if(DISPENSER_NOT_HACKED) + user.visible_message("[user] modifies [src] with [attacking_object], turning a light on.", "You enable a light in [src].") + dispensable_reagents += hacked_reagents + hacked_check = DISPENSER_HACKED + if(DISPENSER_HACKED) + user.visible_message("[user] modifies [src] with [attacking_object], turning a light off.", "You disable a light in [src].") + dispensable_reagents -= hacked_reagents + hacked_check = DISPENSER_NOT_HACKED + + if(HAS_TRAIT(attacking_object, TRAIT_TOOL_WRENCH)) + if(!wrenchable) + to_chat(user, "[src] cannot be unwrenched.") + + if(!do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + return + if(!src) + return + + playsound(loc, 'sound/items/Ratchet.ogg', 25, 1) + anchored = !anchored + if(anchored) + user.visible_message("[user] tightens the bolts securing [src] to the surface.", "You tighten the bolts securing [src] to the surface.") + return + + user.visible_message("[user] unfastens the bolts securing [src] to the surface.", "You unfasten the bolts securing [src] to the surface.") + /obj/structure/machinery/chem_dispenser/attack_remote(mob/user as mob) return src.attack_hand(user) /obj/structure/machinery/chem_dispenser/attack_hand(mob/user as mob) if(stat & BROKEN) + to_chat(user, SPAN_WARNING("[src] is inoperative.")) return if(req_skill && !skillcheck(user, req_skill, req_skill_level)) - to_chat(user, SPAN_WARNING("You don't have the training to use this.")) + to_chat(user, SPAN_WARNING("You don't have the training to use [src].")) return tgui_interact(user) @@ -206,9 +268,10 @@ ui_title = "Soda Dispens-o-matic" req_skill = null req_skill_level = null - accept_glass = 1 + accept_beaker_only = FALSE wrenchable = TRUE network = "Misc" + hacked_check = DISPENSER_NOT_HACKED dispensable_reagents = list( "water", "ice", @@ -233,76 +296,43 @@ "lemonjuice", "banana", ) - var/hackedcheck = 0 - -/obj/structure/machinery/chem_dispenser/soda/attackby(obj/item/B as obj, mob/user as mob) - ..() - if(HAS_TRAIT(B, TRAIT_TOOL_MULTITOOL)) - if(hackedcheck == 0) - to_chat(user, "You change the mode from 'Soda Magic' to 'Milking Time'.") - dispensable_reagents += list("milk","soymilk") - hackedcheck = 1 - return - - else - to_chat(user, "You change the mode from 'Milking Time' to 'Soda Magic'.") - dispensable_reagents -= list("milk","soymilk") - hackedcheck = 0 - return - else if(HAS_TRAIT(B, TRAIT_TOOL_WRENCH)) - if(!wrenchable) return - - if(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - if(!src) return - playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) - switch (anchored) - if (FALSE) - anchored = TRUE - user.visible_message("[user] tightens the bolts securing \the [src] to the surface.", "You tighten the bolts securing \the [src] to the surface.") - if (TRUE) - user.visible_message("[user] unfastens the bolts securing \the [src] to the surface.", "You unfasten the bolts securing \the [src] to the surface.") - anchored = FALSE - return + hacked_reagents = list( + "milk", + "soymilk", + ) -/obj/structure/machinery/chem_dispenser/beer +/obj/structure/machinery/chem_dispenser/soda/beer icon_state = "booze_dispenser" name = "booze dispenser" ui_title = "Booze Portal 9001" - req_skill = null - req_skill_level = null - accept_glass = 1 - wrenchable = TRUE - network = "Misc" desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." - dispensable_reagents = list("water","ice","sodawater","sugar","tonic","beer","kahlua","whiskey","sake","wine","vodka","gin","rum","vermouth","cognac","ale","mead","thirteenloko","tequila") - var/hackedcheck = 0 - -/obj/structure/machinery/chem_dispenser/beer/attackby(obj/item/B as obj, mob/user as mob) - ..() - - if(HAS_TRAIT(B, TRAIT_TOOL_MULTITOOL)) - if(hackedcheck == 0) - to_chat(user, "You disable the 'Weyland-Yutani-are-cheap-bastards' lock, enabling hidden and very expensive boozes.") - dispensable_reagents += list("goldschlager","patron","absinthe") - hackedcheck = 1 - return + dispensable_reagents = list( + "water", + "ice", + "sodawater", + "sugar", + "tonic", + "beer", + "kahlua", + "whiskey", + "sake", + "wine", + "vodka", + "gin", + "rum", + "vermouth", + "cognac", + "ale", + "mead", + "thirteenloko", + "tequila", + ) + hacked_reagents = list( + "goldschlager", + "patron", + "absinthe", + ) - else - to_chat(user, "You re-enable the 'Weyland-Yutani-are-cheap-bastards' lock, disabling hidden and very expensive boozes.") - dispensable_reagents -= list("goldschlager","patron","absinthe") - hackedcheck = 0 - return - else if(HAS_TRAIT(B, TRAIT_TOOL_WRENCH)) - if(!wrenchable) return - - if(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) - if(!src) return - playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) - switch (anchored) - if (FALSE) - anchored = TRUE - user.visible_message("[user] tightens the bolts securing \the [src] to the surface.", "You tighten the bolts securing \the [src] to the surface.") - if (TRUE) - user.visible_message("[user] unfastens the bolts securing \the [src] to the surface.", "You unfasten the bolts securing \the [src] to the surface.") - anchored = FALSE - return +#undef DISPENSER_UNHACKABLE +#undef DISPENSER_NOT_HACKED +#undef DISPENSER_HACKED diff --git a/code/modules/reagents/chemistry_machinery/chem_simulator.dm b/code/modules/reagents/chemistry_machinery/chem_simulator.dm index 8889efc9ef80..2c8602b0dab7 100644 --- a/code/modules/reagents/chemistry_machinery/chem_simulator.dm +++ b/code/modules/reagents/chemistry_machinery/chem_simulator.dm @@ -576,8 +576,9 @@ sleep(10) var/obj/item/paper/research_report/report = new /obj/item/paper/research_report/(loc) var/datum/reagent/D = chemical_reagents_list[id] + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) report.name = "Simulation result for [D.name]" - report.info += "
Official Company Document
Simulated Synthesis Report

Result for [D.name]

" + report.info += "
Official Company Document
Simulated Synthesis Report

Result for [D.name]

" report.generate(D) report.info += "
This report was automatically printed by the Synthesis Simulator.
The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[game_year], [worldtime2text()]
\n" playsound(loc, 'sound/machines/twobeep.ogg', 15, 1) diff --git a/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm b/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm index 8b781407aec4..dc1f72ec41c7 100644 --- a/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm +++ b/code/modules/reagents/chemistry_machinery/reagent_analyzer.dm @@ -104,8 +104,9 @@ chemical_data.complete_chemical(S) else + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) report.name = "Analysis of ERROR" - report.info += "
Official Weyland-Yutani Document
Reagent Analysis Print

Analysis ERROR

" + report.info += "
Official Weyland-Yutani Document
Reagent Analysis Print

Analysis ERROR

" report.info += "Result:
Analysis failed for sample #[sample_number].

\n" report.info += "Reason for error:
[reason]
\n" report.info += "
This report was automatically printed by the A-XRF Scanner.
The [MAIN_SHIP_NAME], [time2text(world.timeofday, "MM/DD")]/[game_year], [worldtime2text()]
\n" @@ -115,8 +116,8 @@ report = new /obj/item/paper/research_report(loc) report.name = "Analysis of [name]" - - report.info += "
Official Weyland-Yutani Document
Automated A-XRF Report

Analysis of [name]

" + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + report.info += "
Official Weyland-Yutani Document
Automated A-XRF Report

Analysis of [name]

" if(sample_number) report.info += "Results for sample: #[sample_number]
\n" report.generate(src, admin_spawned) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index ea4a7fdbc79d..50449b32fcb9 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -1,6 +1,6 @@ /obj/structure/machinery/computer/shuttle/dropship/flight name = "dropship navigation computer" - desc = "flight computer for dropship" + desc = "A flight computer that can be used for autopilot or long-range flights." icon = 'icons/obj/structures/machinery/shuttle-parts.dmi' icon_state = "console" req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 7e181ed470cb..983fffeb2634 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -635,7 +635,7 @@ var/mob/dead/observer/obs = mob.ghostize(FALSE) if(obs) obs.timeofdeath = world.time - obs.client?.larva_queue_time = world.time + obs.client?.player_details.larva_queue_time = max(obs.client.player_details.larva_queue_time, world.time) mob.moveToNullspace() // Now that mobs are stowed, delete the shuttle diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 12f33d779661..303d4c0494ed 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -278,6 +278,8 @@ // shake_camera(affected_mob, 10, 1) affected_mob.apply_effect(3, WEAKEN) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) + /datum/map_template/shuttle/alamo name = "Alamo" shuttle_id = DROPSHIP_ALAMO diff --git a/code/modules/shuttle/shuttles/escape_shuttle.dm b/code/modules/shuttle/shuttles/escape_shuttle.dm index a4bce9910bb7..6c580f9f163b 100644 --- a/code/modules/shuttle/shuttles/escape_shuttle.dm +++ b/code/modules/shuttle/shuttles/escape_shuttle.dm @@ -1,5 +1,3 @@ -#define CRASH_LAND_PROBABILITY 50 - /obj/docking_port/mobile/escape_shuttle name = "Escape Pod" id = ESCAPE_SHUTTLE @@ -10,6 +8,8 @@ rechargeTime = SHUTTLE_RECHARGE ignitionTime = 8 SECONDS ignition_sound = 'sound/effects/escape_pod_warmup.ogg' + /// The % chance of the escape pod crashing into the groundmap + var/crash_land_chance = 33 var/datum/door_controller/single/door_handler = new() var/launched = FALSE @@ -76,7 +76,7 @@ return destination = null - if(prob(CRASH_LAND_PROBABILITY)) + if(prob(crash_land_chance)) create_crash_point() set_mode(SHUTTLE_IGNITING) @@ -176,6 +176,12 @@ . = ..() playsound(src,'sound/effects/escape_pod_launch.ogg', 50, 1) +/obj/docking_port/mobile/escape_shuttle/proc/force_crash() + create_crash_point() + set_mode(SHUTTLE_IGNITING) + on_ignition() + setTimer(ignitionTime) + /obj/docking_port/mobile/escape_shuttle/e id = ESCAPE_SHUTTLE_EAST width = 4 @@ -270,6 +276,3 @@ /datum/map_template/shuttle/escape_pod_e_cl name = "Escape Pod E CL" shuttle_id = ESCAPE_SHUTTLE_EAST_CL - - -#undef CRASH_LAND_PROBABILITY diff --git a/code/modules/tgs/core/_definitions.dm b/code/modules/tgs/core/_definitions.dm index ebf6d17c2a07..fd98034eb716 100644 --- a/code/modules/tgs/core/_definitions.dm +++ b/code/modules/tgs/core/_definitions.dm @@ -1,2 +1,10 @@ +#if DM_VERSION < 510 +#error The TGS DMAPI does not support BYOND versions < 510! +#endif + #define TGS_UNIMPLEMENTED "___unimplemented" #define TGS_VERSION_PARAMETER "server_service_version" + +#ifndef TGS_DEBUG_LOG +#define TGS_DEBUG_LOG(message) +#endif diff --git a/code/modules/tgs/v3210/commands.dm b/code/modules/tgs/v3210/commands.dm index d9bd287465b9..e65c816320dc 100644 --- a/code/modules/tgs/v3210/commands.dm +++ b/code/modules/tgs/v3210/commands.dm @@ -47,7 +47,7 @@ user.friendly_name = sender // Discord hack, fix the mention if it's only numbers (fuck you IRC trolls) - var/regex/discord_id_regex = regex(@"^[0-9]+$") + var/regex/discord_id_regex = regex("^\[0-9\]+$") if(findtext(sender, discord_id_regex)) sender = "<@[sender]>" @@ -55,4 +55,4 @@ var/datum/tgs_message_content/result = stc.Run(user, params) result = UpgradeDeprecatedCommandResponse(result, command) - return result?.text || TRUE + return result ? result.text : TRUE diff --git a/code/modules/tgs/v4/commands.dm b/code/modules/tgs/v4/commands.dm index d6d3d718d471..25dd6740e3af 100644 --- a/code/modules/tgs/v4/commands.dm +++ b/code/modules/tgs/v4/commands.dm @@ -40,5 +40,5 @@ var/datum/tgs_message_content/result = sc.Run(u, params) result = UpgradeDeprecatedCommandResponse(result, command) - return result?.text + return result ? result.text : TRUE return "Unknown command: [command]!" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index c7213cc24699..f973338daa03 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -5,8 +5,8 @@ #define DMAPI5_TOPIC_DATA "tgs_data" #define DMAPI5_BRIDGE_REQUEST_LIMIT 8198 -#define DMAPI5_TOPIC_REQUEST_LIMIT 65529 -#define DMAPI5_TOPIC_RESPONSE_LIMIT 65528 +#define DMAPI5_TOPIC_REQUEST_LIMIT 65528 +#define DMAPI5_TOPIC_RESPONSE_LIMIT 65529 #define DMAPI5_BRIDGE_COMMAND_PORT_UPDATE 0 #define DMAPI5_BRIDGE_COMMAND_STARTUP 1 diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 926ea10a8f27..34cc43f8762f 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -22,12 +22,17 @@ var/detached = FALSE +/datum/tgs_api/v5/New() + . = ..() + TGS_DEBUG_LOG("V5 API created") + /datum/tgs_api/v5/ApiVersion() return new /datum/tgs_version( #include "__interop_version.dm" ) /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level) + TGS_DEBUG_LOG("OnWorldNew()") server_port = world.params[DMAPI5_PARAM_SERVER_PORT] access_identifier = world.params[DMAPI5_PARAM_ACCESS_IDENTIFIER] @@ -96,17 +101,28 @@ return TRUE /datum/tgs_api/v5/proc/RequireInitialBridgeResponse() + TGS_DEBUG_LOG("RequireInitialBridgeResponse()") + var/logged = FALSE while(!version) + if(!logged) + TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep") + logged = TRUE + sleep(1) + TGS_DEBUG_LOG("RequireInitialBridgeResponse: Passed") + /datum/tgs_api/v5/OnInitializationComplete() Bridge(DMAPI5_BRIDGE_COMMAND_PRIME) /datum/tgs_api/v5/OnTopic(T) + TGS_DEBUG_LOG("OnTopic()") RequireInitialBridgeResponse() + TGS_DEBUG_LOG("OnTopic passed bridge request gate") var/list/params = params2list(T) var/json = params[DMAPI5_TOPIC_DATA] if(!json) + TGS_DEBUG_LOG("No \"[DMAPI5_TOPIC_DATA]\" entry found, ignoring...") return FALSE // continue to /world/Topic if(!initialized) @@ -156,7 +172,7 @@ TGS_WARNING_LOG("Received legacy string when a [/datum/tgs_message_content] was expected. Please audit all calls to TgsChatBroadcast, TgsChatTargetedBroadcast, and TgsChatPrivateMessage to ensure they use the new /datum.") return new /datum/tgs_message_content(message) -/datum/tgs_api/v5/ChatBroadcast(datum/tgs_message_content/message, list/channels) +/datum/tgs_api/v5/ChatBroadcast(datum/tgs_message_content/message2, list/channels) if(!length(channels)) channels = ChatChannelInfo() @@ -165,45 +181,45 @@ var/datum/tgs_chat_channel/channel = I ids += channel.id - message = UpgradeDeprecatedChatMessage(message) + message2 = UpgradeDeprecatedChatMessage(message2) if (!length(channels)) return - message = message._interop_serialize() - message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids + var/list/data = message2._interop_serialize() + data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids if(intercepted_message_queue) - intercepted_message_queue += list(message) + intercepted_message_queue += list(data) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) -/datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message, admin_only) +/datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message2, admin_only) var/list/channels = list() for(var/I in ChatChannelInfo()) var/datum/tgs_chat_channel/channel = I if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) channels += channel.id - message = UpgradeDeprecatedChatMessage(message) + message2 = UpgradeDeprecatedChatMessage(message2) if (!length(channels)) return - message = message._interop_serialize() - message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels + var/list/data = message2._interop_serialize() + data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels if(intercepted_message_queue) - intercepted_message_queue += list(message) + intercepted_message_queue += list(data) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) -/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message, datum/tgs_chat_user/user) - message = UpgradeDeprecatedChatMessage(message) - message = message._interop_serialize() - message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id) +/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) + message2 = UpgradeDeprecatedChatMessage(message2) + var/list/data = message2._interop_serialize() + data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id) if(intercepted_message_queue) - intercepted_message_queue += list(message) + intercepted_message_queue += list(data) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) /datum/tgs_api/v5/ChatChannelInfo() RequireInitialBridgeResponse() @@ -211,6 +227,7 @@ return chat_channels.Copy() /datum/tgs_api/v5/proc/DecodeChannels(chat_update_json) + TGS_DEBUG_LOG("DecodeChannels()") var/list/chat_channels_json = chat_update_json[DMAPI5_CHAT_UPDATE_CHANNELS] if(istype(chat_channels_json)) chat_channels.Cut() diff --git a/code/modules/tgs/v5/commands.dm b/code/modules/tgs/v5/commands.dm index a832c81f172d..9557f8a08ed5 100644 --- a/code/modules/tgs/v5/commands.dm +++ b/code/modules/tgs/v5/commands.dm @@ -35,10 +35,10 @@ if(sc) var/datum/tgs_message_content/response = sc.Run(u, params) response = UpgradeDeprecatedCommandResponse(response, command) - + var/list/topic_response = TopicResponse() - topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE] = response?.text - topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE] = response?._interop_serialize() + topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE] = response ? response.text : null + topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE] = response ? response._interop_serialize() : null return topic_response return TopicResponse("Unknown custom chat command: [command]!") diff --git a/code/modules/tgs/v5/serializers.dm b/code/modules/tgs/v5/serializers.dm index 7f9bc731b792..3a32848ad512 100644 --- a/code/modules/tgs/v5/serializers.dm +++ b/code/modules/tgs/v5/serializers.dm @@ -1,12 +1,12 @@ /datum/tgs_message_content/proc/_interop_serialize() - return list("text" = text, "embed" = embed?._interop_serialize()) + return list("text" = text, "embed" = embed ? embed._interop_serialize() : null) /datum/tgs_chat_embed/proc/_interop_serialize() CRASH("Base /proc/interop_serialize called on [type]!") /datum/tgs_chat_embed/structure/_interop_serialize() var/list/serialized_fields - if(islist(fields)) + if(istype(fields, /list)) serialized_fields = list() for(var/datum/tgs_chat_embed/field/field as anything in fields) serialized_fields += list(field._interop_serialize()) @@ -16,12 +16,12 @@ "url" = url, "timestamp" = timestamp, "colour" = colour, - "image" = image?._interop_serialize(), - "thumbnail" = thumbnail?._interop_serialize(), - "video" = video?._interop_serialize(), - "footer" = footer?._interop_serialize(), - "provider" = provider?._interop_serialize(), - "author" = author?._interop_serialize(), + "image" = src.image ? src.image._interop_serialize() : null, + "thumbnail" = thumbnail ? thumbnail._interop_serialize() : null, + "video" = video ? video._interop_serialize() : null, + "footer" = footer ? footer._interop_serialize() : null, + "provider" = provider ? provider._interop_serialize() : null, + "author" = author ? author._interop_serialize() : null, "fields" = serialized_fields ) @@ -43,7 +43,7 @@ . = ..() .["iconUrl"] = icon_url .["proxyIconUrl"] = proxy_icon_url - + /datum/tgs_chat_embed/footer/_interop_serialize() return list( "text" = text, diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index 56c1824fd97d..d7d471213813 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -5,6 +5,7 @@ return response /datum/tgs_api/v5/proc/ProcessTopicJson(json, check_access_identifier) + TGS_DEBUG_LOG("ProcessTopicJson(..., [check_access_identifier])") var/list/result = ProcessRawTopic(json, check_access_identifier) if(!result) result = TopicResponse("Runtime error!") @@ -25,16 +26,20 @@ return response_json /datum/tgs_api/v5/proc/ProcessRawTopic(json, check_access_identifier) + TGS_DEBUG_LOG("ProcessRawTopic(..., [check_access_identifier])") var/list/topic_parameters = json_decode(json) if(!topic_parameters) + TGS_DEBUG_LOG("ProcessRawTopic: json_decode failed") return TopicResponse("Invalid topic parameters json: [json]!"); var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER] if(check_access_identifier && their_sCK != access_identifier) - return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER]!") + TGS_DEBUG_LOG("ProcessRawTopic: access identifier check failed") + return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER] or it does not match!") var/command = topic_parameters[DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE] if(!isnum(command)) + TGS_DEBUG_LOG("ProcessRawTopic: command type check failed") return TopicResponse("Failed to decode [DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE]!") return ProcessTopicCommand(command, topic_parameters) @@ -43,6 +48,7 @@ return "response[payload_id]" /datum/tgs_api/v5/proc/ProcessTopicCommand(command, list/topic_parameters) + TGS_DEBUG_LOG("ProcessTopicCommand([command], ...)") switch(command) if(DMAPI5_TOPIC_COMMAND_CHAT_COMMAND) @@ -55,7 +61,6 @@ return result if(DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION) - intercepted_message_queue = list() var/list/event_notification = topic_parameters[DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION] if(!istype(event_notification)) return TopicResponse("Invalid [DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION]!") @@ -66,23 +71,25 @@ var/list/event_parameters = event_notification[DMAPI5_EVENT_NOTIFICATION_PARAMETERS] if(event_parameters && !istype(event_parameters)) - return TopicResponse("Invalid or missing [DMAPI5_EVENT_NOTIFICATION_PARAMETERS]!") + . = TopicResponse("Invalid or missing [DMAPI5_EVENT_NOTIFICATION_PARAMETERS]!") + else + var/list/response = TopicResponse() + . = response + if(event_handler != null) + var/list/event_call = list(event_type) + if(event_parameters) + event_call += event_parameters + + intercepted_message_queue = list() + event_handler.HandleEvent(arglist(event_call)) + response[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue + intercepted_message_queue = null - var/list/event_call = list(event_type) if (event_type == TGS_EVENT_WATCHDOG_DETACH) detached = TRUE chat_channels.Cut() // https://github.com/tgstation/tgstation-server/issues/1490 - if(event_parameters) - event_call += event_parameters - - if(event_handler != null) - event_handler.HandleEvent(arglist(event_call)) - - var/list/response = TopicResponse() - response[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue - intercepted_message_queue = null - return response + return if(DMAPI5_TOPIC_COMMAND_CHANGE_PORT) var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] @@ -122,8 +129,10 @@ return TopicResponse() if(DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE) + TGS_DEBUG_LOG("ProcessTopicCommand: It's a chat update") var/list/chat_update_json = topic_parameters[DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE] if(!istype(chat_update_json)) + TGS_DEBUG_LOG("ProcessTopicCommand: failed \"[DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE]\" check") return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE]!") DecodeChannels(chat_update_json) @@ -138,7 +147,7 @@ return TopicResponse() if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) - if(event_handler?.receive_health_checks) + if(event_handler && event_handler.receive_health_checks) event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) return TopicResponse() diff --git a/code/modules/tgui/tgui-say/modal.dm b/code/modules/tgui/tgui-say/modal.dm index b959019b894f..f1e87e001cef 100644 --- a/code/modules/tgui/tgui-say/modal.dm +++ b/code/modules/tgui/tgui-say/modal.dm @@ -83,7 +83,7 @@ if(!payload?["channel"]) CRASH("No channel provided to an open TGUI-Say") window_open = TRUE - if(payload["channel"] != OOC_CHANNEL && payload["channel"] != LOOC_CHANNEL && payload["channel"] != MOD_CHANNEL && payload["channel"] != ADMIN_CHANNEL && payload["channel"] != MENTOR_CHANNEL) + if(payload["channel"] != OOC_CHANNEL && payload["channel"] != LOOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL && payload["channel"] != MENTOR_CHANNEL) start_thinking() return TRUE diff --git a/code/modules/tgui/tgui-say/speech.dm b/code/modules/tgui/tgui-say/speech.dm index f278361ac0d0..7bce349e1b7f 100644 --- a/code/modules/tgui/tgui-say/speech.dm +++ b/code/modules/tgui/tgui-say/speech.dm @@ -47,9 +47,6 @@ if(LOOC_CHANNEL) client.looc(entry) return TRUE - if(MOD_CHANNEL) - client.cmd_mod_say(entry) - return TRUE if(ADMIN_CHANNEL) client.cmd_admin_say(entry) return TRUE @@ -94,7 +91,7 @@ return TRUE if(type == "force") var/target_channel = payload["channel"] - if(target_channel == ME_CHANNEL || target_channel == OOC_CHANNEL || target_channel == LOOC_CHANNEL || target_channel == MOD_CHANNEL) + if(target_channel == ME_CHANNEL || target_channel == OOC_CHANNEL || target_channel == LOOC_CHANNEL || target_channel == ADMIN_CHANNEL) target_channel = SAY_CHANNEL // No ooc leaks delegate_speech(alter_entry(payload), target_channel) return TRUE diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index be92afffb898..010cba770ce2 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -85,6 +85,7 @@ #include "unit_test.dm" #include "spawn_humans.dm" #include "check_runtimes.dm" +#include "wj_emotes.dm" #undef TEST_ASSERT #undef TEST_ASSERT_EQUAL diff --git a/code/modules/unit_tests/wj_emotes.dm b/code/modules/unit_tests/wj_emotes.dm new file mode 100644 index 000000000000..f89757665011 --- /dev/null +++ b/code/modules/unit_tests/wj_emotes.dm @@ -0,0 +1,7 @@ +/// Test that all working joe emotes have a category +/datum/unit_test/wj_emotes + +/datum/unit_test/wj_emotes/Run() + for(var/datum/emote/living/carbon/human/synthetic/working_joe/emote as anything in subtypesof(/datum/emote/living/carbon/human/synthetic/working_joe)) + if(!initial(emote.category)) + TEST_FAIL("Emote [emote] did not have a category!") diff --git a/code/modules/vehicles/interior/interior.dm b/code/modules/vehicles/interior/interior.dm index b56de4bfe16b..046b42495ac7 100644 --- a/code/modules/vehicles/interior/interior.dm +++ b/code/modules/vehicles/interior/interior.dm @@ -72,6 +72,7 @@ entrance_markers = null QDEL_NULL(reservation) + SSinterior.interiors -= src return ..() diff --git a/colonialmarines.dme b/colonialmarines.dme index 204c144c8916..74f0f99545b4 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -111,6 +111,7 @@ #include "code\__DEFINES\vv.dm" #include "code\__DEFINES\weapon_stats.dm" #include "code\__DEFINES\weather.dm" +#include "code\__DEFINES\wj_emotes.dm" #include "code\__DEFINES\xeno.dm" #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" @@ -370,6 +371,7 @@ #include "code\datums\components\speed_modifier.dm" #include "code\datums\components\toxin_buildup.dm" #include "code\datums\components\weed_damage_reduction.dm" +#include "code\datums\components\weed_food.dm" #include "code\datums\components\xeno\shield_slash.dm" #include "code\datums\construction\construction_template.dm" #include "code\datums\construction\xenomorph\construction_template_xenomorph.dm" @@ -556,7 +558,6 @@ #include "code\datums\redis\redis_message.dm" #include "code\datums\redis\callbacks\_redis_callback.dm" #include "code\datums\redis\callbacks\asay.dm" -#include "code\datums\redis\callbacks\msay.dm" #include "code\datums\stamina\_stamina.dm" #include "code\datums\stamina\none.dm" #include "code\datums\statistics\cause_data.dm" @@ -603,11 +604,13 @@ #include "code\datums\weather\weather_events\faction_clash.dm" #include "code\datums\weather\weather_events\lv522_chances_claim.dm" #include "code\datums\weather\weather_events\lv624.dm" +#include "code\datums\weather\weather_events\new_varadero.dm" #include "code\datums\weather\weather_events\sorokyne.dm" #include "code\datums\weather\weather_map_holders\big_red.dm" #include "code\datums\weather\weather_map_holders\faction_clash.dm" #include "code\datums\weather\weather_map_holders\lv522_chances_claim.dm" #include "code\datums\weather\weather_map_holders\lv624.dm" +#include "code\datums\weather\weather_map_holders\new_varadero.dm" #include "code\datums\weather\weather_map_holders\sorokyne.dm" #include "code\datums\xeno_shields\xeno_shield.dm" #include "code\datums\xeno_shields\shield_types\crusher_shield.dm" @@ -773,6 +776,7 @@ #include "code\game\machinery\sentry_holder.dm" #include "code\game\machinery\spaceheater.dm" #include "code\game\machinery\status_display.dm" +#include "code\game\machinery\storm_siren.dm" #include "code\game\machinery\suit_storage_unit.dm" #include "code\game\machinery\supply_display.dm" #include "code\game\machinery\teleporter.dm" @@ -1780,7 +1784,6 @@ #include "code\modules\mob\living\carbon\human\powers\human_powers.dm" #include "code\modules\mob\living\carbon\human\powers\issue_order.dm" #include "code\modules\mob\living\carbon\human\species\emote-monkey.dm" -#include "code\modules\mob\living\carbon\human\species\emote-synthetic.dm" #include "code\modules\mob\living\carbon\human\species\emote-yautja.dm" #include "code\modules\mob\living\carbon\human\species\human.dm" #include "code\modules\mob\living\carbon\human\species\monkey.dm" @@ -1788,6 +1791,16 @@ #include "code\modules\mob\living\carbon\human\species\synthetic.dm" #include "code\modules\mob\living\carbon\human\species\yautja.dm" #include "code\modules\mob\living\carbon\human\species\zombie.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\_emote.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\_species.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\farewell.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\greeting.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\notice.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\question.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\quip.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\restricted_area.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\task_update.dm" +#include "code\modules\mob\living\carbon\human\species\working_joe\warning.dm" #include "code\modules\mob\living\carbon\xenomorph\Abilities.dm" #include "code\modules\mob\living\carbon\xenomorph\attack_alien.dm" #include "code\modules\mob\living\carbon\xenomorph\damage_procs.dm" diff --git a/config/example/admin_ranks.txt b/config/example/admin_ranks.txt index e8d13e4f24fb..7fcac3b371f0 100644 --- a/config/example/admin_ranks.txt +++ b/config/example/admin_ranks.txt @@ -19,7 +19,6 @@ # +BAN = the ability to ban, jobban and fullban # +STEALTH = the ability to stealthmin (make yourself appear with a fake name to everyone but other admins # +POSSESS = the ability to possess objects -# +REJUV (or +REJUVINATE) = the ability to heal, respawn, modify damage and use godmode # +COLOR = the ability to use the OOC > "Set OOC Color - Self" verb # +BUILD (or +BUILDMODE) = the ability to use buildmode # +SERVER = higher-risk admin verbs and abilities, such as those which affect the server configuration. @@ -36,16 +35,16 @@ Mentor +MENTOR +COLOR Trial Moderator +MOD +SERVER +COLOR -Moderator +MOD +SERVER +BAN +REJUV +COLOR +NOLOCK -Trial Admin +ADMIN +MOD +SERVER +BAN +REJUV +SPAWN +STEALTH +VAREDIT +COLOR -Admin +ADMIN +MOD +SERVER +BAN +REJUV +SPAWN +STEALTH +VAREDIT +POSSESS +SOUND +COLOR +BUILDMODE +Moderator +MOD +SERVER +BAN +COLOR +NOLOCK +Trial Admin +ADMIN +MOD +SERVER +BAN +SPAWN +STEALTH +VAREDIT +COLOR +Admin +ADMIN +MOD +SERVER +BAN +SPAWN +STEALTH +VAREDIT +POSSESS +SOUND +COLOR +BUILDMODE Coder +MOD +SERVER +BAN +VAREDIT +SPAWN +DEBUG +COLOR Mapper +MOD +VAREDIT +COLOR +BUILDMODE +SPAWN Spriter +MOD +VAREDIT +SPAWN +COLOR -Developer +ADMIN +MOD +SERVER +BAN +VAREDIT +SPAWN +DEBUG +REJUV +POSSESS +BUILDMODE +SOUND +COLOR -Lead Spriter +ADMIN +MOD +SERVER +REJUV +VAREDIT +BUILDMODE +SPAWN +DEBUG +COLOR +Developer +ADMIN +MOD +SERVER +BAN +VAREDIT +SPAWN +DEBUG +POSSESS +BUILDMODE +SOUND +COLOR +Lead Spriter +ADMIN +MOD +SERVER +VAREDIT +BUILDMODE +SPAWN +DEBUG +COLOR Host +EVERYTHING @@ -55,6 +54,6 @@ Head Dev +EVERYTHING Legacy Mentor +MENTOR +COLOR -Senior Moderator +ADMIN +MOD +SERVER +BAN +REJUV +SPAWN +STEALTH +VAREDIT +POSSESS +SOUND +COLOR +BUILDMODE -Senior Admin +ADMIN +MOD +SERVER +BAN +REJUV +SPAWN +STEALTH +VAREDIT +POSSESS +SOUND +COLOR +BUILDMODE +DEBUG +Senior Moderator +ADMIN +MOD +SERVER +BAN +SPAWN +STEALTH +VAREDIT +POSSESS +SOUND +COLOR +BUILDMODE +Senior Admin +ADMIN +MOD +SERVER +BAN +SPAWN +STEALTH +VAREDIT +POSSESS +SOUND +COLOR +BUILDMODE +DEBUG diff --git a/config/example/config.txt b/config/example/config.txt index bf061da71417..1fee5c898574 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -239,3 +239,6 @@ GAMEMODE_ROUNDS_NEEDED 5 ## Default gamemode to auto-switch back to after a round has concluded GAMEMODE_DEFAULT extended + +## How long the mob will take to chestburst, in seconds +#EMBRYO_BURST_TIMER 450 diff --git a/html/changelogs/AutoChangeLog-pr-3732.yml b/html/changelogs/AutoChangeLog-pr-3732.yml deleted file mode 100644 index 1fcec99781cb..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3732.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "blackdragonTOW" -delete-after: True -changes: - - refactor: "refactored dropship_ammo so that missiles don't use Spawn()" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-3762.yml b/html/changelogs/AutoChangeLog-pr-3762.yml deleted file mode 100644 index 708eac96abb7..000000000000 --- a/html/changelogs/AutoChangeLog-pr-3762.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "ghostsheet" -delete-after: True -changes: - - bugfix: "Fixed Extended Barrel bug of building up free bullet velocity." \ No newline at end of file diff --git a/html/changelogs/archive/2023-07.yml b/html/changelogs/archive/2023-07.yml index eb01ed3f4007..0edee30b9f8e 100644 --- a/html/changelogs/archive/2023-07.yml +++ b/html/changelogs/archive/2023-07.yml @@ -27,3 +27,303 @@ theselfish: - qol: Made the MP beret to be clickable. - imageadd: Updated the MP beret obj sprite to be easier to click. +2023-07-03: + blackdragonTOW: + - refactor: refactored dropship_ammo so that missiles don't use Spawn() + ghostsheet: + - bugfix: Fixed Extended Barrel bug of building up free bullet velocity. +2023-07-04: + Drathek: + - bugfix: Fixed a persistence problem for the time of death value used for the larva + queue. + - bugfix: Fixed brainmobs (human gibbing) not getting a time of death value. + harryob: + - bugfix: paper images should appear once again + zzzmike: + - balance: pods crash land 33% of the time rather than 50% +2023-07-05: + BeagleGaming1: + - rscadd: Queen makes noise when moved even while resting + Hopek, Gul Dreggrod: + - rscadd: Adds a Luxurious fountain pen to the game. Currently spawns on the right + ear of high ranking command staff. Sprited by Gul Dreggrod. + QuickLode: + - rscadd: CMB/ICC Survivors now get a limited radio that they can use to communicate + with CMB reinforcements. + - rscadd: CMB/Anchorpoint Marines get bandages to stop bleeding. + harryob: + - rscadd: all xenos can now access the tacmap, while the queen is on ovi +2023-07-06: + BeagleGaming1: + - code_imp: evacuation pod crash chance changed to a var + - code_imp: proc added to force evacuation pods to crash + Drathek: + - bugfix: Fixed more broken logos (primarily WY research papers) + - balance: Weed nodes can no longer be placed in walls or window frames (or any + turf or structure with density) + - refactor: Refactored the plant weeds ability code + - balance: Gardener's hardy weeds now upgrade normal weeds (just like hive weeds + upgrade weeds). + - balance: Gardener's hardy weeds now don't prevent special structures (core and + pylons) but they are still only allowed if the turf allows them. + Newyearnewme, Morrow: + - rscadd: Xeno structures/weeds now become forsaken after hijack + Steelpoint: + - imageadd: Synth utility vest is now slimmer in appearance + realforest2001: + - admin: Adds logs for bioscans successfully completing. + thatoneyeeter: + - balance: metal foam now becomes solid faster +2023-07-07: + Diegoflores31: + - rscadd: Defender Tail Slam has a 1% chance to do a BONK sound instead. + Drathek: + - bugfix: Fixed ghost icons for larva and ovi queen + Morrow: + - rscdel: Removes fountain pens from gear sets + - rscdel: Removed nesting the dead + - rscadd: Added a visiting USASF Commander (CO survivor) to New Varadero + - bugfix: Burnt matches no longer permanently give you a light source if they naturally + burn out + QuickLoad: + - balance: Colony Synthetics are faster but are less resistant. This allows for + the option of avoiding engagements. + - balance: Colony Synthetics have slightly better CQC and can carry people better. + realforest2001: + - bugfix: Fixes Queen making footstep sounds while dead and being dragged. +2023-07-08: + Ben10083: + - bugfix: Working Joes can no longer have a gradient on their rare hair spawn. + - rscdel: Working Joes can no longer be fed. + - code_imp: 'New trait: Cannot eat. Self-explanatory.' + Cursor: + - spellcheck: Changed Chem Dispenser to Chemical Dispenser, added descriptions to + the cryo cell, rail computer and chemical dispenser. Updated the descriptions + for the Blood Dispenser and Dropship computer. + Drathek: + - bugfix: Fixed facehuggers incorrectly displaying thrown state when it has landed + Drathek Kugamo: + - rscadd: Added the ability for weeds to merge with unrevivable corpses + - imageadd: Added human shaped weeds by Kugamo + - code_imp: Added a signal for weeds sent to the turf to indicate it is now weeded, + and added a signal for afterbuckle. + - bugfix: Closets (including coffins) can no longer move anchored mobs. + Morrow: + - qol: Create humans tab length increase + - qol: Create humans tab now defaults to 0 range to spawn + - bugfix: Fixed extraneous messages in regards to wall nests + SpartanBobby: + - balance: changes M4A3 magazine size from 9 to 12 + Zonespace27: + - bugfix: The maintenance jack should work a little better at crowbarring things. +2023-07-09: + Khadd: + - rscadd: added a iv tube between the user and the bloodpack / iv drip + - imageadd: sprites for the iv tube + Zonespace27: + - rscadd: Working Joes now have an emote panel to use voice lines, accessible as + an action button. + theselfish: + - qol: Foxtrot's radio channel is now on if you have multi-squad in your headset. +2023-07-10: + BeagleGaming1: + - rscadd: Acid runners don't get acid from slashing nested humans + - rscadd: Very late-stage marines do not give acid + - bugfix: Fixes one way of abusing resin fruit + Drathek: + - rscdel: Remove first life priority for larva queue + - bugfix: Fix ghosting as a facehugger counting as death for the larva queue + blackdragonTOW: + - spellcheck: Added "U1" designation to the UGL attachment. +2023-07-11: + BeagleGaming1: + - bugfix: Fixes the Working Joe species +2023-07-12: + Morrow: + - bugfix: Stops xenos from bypassing dead moving via roller beds + - balance: Telebaton now scales in stunforce effectiveness based on policing skill + - balance: Marines called with foxtrot nerfed from 15 to 10. + SpartanBobby: + - maptweak: 'LV522: Flips the layout of engineering making the T-comms unit on the + far side of the LZ' + - balance: reduces the M1911 magazine size from 14 to 7 + Steelpoint: + - balance: Synthetic Armour slowdown has been decreased +2023-07-13: + QuickLoad, Thwomper: + - imageadd: Synthetic Uniforms & Vest with United Americas flair and classic jumpsuits + which remind you of life on the Frontier. Sprited by THE THWOMPA himself! + - qol: Synthetic Vendor is more organized. Removes scrub cap, adds shoe. +2023-07-14: + Drathek: + - bugfix: Fix ghosting preventing first dibs on the larva in a hugged marine + Unknownity: + - bugfix: Fixed burrowed mobs being able to be targeted by sentries, mines and SG + autofire. + - bugfix: Fixed burrowed mobs being able to grab mobs on the surface. + - bugfix: Fixed burrowed mobs being able to resist while burrowed. + - bugfix: Fixed burrowers taking damage from direct flame and shrapnel from explosions. + - bugfix: Fixed burrowers being able to get slashed from enemy Xenos on the surface. + - bugfix: Fixed burrowers unburrow stun to now properly target and stun enemy Xenos. + - soundadd: Added sounds for the Burrower when they are burrowing and unburrowing. +2023-07-15: + BeagleGaming1: + - code_imp: Messed with chem and drink dispenser code + Ben10083: + - spellcheck: Fixed typos relating to M74 airburst packets. + - mapadd: Combat Information Center Reception now has a telephone + - maptweak: Medical Lower telephone shifted to the left + Drathek: + - bugfix: Fix morpher ejected items and dumped objectives not restoring their mouse_opacity + setting. + Morrow: + - admin: VV Jump To Fix + - balance: Lurkers now lose their invisibility when they run into a person + Steelpoint: + - ui: Predator Ship is now called 'Yautja Ship" for teleporting Predators + Zonespace27: + - admin: Removed msay. All staff now have access to asay + ondrej008: + - bugfix: The HE OB now deals the correct amount of damage to xenos, before it dealt + half damage caused by xenos being forced to rest before it hit. + realforest2001: + - soundadd: Added a drag sound for footstep component + - bugfix: Fixes the icon on the alien blade on LV. + - bugfix: Carbon copies can no longer infinitely breed. + - rscadd: Added a PMC Synth Survivor preset, and stopped PMC Synth Survivor using + the ERT set. + - bugfix: You can no longer weld non metal containers closed. + - bugfix: Fixes the toggle notification sound verb for Yautja bracers not working. +2023-07-16: + Drathek: + - rscadd: Facehuggers now convert to their NPC version after 7 minutes of inactivity + and no client. + - code_imp: Cleanup join as xeno button code somewhat. + Drathek, Fira: + - bugfix: Fixed an issue with table flips that could make some tables incorrectly + unflippable, and cause infinite loops. It is no longer possible to flip tables + that t-shape or cross, or spans more than 5 tiles away from you. + Drathek, Steelpoint: + - bugfix: Fixed possible hardeletes for predator landmarks and vehicles. Predator + teleporation descriptions now do not change if the area is altered at runtime + so they can still be found correctly. + theselfish: + - rscadd: SOs may now get coats in their vendor. +2023-07-17: + Puckaboo2: + - spellcheck: Some duplicate icon states have been differentiated to prevent future + missing icon state errors. + - imageadd: Added new icon states for chemical and virology dispensers. + - rscdel: Removed dozens of duplicate icon states from over 50 files to reduce bloat. + - rscdel: Removed duplicate empty icon states. + realforest2001: + - maptweak: Added Apollo Maintenance Controllers to the following locations. + - maptweak: Astronavigation, CIC Substation, Brig Substation, Req Aux Storage, Hangar + & OT & Engineering workshops, Reactor Core Room and Lifeboat Control Ring. +2023-07-19: + Ben10083: + - rscadd: Working Joes now have a unique death message. Credit to Quickload for + the message. + - soundadd: Working Joes now have a death rattle. Credit to Quickload for shifting + through Alien Isolation audio files. + - qol: Things that die with intent eyes now lose color in their eyes on death. + Drathek: + - bugfix: Banished players will no longer be candidates for hives they are banished + from. + - bugfix: Cryoing will now set your larva queue time so you don't get prioritized + over others that have been waiting. + - admin: Shuttle intoTheSunset will set larva queue time the same as other situations. + - qol: Added a preference to disable xeno ability deactivation when re-selecting + the same ability + Morrow: + - rscadd: Added bayonet pouch to req + - balance: Explosive pouch inventory size from 3 to 6 + - balance: Explosive pouch can no longer hold mine boxes + NewyearnewmeUwu: + - rscadd: Added the ES-4 electrostatic pistol to the CL's safe. + realforest2001: + - balance: Reduced tranq pistol bullet damage from 40 to 15 + - bugfix: Fixes another synth survivor variant having marine comms. + theselfish: + - spellcheck: Goodbye Squad Spotter, hello regular non-squaded Spotter. +2023-07-20: + Anuv: + - bugfix: '#3775' + - rscadd: Added a new storm siren unique to NV, new survivor types + - spellcheck: Updates to the waking distress call notif. + - code_imp: Weather-related code changes. Update to the handheld maps. + - soundadd: Added new monsoon weather sfx, new map-unique ambience, new storm siren + sfx. + - maptweak: New LZ (LZ2 Palm Airfield) in the NE with a construction zone. Removed + a number of rocks around cave areas. Increased hive location choices from 3 + to 4. Added glass ceilings to facility areas (deep caves are still protected, + can be OB'd). Slightly widened the 45 minute weed protection areas around LZs. + Added a fog monsoon to the SE beach that dissipates after an hour. Expanded + east beach. New SW cave section. Opened up the walkway west of LZ1. Enhanced + survivor loot and mats to a comparable degree to current maps. Many small changes + to lessen chokes and offer more route choice for xenos and marines alike. Removed + Spearhead/Rival and laser pistols. Swapped fawras for monkeys. Added more survivor-type + choices. Added a bar area and decrepit truck to the north beach. + - config: Enabled NV again as a map in maps.txt. + Awantje: + - bugfix: The M56D no longer let's you violate density code when exiting it. + BeagleGaming1: + - config: Moved time to burst to the config + - balance: Fixed time to burst, lowering it from 15 minutes to 7.5 minutes by default + - balance: Stasis bags used on late-stage mobs properly slow growth down less + Ben10083: + - qol: Non player Facehuggers now also notify the hive when they facehug something. + - spellcheck: fix typo relating to Starshell ash + Diegoflores31: + - balance: Acid Splash damage increased to 25 + - balance: Acid Splash damage can be reduced with BIO armor. + - balance: Reduced Light armor BIO resistance by 10 + - balance: Increased Heavy armor BIO resistance by 5 + - balance: Increased VL vest BIO resistance by 5 + GoldenDarkness55: + - balance: Base rav cooldown regain per slash reduced (4 to 3), empowered charge + stun duration reduced (2 to 1.3), empower duration increased (5 to 6.5), empower + cooldown reduced (22 to 18), duration window for second empower cast reduced + (15 to 6), base shield gain reduced (75 to 50), shield gain per marine reduced + (80 to 50), maximum empower targets increased (5 to 6), scissor slash cooldown + reduced (10 to 6), and damage reduced (45 to 40) + - balance: Hedge rav doesn't lose speed anymore, but loses 10 slash damage instead. + Shield duration increased (2 to 2.5), Fire Spikes shard range increased (5 to + 6), Spike Shed shard lockout duration reduced (30 to 15), shard lock speed reduced + to maintain same speed as previously. Shard damage increased (5 to 8), shard + slowdown duration reduced (8 to 3), shard gain per tick reduced (10 to 5), shard + gain per bullet reduced (20 to 10), added shard gain per slash (15) + Huffie56: + - bugfix: fix some area having no apc on the almayer making them not behave like + they should specialy when hijack happen. + IowaPotatoFarmer: + - rscadd: The PMC Crash on Solaris Ridge now spawns one PMC medic survivor and one + PMC engineer survivor. + - bugfix: The Wey-Yu goon survivors now have their unique corporate white camo M41A + MK2 back. + Kaboomcat: + - imageadd: Updated the gin bottle sprite + QuickLoad: + - balance: Tones down ERT skills. Impacts VAIPO/Dutch'sDozen/CMB/UPP/CLF/EMerc. + - balance: Gives PMC & SurvPMC a trained level of CQC. + Steelpoint: + - maptweak: More weed spawns so larva don't spawn in area with no weed to evolve + on. + - rscadd: Predator toolbelt is now a unique item with its own sprite. + TeDGamer: + - bugfix: Xenos allied to the hive can now open hive's doors + - bugfix: Huggers can now scuttle doors + - code_imp: Combined hugger + larva code to allow for any small castes to scuttle + Zonespace27: + - balance: Trashbags now hold normal items and can be looked through like a box + or storage container. + - balance: Trashbags no longer fit in your belt slot. + ihatethisengine: + - balance: Lurkers don't lose invisibility when they bump into partly visible mobs. + realforest2001: + - admin: Removed the R_REJUVINATE permissions flag and replaces instances where + it is used with R_MOD. + - admin: Added logs if a restricted proc is proccalled. + silencer_pl: + - qol: Default paper and desc_lore viewing windows are now larger to match the expected + content in them better. diff --git a/html/create_humans.html b/html/create_humans.html index ed9361fc6f25..06b92cba0c71 100644 --- a/html/create_humans.html +++ b/html/create_humans.html @@ -11,7 +11,7 @@ Amount of humans:
- Range to spawn in: + Range to spawn in:

Spawn mobs as:
Regular
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi index 704c0ad1c02c..d6ee40cf7fe8 100644 Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ diff --git a/icons/effects/genetics.dmi b/icons/effects/genetics.dmi index 8e31fea96135..fa46a2d6c094 100644 Binary files a/icons/effects/genetics.dmi and b/icons/effects/genetics.dmi differ diff --git a/icons/mob/hud/actions.dmi b/icons/mob/hud/actions.dmi index 1692879116dc..4d0697733207 100644 Binary files a/icons/mob/hud/actions.dmi and b/icons/mob/hud/actions.dmi differ diff --git a/icons/mob/hud/alien_standard.dmi b/icons/mob/hud/alien_standard.dmi index 7e339ec5e83d..8bad0b44acc9 100644 Binary files a/icons/mob/hud/alien_standard.dmi and b/icons/mob/hud/alien_standard.dmi differ diff --git a/icons/mob/hud/hud.dmi b/icons/mob/hud/hud.dmi index 91fd9e92b5fa..f8ea98d01e53 100644 Binary files a/icons/mob/hud/hud.dmi and b/icons/mob/hud/hud.dmi differ diff --git a/icons/mob/hud/human_bronze.dmi b/icons/mob/hud/human_bronze.dmi index 4f2ee88d1da5..11a724057245 100644 Binary files a/icons/mob/hud/human_bronze.dmi and b/icons/mob/hud/human_bronze.dmi differ diff --git a/icons/mob/hud/human_old.dmi b/icons/mob/hud/human_old.dmi index 2e29c09411b7..194206d4de16 100644 Binary files a/icons/mob/hud/human_old.dmi and b/icons/mob/hud/human_old.dmi differ diff --git a/icons/mob/hud/human_orange.dmi b/icons/mob/hud/human_orange.dmi index 420fb3e8ea3e..8a46dad89ed5 100644 Binary files a/icons/mob/hud/human_orange.dmi and b/icons/mob/hud/human_orange.dmi differ diff --git a/icons/mob/hud/screen1.dmi b/icons/mob/hud/screen1.dmi index df8475ef0ebd..fd4cf8188579 100644 Binary files a/icons/mob/hud/screen1.dmi and b/icons/mob/hud/screen1.dmi differ diff --git a/icons/mob/hud/screen1_robot.dmi b/icons/mob/hud/screen1_robot.dmi index a54b0a34b392..679a555c97a6 100644 Binary files a/icons/mob/hud/screen1_robot.dmi and b/icons/mob/hud/screen1_robot.dmi differ diff --git a/icons/mob/hud/talk.dmi b/icons/mob/hud/talk.dmi index 52255e1094f9..c6f043bfd781 100644 Binary files a/icons/mob/hud/talk.dmi and b/icons/mob/hud/talk.dmi differ diff --git a/icons/mob/humans/green_armors.dmi b/icons/mob/humans/green_armors.dmi index e1a5aaf8c13f..5022b6c4bbc7 100644 Binary files a/icons/mob/humans/green_armors.dmi and b/icons/mob/humans/green_armors.dmi differ diff --git a/icons/mob/humans/human.dmi b/icons/mob/humans/human.dmi index f98eb58f08ff..7bcd1e9796cc 100644 Binary files a/icons/mob/humans/human.dmi and b/icons/mob/humans/human.dmi differ diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi index 1d5ed650b6f9..f95ba65ece52 100644 Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ diff --git a/icons/mob/humans/onmob/helmet_garb.dmi b/icons/mob/humans/onmob/helmet_garb.dmi index 10d988b153dd..3bb63088783f 100644 Binary files a/icons/mob/humans/onmob/helmet_garb.dmi and b/icons/mob/humans/onmob/helmet_garb.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 52b3120ab12b..b149c4ea872b 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index cedbcf8c0e7e..70fa3a73fbc5 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_0.dmi b/icons/mob/humans/onmob/suit_0.dmi index 5cccc4c2e0e0..0065384e2c6c 100644 Binary files a/icons/mob/humans/onmob/suit_0.dmi and b/icons/mob/humans/onmob/suit_0.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index c17f403d99ce..39a91e225039 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index cac9869c9034..a3e34fc2e16c 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/mob/humans/species/monkeys/onmob/suit_monkey_0.dmi b/icons/mob/humans/species/monkeys/onmob/suit_monkey_0.dmi index 3083c943c761..6d05304ef8d9 100644 Binary files a/icons/mob/humans/species/monkeys/onmob/suit_monkey_0.dmi and b/icons/mob/humans/species/monkeys/onmob/suit_monkey_0.dmi differ diff --git a/icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi b/icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi index 730ee28ff467..cc6fb5d13b03 100644 Binary files a/icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi and b/icons/mob/humans/species/monkeys/onmob/uniform_monkey_0.dmi differ diff --git a/icons/mob/xenonids/lurker.dmi b/icons/mob/xenonids/lurker.dmi index bc2c3aa06837..45a04ac68446 100644 Binary files a/icons/mob/xenonids/lurker.dmi and b/icons/mob/xenonids/lurker.dmi differ diff --git a/icons/mob/xenos/weeds.dmi b/icons/mob/xenos/weeds.dmi index 8eb4b2203cf6..0b9403058109 100644 Binary files a/icons/mob/xenos/weeds.dmi and b/icons/mob/xenos/weeds.dmi differ diff --git a/icons/obj/bodybag.dmi b/icons/obj/bodybag.dmi index 9084afd56f63..157a7692b2a8 100644 Binary files a/icons/obj/bodybag.dmi and b/icons/obj/bodybag.dmi differ diff --git a/icons/obj/items/black_goo_stuff.dmi b/icons/obj/items/black_goo_stuff.dmi index 2d7b063bc4b8..b40461a40101 100644 Binary files a/icons/obj/items/black_goo_stuff.dmi and b/icons/obj/items/black_goo_stuff.dmi differ diff --git a/icons/obj/items/clothing/halloween_clothes.dmi b/icons/obj/items/clothing/halloween_clothes.dmi index 3de24560ec9d..530b7cf5a905 100644 Binary files a/icons/obj/items/clothing/halloween_clothes.dmi and b/icons/obj/items/clothing/halloween_clothes.dmi differ diff --git a/icons/obj/items/clothing/suits.dmi b/icons/obj/items/clothing/suits.dmi index cff4b5d48c17..668b9a86c62f 100644 Binary files a/icons/obj/items/clothing/suits.dmi and b/icons/obj/items/clothing/suits.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 254c9e8b67c9..4d4d7df3224d 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/items/drinks.dmi b/icons/obj/items/drinks.dmi index 10872151260a..2823407a429c 100644 Binary files a/icons/obj/items/drinks.dmi and b/icons/obj/items/drinks.dmi differ diff --git a/icons/obj/items/food.dmi b/icons/obj/items/food.dmi index ac802dc66a9a..6e2c86aa4999 100644 Binary files a/icons/obj/items/food.dmi and b/icons/obj/items/food.dmi differ diff --git a/icons/obj/items/hunter/pred_gear.dmi b/icons/obj/items/hunter/pred_gear.dmi index 5587cc685bec..d647b32b96fd 100644 Binary files a/icons/obj/items/hunter/pred_gear.dmi and b/icons/obj/items/hunter/pred_gear.dmi differ diff --git a/icons/obj/items/paper.dmi b/icons/obj/items/paper.dmi index 3589d5a1b4c2..d0c918a65e59 100644 Binary files a/icons/obj/items/paper.dmi and b/icons/obj/items/paper.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi index 295071f1d7c5..11eab502b0cf 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi index 41231e81b975..d040aa85fd5d 100644 Binary files a/icons/obj/items/weapons/guns/attachments/barrel.dmi and b/icons/obj/items/weapons/guns/attachments/barrel.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/rail.dmi b/icons/obj/items/weapons/guns/attachments/rail.dmi index 10e3cbe99a8c..315005696ba8 100644 Binary files a/icons/obj/items/weapons/guns/attachments/rail.dmi and b/icons/obj/items/weapons/guns/attachments/rail.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi index 481710383a14..8eb95d15770f 100644 Binary files a/icons/obj/items/weapons/guns/attachments/stock.dmi and b/icons/obj/items/weapons/guns/attachments/stock.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index 8cbf735ac96b..1a55ea7e215f 100644 Binary files a/icons/obj/items/weapons/guns/attachments/under.dmi and b/icons/obj/items/weapons/guns/attachments/under.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi b/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi index 46ce2b74ba68..44eb7e3543c9 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi differ diff --git a/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi b/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi index d1bdb7d3b0c9..568bfd0ee456 100644 Binary files a/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi and b/icons/obj/items/weapons/guns/legacy/old_bayguns.dmi differ diff --git a/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi b/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi index bf67ed68502c..24cade43454f 100644 Binary files a/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi and b/icons/obj/items/weapons/guns/legacy/old_cmguns.dmi differ diff --git a/icons/obj/items/weapons/projectiles.dmi b/icons/obj/items/weapons/projectiles.dmi index 720ea1e61f2d..c3aa143def9b 100644 Binary files a/icons/obj/items/weapons/projectiles.dmi and b/icons/obj/items/weapons/projectiles.dmi differ diff --git a/icons/obj/structures/doors/mineral_doors.dmi b/icons/obj/structures/doors/mineral_doors.dmi index 1613f466d523..f9e025ccf0e9 100644 Binary files a/icons/obj/structures/doors/mineral_doors.dmi and b/icons/obj/structures/doors/mineral_doors.dmi differ diff --git a/icons/obj/structures/doors/prison_FOP/prison_hatches.dmi b/icons/obj/structures/doors/prison_FOP/prison_hatches.dmi index 489d2333f2a6..23864a1065d1 100644 Binary files a/icons/obj/structures/doors/prison_FOP/prison_hatches.dmi and b/icons/obj/structures/doors/prison_FOP/prison_hatches.dmi differ diff --git a/icons/obj/structures/machinery/computer3.dmi b/icons/obj/structures/machinery/computer3.dmi index 4735cfc5a1a4..047417f303f3 100644 Binary files a/icons/obj/structures/machinery/computer3.dmi and b/icons/obj/structures/machinery/computer3.dmi differ diff --git a/icons/obj/structures/machinery/cryogenics.dmi b/icons/obj/structures/machinery/cryogenics.dmi index b2c5d2e0c5ce..dc061195583f 100644 Binary files a/icons/obj/structures/machinery/cryogenics.dmi and b/icons/obj/structures/machinery/cryogenics.dmi differ diff --git a/icons/obj/structures/machinery/shuttle-parts.dmi b/icons/obj/structures/machinery/shuttle-parts.dmi index 1ec8a07e6b3f..7db27387e7c1 100644 Binary files a/icons/obj/structures/machinery/shuttle-parts.dmi and b/icons/obj/structures/machinery/shuttle-parts.dmi differ diff --git a/icons/obj/structures/machinery/vending.dmi b/icons/obj/structures/machinery/vending.dmi index ecc570680a74..3098aadca8be 100644 Binary files a/icons/obj/structures/machinery/vending.dmi and b/icons/obj/structures/machinery/vending.dmi differ diff --git a/icons/obj/structures/props/dam.dmi b/icons/obj/structures/props/dam.dmi index 3541b2412e13..76f67514c2ea 100644 Binary files a/icons/obj/structures/props/dam.dmi and b/icons/obj/structures/props/dam.dmi differ diff --git a/icons/obj/structures/props/fence.dmi b/icons/obj/structures/props/fence.dmi index 9ed9d1f7fc20..016aab562777 100644 Binary files a/icons/obj/structures/props/fence.dmi and b/icons/obj/structures/props/fence.dmi differ diff --git a/icons/obj/structures/stairs/perspective_stairs_ice.dmi b/icons/obj/structures/stairs/perspective_stairs_ice.dmi index 8f5bf6935d7b..3311adfc11dd 100644 Binary files a/icons/obj/structures/stairs/perspective_stairs_ice.dmi and b/icons/obj/structures/stairs/perspective_stairs_ice.dmi differ diff --git a/icons/obj/structures/stairs/perspective_stairs_kutjevo.dmi b/icons/obj/structures/stairs/perspective_stairs_kutjevo.dmi index 86a2cfde6339..f9c759a32d12 100644 Binary files a/icons/obj/structures/stairs/perspective_stairs_kutjevo.dmi and b/icons/obj/structures/stairs/perspective_stairs_kutjevo.dmi differ diff --git a/icons/old_stuff/Seasonal/xmas.dmi b/icons/old_stuff/Seasonal/xmas.dmi index 8dd25fd4b6d4..9669a6034b9c 100644 Binary files a/icons/old_stuff/Seasonal/xmas.dmi and b/icons/old_stuff/Seasonal/xmas.dmi differ diff --git a/icons/rebase_icons.dmi b/icons/rebase_icons.dmi index aaf92453b29a..2d394cef793d 100644 Binary files a/icons/rebase_icons.dmi and b/icons/rebase_icons.dmi differ diff --git a/icons/turf/almayer.dmi b/icons/turf/almayer.dmi index a90940470acf..07f771ec78c7 100644 Binary files a/icons/turf/almayer.dmi and b/icons/turf/almayer.dmi differ diff --git a/icons/turf/area_strata.dmi b/icons/turf/area_strata.dmi index 54b90d0a8f92..8c9791522989 100644 Binary files a/icons/turf/area_strata.dmi and b/icons/turf/area_strata.dmi differ diff --git a/icons/turf/floors/asphalt.dmi b/icons/turf/floors/asphalt.dmi index ef4f07d5f374..57b807b1c3f4 100644 Binary files a/icons/turf/floors/asphalt.dmi and b/icons/turf/floors/asphalt.dmi differ diff --git a/icons/turf/floors/concrete.dmi b/icons/turf/floors/concrete.dmi index d3aa3a1fa7ee..54d7dd3aaaef 100644 Binary files a/icons/turf/floors/concrete.dmi and b/icons/turf/floors/concrete.dmi differ diff --git a/icons/turf/floors/floors.dmi b/icons/turf/floors/floors.dmi index 681ffa537aa4..7b68cbb2b6b2 100644 Binary files a/icons/turf/floors/floors.dmi and b/icons/turf/floors/floors.dmi differ diff --git a/icons/turf/walls/bunker.dmi b/icons/turf/walls/bunker.dmi index 6f7537e20f7c..d9d4f8a080cb 100644 Binary files a/icons/turf/walls/bunker.dmi and b/icons/turf/walls/bunker.dmi differ diff --git a/icons/turf/walls/dev/dev.dmi b/icons/turf/walls/dev/dev.dmi index 0c6025876b2e..4a1eaf6f7b6a 100644 Binary files a/icons/turf/walls/dev/dev.dmi and b/icons/turf/walls/dev/dev.dmi differ diff --git a/icons/turf/walls/floodgate.dmi b/icons/turf/walls/floodgate.dmi index 5b3f00abb597..f67e5a7a3fcc 100644 Binary files a/icons/turf/walls/floodgate.dmi and b/icons/turf/walls/floodgate.dmi differ diff --git a/icons/turf/walls/kutjevo/kutjevo.dmi b/icons/turf/walls/kutjevo/kutjevo.dmi index 5c8c0053e1bf..3aba82409af6 100644 Binary files a/icons/turf/walls/kutjevo/kutjevo.dmi and b/icons/turf/walls/kutjevo/kutjevo.dmi differ diff --git a/icons/turf/walls/solaris/solaris.dmi b/icons/turf/walls/solaris/solaris.dmi index 85d5c118a901..96865710abd7 100644 Binary files a/icons/turf/walls/solaris/solaris.dmi and b/icons/turf/walls/solaris/solaris.dmi differ diff --git a/icons/turf/walls/solaris/solaris_old.dmi b/icons/turf/walls/solaris/solaris_old.dmi index 59846bf0ad1c..2aca7b187508 100644 Binary files a/icons/turf/walls/solaris/solaris_old.dmi and b/icons/turf/walls/solaris/solaris_old.dmi differ diff --git a/icons/turf/walls/strata_outpost.dmi b/icons/turf/walls/strata_outpost.dmi index 36e20bdd176a..6043f7c32d8d 100644 Binary files a/icons/turf/walls/strata_outpost.dmi and b/icons/turf/walls/strata_outpost.dmi differ diff --git a/icons/turf/walls/windows.dmi b/icons/turf/walls/windows.dmi index b1b7c7ebfbe9..85f822873e68 100644 Binary files a/icons/turf/walls/windows.dmi and b/icons/turf/walls/windows.dmi differ diff --git a/map_config/maps.txt b/map_config/maps.txt index 38a73946cf8b..885b1e76faad 100644 --- a/map_config/maps.txt +++ b/map_config/maps.txt @@ -58,7 +58,6 @@ map lv522_chances_claim endmap map new_varadero - disabled endmap map whiskey_outpost_v2 diff --git a/maps/interiors/fancylocker.dmm b/maps/interiors/fancylocker.dmm index b26879d705f8..a6ecb6155e72 100644 --- a/maps/interiors/fancylocker.dmm +++ b/maps/interiors/fancylocker.dmm @@ -88,7 +88,7 @@ /area/vehicle/apc) "t" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/chem_dispenser/beer, +/obj/structure/machinery/chem_dispenser/soda/beer, /turf/open/floor/wood, /area/vehicle/apc) "u" = ( diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm index e712260a4947..d0d489677fc1 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm @@ -1425,6 +1425,15 @@ icon_state = "rasputin15" }, /area/bigredv2/outside/office_complex) +"hN" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 4 + }, +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/bigredv2/outside/office_complex) "id" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 4 @@ -1632,6 +1641,15 @@ icon_state = "floor8" }, /area/bigredv2/outside/office_complex) +"XH" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 4 + }, +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/bigredv2/outside/office_complex) (1,1,1) = {" ac @@ -1911,7 +1929,7 @@ cX cX by aN -id +XH AB yS aV @@ -2078,7 +2096,7 @@ od yS yS cu -id +hN yS yS yS diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index bddc64a61ad2..3fefea9f08b0 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -22132,7 +22132,7 @@ /area/corsat/gamma/biodome/toxins) "biR" = ( /obj/structure/surface/table/woodentable, -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ dir = 8; pixel_x = 15 }, @@ -25197,7 +25197,7 @@ /area/corsat/sigma/south/offices) "bsN" = ( /obj/structure/surface/table/woodentable, -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ dir = 8 }, /turf/open/floor/corsat{ diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 1c4017a163a3..9aeb42c9d8c5 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -60906,6 +60906,12 @@ icon_state = "tile" }, /area/desert_dam/exterior/valley/south_valley_dam) +"goY" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/mars_cave{ + icon_state = "mars_dirt_5" + }, +/area/desert_dam/interior/lab_northeast/east_lab_containment) "gpi" = ( /obj/structure/prop/dam/large_boulder/boulder1, /turf/open/desert/dirt, @@ -64042,6 +64048,10 @@ icon_state = "wood" }, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +"rEa" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_biology) "rEH" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, @@ -100042,7 +100052,7 @@ amq afI ana amZ -ana +goY agL afG arH @@ -104949,7 +104959,7 @@ acu afG afI akW -akW +lNN agL amn afI @@ -109407,7 +109417,7 @@ alI alI aoI aoN -apg +rEa apk apg apy @@ -110579,7 +110589,7 @@ aoI aoN apg apk -apg +rEa apy afP amx diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index 7ce999271a29..76257b973b43 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -14261,7 +14261,7 @@ /area/ice_colony/surface/bar/bar) "aPy" = ( /obj/structure/surface/table/woodentable, -/obj/structure/machinery/chem_dispenser/beer, +/obj/structure/machinery/chem_dispenser/soda/beer, /obj/structure/machinery/alarm{ dir = 1; pixel_y = -24 diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index a431aa368702..d221090da880 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -6004,7 +6004,7 @@ /turf/open/floor/plating, /area/shiva/interior/colony/s_admin) "aRc" = ( -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ pixel_y = 8 }, /obj/structure/surface/table/reinforced/prison, diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 3d626437679a..e5a6a43cf617 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -381,7 +381,7 @@ /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/med/cells) "azb" = ( -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ icon_state = "dispenser" }, /turf/open/floor/kutjevo/tan/multi_tiles, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 34eecc574c9c..cb5f023d59fa 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -2334,13 +2334,11 @@ }, /area/lv522/oob) "bzL" = ( -/obj/structure/machinery/space_heater/radiator/red{ - dir = 4 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/structure/machinery/camera/autoname, +/obj/structure/machinery/light/small{ + dir = 1 }, +/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "bAc" = ( /obj/structure/filingcabinet/seeds{ @@ -3443,10 +3441,11 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) "cfd" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/recharger, -/obj/effect/spawner/random/powercell, -/turf/open/floor/prison, +/obj/structure/closet/wardrobe/engineering_yellow, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/lv522/indoors/lone_buildings/engineering) "cfg" = ( /obj/item/clothing/head/hardhat/white, @@ -3568,13 +3567,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_2) -"cjf" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/lv522/indoors/lone_buildings/engineering) "cjv" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -4784,6 +4776,12 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) +"cNO" = ( +/obj/structure/machinery/colony_floodlight_switch{ + pixel_y = 30 + }, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/engineering) "cNQ" = ( /turf/open/floor/corsat{ dir = 8; @@ -7762,7 +7760,8 @@ }, /area/lv522/oob) "ebR" = ( -/obj/structure/closet/secure_closet/engineering_welding, +/obj/structure/surface/table/almayer, +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -8354,7 +8353,7 @@ /turf/open/floor/corsat{ icon_state = "marked" }, -/area/lv522/atmos/east_reactor/east) +/area/lv522/oob) "eow" = ( /obj/structure/tunnel{ pixel_x = 2; @@ -9813,6 +9812,18 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) +"eXU" = ( +/obj/structure/machinery/power/terminal, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/engineering) "eXV" = ( /obj/structure/cargo_container/horizontal/blue/bottom{ pixel_x = 16 @@ -10351,6 +10362,17 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"flC" = ( +/obj/structure/machinery/light/small, +/obj/structure/machinery/camera/autoname{ + dir = 1; + network = list("interrogation") + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) "flI" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/ashtray/bronze{ @@ -11092,9 +11114,9 @@ icon_state = "gib6" }, /turf/open/asphalt/cement{ - icon_state = "cement12" + icon_state = "cement4" }, -/area/lv522/outdoors/colony_streets/south_west_street) +/area/lv522/outdoors/colony_streets/central_streets) "fCW" = ( /turf/open/floor/prison{ icon_state = "darkbrownfull2" @@ -11745,10 +11767,16 @@ }, /area/lv522/indoors/a_block/dorms) "fSv" = ( -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/structure/surface/table/almayer, +/obj/item/clothing/head/beret/eng, +/obj/item/ammo_box/magazine/nailgun/empty{ + pixel_x = -6; + pixel_y = 12 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "fSR" = ( /obj/structure/surface/table/almayer, @@ -12196,6 +12224,12 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/a_block/executive) +"gcX" = ( +/obj/structure/window_frame/strata/reinforced, +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/lone_buildings/engineering) "gcY" = ( /obj/structure/cargo_container/ferret/left, /turf/open/auto_turf/shale/layer0, @@ -14028,7 +14062,7 @@ }, /area/lv522/atmos/east_reactor/east) "gUA" = ( -/obj/structure/machinery/recharge_station, +/obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -14267,10 +14301,7 @@ }, /area/lv522/atmos/command_centre) "gZg" = ( -/obj/item/shard{ - icon_state = "medium" - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -16925,6 +16956,10 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor) +"icy" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/prison, +/area/lv522/indoors/lone_buildings/engineering) "icE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -17940,11 +17975,17 @@ }, /area/lv522/indoors/a_block/corpo/glass) "izp" = ( -/obj/structure/machinery/power/smes/buildable{ - capacity = 1e+006; - dir = 1 +/obj/structure/surface/table/almayer, +/obj/item/clothing/glasses/meson, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/landmark/objective_landmark/close, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, -/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "izr" = ( /obj/structure/platform/stair_cut, @@ -19364,18 +19405,6 @@ icon_state = "browncorner" }, /area/lv522/atmos/east_reactor/south) -"jeo" = ( -/obj/structure/pipes/vents/pump, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/lv522/indoors/lone_buildings/engineering) "jey" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -19728,7 +19757,10 @@ /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) "jkL" = ( -/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/machinery/recharge_station, +/obj/item/shard{ + icon_state = "medium" + }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -21213,13 +21245,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/nw_rockies) -"jPO" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/indoors/lone_buildings/engineering) "jQa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/dam/crane{ @@ -21281,13 +21306,6 @@ icon_state = "darkpurplefull2" }, /area/lv522/indoors/a_block/dorms) -"jSG" = ( -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/indoors/lone_buildings/engineering) "jSR" = ( /obj/structure/machinery/conveyor, /turf/open/floor/corsat{ @@ -21595,6 +21613,13 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"jYy" = ( +/obj/structure/machinery/power/smes/buildable{ + capacity = 1e+006; + dir = 1 + }, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/engineering) "jYE" = ( /obj/structure/machinery/power/apc/weak{ dir = 1 @@ -21941,7 +21966,11 @@ }, /area/lv522/indoors/a_block/security) "kfi" = ( -/obj/structure/closet/toolcloset, +/obj/structure/surface/table/almayer, +/obj/effect/landmark/objective_landmark/close, +/obj/structure/extinguisher_cabinet{ + pixel_y = 30 + }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -22486,6 +22515,14 @@ icon_state = "brown" }, /area/lv522/atmos/east_reactor/south) +"knT" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ + density = 0; + pixel_x = -6; + pixel_y = 11 + }, +/turf/open/floor/prison, +/area/lv522/indoors/lone_buildings/engineering) "knW" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -23477,6 +23514,14 @@ icon_state = "floor_marked" }, /area/lv522/outdoors/colony_streets/north_west_street) +"kIs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/engineering) "kIM" = ( /obj/item/ammo_magazine/rifle/m4ra/ap{ current_rounds = 0 @@ -25813,10 +25858,17 @@ }, /area/lv522/indoors/a_block/kitchen) "lHu" = ( -/obj/structure/machinery/power/terminal{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/disposal{ + density = 0; + layer = 3.1; + pixel_x = -6; + pixel_y = 16 }, -/turf/open/floor/plating, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/engineering) "lHH" = ( /obj/effect/decal/cleanable/dirt, @@ -25864,9 +25916,6 @@ icon_state = "greenfull" }, /area/lv522/indoors/b_block/bridge) -"lIC" = ( -/turf/open/floor/prison, -/area/lv522/indoors/lone_buildings/engineering) "lIM" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ id = "Corpo Vault"; @@ -25928,17 +25977,15 @@ }, /area/lv522/atmos/east_reactor/south) "lKu" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/glasses/meson, -/obj/item/shard{ - icon_state = "medium" +/obj/structure/machinery/power/smes/buildable{ + capacity = 1e+006; + dir = 1 }, -/obj/effect/landmark/objective_landmark/close, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, +/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "lKC" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -26701,6 +26748,11 @@ icon_state = "cement14" }, /area/lv522/outdoors/colony_streets/south_street) +"mdp" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/tool/weldingtool, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/engineering) "mdr" = ( /obj/structure/bed/chair{ dir = 4 @@ -27497,6 +27549,14 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/closed/wall/strata_outpost/reinforced, /area/lv522/oob/w_y_vault) +"mwC" = ( +/obj/item/clothing/head/welding, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/engineering) "mwT" = ( /obj/structure/prop/dam/truck, /obj/structure/prop/holidays/wreath{ @@ -29078,9 +29138,6 @@ icon_state = "18" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"nfx" = ( -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/engineering) "nfP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29284,6 +29341,13 @@ icon_state = "cement12" }, /area/lv522/outdoors/nw_rockies) +"nky" = ( +/obj/structure/machinery/power/apc/weak, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) "nkX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29710,8 +29774,11 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) "nsd" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/prison, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/lv522/indoors/lone_buildings/engineering) "nsr" = ( /obj/structure/surface/table/almayer, @@ -30140,6 +30207,11 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"nEY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/lone_buildings/engineering) "nFj" = ( /turf/open/floor/plating, /area/lv522/landing_zone_1) @@ -30431,8 +30503,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_1) "nMd" = ( -/obj/structure/surface/table/almayer, -/obj/effect/landmark/objective_landmark/close, +/obj/structure/closet/toolcloset, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -31935,13 +32006,13 @@ /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) "ooh" = ( -/obj/structure/surface/table/almayer, -/obj/item/clothing/head/beret/eng, -/obj/item/ammo_box/magazine/nailgun/empty{ - pixel_x = -6; - pixel_y = 12 +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Generator Room"; + welded = 1 + }, +/turf/open/floor/corsat{ + icon_state = "marked" }, -/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "oot" = ( /turf/open/floor/prison{ @@ -32217,6 +32288,15 @@ icon_state = "blue_plate" }, /area/lv522/indoors/a_block/admin) +"otM" = ( +/obj/structure/machinery/space_heater/radiator/red{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) "otQ" = ( /turf/open/floor/corsat{ icon_state = "marked" @@ -33072,12 +33152,8 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_west_street) "oPc" = ( -/obj/item/clothing/gloves/yellow, -/obj/structure/machinery/space_heater/radiator/red, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/engineering) "oPs" = ( /obj/effect/decal/cleanable/dirt, @@ -33266,8 +33342,14 @@ }, /area/lv522/indoors/a_block/dorms) "oTp" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating, +/obj/structure/surface/table/almayer, +/obj/item/ammo_box/magazine/nailgun/empty{ + pixel_y = 5 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "oTD" = ( /obj/item/lightstick/red/spoke/planted{ @@ -33402,13 +33484,6 @@ icon_state = "marked" }, /area/lv522/indoors/c_block/mining) -"oWb" = ( -/obj/effect/landmark/static_comms/net_one, -/turf/open/floor/prison{ - dir = 10; - icon_state = "floor_marked" - }, -/area/lv522/indoors/lone_buildings/engineering) "oWq" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat{ @@ -34570,6 +34645,11 @@ icon_state = "cell_stripe" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"pwT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison, +/area/lv522/indoors/lone_buildings/engineering) "pwW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -34876,13 +34956,21 @@ /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) "pCT" = ( -/obj/structure/machinery/disposal, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, +/obj/structure/machinery/power/terminal, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "pCU" = ( -/obj/item/prop/alien/hugger, -/turf/open/floor/prison, +/obj/item/ammo_magazine/smg/nailgun{ + current_rounds = 0 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/lv522/indoors/lone_buildings/engineering) "pCW" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -35887,10 +35975,6 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/machinery/camera/autoname, -/obj/structure/machinery/light/small{ - dir = 1 - }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -35904,10 +35988,9 @@ }, /area/lv522/indoors/a_block/admin) "pXk" = ( -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/powercell, -/obj/structure/machinery/cell_charger, +/obj/structure/machinery/power/monitor{ + name = "Main Power Grid Monitoring" + }, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -36549,11 +36632,7 @@ }, /area/lv522/indoors/a_block/admin) "qmA" = ( -/obj/effect/decal/cleanable/generic, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, +/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "qmD" = ( /obj/structure/fence, @@ -38018,12 +38097,10 @@ }, /area/lv522/indoors/b_block/bar) "qOa" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ - density = 0; - pixel_x = -4; - pixel_y = 12 +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, -/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "qOi" = ( /obj/structure/prop/invuln/fire{ @@ -38538,13 +38615,11 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "qWf" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "qWt" = ( /obj/structure/window/framed/strata/reinforced, @@ -38704,12 +38779,17 @@ }, /area/lv522/indoors/a_block/hallway) "qZJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/camera/autoname{ - dir = 1 +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, -/obj/structure/machinery/light/small, -/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "qZT" = ( /obj/item/prop/colony/usedbandage{ @@ -38832,11 +38912,9 @@ /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) "rbc" = ( -/obj/item/shard{ - icon_state = "medium" - }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk/prison, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "rbj" = ( /obj/item/weapon/twohanded/folded_metal_chair, @@ -39902,6 +39980,11 @@ /obj/structure/machinery/light/double, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) +"rwM" = ( +/turf/open/floor/corsat{ + icon_state = "marked" + }, +/area/lv522/indoors/lone_buildings/engineering) "rwR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -40378,14 +40461,10 @@ }, /area/lv522/outdoors/colony_streets/south_west_street) "rIn" = ( -/obj/item/ammo_magazine/smg/nailgun{ - current_rounds = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, +/turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/engineering) "rIr" = ( /obj/structure/stairs/perspective{ @@ -41188,12 +41267,11 @@ /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/north_street) "rZg" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ - density = 0; - pixel_x = 5; - pixel_y = 11 +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/prison, +/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "rZi" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -42558,13 +42636,10 @@ }, /area/lv522/indoors/a_block/security/glass) "sEa" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 30 - }, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "sEc" = ( /obj/structure/bed/bedroll{ @@ -42794,16 +42869,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) -"sJl" = ( -/obj/structure/machinery/power/apc/weak{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" - }, -/area/lv522/indoors/lone_buildings/engineering) "sJI" = ( /obj/structure/surface/table/almayer, /obj/item/key/cargo_train, @@ -43249,15 +43314,10 @@ }, /area/lv522/outdoors/n_rockies) "sQD" = ( -/obj/structure/machinery/colony_floodlight_switch{ - pixel_y = 30 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/generic, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 }, +/turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/engineering) "sQI" = ( /obj/effect/decal/cleanable/generic, @@ -43555,9 +43615,10 @@ }, /area/lv522/outdoors/colony_streets/north_west_street) "sXM" = ( -/obj/structure/machinery/power/monitor{ - name = "Main Power Grid Monitoring" - }, +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/powercell, +/obj/structure/machinery/cell_charger, /turf/open/floor/prison{ dir = 4; icon_state = "darkyellowfull2" @@ -46281,6 +46342,17 @@ icon_state = "floor_plate" }, /area/lv522/indoors/lone_buildings/storage_blocks) +"udM" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/lone_buildings/engineering) "udR" = ( /turf/open/floor/corsat{ dir = 4; @@ -46721,8 +46793,10 @@ /area/lv522/outdoors/colony_streets/north_east_street) "ukp" = ( /obj/structure/surface/table/almayer, -/obj/item/ammo_box/magazine/nailgun/empty{ - pixel_y = 5 +/obj/structure/machinery/recharger, +/obj/effect/spawner/random/powercell, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) @@ -47043,12 +47117,10 @@ }, /area/lv522/outdoors/colony_streets/north_street) "usn" = ( -/obj/structure/machinery/light{ - dir = 4 - }, +/obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" + dir = 10; + icon_state = "floor_marked" }, /area/lv522/indoors/lone_buildings/engineering) "usy" = ( @@ -49144,10 +49216,14 @@ }, /area/lv522/indoors/a_block/security) "vir" = ( -/obj/structure/machinery/power/geothermal{ - fail_rate = 5 +/obj/structure/closet/wardrobe/engineering_yellow, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" }, -/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "viA" = ( /obj/item/lightstick/red/spoke/planted{ @@ -49937,11 +50013,10 @@ }, /area/lv522/indoors/a_block/medical) "vzc" = ( -/obj/structure/closet/wardrobe/engineering_yellow, -/turf/open/floor/prison{ - dir = 4; - icon_state = "darkyellowfull2" +/obj/structure/machinery/power/geothermal{ + fail_rate = 5 }, +/turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) "vzg" = ( /obj/item/stack/rods{ @@ -50339,13 +50414,20 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) "vGP" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/turf/open/floor/prison{ + dir = 10; + icon_state = "floor_marked" + }, /area/lv522/indoors/lone_buildings/engineering) "vHo" = ( -/obj/item/clothing/head/welding, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/lv522/indoors/lone_buildings/engineering) "vHw" = ( /obj/structure/barricade/wooden{ @@ -51408,12 +51490,17 @@ }, /area/lv522/indoors/lone_buildings/storage_blocks) "wbj" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Generator Room" +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + density = 0; + pixel_x = 13; + pixel_y = 11 }, -/turf/open/floor/corsat{ - icon_state = "marked" +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ + density = 0; + pixel_x = -13; + pixel_y = 11 }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "wbt" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -51547,9 +51634,7 @@ }, /area/lv522/indoors/a_block/security/glass) "wdj" = ( -/turf/open/floor/corsat{ - icon_state = "marked" - }, +/turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) "wdy" = ( /turf/open/asphalt/cement{ @@ -53140,7 +53225,11 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "wOo" = ( -/turf/open/floor/plating/plating_catwalk/prison, +/obj/structure/pipes/vents/pump, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/lv522/indoors/lone_buildings/engineering) "wOu" = ( /obj/structure/desertdam/decals/road_edge{ @@ -53779,10 +53868,11 @@ /turf/open/auto_turf/shale/layer0, /area/lv522/outdoors/colony_streets/south_east_street) "xdD" = ( -/obj/structure/window_frame/strata/reinforced, -/turf/open/floor/corsat{ - icon_state = "marked" +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/shard{ + icon_state = "medium" }, +/turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/engineering) "xdF" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -54679,6 +54769,16 @@ icon_state = "cement1" }, /area/lv522/outdoors/colony_streets/central_streets) +"xzj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) "xzn" = ( /turf/open/floor/prison, /area/lv522/atmos/outdoor) @@ -55117,10 +55217,14 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) "xJX" = ( -/obj/item/tool/weldingtool, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, +/obj/effect/decal/cleanable/generic, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, /area/lv522/indoors/lone_buildings/engineering) "xKc" = ( /obj/structure/barricade/handrail{ @@ -55928,6 +56032,16 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) +"xZS" = ( +/obj/item/clothing/gloves/yellow, +/obj/structure/machinery/space_heater/radiator/red{ + pixel_y = 26 + }, +/turf/open/floor/prison{ + dir = 4; + icon_state = "darkyellowfull2" + }, +/area/lv522/indoors/lone_buildings/engineering) "yae" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -61714,16 +61828,16 @@ ruU fXx nJv xVd -vir -vir -vir +vGP +usn +nJv nJv rCa rCa nJv -nJv -jSG -oWb +vzc +vzc +vzc xVd nJv hpq @@ -61940,18 +62054,18 @@ umf ruU fXx nJv -vir +nJv +vGP vGP -nfx qZJ +otM +wdj +qOa nJv -sJl -lIC -qWf bzL -jPO -jPO -nJv +qmA +qmA +vzc nJv hpq ofi @@ -62169,15 +62283,15 @@ fAA nJv vir xJX -vGP -nfx -nJv +vHo +udM +nEY sQD nsd -nsd -nsd +nJv +cNO qmA -cjf +mdp vzc nJv gpB @@ -62394,17 +62508,17 @@ ruU ruU taj nJv -vir -nfx -vHo +cfd +vIy +vIy oTp -nJv +knT sEa -vIy -ukp +nky +nJv rZg -vIy -vIy +mwC +kIs vzc nJv gpB @@ -62620,20 +62734,20 @@ ruU ruU ruU fXx -xvQ -izp +nJv +nJv lHu -vIy +pwT fSv wbj rIn wOo ooh qOa -nsd +vIy pCT -nJv -nJv +jYy +xvQ hpq ofi tZh @@ -62846,22 +62960,22 @@ ruU ruU ruU ruU -fXx -xvQ +fCU +kvq izp -lHu -vIy -fSv +qWf +icy +wdj +wdj wdj -cjf pCU -lIC -lIC +rwM +qOa vIy -lIC +eXU lKu -kvq -fCU +xvQ +hpq ofi max max @@ -63076,16 +63190,16 @@ ruU fXx xvQ sXM -vIy -vIy +ukp +xdD oPc +nEY +sQD +flC nJv -jeo -nsd -wOo -nsd +xZS rbc -cfd +vIy pXk xvQ hpq @@ -63306,10 +63420,10 @@ xVd kfi ebR jkL -nJv +xzj pWW qLa -usn +nJv gZg gUA nMd @@ -63531,14 +63645,14 @@ fXx gbB nJv xvQ -xvQ -xvQ +gcX +kvq ivK wng hpO ivK -kvq -xdD +xvQ +xvQ xvQ nJv kmq diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index cec27c56b079..b84ed33ef0e4 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -12062,7 +12062,7 @@ /area/lv624/lazarus/comms) "aZi" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ pixel_y = 26 }, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -14106,10 +14106,9 @@ /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) "fja" = ( -/obj/item/attachable/bayonet{ +/obj/item/weapon/unathiknife{ desc = "A curved blade made of a strange material. It looks both old and very sharp."; force = 30; - icon_state = "unathiknife"; name = "\improper alien blade"; throwforce = 26 }, @@ -17272,10 +17271,9 @@ /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) "nED" = ( -/obj/item/attachable/bayonet{ +/obj/item/weapon/unathiknife{ desc = "A curved blade made of a strange material. It looks both old and very sharp."; force = 30; - icon_state = "unathiknife"; name = "\improper alien blade"; throwforce = 26 }, diff --git a/maps/map_files/LV624/standalone/sandtemple-jungle.dmm b/maps/map_files/LV624/standalone/sandtemple-jungle.dmm index 3b5a0176fb01..770d6a93473e 100644 --- a/maps/map_files/LV624/standalone/sandtemple-jungle.dmm +++ b/maps/map_files/LV624/standalone/sandtemple-jungle.dmm @@ -55,10 +55,9 @@ /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) "lR" = ( -/obj/item/attachable/bayonet{ +/obj/item/weapon/unathiknife{ desc = "A curved blade made of a strange material. It looks both old and very sharp."; force = 30; - icon_state = "unathiknife"; name = "\improper alien blade"; throwforce = 26 }, diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 7969b1a120a0..20558b48ac32 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -1,22 +1,19 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"aad" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/folder/black_random{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/folder/black_random, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/records) "aae" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva, /area/varadero/interior/disposals) -"aai" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/maintenance) +"aag" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2"; + pixel_x = 21 + }, +/obj/effect/decal/cleanable/blood/drip{ + pixel_y = 15; + pixel_x = -14 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "aaA" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/sofa/vert/grey/top, @@ -24,6 +21,22 @@ icon_state = "floor3" }, /area/varadero/interior/medical) +"aaG" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/monsoon) +"abf" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/mob/living/simple_animal/mouse, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/varadero/interior/medical) "abl" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/radio, @@ -32,6 +45,15 @@ icon_state = "red" }, /area/varadero/interior/security) +"abu" = ( +/obj/item/stack/sheet/wood, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "abE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -43,18 +65,18 @@ }, /turf/open/floor/plating, /area/varadero/interior/maintenance/security) -"acq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave{ - desc = "There's two of them."; - pixel_x = -3; - pixel_y = 7 +"abK" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4 }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "blue" +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/technical_storage) +/area/varadero/exterior/pontoon_beach) +"abL" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "acO" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/beakers, @@ -64,12 +86,19 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"ade" = ( +/obj/structure/machinery/camera/autoname/lz_camera, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"adw" = ( +/turf/closed/wall/r_wall, +/area/varadero/interior/cargo) "adC" = ( /obj/item/clipboard{ pixel_x = 4; pixel_y = 5 }, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/varadero/interior/research) "adR" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -78,6 +107,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"aer" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "afg" = ( /turf/closed/wall/r_wall/elevator{ dir = 8 @@ -106,6 +141,12 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) +"afz" = ( +/obj/structure/machinery/door/airlock/multi_tile/elevator/access/dormatory, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_N) "afR" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -121,6 +162,21 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"agn" = ( +/obj/structure/window_frame/colony, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"agJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/trackimp, +/obj/item/device/binoculars, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "red" + }, +/area/varadero/interior/security) "agM" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/secure{ @@ -133,9 +189,18 @@ }, /turf/open/floor/plating, /area/varadero/interior/electrical) +"ahb" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/overlay/palmtree_r, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "ahg" = ( /turf/closed/wall, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) "ahD" = ( /obj/item/shard{ icon_state = "medium" @@ -157,28 +222,15 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"aii" = ( -/mob/living/simple_animal/hostile/retaliate/clown{ - desc = "They lacked critical information when they asked for this. But ask and you shall receive. Gonzo is here hunting an escaped Nexus 7 who is hiding amongst UA service members."; - health = 10000; - move_to_delay = 2; - name = "Gonzo the Magnificent"; - rapid = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) -"aiK" = ( -/obj/structure/machinery/door_control{ - id = "undergroundhangarsouth"; - name = "Underground Hangar Lock"; - pixel_x = -24 +"aiR" = ( +/obj/structure/machinery/door/airlock/almayer/security{ + name = "\improper Underground Security Evidence Storage"; + req_access_txt = "100" }, -/turf/open/floor/plating/icefloor{ - icon_state = "warnplate" +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/security) "akd" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/structure/machinery/firealarm{ @@ -196,6 +248,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"akg" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/monsoon) "akk" = ( /obj/structure/surface/table/woodentable, /obj/structure/pipes/standard/simple/hidden/green{ @@ -209,6 +267,17 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) +"akn" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/up, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) +"akO" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) "ald" = ( /obj/structure/pipes/unary/freezer{ dir = 8; @@ -236,13 +305,22 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/bunks) -"alE" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"alD" = ( +/obj/structure/filtration/coagulation_arm{ + indestructible = 1; + layer = 2.1; + density = 0 }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 2.991 + }, +/obj/structure/platform, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) "alG" = ( /obj/structure/bed/chair{ dir = 8 @@ -260,20 +338,22 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/caves) -"amu" = ( -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) -"amK" = ( -/obj/structure/pipes/standard/simple/hidden/green{ +"alM" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/machinery/light/small{ - dir = 1 +/obj/structure/machinery/sleep_console, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/interior/medical) +"ami" = ( +/obj/structure/prop/dam/crane/damaged{ + dir = 4 }, -/area/varadero/interior/maintenance/security) +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/digsite) "ani" = ( /obj/structure/machinery/vending/security, /turf/open/floor/shiva{ @@ -281,13 +361,6 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) -"ann" = ( -/obj/structure/machinery/door/airlock/almayer/security{ - name = "\improper Underground Security Evidence Storage"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) "anu" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -300,15 +373,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) -"anO" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Underground Security Detective's Office"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) +"anA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/woodentable, +/obj/item/storage/box/drinkingglasses, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "aoi" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor{ @@ -326,17 +396,31 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"aoU" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/wood, -/area/varadero/interior/records) -"apl" = ( -/obj/structure/reagent_dispensers/water_cooler/stacks{ - density = 0; - pixel_y = 17 +"aoC" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior/comms2) +"aoE" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/research) +"apj" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/wood, -/area/varadero/interior/chapel) +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) +"apG" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/farocean) +"apH" = ( +/obj/item/tool/wrench, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "apI" = ( /obj/structure/machinery/computer/cameras/telescreen{ name = "Interrogation Telescreen"; @@ -351,6 +435,15 @@ icon_state = "red" }, /area/varadero/interior/security) +"apY" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) "aqb" = ( /obj/structure/machinery/light{ dir = 4 @@ -360,18 +453,35 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) -"aqf" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +"aqh" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -18; + pixel_y = -8 }, -/turf/open/floor/shiva, -/area/varadero/interior/technical_storage) +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + pixel_x = -17; + pixel_y = -19 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "aqk" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"aqq" = ( +/obj/structure/prop/rock/brown, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/pontoon_beach) "aqw" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -390,11 +500,21 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_N) -"arG" = ( -/obj/structure/machinery/power/port_gen/pacman/mrs, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"arC" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, +/area/varadero/interior/comms1) +"arF" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/trash/ceramic_plate, +/obj/item/trash/popcorn, +/obj/item/trash/candy, +/obj/item/tool/crowbar, +/obj/item/tool/lighter/zippo, +/turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz1_near) "asf" = ( /obj/structure/bed/chair/hunter{ @@ -404,28 +524,11 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"asi" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/closed/wall/r_wall, -/area/varadero/interior/caves/east) "asx" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"asJ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/coast/north, -/area/varadero/exterior/pontoon_beach) -"atb" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "yellow" - }, -/area/varadero/interior/cargo) "atz" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva{ @@ -439,18 +542,18 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"auf" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating, -/area/varadero/interior/security) -"auy" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"aud" = ( +/obj/structure/sink{ + pixel_y = 15 }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "auE" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -461,10 +564,6 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_NW) -"auU" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) "avl" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -490,33 +589,65 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"awf" = ( -/obj/item/toy/beach_ball, -/turf/open/gm/coast/south, -/area/varadero/exterior/pontoon_beach) -"axX" = ( -/obj/structure/machinery/door/poddoor/two_tile/four_tile/vertical/secure{ - id = "undergroundhangarwest"; - name = "Underground Hangar" +"avX" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/exterior/comms4) +"awr" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/gm/dirt{ + icon_state = "desert0" }, -/turf/open/floor/plating/icefloor, /area/varadero/exterior/lz1_near) +"awu" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"awJ" = ( +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/interior_protected/caves/central) +"axh" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"axs" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"axv" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "axY" = ( /obj/structure/bed/chair/comfy/lime, /turf/open/floor/wood, /area/varadero/interior/research) -"axZ" = ( -/obj/structure/flora/pottedplant{ - desc = "How did that get in there?"; - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) "ayo" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -527,12 +658,54 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) -"azH" = ( -/obj/structure/tunnel{ - id = "cargo_tunnel" +"ayx" = ( +/obj/structure/prop/power_transformer{ + dir = 0 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, +/area/varadero/exterior/lz2_near) +"ayF" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/north_research) +/area/varadero/exterior/lz2_near) +"azh" = ( +/obj/item/clothing/shoes/swimmingfins, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) +"azr" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"azv" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) +"azw" = ( +/obj/structure/largecrate/random/mini/wooden, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "azK" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -550,6 +723,59 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) +"aAj" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) +"aAr" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"aAC" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"aAX" = ( +/obj/docking_port/stationary/marine_dropship/lz2{ + name = "LZ2 - Palm Airfield" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"aAY" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "aBp" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -558,24 +784,49 @@ icon_state = "freezerfloor" }, /area/varadero/interior/cargo) +"aBz" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "aBB" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"aBE" = ( -/obj/structure/tunnel{ - id = "east_cargo_tunnel" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/caves/north_research) "aBK" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers{ icon_state = "brflowers_3" }, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) +"aBO" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/disposals) +"aCd" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) "aCl" = ( /obj/structure/machinery/door/airlock/strata/autoname{ autoname = 0; @@ -588,21 +839,12 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"aCm" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/bed/chair{ - buckling_y = 18; - dir = 8; - icon_state = "chair_alt"; - pixel_x = -5; - pixel_y = 12 - }, +"aCo" = ( +/obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/security) +/area/varadero/exterior/lz1_near) "aCz" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/shiva{ @@ -622,13 +864,30 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"aCM" = ( -/obj/structure/closet/toolcloset, +"aCW" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) +"aCX" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" }, -/area/varadero/exterior/lz1_near) +/area/varadero/exterior/lz2_near) +"aCY" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/power/apc{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "aDu" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -700,20 +959,6 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"aEn" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/varadero/interior_protected/vessel) "aED" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -724,6 +969,16 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"aEQ" = ( +/obj/structure/shuttle/engine/router{ + dir = 4; + unacidable = 0 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) "aFg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -749,21 +1004,21 @@ icon_state = "floor3" }, /area/varadero/interior/laundry) -"aFo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) -"aFr" = ( -/obj/effect/overlay/palmtree_r{ - icon_state = "palm2" - }, -/turf/closed/wall/rock/brown, -/area/varadero/interior/oob) "aFt" = ( /turf/closed/wall, /area/varadero/interior_protected/maintenance/south) +"aFu" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/cargo) +"aFK" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "aFM" = ( /obj/structure/machinery/door/window/brigdoor/westleft{ dir = 4; @@ -777,6 +1032,25 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"aFX" = ( +/obj/effect/decal/warning_stripes/asteroid{ + dir = 1; + icon_state = "warning_s" + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "greencorners" + }, +/area/varadero/interior/hall_SE) +"aGx" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "aGX" = ( /obj/structure/closet/firecloset/full, /obj/structure/machinery/light{ @@ -804,6 +1078,25 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/wood, /area/varadero/interior/research) +"aHu" = ( +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/exterior/lz1_near) +"aHw" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 1; + layer = 3.1; + pixel_y = 10 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "aHy" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor{ @@ -870,24 +1163,52 @@ /obj/structure/prop/ice_colony/ground_wire{ dir = 1 }, -/obj/item/clothing/mask/gas/yautja{ - pixel_x = 1; - pixel_y = -12 - }, /turf/open/shuttle{ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"aJF" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"aJD" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, -/turf/open/floor/carpet, -/area/varadero/interior/hall_SE) +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"aJF" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/open/floor/carpet, +/area/varadero/interior/hall_SE) +"aJI" = ( +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/research) "aJP" = ( /obj/structure/bed/chair/wood/normal, /turf/open/floor/carpet, @@ -912,12 +1233,26 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"aKJ" = ( +/obj/item/tool/warning_cone, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "aLc" = ( /turf/open/floor/shiva{ dir = 4; icon_state = "yellowcorners" }, /area/varadero/interior/disposals) +"aLl" = ( +/turf/open/floor/shiva{ + icon_state = "wred" + }, +/area/varadero/interior/medical) "aLn" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor/shiva{ @@ -930,42 +1265,42 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"aNz" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "req_sec_storage"; - name = "\improper Requesitions Storage Shutters" +"aMC" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/maintenance/north) +"aMN" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/structure/machinery/light/small{ + dir = 1 }, -/turf/open/floor/plating, -/area/varadero/interior/cargo) +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "aOg" = ( /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"aOi" = ( -/turf/open/floor/shiva{ - dir = 8; - icon_state = "snow_mat" - }, -/area/varadero/interior/security) -"aOZ" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -11 - }, -/turf/open/floor{ - icon_state = "white" +"aOG" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 }, -/area/varadero/interior/toilets) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "aPe" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) -"aPw" = ( -/obj/structure/closet/crate/freezer, -/turf/open/floor{ - icon_state = "freezerfloor" +"aPQ" = ( +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/shiva{ + dir = 1 }, -/area/varadero/interior/cargo) +/area/varadero/interior/research) "aPU" = ( /obj/structure/bed/chair{ icon_state = "chair_alt" @@ -986,7 +1321,7 @@ "aQq" = ( /obj/structure/window/framed/colony/reinforced/hull, /turf/open/floor/plating/icefloor, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) "aQu" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -1002,46 +1337,77 @@ icon_state = "red" }, /area/varadero/interior/morgue) +"aQN" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) +"aQR" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) +"aQY" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/tool/screwdriver, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "aRr" = ( /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/hall_NW) -"aRH" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 +"aRL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/door/window/eastright{ + dir = 1; + pixel_y = 17 + }, +/obj/item/weapon/gun/revolver/cmb{ + pixel_y = 2 + }, +/obj/item/clothing/ears/earmuffs{ + icon_state = "earmuffs2"; + pixel_x = 2; + pixel_y = 8 }, /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/varadero/interior/medical) -"aRI" = ( -/obj/item/toy/handcard/uno_reverse_purple{ - pixel_x = 9; - pixel_y = 6 +/area/varadero/interior/security) +"aSe" = ( +/obj/item/reagent_container/food/snacks/birthdaycakeslice, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"aSj" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) +"aSt" = ( +/obj/item/stack/sheet/wood, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"aSU" = ( +/obj/structure/catwalk, +/turf/open/floor/plating/plating_catwalk, +/area/varadero/interior/maintenance/north) +"aTg" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt{ + icon_state = "desert3" }, /area/varadero/exterior/lz1_near) -"aTc" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "aTh" = ( -/obj/structure/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /obj/effect/landmark/hunter_primary, /turf/open/floor/shiva{ icon_state = "floor3" @@ -1069,17 +1435,18 @@ dir = 1 }, /area/varadero/interior/cargo) -"aUj" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Underground Lavatory"; - req_access_txt = "100"; - req_one_access = null +"aTY" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/turf/open/floor/plating, -/area/varadero/interior/laundry) +/area/varadero/exterior/pontoon_beach) +"aUA" = ( +/obj/structure/prop/rock/brown, +/obj/structure/prop/invuln/lattice_prop, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/pool) "aUD" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -1103,21 +1470,51 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"aVE" = ( -/obj/structure/pipes/standard/manifold/hidden/green, +"aVs" = ( +/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{ + id = "undergroundhangarsouth"; + unacidable = 1; + name = "Pontoon South Door"; + openspeed = 17 + }, +/turf/open/floor/plating/icefloor{ + dir = 1; + icon_state = "warnplate" + }, +/area/varadero/interior/maintenance/north) +"aVt" = ( +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "On closer inspection, everything on these shelves are made of plastic."; + icon_state = "book-3"; + name = "book case" + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/varadero/interior/library) +"aVF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + desc = "There's two of them."; + pixel_x = -3; + pixel_y = 7 + }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/shiva{ - dir = 8; - icon_state = "green" + dir = 1; + icon_state = "blue" }, -/area/varadero/interior/mess) +/area/varadero/interior/technical_storage) "aVQ" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall, /area/varadero/interior/hall_N) -"aWz" = ( -/obj/structure/bed/chair, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "aWA" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/shiva{ @@ -1131,6 +1528,10 @@ icon_state = "darkgreencorners2" }, /area/varadero/interior/hall_SE) +"aXb" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/digsite) "aXm" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -1139,6 +1540,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"aXt" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) "aXz" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1147,6 +1555,25 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"aXA" = ( +/obj/structure/largecrate/supply/medicine/iv, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) +"aYg" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "aZb" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" @@ -1159,15 +1586,31 @@ icon_state = "floor3" }, /area/varadero/interior/bunks) -"aZt" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null +"aZq" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 }, -/turf/open/floor/plating, -/area/varadero/exterior/lz1_near) +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/varadero/interior/medical) "aZv" = ( /obj/structure/bed/chair{ dir = 4; @@ -1175,23 +1618,17 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"aZZ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/bed/chair{ - icon_state = "chair_alt"; - pixel_x = 3; - pixel_y = 17 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"aZX" = ( +/turf/open/floor/shiva{ + dir = 4; + icon_state = "yellow" }, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/comms3) "baa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, @@ -1205,6 +1642,19 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"bah" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "bak" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -1226,14 +1676,33 @@ icon_state = "red" }, /area/varadero/interior/security) +"baN" = ( +/obj/structure/closet/crate/secure, +/obj/effect/landmark/objective_landmark/close, +/obj/item/trash/wy_chips_pepper, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "bbt" = ( /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"bbS" = ( -/obj/item/stack/sheet/wood/small_stack, +"bbG" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/coast/west, +/area/varadero/exterior/pontoon_beach) +"bbK" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/gm/dirt, -/area/varadero/interior/maintenance/north) +/area/varadero/exterior/lz2_near) +"bbW" = ( +/obj/item/clothing/under/shorts/black, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "bluefull" + }, +/area/varadero/interior/maintenance) "bcg" = ( /obj/structure/surface/rack, /obj/structure/window/reinforced{ @@ -1246,6 +1715,38 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"bcD" = ( +/obj/item/tool/wet_sign, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) +"bdc" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"bdH" = ( +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/interior/caves/north_research) +"bdJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/security{ + name = "\improper Underground Security Custodial Closet"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) "ben" = ( /obj/structure/filingcabinet{ density = 0; @@ -1267,6 +1768,16 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/bunks) +"bez" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "beE" = ( /obj/item/device/taperecorder, /obj/structure/surface/table/reinforced/prison, @@ -1274,6 +1785,9 @@ icon_state = "redfull" }, /area/varadero/interior/security) +"beK" = ( +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/exterior/lz2_near) "beM" = ( /obj/structure/machinery/light{ dir = 4 @@ -1285,12 +1799,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"beU" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/eastbeach) "bfg" = ( /obj/structure/surface/table, /obj/item/ashtray/plastic, @@ -1319,14 +1827,19 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"bgi" = ( -/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ - icon_state = "sparsegrass_2" - }, +"bfX" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/colonist, /turf/open/gm/dirt{ icon_state = "desert3" }, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/eastbeach) +"bgh" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "warnplate" + }, +/area/varadero/interior/maintenance/north) "bgl" = ( /turf/open/floor/shiva{ dir = 1; @@ -1336,50 +1849,23 @@ "bgE" = ( /turf/closed/wall/r_wall, /area/varadero/interior/maintenance/north) -"bhp" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/ammo_magazine/pistol/mod88, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "red" - }, -/area/varadero/interior/security) "bhF" = ( /obj/structure/sign/safety/water{ pixel_x = 15 }, /turf/closed/wall/r_wall, /area/varadero/interior/hall_N) -"bhS" = ( -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/wood, -/area/varadero/interior/research) +"bhU" = ( +/obj/structure/machinery/floodlight{ + name = "Floodlight"; + unacidable = 0; + wrenchable = 1 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "bih" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1407,17 +1893,6 @@ icon_state = "floor3" }, /area/varadero/interior/morgue) -"biA" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0 - }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = -1; - pixel_y = 12 - }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) "biF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/pipes/standard/simple/hidden/green, @@ -1432,6 +1907,18 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"biS" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "bjf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1445,13 +1932,6 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"bjz" = ( -/obj/structure/sign/safety/water, -/obj/structure/sign/safety/south{ - pixel_x = 15 - }, -/turf/closed/wall/r_wall, -/area/varadero/interior/maintenance) "bjA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva{ @@ -1459,6 +1939,10 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"bjC" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "bjP" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/far, @@ -1466,13 +1950,12 @@ icon_state = "floor3" }, /area/varadero/interior/records) -"bkx" = ( -/obj/structure/machinery/constructable_frame, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" +"bko" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/area/varadero/interior/electrical) +/turf/open/gm/coast/west, +/area/varadero/exterior/monsoon) "bkC" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/secure{ @@ -1500,12 +1983,10 @@ "bkM" = ( /turf/closed/wall, /area/varadero/interior/hall_SE) -"bkU" = ( -/turf/open/floor/plating/icefloor{ - dir = 8; - icon_state = "warnplate" - }, -/area/varadero/exterior/lz1_near) +"bls" = ( +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) "bmt" = ( /obj/structure/surface/rack, /obj/structure/window/reinforced{ @@ -1518,6 +1999,20 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"bmI" = ( +/obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) +"bmV" = ( +/obj/effect/decal/warning_stripes/asteroid{ + icon_state = "warning_s" + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "bnc" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/cup{ @@ -1535,6 +2030,23 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"bnf" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"bng" = ( +/obj/structure/surface/rack, +/obj/item/tool/pickaxe, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"bnm" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior/cargo) "bnB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1548,12 +2060,16 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"bnH" = ( +/obj/structure/prop/dam/truck/damaged, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "boI" = ( /obj/structure/prop/almayer/computers/sensor_computer2, /turf/open/floor/prison{ icon_state = "darkredfull2" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) "boV" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1563,16 +2079,22 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"bpM" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/item/storage/toolbox/mechanical{ - pixel_x = 1; - pixel_y = 7 +"bpH" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior_protected/maintenance/south) +/area/varadero/interior/cargo) +"bpI" = ( +/obj/effect/landmark/hunter_secondary, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_N) "bpT" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1624,30 +2146,29 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"bsH" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"bte" = ( +/obj/structure/closet/crate/radiation, +/obj/item/stack/sheet/mineral/phoron/medium_stack{ + pixel_x = -5 }, -/area/varadero/interior_protected/maintenance/south) -"btl" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/item/stack/sheet/mineral/uranium/small_stack{ + pixel_y = -7; + pixel_x = 5 }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "green" +/obj/item/stack/sheet/mineral/lead{ + pixel_x = 2; + pixel_y = 6; + amount = 5 }, -/area/varadero/interior/mess) -"bug" = ( -/obj/structure/bed/chair{ - dir = 8 +/turf/open/shuttle/elevator, +/area/varadero/interior/hall_N) +"btU" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/shiva, -/area/varadero/interior/technical_storage) +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/pontoon_beach) "bum" = ( /obj/structure/machinery/shower{ dir = 4 @@ -1658,6 +2179,14 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/carpet, /area/varadero/interior/administration) +"buB" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) "buH" = ( /obj/structure/machinery/light, /turf/open/floor/shiva{ @@ -1665,20 +2194,6 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"buN" = ( -/obj/structure/prop/rock/brown{ - layer = 2 - }, -/obj/structure/bed{ - can_buckle = 0; - desc = "A lightweight support lattice."; - icon = 'icons/obj/structures/structures.dmi'; - icon_state = "latticefull"; - layer = 2.1; - name = "lattice" - }, -/turf/open/gm/river, -/area/varadero/interior_protected/vessel) "bvE" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -1689,18 +2204,26 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"bvR" = ( +"bvF" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -18; + pixel_y = -8 + }, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + pixel_x = -17; + pixel_y = -19 + }, /obj/structure/platform/kutjevo/smooth{ - dir = 1 + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/turf/open/gm/river, -/area/varadero/interior/oob) +/area/varadero/exterior/pontoon_beach) "bvS" = ( /obj/structure/bedsheetbin, /obj/item/clothing/gloves/marine/veteran/pmc, @@ -1708,20 +2231,6 @@ icon_state = "floor3" }, /area/varadero/interior/laundry) -"bwd" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Underground Power Substation"; - req_access_txt = "100" - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/plating, -/area/varadero/interior/electrical) "bwz" = ( /obj/structure/closet/emcloset, /turf/open/floor/shiva{ @@ -1777,15 +2286,64 @@ pixel_x = 8; pixel_y = 3 }, +/obj/item/book/manual/marine_law{ + pixel_x = 8 + }, +/obj/item/reagent_container/food/drinks/bottle/vodka{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/handcuffs{ + pixel_x = 2; + pixel_y = 16 + }, +/obj/structure/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/shiva{ icon_state = "redfull" }, /area/varadero/interior/security) +"bys" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "byw" = ( /obj/structure/surface/table, /obj/item/folder/black, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"byC" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) +"byF" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) +"byU" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"bzf" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) "bzn" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -1801,12 +2359,67 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"bAT" = ( -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +"bzz" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/comms3) +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"bAj" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/cargo) +"bAE" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "Made in Little Japan."; + health = 300; + icon = 'icons/obj/items/items.dmi'; + icon_state = "sheet-lizard"; + name = "exotic bedsheet"; + pixel_x = -1 + }, +/obj/item/ammo_magazine/rifle/m4ra, +/turf/open/floor/wood, +/area/varadero/interior/bunks) +"bBo" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/records) "bBt" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -1823,6 +2436,20 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"bBV" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"bCi" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/research) "bCA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -1831,12 +2458,12 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"bDr" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +"bCM" = ( +/obj/structure/platform_decoration/kutjevo, /obj/structure/platform/kutjevo/smooth{ - dir = 8 + dir = 1; + climb_delay = 1; + layer = 2.99 }, /obj/structure/barricade/handrail{ desc = "Your platforms look pretty heavy king, let me support them for you."; @@ -1844,23 +2471,20 @@ icon_state = "hr_kutjevo"; name = "support struts" }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) -"bDM" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/area/varadero/exterior/pontoon_beach) +"bDs" = ( +/obj/item/weapon/gun/flare{ + current_mag = null }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; +/turf/open/floor{ dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" + icon_state = "asteroidfloor" }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/lz2_near) "bEj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/junction, @@ -1868,6 +2492,30 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) +"bEX" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/comms3) +"bEY" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/pontoon_beach) "bFj" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/donkpockets{ @@ -1903,7 +2551,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) +/area/varadero/interior/cargo) "bGe" = ( /obj/item/stool{ pixel_x = 7; @@ -1927,11 +2575,11 @@ /area/varadero/interior/hall_SE) "bGC" = ( /obj/structure/sign/safety/restrictedarea, -/obj/structure/sign/safety/airlock{ - pixel_x = 15 - }, /turf/closed/wall, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) +"bGU" = ( +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "bHc" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1943,81 +2591,73 @@ icon_state = "white" }, /area/varadero/interior/toilets) -"bHo" = ( +"bIt" = ( +/turf/closed/wall, +/area/varadero/interior/technical_storage) +"bJv" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/gm/river, -/area/varadero/interior/maintenance) -"bHL" = ( -/turf/closed/wall/r_wall/elevator/arrivals{ - icon_state = "wall_button_freight" +/obj/structure/machinery/power/apc{ + dir = 1 }, -/area/varadero/interior/hall_N) -"bHT" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; +/turf/open/floor{ dir = 1; - icon_state = "p_stair_full" + icon_state = "asteroidfloor" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/area/varadero/interior/comms1) +"bJH" = ( +/obj/item/tool/warning_cone, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/gm/dirt, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) +"bJI" = ( +/turf/closed/wall/rock/brown, /area/varadero/exterior/lz1_near) -"bIi" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, +"bJV" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 1 + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/oob) -"bIj" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/exterior/pontoon_beach) +"bLl" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior_protected/maintenance/south) -"bIq" = ( -/obj/structure/machinery/floodlight, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "yellow" +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, -/area/varadero/interior/electrical) -"bIt" = ( -/turf/closed/wall, -/area/varadero/interior/technical_storage) -"bIz" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior_protected/maintenance/south) -"bIQ" = ( -/obj/structure/prop/invuln/overhead_pipe{ +/obj/structure/platform/kutjevo/smooth{ dir = 4; - pixel_y = 13 + climb_delay = 1; + layer = 2.99 }, -/turf/open/gm/dirt, -/area/varadero/interior/maintenance/north) -"bJH" = ( -/obj/item/tool/warning_cone, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) +/area/varadero/exterior/pontoon_beach) "bLp" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -2046,6 +2686,26 @@ icon_state = "red" }, /area/varadero/interior/administration) +"bLN" = ( +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/comms3) +"bLV" = ( +/obj/item/lightstick/variant/planted, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"bMf" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Underground Reception Archives"; + req_access_txt = "100" + }, +/turf/open/floor/plating, +/area/varadero/interior/records) "bMk" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -2056,6 +2716,13 @@ /obj/structure/largecrate/random/case/double, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) +"bMG" = ( +/obj/structure/closet/crate/ammo/alt, +/obj/item/trash/ceramic_plate, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "bMV" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -2090,28 +2757,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) -"bNF" = ( -/obj/item/weapon/harpoon/yautja{ - anchored = 1; - name = "Alien Harpoon"; - pixel_x = 6 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "squareswood" - }, -/area/varadero/interior_protected/vessel) "bNN" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 @@ -2122,11 +2767,34 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"bOZ" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) +"bOO" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/structure/machinery/alarm{ + pixel_y = 24 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_N) +"bPe" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) +"bPk" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "bPl" = ( /obj/structure/bed/chair{ dir = 1 @@ -2171,12 +2839,34 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"bQx" = ( -/obj/docking_port/stationary/marine_dropship/lz1{ - dwidth = 1 +"bPG" = ( +/obj/structure/surface/table/woodentable, +/obj/item/device/flashlight/lamp/candelabra{ + layer = 3.2; + pixel_x = 1; + pixel_y = 13 }, -/turf/open/floor/plating/icefloor, -/area/varadero/exterior/lz1_near) +/turf/open/floor/prison/chapel_carpet{ + dir = 1; + icon_state = "doubleside" + }, +/area/varadero/interior/chapel) +"bPL" = ( +/obj/item/handcuffs{ + pixel_x = 2; + pixel_y = 16 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) +"bQa" = ( +/obj/structure/catwalk, +/obj/structure/largecrate/random, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) "bQH" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /obj/structure/disposalpipe/segment{ @@ -2202,15 +2892,6 @@ icon_state = "freezerfloor" }, /area/varadero/interior/cargo) -"bRp" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/morgue) "bRQ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -2225,15 +2906,57 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/research) -"bSO" = ( -/obj/item/stack/rods, -/obj/item/shard{ - icon_state = "medium" +"bSd" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/shiva{ + dir = 1 }, -/turf/open/shuttle{ - icon_state = "floor6" +/area/varadero/interior/research) +"bSj" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 }, -/area/varadero/interior_protected/vessel) +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"bSu" = ( +/obj/structure/closet/crate/supply, +/obj/effect/spawner/random/attachment, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) +"bSD" = ( +/obj/structure/machinery/power/apc{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"bSQ" = ( +/obj/item/tool/warning_cone, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"bTf" = ( +/obj/item/clothing/mask/rebreather, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) +"bTg" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "bTm" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/weapon/gun/rifle/m4ra, @@ -2264,6 +2987,22 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"bUK" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "green" + }, +/area/varadero/interior/hall_N) +"bUP" = ( +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/monsoon) "bUR" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard{ @@ -2280,6 +3019,17 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) +"bVe" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "bVq" = ( /obj/structure/machinery/light{ dir = 4 @@ -2302,16 +3052,65 @@ icon_state = "green" }, /area/varadero/interior/court) -"bXH" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/varadero/interior/medical) -"bXI" = ( +"bVQ" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"bVS" = ( +/turf/open/gm/dirt{ + icon_state = "desert_dug" + }, +/area/varadero/exterior/lz1_near) +"bVX" = ( +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/lz1_near) +"bWq" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/plasteel/medium_stack, +/obj/item/trash/crushed_cup, +/obj/item/prop/magazine/dirty/torn, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) +"bYO" = ( +/obj/item/tool/shovel/spade, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"bYT" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/light/small, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) +"bZg" = ( /obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access = null; + req_one_access = null + }, /turf/open/floor/shiva{ - icon_state = "multi_tiles" + dir = 1 }, -/area/varadero/interior/records) +/area/varadero/interior/maintenance/research) +"bZv" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "bZA" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor{ @@ -2319,18 +3118,6 @@ icon_state = "asteroidfloor" }, /area/varadero/interior/maintenance/north) -"bZD" = ( -/obj/structure/bed/chair{ - buckling_y = 18; - dir = 8; - icon_state = "chair_alt"; - pixel_x = -5; - pixel_y = 12 - }, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/technical_storage) "bZI" = ( /turf/open/floor/shiva{ dir = 6; @@ -2346,6 +3133,29 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"caD" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"cba" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "cbe" = ( /obj/structure/filingcabinet{ pixel_x = -8; @@ -2391,6 +3201,14 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"cbI" = ( +/obj/item/cpr_dummy{ + dir = 0 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "cbK" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -2402,26 +3220,13 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"cbU" = ( -/obj/effect/landmark/static_comms/net_two, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/interior/comms3) -"ccf" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) -"ccK" = ( -/turf/open/floor/shiva{ - dir = 1; - icon_state = "snow_mat" +"ccp" = ( +/obj/structure/machinery/landinglight/ds2/spoke{ + pixel_x = -1; + pixel_y = 22 }, -/area/varadero/interior/security) +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/maintenance/north) "ccU" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -2433,6 +3238,16 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"cdb" = ( +/turf/closed/wall, +/area/varadero/interior/maintenance/security) +"cdc" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) "cdy" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -2443,22 +3258,40 @@ icon_state = "red" }, /area/varadero/interior/security) -"cek" = ( -/obj/structure/machinery/light{ - dir = 4 +"cdL" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) +"cdO" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 }, -/obj/structure/machinery/vending/coffee, /turf/open/floor/shiva{ - dir = 4; + dir = 8; icon_state = "yellow" }, /area/varadero/interior/cargo) +"cdS" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) +"cel" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "ceo" = ( /obj/structure/bed/chair, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/laundry) +"ceJ" = ( +/obj/item/storage/fancy/candle_box, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "cfq" = ( /obj/item/stool{ layer = 2.5; @@ -2469,23 +3302,34 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"cgb" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, -/obj/structure/machinery/light{ - dir = 1 +"cfs" = ( +/obj/structure/machinery/power/smes/buildable{ + name = "colony distribution SMES" + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"cgb" = ( +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/shiva{ dir = 1; icon_state = "yellow" }, /area/varadero/interior/technical_storage) -"cgp" = ( -/obj/structure/surface/table, -/obj/item/tool/kitchen/utensil/fork, +"cgj" = ( +/obj/item/stack/sheet/metal/med_small_stack, /turf/open/floor/shiva{ - icon_state = "floor3" + icon_state = "multi_tiles" }, -/area/varadero/interior/mess) +/area/varadero/interior/comms3) +"cgr" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/north, +/area/varadero/interior/caves/north_research) "cgA" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 @@ -2498,12 +3342,15 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"cgB" = ( +"che" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/shiva{ - dir = 6; - icon_state = "yellow" + icon_state = "multi_tiles" }, -/area/varadero/interior/cargo) +/area/varadero/interior/comms3) "chr" = ( /obj/structure/bed/stool{ icon_state = "stool_alt" @@ -2513,6 +3360,9 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"chs" = ( +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/hall_SE) "chE" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -2527,11 +3377,24 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) +"chX" = ( +/obj/effect/landmark/railgun_camera_pos, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "cic" = ( /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/laundry) +"cil" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "yellow" + }, +/area/varadero/interior/electrical) "cit" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -2548,18 +3411,6 @@ icon_state = "yellow" }, /area/varadero/interior/hall_SE) -"civ" = ( -/obj/item/paper_bin{ - pixel_y = 6 - }, -/obj/item/tool/pen/blue{ - pixel_x = 7 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/security) "ciH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -2593,6 +3444,14 @@ icon_state = "purple" }, /area/varadero/interior/research) +"ckx" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "ckz" = ( /obj/structure/machinery/photocopier, /turf/open/floor/shiva{ @@ -2600,6 +3459,14 @@ icon_state = "purple" }, /area/varadero/interior/research) +"ckF" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/green, +/obj/effect/landmark/corpsespawner/doctor, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "ckG" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /obj/effect/landmark/queen_spawn, @@ -2624,15 +3491,47 @@ dir = 1 }, /area/varadero/interior/research) +"clA" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/varadero/interior/dock_control) "clD" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/bunks) +"clG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) "clX" = ( /turf/closed/wall/r_wall, /area/varadero/interior/maintenance) +"cmf" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/obj/structure/prop/invuln/pipe_water, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) "cmk" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -2651,6 +3550,13 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"cmr" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) "cmU" = ( /obj/item/reagent_container/food/snacks/fishfingers{ pixel_y = 7 @@ -2661,6 +3567,36 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"cne" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/comms1) +"cnv" = ( +/obj/structure/closet/crate/ammo/alt, +/obj/item/ammo_magazine/pistol/vp78, +/obj/item/ammo_magazine/pistol/vp78{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/item/ammo_magazine/pistol/vp78, +/obj/item/ammo_magazine/pistol/vp78{ + pixel_y = 4; + pixel_x = -5 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "cnW" = ( /obj/structure/surface/table, /obj/structure/prop/server_equipment/laptop/on, @@ -2675,14 +3611,32 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) -"coh" = ( -/obj/structure/machinery/light{ - dir = 8 +"cog" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" }, -/turf/open/floor{ - icon_state = "white" +/area/varadero/interior/cargo) +"coz" = ( +/obj/structure/sign/safety/bulkhead_door, +/turf/closed/wall/r_wall, +/area/varadero/interior/maintenance/north) +"coQ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/toilets) +/area/varadero/exterior/pontoon_beach) +"coX" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "cpA" = ( /obj/structure/morgue, /turf/open/floor/shiva{ @@ -2697,6 +3651,32 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"cpF" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"cql" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "cqB" = ( /obj/structure/machinery/light{ dir = 8 @@ -2714,65 +3694,23 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall, /area/varadero/interior/electrical) +"cqZ" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior_protected/maintenance/south) "crq" = ( /obj/item/stack/sheet/metal, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) -"crx" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/pistol{ - pixel_x = 4 - }, -/obj/item/ammo_magazine/pistol{ - pixel_x = -4 - }, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol{ - pixel_x = 4 - }, -/obj/item/ammo_magazine/pistol{ - pixel_x = 4 - }, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol, -/obj/item/ammo_magazine/pistol{ - pixel_x = -4 - }, -/obj/item/ammo_magazine/pistol{ - pixel_x = -4 - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "red" - }, -/area/varadero/interior/security) -"crK" = ( -/obj/structure/machinery/door_control{ - id = "req_sec_storage"; - name = "Requesition Secure Storage"; - normaldoorcontrol = 1; - pixel_y = -24; - req_access_txt = "100"; - specialfunctions = 4 - }, -/turf/open/floor/shiva{ - icon_state = "yellow" - }, -/area/varadero/interior/cargo) -"crO" = ( -/obj/structure/toilet, -/obj/structure/machinery/light/small{ - dir = 1 +"crC" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 }, -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/decal/cleanable/blood, -/turf/open/floor{ - icon_state = "white" +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/toilets) -"crY" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior_protected/caves) +/area/varadero/interior/maintenance/security) "csb" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/sofa/vert/grey/bot, @@ -2791,22 +3729,56 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"ctw" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "blue" + }, +/area/varadero/interior/administration) "cty" = ( /turf/closed/wall/rock/brown, /area/varadero/interior_protected/caves/central) -"ctL" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/dirt, +"ctE" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, /area/varadero/exterior/pontoon_beach) -"ctQ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"cuc" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 2.991 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/item/stack/sheet/glass{ + amount = 30 }, -/turf/open/floor/plating, -/area/varadero/interior/hall_NW) +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "cud" = ( /obj/structure/machinery/power/apc{ dir = 8; @@ -2831,6 +3803,10 @@ /obj/item/weapon/gun/pistol/mod88{ pixel_y = -2 }, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, /turf/open/floor/shiva{ dir = 5; icon_state = "red" @@ -2843,6 +3819,9 @@ pixel_x = 16; pixel_y = -8 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/shiva{ dir = 8; icon_state = "green" @@ -2872,6 +3851,15 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"cwk" = ( +/obj/structure/largecrate/random, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "cwp" = ( /obj/structure/window/reinforced{ dir = 4; @@ -2890,26 +3878,47 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"cwE" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior/maintenance/north) "cwQ" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/bible/booze, /turf/open/floor/carpet, /area/varadero/interior/chapel) -"czg" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) -"czl" = ( -/obj/structure/machinery/vending/security, -/obj/structure/machinery/alarm{ +"cxT" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) +"cym" = ( +/obj/structure/platform/kutjevo/smooth{ dir = 4; - pixel_x = -24 + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/shiva{ - dir = 10; - icon_state = "red" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/security) +/area/varadero/interior/caves/north_research) +"cyT" = ( +/obj/structure/machinery/light/small, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"czA" = ( +/obj/item/stack/sheet/wood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/pontoon_beach) "czG" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/corsat{ @@ -2924,6 +3933,10 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) +"cAx" = ( +/obj/structure/largecrate/random, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) "cAX" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva{ @@ -2937,9 +3950,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) -"cBu" = ( -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) +"cBI" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "cBW" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -2947,12 +3961,12 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) -"cCO" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"cCk" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "cDc" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -2961,16 +3975,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"cDk" = ( -/obj/structure/filingcabinet, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/records) "cDm" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = -9; @@ -2980,12 +3984,30 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"cDY" = ( -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor{ - icon_state = "white" +"cDr" = ( +/obj/structure/closet/secure_closet/medical1{ + req_access_txt = "100" }, -/area/varadero/interior/toilets) +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "wred" + }, +/area/varadero/interior/medical) +"cEm" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "cEu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3001,40 +4023,56 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"cEW" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/largecrate/random, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "cFe" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"cFh" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/eastocean) "cFu" = ( /obj/structure/xenoautopsy/tank/larva, /turf/open/shuttle{ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"cFQ" = ( -/obj/structure/prop/rock/brown, -/obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/auto_turf/sand_white/layer1, +"cFw" = ( +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"cFz" = ( +/turf/open/gm/coast/beachcorner2/north_west, /area/varadero/interior/caves/east) -"cFV" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +"cFK" = ( +/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{ + id = "undergroundhangarsouth"; + unacidable = 1; + name = "Pontoon South Door"; + openspeed = 17 }, -/turf/open/floor/shiva{ - icon_state = "wredfull" +/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{ + id = "undergroundhangarsouth"; + unacidable = 1; + name = "Pontoon South Door"; + openspeed = 17 }, -/area/varadero/interior/medical) +/turf/open/floor/plating/icefloor{ + dir = 1; + icon_state = "warnplate" + }, +/area/varadero/interior/maintenance/north) +"cFZ" = ( +/obj/structure/cargo_container/kelland/left, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"cGc" = ( +/obj/item/book/manual/detective, +/turf/open/floor{ + icon_state = "wood" + }, +/area/varadero/interior/library) "cGd" = ( /obj/structure/machinery/power/apc{ pixel_y = -24; @@ -3054,16 +4092,16 @@ icon_state = "purple" }, /area/varadero/interior/research) -"cGH" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +"cGD" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, +/obj/effect/decal/cleanable/dirt, /turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +/area/varadero/exterior/monsoon) "cGR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3099,6 +4137,43 @@ icon_state = "red" }, /area/varadero/interior/security) +"cHl" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/technical_storage) +"cHR" = ( +/obj/structure/surface/table, +/obj/item/tool/kitchen/utensil/fork, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 24 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) +"cHS" = ( +/obj/structure/closet/crate/freezer/rations, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/explosive/grenade/incendiary/molotov{ + pixel_x = -3 + }, +/obj/item/explosive/grenade/incendiary/molotov{ + pixel_x = 6 + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/varadero/interior/cargo) "cHV" = ( /obj/structure/window/phoronreinforced{ dir = 4; @@ -3145,24 +4220,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/bunks) -"cIR" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/electrical, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellow" - }, -/area/varadero/interior/electrical) -"cIV" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/comms2) "cJa" = ( /obj/structure/reagent_dispensers/water_cooler{ density = 0; @@ -3175,16 +4232,35 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"cJX" = ( -/obj/structure/machinery/light{ - dir = 4 +"cJL" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/wood, -/area/varadero/interior/hall_SE) -"cKa" = ( -/turf/closed/wall, -/area/varadero/interior/comms2) +/area/varadero/exterior/farocean) +"cKB" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"cKC" = ( +/obj/item/explosive/grenade/incendiary, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) +"cKK" = ( +/obj/item/paper/crumpled/bloody, +/obj/effect/landmark/corpsespawner/security, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) "cKZ" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -3208,6 +4284,24 @@ "cLP" = ( /turf/open/space, /area/space) +"cLV" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) +"cLX" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "cLY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3217,7 +4311,9 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/mess) "cMf" = ( /obj/structure/bed/chair, @@ -3226,12 +4322,13 @@ icon_state = "green" }, /area/varadero/interior/court) -"cMy" = ( -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"cNb" = ( +/obj/structure/surface/table, +/obj/item/device/binoculars, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/electrical) +/area/varadero/interior/maintenance/north) "cNh" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight, @@ -3239,22 +4336,9 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"cNi" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light, -/obj/item/device/flashlight{ - pixel_x = -7; - pixel_y = 9 - }, -/obj/effect/spawner/random/powercell, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) -"cNk" = ( -/obj/structure/closet/crate, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) +"cNt" = ( +/turf/open/gm/coast/north, +/area/varadero/exterior/comms4) "cNu" = ( /turf/open/floor/shiva{ dir = 1; @@ -3315,17 +4399,12 @@ dir = 1 }, /area/varadero/interior/research) -"cNZ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Underground Requesitions Freezer"; - req_access_txt = "100"; - req_one_access = null +"cOj" = ( +/obj/item/circuitboard/apc, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/plating, -/area/varadero/interior/cargo) +/area/varadero/interior/maintenance/north) "cOs" = ( /obj/structure/bed/sofa/pews/flipped{ dir = 4 @@ -3354,19 +4433,10 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/plating, -/area/varadero/interior/research) -"cPT" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/turf/open/floor/shiva{ + dir = 1 }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/research) "cQr" = ( /obj/item/tool/crowbar/red{ pixel_x = 9; @@ -3382,15 +4452,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"cQK" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) "cRn" = ( /obj/item/prop/alien/hugger, /turf/open/shuttle{ @@ -3417,24 +4478,13 @@ }, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"cSb" = ( -/obj/structure/surface/rack, -/obj/item/explosive/grenade/incendiary, -/obj/item/explosive/grenade/incendiary{ - pixel_x = -4; - pixel_y = -2 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/security) +"cSc" = ( +/obj/structure/prop/invuln/overhead_pipe, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/eastbeach) "cSq" = ( /turf/open/floor/wood, /area/varadero/interior/chapel) -"cSI" = ( -/obj/effect/landmark/corpsespawner/colonist/random/burst, -/turf/open/floor/carpet, -/area/varadero/interior/bunks) "cTb" = ( /obj/item/device/flashlight/flare, /turf/open/shuttle{ @@ -3461,6 +4511,12 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"cTw" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) "cTV" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -3468,11 +4524,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"cUq" = ( -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms3) "cUE" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -3486,6 +4537,38 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"cUF" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/plasticflaps/mining, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"cUN" = ( +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "cUZ" = ( /obj/structure/largecrate/random/case/double{ anchored = 1 @@ -3494,6 +4577,16 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/caves) +"cVd" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"cVq" = ( +/turf/open/gm/coast/east, +/area/varadero/exterior/lz2_near) "cVG" = ( /obj/structure/bed/chair{ dir = 8 @@ -3502,24 +4595,52 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) -"cWU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +"cWs" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/prop/invuln/pipe_water, /turf/open/floor/shiva{ - icon_state = "multi_tiles" + dir = 8; + icon_state = "snow_mat" }, -/area/varadero/interior/cargo) -"cXo" = ( -/obj/structure/platform/kutjevo/smooth{ +/area/varadero/interior/maintenance) +"cWu" = ( +/obj/structure/prop/invuln/minecart_tracks{ dir = 1 }, /obj/structure/platform/kutjevo/smooth{ - dir = 4 + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"cXa" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "cXQ" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -3532,6 +4653,16 @@ /obj/item/storage/firstaid/adv, /turf/open/floor/wood, /area/varadero/interior/security) +"cYc" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "greenfull" + }, +/area/varadero/interior/hall_N) "cYr" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 @@ -3542,6 +4673,16 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"cYw" = ( +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" + }, +/obj/effect/decal/warning_stripes, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/monsoon) "cYB" = ( /obj/structure/window_frame/colony/reinforced, /turf/open/floor/plating/icefloor{ @@ -3550,11 +4691,12 @@ /area/varadero/interior/maintenance/security) "cYC" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, -/turf/open/auto_turf/sand_white/layer0, +/turf/open/gm/dirt, /area/varadero/interior_protected/caves) -"cYT" = ( -/turf/open/floor/plating, -/area/varadero/interior/court) +"cYV" = ( +/obj/structure/largecrate/random, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "cYZ" = ( /obj/structure/machinery/landinglight/ds2, /turf/open/floor{ @@ -3569,6 +4711,10 @@ icon_state = "yellowfull" }, /area/varadero/interior/technical_storage) +"cZR" = ( +/obj/structure/sign/safety/medical, +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/medical) "cZZ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -3577,6 +4723,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"dad" = ( +/obj/item/stack/tile/plasteel, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/hall_SE) "daA" = ( /obj/structure/bed/chair, /obj/effect/landmark/survivor_spawner, @@ -3585,20 +4735,18 @@ icon_state = "green" }, /area/varadero/interior/court) +"daS" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "dbg" = ( /turf/open/floor/shiva{ icon_state = "yellow" }, /area/varadero/interior/technical_storage) -"dbm" = ( -/obj/item/ammo_magazine/revolver/pkd{ - pixel_y = 3 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) "dbu" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -3611,20 +4759,14 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) -"dcx" = ( -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/varadero/interior/morgue) +"dcM" = ( +/obj/item/ammo_magazine/revolver/cmb, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) +"dda" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) "ddc" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 1; @@ -3664,6 +4806,27 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/plating, /area/varadero/interior/research) +"deq" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/obj/structure/prop/invuln/pipe_water, +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 3; + pixel_y = -13 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"deE" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "deX" = ( /obj/item/trash/boonie, /turf/open/floor/shiva{ @@ -3671,9 +4834,6 @@ icon_state = "yellow" }, /area/varadero/interior/hall_NW) -"dfi" = ( -/turf/closed/wall, -/area/varadero/interior/maintenance/security) "dfs" = ( /obj/item/storage/belt/utility, /obj/structure/surface/rack, @@ -3684,6 +4844,9 @@ dir = 8; pixel_x = 24 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/shiva{ dir = 1 }, @@ -3692,6 +4855,7 @@ /obj/structure/machinery/computer/shuttle_control/ice_colony/elevator1{ pixel_y = 32 }, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, @@ -3701,6 +4865,15 @@ icon_state = "red" }, /area/varadero/interior/morgue) +"dgF" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/electrical) "dgP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3710,13 +4883,101 @@ icon_state = "yellowcorners" }, /area/varadero/interior/disposals) -"dhh" = ( -/obj/item/weapon/gun/energy/rxfm5_eva, -/obj/structure/closet/cabinet, -/obj/effect/spawner/random/powercell, -/obj/effect/spawner/random/powercell, +"dgY" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"dhp" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/machinery/disposal, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/records) +"dhQ" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/colonist, +/obj/item/weapon/katana, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) +"dhV" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"dir" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) +"diu" = ( +/obj/structure/bed/chair/comfy{ + dir = 8; + pixel_x = 12; + pixel_y = 25 + }, +/obj/structure/bed/chair/comfy{ + pixel_x = -7; + pixel_y = 18 + }, +/obj/structure/bed/chair/comfy{ + dir = 8; + pixel_x = 7; + pixel_y = 12 + }, +/obj/structure/bed/chair/comfy{ + dir = 4; + pixel_x = 7 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"diK" = ( +/obj/structure/machinery/power/apc{ + dir = 8; + pixel_x = -30; + start_charge = 0 + }, +/obj/item/stack/sheet/wood, +/obj/item/tool/kitchen/knife/butcher{ + pixel_x = -7; + pixel_y = 6 + }, /turf/open/floor/wood, -/area/varadero/interior/research) +/area/varadero/interior/beach_bar) +"diQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper, +/obj/item/tool/pen/blue{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/folder/black_random{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/folder/black_random{ + pixel_x = -3; + pixel_y = -1 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/machinery/alarm{ + pixel_y = 24 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/records) "diW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3726,6 +4987,25 @@ icon_state = "redcorners" }, /area/varadero/interior/security) +"djb" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) +"djh" = ( +/obj/item/book/manual/security_space_law, +/turf/open/floor{ + icon_state = "wood" + }, +/area/varadero/interior/library) +"djC" = ( +/obj/structure/closet/toolcloset, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "djH" = ( /obj/structure/pipes/vents/pump, /obj/structure/surface/table/woodentable/fancy, @@ -3738,21 +5018,32 @@ /obj/structure/bed/chair, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"dki" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/eastbeach) "dkl" = ( /turf/open/floor/shiva{ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"dkt" = ( -/turf/open/floor/shiva{ - dir = 8; - icon_state = "red" +"dkr" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_N) +/area/varadero/interior/research) +"dkC" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"dkS" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/monsoon) "dkV" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -3761,6 +5052,23 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"dlh" = ( +/obj/structure/machinery/chem_dispenser/soda{ + density = 0; + pixel_y = 32 + }, +/obj/item/frame/table/wood/poor, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"dlr" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz1_near) "dlv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3770,27 +5078,30 @@ icon_state = "purple" }, /area/varadero/interior/research) -"dlI" = ( -/obj/structure/window/reinforced/tinted{ - dir = 4 - }, -/obj/structure/surface/table, -/turf/open/floor/shiva{ - icon_state = "snow_mat" - }, -/area/varadero/interior/security) -"dmg" = ( -/obj/structure/machinery/floodlight, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" - }, -/area/varadero/interior/electrical) +"dlD" = ( +/obj/structure/prop/rock/brown_degree, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "dmN" = ( /turf/closed/wall/r_wall/elevator{ dir = 5 }, /area/varadero/interior/records) +"dmP" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/medical) +"dmR" = ( +/obj/structure/surface/rack, +/obj/item/storage/pouch/medkit/full_advanced, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) "dmS" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -3805,6 +5116,15 @@ }, /turf/open/floor/interior/plastic/alt, /area/varadero/interior/laundry) +"dnA" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/varadero/interior/court) "dnU" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor{ @@ -3819,6 +5139,12 @@ icon_state = "white" }, /area/varadero/interior/security) +"dnW" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/shiva{ + icon_state = "wredfull" + }, +/area/varadero/interior/medical) "doa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3828,6 +5154,31 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"dob" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"dos" = ( +/obj/item/clothing/head/helmet, +/turf/open/floor/wood, +/area/varadero/interior/security) +"doH" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"doO" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/records) "doP" = ( /obj/structure/prop/rock/brown, /obj/effect/decal/warning_stripes{ @@ -3842,18 +5193,14 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/plating, /area/varadero/interior/research) -"dpl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/coast/beachcorner/north_east, -/area/varadero/interior/oob) "dpz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Underground Security Brig"; req_access_txt = "100" }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/security) "dpO" = ( /obj/structure/surface/table/reinforced/prison, @@ -3864,6 +5211,9 @@ icon_state = "red" }, /area/varadero/interior/security) +"dpW" = ( +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/exterior/comms4) "dpZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -3873,20 +5223,10 @@ icon_state = "yellowcorners" }, /area/varadero/interior/cargo) -"dqy" = ( -/obj/structure/machinery/light/small, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/plating, -/area/varadero/interior/disposals) -"drn" = ( -/obj/structure/machinery/light/small, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) +"dqx" = ( +/obj/structure/cargo_container/wy/right, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "dro" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/structure/machinery/alarm{ @@ -3905,6 +5245,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"dsi" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/digsite) "dss" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -3912,30 +5256,7 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) -"dsw" = ( -/turf/open/floor/shiva{ - icon_state = "red" - }, -/area/varadero/interior/hall_N) -"dtj" = ( -/obj/structure/sign/poster/propaganda, -/turf/closed/wall/r_wall, -/area/varadero/interior/technical_storage) -"dtq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/shiva{ - icon_state = "snow_mat" - }, -/area/varadero/interior/maintenance) -"dtu" = ( -/obj/structure/machinery/alarm{ - pixel_y = 24 - }, -/turf/open/floor/wood, -/area/varadero/interior/security) -"duh" = ( +"dsz" = ( /obj/structure/filingcabinet{ density = 0; icon_state = "chestdrawer"; @@ -3948,9 +5269,35 @@ pixel_x = 8; pixel_y = 11 }, -/obj/effect/landmark/objective_landmark/medium, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"dsC" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"dtj" = ( +/obj/structure/sign/poster/propaganda, +/turf/closed/wall, +/area/varadero/interior/technical_storage) +"dtu" = ( +/obj/structure/machinery/alarm{ + pixel_y = 24 + }, /turf/open/floor/wood, -/area/varadero/interior/bunks) +/area/varadero/interior/security) +"dtH" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/hall_SE) "duw" = ( /obj/effect/decal/cleanable/cobweb2{ pixel_x = 11; @@ -3978,13 +5325,37 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) -"dwu" = ( -/obj/structure/bed/roller, +"duN" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + dir = 1; + name = "\improper Underground Library"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) +"dvw" = ( +/obj/item/ammo_magazine/handful/shotgun/buckshot{ + pixel_x = -13; + pixel_y = 12 + }, /turf/open/floor/shiva{ - dir = 6; - icon_state = "wred" + dir = 8; + icon_state = "redfull" }, -/area/varadero/interior/medical) +/area/varadero/interior/hall_N) +"dvT" = ( +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/eastbeach) +"dwN" = ( +/obj/item/tool/wet_sign, +/obj/item/tool/mop, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "dwP" = ( /obj/structure/machinery/computer3/powermonitor, /turf/open/floor/shiva{ @@ -3992,6 +5363,16 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) +"dxn" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "greenfull" + }, +/area/varadero/interior/hall_N) "dxt" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -3999,18 +5380,34 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"dxy" = ( -/obj/structure/window_frame/colony/reinforced, -/obj/item/shard, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/caves/east) "dxK" = ( /obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer0, +/turf/open/gm/dirt, /area/varadero/interior/caves/north_research) +"dyl" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) +"dyo" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/pontoon_beach) +"dzH" = ( +/obj/structure/largecrate/random, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "dzN" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox/electrical{ @@ -4025,10 +5422,6 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"dzV" = ( -/obj/item/ammo_magazine/handful/shotgun/buckshot, -/turf/open/floor/carpet, -/area/varadero/exterior/lz1_near) "dBA" = ( /obj/item/tool/surgery/surgicaldrill/predatorsurgicaldrill{ pixel_x = 10 @@ -4038,6 +5431,12 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"dBB" = ( +/obj/structure/machinery/body_scanconsole, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/medical) "dCz" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/camera{ @@ -4052,36 +5451,42 @@ icon_state = "red" }, /area/varadero/interior/morgue) -"dDo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"dCE" = ( +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +/area/varadero/interior/comms3) +"dDn" = ( +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) "dDu" = ( /obj/item/tool/wirecutters, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"dEl" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/book/manual/security_space_law{ - pixel_x = 3; - pixel_y = 5 - }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) -"dEN" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +"dDG" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) +"dEo" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/eastbeach) +/area/varadero/interior_protected/maintenance/south) +"dEJ" = ( +/obj/structure/machinery/landinglight/ds2/spoke{ + pixel_x = -1; + pixel_y = 22 + }, +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/oob) "dFd" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -4094,12 +5499,57 @@ /obj/structure/largecrate/supply/supplies/water, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"dFt" = ( +/obj/structure/prop/fishing/line/long, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/pontoon_beach) +"dFC" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"dGh" = ( +/obj/effect/landmark/objective_landmark/medium, +/obj/structure/closet/crate/hydroponics/prespawned, +/turf/open/floor/shiva{ + icon_state = "blue" + }, +/area/varadero/interior/technical_storage) "dGr" = ( /turf/closed/shuttle{ dir = 1; icon_state = "pwall" }, /area/space) +"dGu" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) +"dGR" = ( +/obj/structure/toilet, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "dHD" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/strata{ @@ -4107,11 +5557,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"dHE" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/east) "dHY" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -4157,22 +5602,27 @@ icon_state = "yellowfull" }, /area/varadero/interior/electrical) -"dIT" = ( -/obj/structure/machinery/body_scanconsole, -/turf/open/floor/shiva{ - icon_state = "floor3" +"dIK" = ( +/obj/structure/largecrate/random, +/obj/structure/machinery/light/small{ + dir = 1 }, -/area/varadero/interior/medical) -"dJO" = ( -/obj/structure/closet/secure_closet/security_empty, -/obj/item/storage/belt/shotgun, -/obj/item/ammo_box/magazine/shotgun/buckshot, -/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"dJX" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/lz2_near) +"dKc" = ( +/obj/structure/closet/secure_closet/security, /turf/open/floor/shiva{ - dir = 8; - icon_state = "blue" + dir = 5; + icon_state = "red" }, -/area/varadero/interior/administration) +/area/varadero/interior/hall_N) "dKm" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/item/clothing/gloves/marine/veteran/pmc, @@ -4193,15 +5643,19 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"dLb" = ( -/obj/structure/machinery/light/small{ - dir = 1 +"dLN" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 }, -/obj/structure/largecrate/random, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 }, -/area/varadero/interior/maintenance/north) +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/medical) "dLP" = ( /obj/item/stool{ icon_state = "stool_alt" @@ -4222,42 +5676,22 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"dNb" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 +"dNh" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 1; + icon_state = "p_stair_full" }, -/obj/item/reagent_container/food/drinks/flask/vacuumflask{ - pixel_x = 9; - pixel_y = 25 +/turf/open/gm/dirt{ + icon_state = "desert3" }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/wood, -/area/varadero/interior/bunks) +/area/varadero/exterior/lz1_near) "dNt" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/caves/north_research) -"dNJ" = ( -/obj/effect/landmark/static_comms/net_one, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) -"dNO" = ( -/obj/effect/landmark/corpsespawner/colonist/random/burst, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/east) "dNU" = ( /obj/structure/bed/chair{ dir = 4 @@ -4301,6 +5735,13 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"dNZ" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves/central) "dOk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/medical/glass{ @@ -4309,16 +5750,18 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, -/area/varadero/interior/medical) -"dOp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 1; - name = "\improper Theta-V Research Laboratory"; - req_access_txt = "100" +/turf/open/floor/shiva{ + icon_state = "wredfull" }, -/turf/open/floor/plating, -/area/varadero/interior/research) +/area/varadero/interior/medical) +"dOl" = ( +/obj/item/prop/colony/used_flare, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"dOm" = ( +/obj/structure/barricade/handrail/wire, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "dOS" = ( /turf/open/gm/dirt{ icon_state = "desert2" @@ -4328,12 +5771,6 @@ /obj/item/reagent_container/glass/bucket, /turf/open/gm/dirt, /area/varadero/interior/maintenance/north) -"dPV" = ( -/obj/effect/spawner/random/tool, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) "dQe" = ( /obj/structure/machinery/light{ dir = 4 @@ -4349,12 +5786,6 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"dQq" = ( -/obj/structure/surface/table, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/electrical) "dQr" = ( /obj/structure/noticeboard{ pixel_y = 32 @@ -4377,6 +5808,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"dRs" = ( +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/eastocean) "dRI" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/icefloor{ @@ -4392,7 +5829,9 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/hall_N) "dSs" = ( /obj/effect/decal/cleanable/blood, @@ -4400,21 +5839,38 @@ icon_state = "floor3" }, /area/varadero/interior/bunks) -"dSM" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Underground Security Armory"; - req_access_txt = "100" +"dSA" = ( +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "On closer inspection, everything on these shelves are made of plastic."; + icon_state = "book-5"; + name = "book case" }, -/turf/open/floor/plating, -/area/varadero/interior/security) +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/varadero/interior/library) "dTe" = ( /obj/item/stack/cable_coil/random, /turf/open/shuttle{ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"dTl" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"dTu" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/farocean) "dTC" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -4422,6 +5878,19 @@ icon_state = "red" }, /area/varadero/interior/medical) +"dTG" = ( +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/eastocean) +"dTS" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) "dUh" = ( /obj/structure/morgue, /turf/open/floor/shiva{ @@ -4435,6 +5904,33 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"dUL" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"dUS" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/shuttle{ + icon_state = "floor6" + }, +/area/varadero/interior_protected/vessel) +"dVq" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + dir = 1; + name = "\improper Underground Library"; + req_one_access = null; + req_access = null + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/varadero/interior/library) "dWl" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -4450,47 +5946,56 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) +"dWH" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) "dWN" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine{ pixel_y = 3 }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/wood, /area/varadero/interior/administration) -"dWY" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ - name = "\improper Colony Administration"; - req_access_txt = "100" +"dWV" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 }, -/turf/open/floor/plating, -/area/varadero/interior/administration) +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "dXd" = ( /turf/closed/wall/r_wall/elevator{ dir = 5 }, /area/varadero/interior/hall_N) -"dXJ" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/item/storage/pill_bottle/inaprovaline/skillless{ - pixel_x = -5 +"dXg" = ( +/turf/closed/wall/rock/brown, +/area/varadero/exterior/pontoon_beach) +"dXr" = ( +/obj/structure/barricade/wooden{ + dir = 1 }, /turf/open/floor/wood, -/area/varadero/interior/bunks) +/area/varadero/interior/beach_bar) +"dYd" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "dYn" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -4499,6 +6004,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"dYp" = ( +/obj/item/book/manual/hydroponics_beekeeping, +/turf/open/floor/carpet, +/area/varadero/interior/library) "dYq" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/co2_cartridge{ @@ -4521,6 +6030,14 @@ icon_state = "redfull" }, /area/varadero/interior/hall_SE) +"dYW" = ( +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "dYX" = ( /obj/structure/machinery/light, /turf/open/floor/carpet, @@ -4564,9 +6081,85 @@ /obj/item/packageWrap, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"eaN" = ( +/obj/effect/landmark/objective_landmark/close, +/obj/structure/closet/crate/ammo/alt, +/obj/item/ammo_magazine/rifle/m4ra{ + pixel_x = 5 + }, +/obj/item/ammo_magazine/rifle/m4ra{ + pixel_y = -5; + pixel_x = -8 + }, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/item/ammo_magazine/rifle{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/ammo_magazine/rifle{ + pixel_x = -7 + }, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/hall_N) +"eaQ" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"ebi" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"ebm" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_half_cap" + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/lz1_near) "ebr" = ( /turf/closed/wall/rock/brown, /area/varadero/interior_protected/caves) +"ebF" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) +"ebJ" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"ebN" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "ecb" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/machinery/light{ @@ -4577,21 +6170,33 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) -"edp" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice8"; - pixel_x = 16; - pixel_y = 24 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/research) +"ecX" = ( +/obj/effect/landmark/corpsespawner/engineer, +/obj/effect/decal/cleanable/blood, +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) "edu" = ( /turf/open/floor/shiva{ dir = 1; icon_state = "blue" }, /area/varadero/interior/maintenance) +"edD" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "eea" = ( /obj/vehicle/train/cargo/engine{ dir = 2 @@ -4608,28 +6213,14 @@ icon_state = "yellow" }, /area/varadero/interior/technical_storage) -"efd" = ( -/obj/structure/machinery/bot/medbot{ - name = "Dr. O" - }, -/turf/open/floor/prison/chapel_carpet, -/area/varadero/interior/chapel) -"efu" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Underground Reception Archives"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/records) "efw" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"efy" = ( +/turf/closed/wall/rock/brown, +/area/varadero/exterior/eastocean) "efU" = ( /obj/structure/machinery/landinglight/ds2{ dir = 4 @@ -4643,6 +6234,29 @@ /obj/effect/landmark/hunter_secondary, /turf/open/floor/plating/icefloor, /area/varadero/exterior/lz1_near) +"egp" = ( +/obj/structure/window/framed/colony, +/obj/structure/noticeboard{ + pixel_y = -32 + }, +/turf/open/floor{ + icon_state = "dark2" + }, +/area/varadero/interior/hall_N) +"egH" = ( +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "On closer inspection, everything on these shelves are made of plastic."; + icon_state = "book-3"; + name = "book case" + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor{ + icon_state = "wood" + }, +/area/varadero/interior/library) "egJ" = ( /obj/structure/surface/table, /obj/item/storage/box/lightstick{ @@ -4655,6 +6269,25 @@ icon_state = "yellow" }, /area/varadero/interior/technical_storage) +"egV" = ( +/obj/item/ammo_magazine/handful/shotgun/buckshot, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) +"eha" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "ehD" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -4664,19 +6297,76 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) +"ehH" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/cargo) +"ehM" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) +"ehT" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) +"ehY" = ( +/obj/item/clothing/under/shorts/red{ + pixel_y = 9; + pixel_x = -8 + }, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/lz2_near) +"eia" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "eij" = ( /obj/structure/bed, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/security) -"eiC" = ( -/turf/open/floor/plating, -/area/varadero/interior/hall_N) "eiK" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) +"ejk" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 24 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "ejK" = ( /obj/structure/machinery/alarm{ dir = 8; @@ -4686,12 +6376,51 @@ icon_state = "wood" }, /area/varadero/interior/library) -"ejN" = ( +"ejM" = ( +/turf/open/gm/coast/north, +/area/varadero/exterior/monsoon) +"ejZ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + dir = 1; + name = "\improper Underground Medical Laboratory"; + req_one_access = null; + req_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) +"ekg" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/comms3) +"ekE" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/turf/open/gm/coast/east, -/area/varadero/interior/oob) +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"ekO" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"elI" = ( +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/eastocean) "elO" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/barricade/wooden, @@ -4699,17 +6428,36 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"emx" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river, -/area/varadero/interior/oob) -"emX" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/largecrate/random, +"elP" = ( +/turf/open/gm/dirt{ + icon_state = "desert2" + }, +/area/varadero/exterior/monsoon) +"emt" = ( +/obj/structure/tunnel{ + id = "north_research_tunnel" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) +"emC" = ( +/obj/structure/surface/rack, +/obj/item/tool/surgery/scalpel/pict_system, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance) +"emP" = ( +/obj/structure/machinery/camera/autoname/lz_camera, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) +"enu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "enH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -4723,41 +6471,51 @@ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) -"eph" = ( -/obj/structure/machinery/light{ - dir = 1 +"enZ" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/farocean) +"eoj" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) +"eoq" = ( +/obj/item/shard{ + icon_state = "medium" }, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = -7; - pixel_y = 13 +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/wood, -/area/varadero/interior/records) -"epm" = ( -/obj/item/weapon/gun/energy/rxfm5_eva, -/turf/open/floor/wood, -/area/varadero/interior/hall_SE) -"epr" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/gloves/botanic_leather, -/obj/item/clothing/mask/cigarette/weed{ - pixel_x = -11; - pixel_y = 16 +/area/varadero/interior/maintenance/security) +"eov" = ( +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/central) +"eoB" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 }, -/obj/item/clothing/mask/cigarette/weed{ - pixel_x = -9; - pixel_y = 13 +/turf/open/gm/dirt{ + icon_state = "desert3" }, -/turf/open/floor/shiva{ - icon_state = "blue" +/area/varadero/exterior/eastbeach) +"eoV" = ( +/obj/structure/prop/resin_prop, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) +"epN" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 }, -/area/varadero/interior/technical_storage) +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "epO" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -4770,13 +6528,16 @@ "epQ" = ( /turf/closed/wall, /area/varadero/interior/morgue) -"epU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/evidencebag, +"epY" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + dir = 1; + name = "\improper Underground Technical Storage"; + req_access_txt = "100" + }, /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/varadero/interior/security) +/area/varadero/interior/technical_storage) "eqe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/cups{ @@ -4796,6 +6557,22 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"eqg" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/pontoon_beach) +"eqn" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "eqB" = ( /obj/structure/bed/chair{ dir = 8 @@ -4804,38 +6581,32 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"erC" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 24 - }, -/obj/structure/surface/table/woodentable, -/obj/item/reagent_container/food/drinks/bottle/vodka/chess/b_bishop{ - pixel_x = -10; - pixel_y = 15 - }, -/obj/item/reagent_container/blood/empty{ - pixel_x = 6; - pixel_y = 5 - }, -/obj/item/storage/box/cups{ - pixel_x = -13; - pixel_y = 3 +"eqT" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + icon_state = "asteroidwarning" }, -/turf/open/floor/wood, -/area/varadero/interior/chapel) +/area/varadero/exterior/lz2_near) "erE" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) -"erS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Requesitions Lobby"; - req_access_txt = "100" +"erK" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null }, -/turf/open/floor/plating, -/area/varadero/interior/cargo) +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"erQ" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "esw" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/icefloor{ @@ -4851,6 +6622,21 @@ icon_state = "red" }, /area/varadero/interior/medical) +"esB" = ( +/obj/structure/closet/radiation, +/obj/effect/landmark/crap_item, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/comms3) +"esK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "esM" = ( /obj/structure/target/syndicate, /turf/open/floor/plating/icefloor{ @@ -4865,6 +6651,14 @@ icon_state = "wood" }, /area/varadero/interior/library) +"etf" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Underground Main Hallway" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_SE) "etv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -4888,6 +6682,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"etV" = ( +/obj/item/stack/sheet/metal, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "eul" = ( /obj/structure/closet/wardrobe/chaplain_black, /obj/effect/landmark/objective_landmark/close, @@ -4909,6 +6707,14 @@ icon_state = "green" }, /area/varadero/interior/hall_N) +"euS" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/pontoon_beach) "evV" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -4920,6 +6726,12 @@ icon_state = "floor3" }, /area/varadero/interior/hall_N) +"evW" = ( +/obj/item/lightstick/variant/planted, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/monsoon) "evX" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 1 @@ -4929,20 +6741,31 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"ewn" = ( -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 +"ewv" = ( +/obj/structure/machinery/constructable_frame, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, +/area/varadero/exterior/eastbeach) +"ewS" = ( +/obj/structure/surface/table, +/obj/item/reagent_container/food/drinks/bottle/holywater, /turf/open/floor/shiva{ - icon_state = "multi_tiles" + dir = 1; + icon_state = "red" }, -/area/varadero/interior/electrical) -"ewO" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/obj/structure/machinery/light/small, +/area/varadero/interior/morgue) +"exj" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/maintenance/south) +/area/varadero/interior/hall_SE) +"exs" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/lightstick/variant/planted, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "exH" = ( /obj/item/device/defibrillator, /obj/structure/surface/table, @@ -4951,6 +6774,13 @@ icon_state = "wred" }, /area/varadero/interior/medical) +"exX" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/eastocean) "eye" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -4961,14 +6791,6 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"eyh" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "eyt" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/caves/east) @@ -4976,6 +6798,14 @@ /obj/structure/surface/table, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"ezb" = ( +/obj/structure/surface/rack, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) "ezc" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -5026,13 +6856,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"ezB" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Underground Security"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) "ezI" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -5041,6 +6864,19 @@ dir = 1 }, /area/varadero/interior/research) +"ezU" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "ezW" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -5090,6 +6926,26 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"eBm" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "eBs" = ( /turf/closed/wall/r_wall/elevator{ dir = 9 @@ -5127,12 +6983,38 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"eCg" = ( +/obj/item/tool/warning_cone, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "eCj" = ( /obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/prison{ icon_state = "darkredfull2" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) +"eCu" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/south, +/area/varadero/interior_protected/caves/central) +"eCB" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 3; + pixel_y = 15; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) "eDF" = ( /obj/structure/bed/stool{ icon_state = "stool_alt" @@ -5148,6 +7030,20 @@ }, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"eDY" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"eEd" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/closed/wall/r_wall, +/area/varadero/interior_protected/maintenance/south) "eEY" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 4 @@ -5157,13 +7053,26 @@ }, /turf/open/floor/plating, /area/varadero/interior/research) -"eFA" = ( -/obj/structure/machinery/portable_atmospherics/canister/air, +"eFB" = ( +/obj/structure/prop/fishing/line/long{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"eFJ" = ( /turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" + icon_state = "multi_tiles" }, -/area/varadero/interior/electrical) +/area/varadero/interior/comms3) +"eFW" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "eGq" = ( /obj/item/reagent_container/food/snacks/eat_bar, /obj/item/reagent_container/food/snacks/eat_bar{ @@ -5174,9 +7083,35 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"eGL" = ( +/obj/item/stack/sheet/plasteel{ + amount = 24 + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) +"eGP" = ( +/obj/structure/closet/cabinet, +/obj/effect/spawner/random/powercell, +/obj/effect/spawner/random/powercell, +/turf/open/floor/wood, +/area/varadero/interior/research) "eGX" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) +"eHl" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/toilets) +"eHs" = ( +/obj/item/lightstick/variant/planted, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"eHv" = ( +/obj/item/stack/sheet/wood/medium_stack, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "eHB" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -5187,6 +7122,10 @@ icon_state = "red" }, /area/varadero/interior/security) +"eHZ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/central) "eIr" = ( /obj/structure/platform_decoration/kutjevo, /turf/open/floor/strata{ @@ -5194,25 +7133,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"eIt" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior_protected/maintenance/south) -"eIK" = ( -/obj/structure/machinery/floodlight{ - name = "Floodlight" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "eIT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/bottle/sake{ @@ -5252,15 +7172,29 @@ icon_state = "red" }, /area/varadero/interior/medical) -"eKt" = ( +"eJN" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) +"eJS" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "greenfull" +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_N) +/area/varadero/interior_protected/maintenance/south) "eKw" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -5269,6 +7203,31 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"eKF" = ( +/obj/structure/bed/chair{ + dir = 4; + icon_state = "chair_alt"; + pixel_y = 9 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"eKL" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"eKW" = ( +/obj/structure/bed, +/obj/item/bedsheet/orange, +/obj/item/toy/farwadoll, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "snow_mat" + }, +/area/varadero/interior/security) "eLE" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/brigdoor/westleft, @@ -5289,11 +7248,20 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"eMf" = ( -/obj/effect/landmark/xeno_hive_spawn, -/obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) +"eLZ" = ( +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + density = 0 + }, +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -1; + pixel_y = 12 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "eMi" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -5324,15 +7292,32 @@ icon_state = "red" }, /area/varadero/interior/security) -"eNa" = ( +"eNk" = ( +/obj/item/toy/sword, +/obj/item/clothing/head/pirate, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"eNA" = ( +/obj/item/weapon/twohanded/fireaxe, +/obj/structure/surface/table/reinforced/prison, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"eOa" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 1 + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/turf/open/gm/coast/west, +/area/varadero/exterior/lz1_near) +"eOh" = ( +/obj/structure/machinery/optable, +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) +/area/varadero/interior/medical) "eOu" = ( /obj/structure/machinery/camera/autoname{ dir = 1; @@ -5342,6 +7327,10 @@ icon_state = "red" }, /area/varadero/interior/security) +"eOv" = ( +/obj/item/circuitboard/airlock, +/turf/open/floor/shiva, +/area/varadero/interior/technical_storage) "eOZ" = ( /obj/structure/bed/chair{ dir = 1 @@ -5359,6 +7348,12 @@ dir = 1 }, /area/varadero/interior/cargo) +"ePz" = ( +/obj/item/explosive/grenade/incendiary/molotov{ + pixel_x = 6 + }, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "ePB" = ( /obj/structure/machinery/light{ dir = 1 @@ -5367,6 +7362,33 @@ icon_state = "green" }, /area/varadero/interior/hall_N) +"eQa" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"eQm" = ( +/obj/structure/window/framed/wood, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"eQr" = ( +/obj/structure/largecrate/random/mini/med{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "eQz" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/paper/research_notes, @@ -5375,13 +7397,22 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"eQU" = ( -/obj/structure/machinery/bot/mulebot, -/turf/open/floor/shiva{ - dir = 9; - icon_state = "yellow" +"eQC" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) +"eQI" = ( +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 }, -/area/varadero/interior/cargo) +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "eQZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -5390,10 +7421,6 @@ icon_state = "white" }, /area/varadero/interior/toilets) -"eRc" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/coast/beachcorner2/north_east, -/area/varadero/interior/oob) "eRD" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/carpet, @@ -5427,9 +7454,6 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"eSd" = ( -/turf/open/gm/coast/beachcorner/north_west, -/area/varadero/exterior/eastbeach) "eSg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -5442,33 +7466,38 @@ icon_state = "red" }, /area/varadero/interior/medical) -"eTP" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3"; - pixel_y = -12 +"eSo" = ( +/obj/structure/closet/crate/construction, +/obj/item/tool/extinguisher, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/obj/structure/barricade/handrail/wire, -/obj/structure/desertdam/decals/road_edge{ - pixel_x = 2 +/area/varadero/exterior/eastbeach) +"eTb" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Underground Security Detective's Office"; + req_access_txt = "100" }, /turf/open/floor/wood, -/area/varadero/interior/court) -"eTX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/area/varadero/interior/security) +"eTi" = ( +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor/shiva{ + icon_state = "redfull" }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) -"eUe" = ( +/area/varadero/interior/medical) +"eTP" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; - pixel_y = 16 + pixel_y = -12 }, +/obj/structure/barricade/handrail/wire, /obj/structure/desertdam/decals/road_edge{ pixel_x = 2 }, -/obj/effect/landmark/corpsespawner/colonist/random, /turf/open/floor/wood, /area/varadero/interior/court) "eUh" = ( @@ -5495,13 +7524,20 @@ }, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) -"eUR" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +"eVn" = ( +/obj/structure/largecrate/random, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" }, -/turf/open/gm/river, -/area/varadero/interior/maintenance) +/area/varadero/interior/cargo) +"eVH" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "eVU" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -5525,19 +7561,63 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"eWC" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/shiva{ +"eWp" = ( +/obj/structure/platform/kutjevo/smooth{ dir = 1; - icon_state = "yellow" + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/electrical) +/obj/structure/largecrate/random, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/comms1) "eWR" = ( /turf/open/floor/shiva{ dir = 8; icon_state = "purplecorners" }, /area/varadero/interior/research) +"eWZ" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz1_near) +"eXg" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "eXr" = ( /obj/structure/surface/rack, /obj/item/storage/briefcase, @@ -5545,26 +7625,33 @@ icon_state = "purple" }, /area/varadero/interior/research) -"eXv" = ( -/obj/structure/largecrate/random, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"eXw" = ( +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + density = 0; + name = "barge float"; + desc = "A supportive lattice connected to two floating pontoons." }, -/area/varadero/interior/caves/east) -"eXT" = ( -/obj/structure/machinery/light, -/obj/structure/noticeboard{ - pixel_y = -32 +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/obj/effect/decal/warning_stripes/asteroid{ - dir = 1; - icon_state = "warning_c" +/area/varadero/exterior/farocean) +"eXN" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/area/varadero/interior/hall_N) +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"eXO" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "eYe" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -5579,6 +7666,12 @@ icon_state = "floor3" }, /area/varadero/interior/morgue) +"eYM" = ( +/obj/structure/machinery/power/monitor, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/electrical) "eZc" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/shiva{ @@ -5595,9 +7688,6 @@ icon_state = "floor3" }, /area/varadero/interior/cargo) -"fal" = ( -/turf/open/gm/dirt, -/area/varadero/interior/comms3) "fao" = ( /obj/structure/reagent_dispensers/water_cooler{ density = 0; @@ -5616,36 +7706,63 @@ "fay" = ( /turf/closed/wall/r_wall, /area/varadero/interior/research) -"faC" = ( -/turf/open/floor/plating, -/area/varadero/interior/mess) -"faG" = ( -/obj/effect/decal/strata_decals/grime/grime4{ - dir = 4 - }, -/turf/open/floor/carpet, -/area/varadero/interior/bunks) -"faV" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"faB" = ( +/obj/effect/landmark/corpsespawner/miner, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) +"faP" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/area/varadero/interior/maintenance/security) -"fbq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 }, -/turf/open/gm/river, -/area/varadero/interior/maintenance) -"fbQ" = ( -/obj/structure/desertdam/decals/road_edge{ - pixel_x = 16 +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" }, -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3"; - pixel_y = -12 +/area/varadero/interior/comms3) +"faX" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" }, -/obj/structure/barricade/handrail/wire{ +/area/varadero/interior/electrical) +"fbr" = ( +/obj/effect/landmark/corpsespawner/miner, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) +"fbw" = ( +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + desc = "A high-power hydroelectric generator."; + name = "hydroelectric generator" + }, +/turf/open/gm/coast/north, +/area/varadero/exterior/lz2_near) +"fbJ" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"fbQ" = ( +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 16 + }, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = -12 + }, +/obj/structure/barricade/handrail/wire{ dir = 4 }, /obj/structure/barricade/handrail/wire, @@ -5672,16 +7789,33 @@ /obj/item/device/camera, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"fcg" = ( +/obj/structure/closet/secure_closet/freezer/meat, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/varadero/interior/cargo) +"fcp" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "fcF" = ( /obj/effect/landmark/crap_item, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) -"fdf" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, +"fcK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/caves/east) +/area/varadero/interior/cargo) "fdn" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ @@ -5702,6 +7836,19 @@ icon_state = "floor3" }, /area/varadero/interior/court) +"fdA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/maintenance/research) "fef" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/eat_bar{ @@ -5717,6 +7864,16 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"feH" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/monsoon) +"feM" = ( +/obj/structure/barricade/wooden, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "feR" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/light/small{ @@ -5734,19 +7891,16 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"feW" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/interior/maintenance/north) "ffe" = ( /obj/structure/curtain/shower, /turf/open/floor/interior/plastic, /area/varadero/interior/laundry) -"ffi" = ( -/obj/effect/decal/warning_stripes/asteroid{ - dir = 4; - icon_state = "warning_c" - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/hall_N) "ffk" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -5756,15 +7910,6 @@ icon_state = "floor3" }, /area/varadero/interior/medical) -"fft" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/exterior/lz1_near) "ffx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5772,14 +7917,28 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) -"ffQ" = ( -/obj/structure/closet/secure_closet/medical1{ - req_access_txt = "100" +"ffY" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 }, /turf/open/floor/shiva{ - icon_state = "wred" + icon_state = "multi_tiles" }, -/area/varadero/interior/medical) +/area/varadero/interior/disposals) +"fga" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/surface/rack, +/obj/item/tool/wrench, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "fgS" = ( /obj/structure/closet/crate/secure, /obj/effect/landmark/objective_landmark/close, @@ -5787,6 +7946,16 @@ icon_state = "floor3" }, /area/varadero/interior/cargo) +"fgW" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "fhh" = ( /obj/item/tool/mop{ pixel_x = -10; @@ -5796,6 +7965,15 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"fhu" = ( +/obj/structure/bed/chair{ + dir = 3 + }, +/turf/open/floor{ + dir = 8; + icon_state = "asteroidwarning" + }, +/area/varadero/exterior/lz1_near) "fhA" = ( /obj/item/device/flashlight, /obj/structure/surface/table/reinforced/prison{ @@ -5825,6 +8003,15 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"fiv" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Underground Staff Canteen" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) "fiA" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -5851,6 +8038,17 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"fjg" = ( +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/swcaves) +"fjv" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/prop/rock/brown, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "fjx" = ( /obj/structure/bed/chair{ dir = 1 @@ -5900,17 +8098,42 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) +"fkd" = ( +/obj/item/toy/beach_ball, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "fkj" = ( /turf/open/floor/shiva{ icon_state = "green" }, /area/varadero/interior/hall_SE) +"fky" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_3"; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "fkE" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/shiva{ icon_state = "blue" }, /area/varadero/interior/hall_SE) +"fkF" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "fkR" = ( /turf/closed/wall, /area/varadero/interior/court) @@ -5924,6 +8147,37 @@ }, /turf/open/floor/wood, /area/varadero/interior/research) +"fmu" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"fmy" = ( +/obj/structure/bed/chair{ + dir = 8; + icon_state = "chair_alt" + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"fnj" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"fnl" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/static_comms/net_two, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "fnq" = ( /obj/effect/spawner/random/technology_scanner, /turf/open/floor/shiva{ @@ -5938,6 +8192,21 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"fof" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8; + unacidable = 0 + }, +/obj/structure/window/phoronreinforced{ + dir = 4; + icon_state = "phoronrwindow" + }, +/obj/item/device/flashlight/slime, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) "foz" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/sink{ @@ -5949,6 +8218,18 @@ icon_state = "green" }, /area/varadero/interior/mess) +"foE" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 24 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) "foF" = ( /obj/structure/machinery/bot/mulebot, /turf/open/floor/shiva{ @@ -5956,6 +8237,12 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"foQ" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "foU" = ( /obj/structure/filingcabinet{ density = 0; @@ -5998,19 +8285,9 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) -"fpV" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/varadero/interior_protected/vessel) +"fpq" = ( +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/lz2_near) "fpY" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/research, /turf/open/shuttle/elevator/grating, @@ -6040,23 +8317,25 @@ icon_state = "red" }, /area/varadero/interior/security) -"frp" = ( -/obj/structure/surface/table, -/obj/item/circuitboard/machine/batteryrack, -/obj/item/stack/cable_coil{ - pixel_x = 2; - pixel_y = 7 - }, -/turf/open/floor/shiva{ - dir = 1 - }, -/area/varadero/interior/morgue) "frQ" = ( /obj/item/stack/sheet/metal, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"frR" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) +"fsC" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 2; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "ftm" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -6071,6 +8350,11 @@ }, /turf/closed/wall/r_wall, /area/varadero/interior/research) +"ftF" = ( +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/comms3) "fuh" = ( /obj/structure/prop/ice_colony/soil_net, /turf/open/gm/dirt{ @@ -6084,6 +8368,18 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"fuF" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/cargo) +"fuS" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/disposals) "fvd" = ( /obj/structure/filingcabinet{ density = 0; @@ -6101,7 +8397,7 @@ /area/varadero/interior/hall_SE) "fvw" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ pixel_y = 8 }, /turf/open/floor/shiva{ @@ -6109,24 +8405,25 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"fvH" = ( -/obj/structure/pipes/standard/simple/hidden/green, +"fvV" = ( +/obj/structure/largecrate/random/barrel/green, /obj/structure/machinery/light/small{ - dir = 8 + dir = 1 }, -/obj/effect/decal/remains/human, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"fwo" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) +"fxK" = ( +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" + }, +/obj/effect/decal/warning_stripes, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/security) -"fvL" = ( -/turf/open/gm/coast/beachcorner/north_east, -/area/varadero/interior/oob) -"fvR" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river, /area/varadero/exterior/pontoon_beach) "fxR" = ( /obj/item/moneybag{ @@ -6146,11 +8443,35 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"fyo" = ( -/obj/effect/landmark/objective_landmark/close, -/obj/structure/closet/crate/ammo/alt, -/turf/open/shuttle/elevator/grating, -/area/varadero/interior/hall_N) +"fxX" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/eastbeach) +"fys" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.01 + }, +/obj/structure/catwalk, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) +"fyH" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/obj/item/ammo_casing/shell{ + icon_state = "cartridge_1_1" + }, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "fyP" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp/candelabra{ @@ -6160,6 +8481,26 @@ }, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"fyZ" = ( +/mob/living/simple_animal/cat{ + desc = "A domesticated, feline pet. The collar says 'Orion'."; + name = "Orion"; + real_name = "Orion" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/morgue) +"fzc" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/gm/dirt, +/area/varadero/interior/caves/north_research) +"fzx" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "fzy" = ( /obj/structure/closet/emcloset, /turf/open/floor/shiva{ @@ -6190,20 +8531,20 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"fBB" = ( -/obj/structure/machinery/floodlight{ - name = "Floodlight" - }, +"fBV" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"fCE" = ( -/obj/structure/surface/rack, -/obj/item/storage/pouch/sling, -/obj/effect/landmark/objective_landmark/science, +"fCB" = ( +/obj/structure/machinery/constructable_frame, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/shiva{ - icon_state = "floor3" + dir = 1; + icon_state = "yellow" }, -/area/varadero/interior/medical) +/area/varadero/interior/electrical) "fDn" = ( /obj/structure/window/reinforced{ dir = 4; @@ -6235,6 +8576,18 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"fDH" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/farocean) +"fEb" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) "fEm" = ( /obj/structure/largecrate/random, /obj/item/reagent_container/food/drinks/cans/thirteenloko{ @@ -6250,6 +8603,21 @@ icon_state = "bcircuit" }, /area/varadero/interior/electrical) +"fEz" = ( +/obj/structure/machinery/door/airlock/multi_tile/elevator/access/arrivals, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/records) +"fEA" = ( +/obj/structure/girder/displaced, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "fEI" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" @@ -6293,6 +8661,10 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"fFw" = ( +/obj/item/stack/sheet/wood, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "fFx" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -6303,9 +8675,14 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) -"fFD" = ( -/turf/open/gm/coast/beachcorner2/north_east, -/area/varadero/interior/oob) +"fFH" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "fFI" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -6314,44 +8691,26 @@ icon_state = "floor3" }, /area/varadero/interior/administration) -"fFN" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, +"fFK" = ( /obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 + can_buckle = 0; + desc = "A lightweight support lattice."; + icon = 'icons/obj/structures/structures.dmi'; + icon_state = "latticefull"; + layer = 2.1; + name = "lattice" }, -/obj/structure/prop/structure_lattice{ - density = 0; - desc = "Made in Little Japan."; - health = 300; - icon = 'icons/obj/items/items.dmi'; - icon_state = "sheet-lizard"; - name = "exotic bedsheet"; - pixel_x = -1 +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/turf/open/floor/wood, -/area/varadero/interior/bunks) -"fGE" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Requesitions Bay"; - req_access_txt = "100" +/area/varadero/interior_protected/vessel) +"fFO" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/plating, -/area/varadero/interior/cargo) +/area/varadero/interior_protected/caves) "fGM" = ( /obj/structure/bed/chair/wood/normal{ dir = 8 @@ -6361,10 +8720,32 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) +"fGN" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/farocean) "fGP" = ( /obj/effect/landmark/queen_spawn, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) +"fHf" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"fHg" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/research) +"fHk" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "fHs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -6386,22 +8767,34 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) -"fIT" = ( -/turf/open/gm/dirt{ - icon_state = "desert0" +"fIk" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/area/varadero/interior/maintenance/north) +/area/varadero/exterior/lz2_near) "fJb" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice4"; pixel_x = -16; pixel_y = 24 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/shiva{ dir = 4; icon_state = "green" }, /area/varadero/interior/hall_SE) +"fJw" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "fJI" = ( /obj/item/clothing/gloves/yautja{ anchored = 1; @@ -6431,6 +8824,19 @@ icon_state = "wred" }, /area/varadero/interior/medical) +"fKz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + name = "\improper Theta-V Research Laboratory Sample Isolation"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/research) "fLn" = ( /obj/structure/machinery/door/window/brigdoor/westleft{ dir = 1; @@ -6443,36 +8849,25 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) -"fLo" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/river, -/area/varadero/interior/oob) "fLu" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"fLS" = ( -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) -"fLV" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_half_cap" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "fLY" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/varadero/exterior/pontoon_beach) +"fLZ" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/effect/landmark/crap_item, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellow" + }, +/area/varadero/interior/comms3) "fMq" = ( /obj/item/device/cassette_tape/heavymetal{ pixel_x = -3; @@ -6488,9 +8883,36 @@ icon_state = "red" }, /area/varadero/interior/medical) -"fNn" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/maintenance/security) +"fMI" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"fMP" = ( +/obj/effect/landmark/objective_landmark/far, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/hall_SE) +"fNm" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "fND" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -6501,13 +8923,22 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"fOA" = ( -/turf/open/gm/coast/south, -/area/varadero/exterior/eastbeach) -"fOW" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/pontoon_beach) +"fOG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/machinery/constructable_frame, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/comms1) +"fOO" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/maintenance/north) "fPn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6533,28 +8964,55 @@ }, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"fPv" = ( +"fPq" = ( /obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; start_charge = 0 }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) -"fPG" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" +/area/varadero/exterior/eastbeach) +"fPJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) +"fPU" = ( +/obj/structure/prop/souto_land/pole{ + dir = 1 }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) -"fQr" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/shiva{ - icon_state = "green" +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 24 }, -/area/varadero/interior/hall_SE) +/obj/structure/flora/pottedplant{ + desc = "How did that get in there?"; + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellow" + }, +/area/varadero/interior/hall_NW) +"fQh" = ( +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/obj/structure/bed/chair/wood/normal{ + dir = 8 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"fQr" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/shiva{ + icon_state = "green" + }, +/area/varadero/interior/hall_N) "fQE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6564,12 +9022,12 @@ icon_state = "green" }, /area/varadero/interior/mess) -"fQU" = ( -/obj/structure/surface/table, -/turf/open/floor/shiva{ - icon_state = "red" +"fQK" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_3" }, -/area/varadero/interior/hall_N) +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) "fQW" = ( /obj/structure/prop/turbine_extras, /turf/open/floor/plating/icefloor{ @@ -6588,13 +9046,35 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) +"fSa" = ( +/obj/structure/window_frame/colony, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"fTh" = ( +/obj/item/tool/shovel, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/monsoon) "fUn" = ( -/obj/structure/surface/table, -/obj/item/paper/janitor{ - pixel_y = 8 +/turf/open/floor/shiva{ + icon_state = "multi_tiles" }, -/turf/open/floor/shiva, -/area/varadero/interior/technical_storage) +/area/varadero/interior/maintenance/north) +"fUs" = ( +/obj/structure/machinery/light/small, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/caves/north_research) +"fUC" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "fUF" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8 @@ -6623,18 +9103,26 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) +"fVt" = ( +/obj/structure/machinery/door_control{ + id = "colony_sec_armory"; + name = "Colony Secure Armory"; + pixel_y = -26 + }, +/obj/item/storage/box/flashbangs, +/turf/open/floor/shiva{ + icon_state = "red" + }, +/area/varadero/interior/security) "fVw" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) -"fWi" = ( -/obj/structure/closet/crate/trashcart, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) +"fWd" = ( +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/eastocean) "fWn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6670,6 +9158,30 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"fWE" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/pontoon_beach) +"fWR" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_half_cap" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "fWU" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -6677,6 +9189,12 @@ icon_state = "redfull" }, /area/varadero/interior/hall_N) +"fWW" = ( +/obj/structure/surface/rack, +/obj/structure/surface/rack, +/obj/item/book/manual/engineering_construction, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "fXa" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp/green{ @@ -6696,6 +9214,16 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) +"fXA" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "fXG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6712,41 +9240,29 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"fXR" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 +"fXX" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/glass{ + amount = 30 }, -/obj/structure/platform/kutjevo/rock, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -3 +/obj/item/trash/crushed_cup, +/obj/item/trash/c_tube, +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/gm/river, -/area/varadero/interior/maintenance/research) -"fYb" = ( -/obj/structure/prop/structure_lattice{ - density = 0; - desc = "On closer inspection, everything on these shelves are made of plastic."; - icon_state = "book-5"; - name = "book case"; - pixel_y = 18 +/area/varadero/interior/cargo) +"fYs" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/wood, -/area/varadero/interior/research) +/area/varadero/interior_protected/maintenance/south) "fYA" = ( /turf/open/floor/shiva{ dir = 8; icon_state = "yellowfull" }, /area/varadero/interior/hall_N) -"fYB" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin, -/obj/item/paper/research_notes, -/turf/open/floor/shiva{ - icon_state = "blue" - }, -/area/varadero/interior/administration) "fYH" = ( /turf/open/floor/shiva{ dir = 8; @@ -6766,12 +9282,6 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_N) -"fZo" = ( -/obj/item/stack/sheet/wood, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) "fZx" = ( /obj/item/stool{ pixel_x = -7; @@ -6808,13 +9318,18 @@ icon_state = "greenfull" }, /area/varadero/interior/medical) -"fZL" = ( -/obj/structure/prop/rock/brown, -/obj/structure/flora/bush/ausbushes/var3/stalkybush{ - pixel_x = -4 +"fZP" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"fZX" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "gan" = ( /obj/structure/machinery/power/apc{ dir = 8; @@ -6845,16 +9360,27 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"gbl" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/engineering{ +"gaG" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"gaJ" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) +"gbE" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; dir = 1; - name = "\improper Underground Disposals"; - req_access_txt = "100" + icon_state = "hr_kutjevo"; + name = "support struts" }, -/turf/open/floor/plating, -/area/varadero/interior/disposals) +/turf/open/gm/coast/east, +/area/varadero/exterior/pontoon_beach) "gbG" = ( /obj/structure/bed/chair/office/dark{ dir = 1; @@ -6865,13 +9391,19 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"gbU" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "snow_mat" +"gcB" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"gcF" = ( +/obj/structure/prop/wooden_cross{ + desc = "A grave to a fishing buddy, long gone" }, -/area/varadero/interior/maintenance) +/obj/item/clothing/head/boaterhat{ + pixel_y = 5 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "gcK" = ( /obj/structure/bed/chair{ dir = 4 @@ -6881,34 +9413,85 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"gdm" = ( -/obj/structure/surface/table, -/obj/item/trash/chunk{ - pixel_x = 3; - pixel_y = 6 - }, -/turf/open/floor/shiva{ - icon_state = "yellow" +"gdJ" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/technical_storage) -"gdw" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." }, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -15; + pixel_y = 16; + indestructible = 1; + unacidable = 1 }, -/area/varadero/interior/records) +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/pontoon_beach) "gdN" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/carpet, /area/varadero/interior/library) +"gdO" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"geo" = ( +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/swcaves) "gey" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/security) +"geK" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"gfc" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"gfe" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "gfg" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -6919,6 +9502,18 @@ icon_state = "red" }, /area/varadero/interior/security) +"gfj" = ( +/obj/effect/decal/cleanable/cobweb{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"gfk" = ( +/obj/structure/girder/displaced, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "gfp" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -6927,6 +9522,25 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) +"gfr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/window/reinforced{ + dir = 8; + health = 80 + }, +/obj/item/tool/stamp{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/storage/box/masks{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/ammo_magazine/rifle, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "gfs" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/flask/vacuumflask{ @@ -6968,6 +9582,23 @@ dir = 8 }, /area/varadero/interior/records) +"ggr" = ( +/obj/item/device/binoculars, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"ggX" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) +"gha" = ( +/obj/structure/surface/table, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "ghb" = ( /obj/item/tool/crowbar, /turf/open/floor/shiva{ @@ -6986,15 +9617,21 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"ghJ" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null +"ghI" = ( +/obj/structure/catwalk, +/obj/structure/barricade/handrail/wire{ + layer = 3.01 }, -/turf/open/floor/plating, -/area/varadero/interior/chapel) +/turf/open/floor/plating/plating_catwalk, +/area/varadero/interior/maintenance/north) +"ghN" = ( +/turf/open/gm/coast/south, +/area/varadero/exterior/monsoon) +"ghW" = ( +/turf/open/gm/dirt{ + icon_state = "desert2" + }, +/area/varadero/exterior/lz2_near) "gia" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -7013,15 +9650,9 @@ icon_state = "purple" }, /area/varadero/interior/research) -"giU" = ( -/obj/structure/largecrate/random/mini/chest/b, -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) +"giN" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "gja" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/invuln/overhead_pipe{ @@ -7038,6 +9669,16 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"gjs" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) "gjw" = ( /turf/open/floor/shiva{ dir = 4; @@ -7064,6 +9705,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"gjC" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "gka" = ( /obj/structure/machinery/shower{ dir = 1 @@ -7085,25 +9730,36 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/wood, /area/varadero/interior/research) +"gkw" = ( +/obj/structure/machinery/power/apc{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/comms4) "gkx" = ( /obj/item/stack/tile/plasteel{ pixel_y = 6 }, /turf/open/floor/plating, /area/varadero/interior/hall_SE) -"gkC" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "gkF" = ( /obj/structure/sign/safety/airlock{ pixel_x = 8 }, /turf/closed/wall, /area/varadero/interior/maintenance) +"gkG" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "gkL" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/emails{ @@ -7121,12 +9777,11 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) -"gll" = ( -/obj/structure/bed/chair, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/hall_NW) +"glp" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "gms" = ( /obj/effect/landmark/good_item, /turf/open/shuttle{ @@ -7158,6 +9813,21 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) +"gnm" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/shotgun/pump, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"gnx" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/shiva{ + icon_state = "green" + }, +/area/varadero/interior/hall_N) "gnC" = ( /obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = -9; @@ -7167,15 +9837,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"gnE" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/closet/secure_closet/surgical{ - pixel_x = -30 - }, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/medical) "gnZ" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor{ @@ -7194,17 +9855,26 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"gpd" = ( -/obj/structure/barricade/handrail/wire{ - dir = 4 +"gor" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/closet/crate/trashcart{ - pixel_y = 8 +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) +"gpJ" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/area/varadero/interior/disposals) +/area/varadero/exterior/farocean) "gqE" = ( /obj/structure/bed/sofa/pews/flipped{ dir = 1 @@ -7227,13 +9897,11 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) -"grm" = ( -/obj/structure/machinery/vending/security, -/turf/open/floor/shiva{ - dir = 9; - icon_state = "red" - }, -/area/varadero/interior/security) +"grG" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/coast/west, +/area/varadero/exterior/farocean) "grT" = ( /obj/structure/sign/safety/water, /turf/closed/wall/r_wall, @@ -7242,6 +9910,12 @@ /obj/structure/prop/rock/brown, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) +"gso" = ( +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/cargo) "gsq" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva{ @@ -7249,45 +9923,66 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"gsu" = ( +/obj/effect/decal/remains/xeno{ + pixel_y = 25 + }, +/obj/effect/landmark/xeno_spawn, +/turf/open/shuttle{ + icon_state = "floor6" + }, +/area/varadero/interior_protected/vessel) +"gsw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/item/tool/stamp, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/cargo) +"gsC" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/lz2_near) "gsP" = ( /turf/open/space/basic, /area/space) -"gtd" = ( +"gsQ" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 8 + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/prop/rock/brown, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) -"gte" = ( -/obj/structure/surface/rack, -/obj/item/tool/pickaxe, -/obj/item/tool/pickaxe{ - pixel_y = -4 +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/turf/open/gm/dirt, -/area/varadero/interior/maintenance/north) -"gtj" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, -/area/varadero/interior/technical_storage) -"gtr" = ( -/obj/effect/decal/warning_stripes/asteroid{ - icon_state = "warning_c" +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"gtv" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 }, -/turf/open/floor/shiva{ - icon_state = "floor3" +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_N) +/area/varadero/exterior/eastbeach) "gtz" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, /obj/structure/barricade/wooden{ dir = 8 }, +/obj/structure/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, @@ -7299,12 +9994,26 @@ icon_state = "purple" }, /area/varadero/interior/research) +"gux" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"guz" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/shiva, +/area/varadero/interior/technical_storage) "guE" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"gvo" = ( +/obj/item/ore/diamond, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "gvE" = ( /obj/structure/machinery/light{ dir = 4 @@ -7322,6 +10031,23 @@ icon_state = "red" }, /area/varadero/interior/administration) +"gvJ" = ( +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"gvM" = ( +/turf/open/floor/shiva{ + dir = 8; + icon_state = "green" + }, +/area/varadero/interior/maintenance/north) "gvR" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva{ @@ -7343,18 +10069,60 @@ icon_state = "floor3" }, /area/varadero/interior/research) +"gwD" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/eastbeach) "gwG" = ( /turf/open/floor/shiva{ dir = 1; icon_state = "red" }, /area/varadero/interior/security) +"gwW" = ( +/obj/structure/surface/rack, +/obj/item/storage/pouch/sling, +/obj/effect/landmark/objective_landmark/science, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) +"gxi" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) +"gxQ" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) +"gxX" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) "gyw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/carpet, /area/varadero/interior/library) +"gyz" = ( +/turf/closed/wall/mineral/gold, +/area/varadero/interior/maintenance) +"gyE" = ( +/obj/structure/bed/chair/wood/normal, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "gyX" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/wood, @@ -7377,10 +10145,15 @@ icon_state = "yellow" }, /area/varadero/interior/technical_storage) -"gzW" = ( -/obj/structure/surface/table/woodentable, -/turf/open/floor/carpet, -/area/varadero/interior/library) +"gzm" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "gAl" = ( /obj/structure/bed/chair{ dir = 4 @@ -7393,12 +10166,25 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"gAV" = ( -/obj/structure/barricade/wooden{ - dir = 1 +"gAK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"gAV" = ( +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) "gBi" = ( @@ -7438,6 +10224,20 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"gBP" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "gBV" = ( /obj/structure/machinery/photocopier, /turf/open/floor/shiva{ @@ -7445,6 +10245,19 @@ icon_state = "redfull" }, /area/varadero/interior/security) +"gBW" = ( +/obj/item/stack/sandbags_empty/half, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) +"gCe" = ( +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"gCh" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/central) "gCi" = ( /obj/structure/machinery/light{ dir = 1 @@ -7453,15 +10266,6 @@ icon_state = "blue" }, /area/varadero/interior/hall_SE) -"gCC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/plating, -/area/varadero/interior/administration) "gCH" = ( /obj/item/ammo_casing{ dir = 6; @@ -7469,12 +10273,42 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"gCQ" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"gCZ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "gDh" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"gDr" = ( +/obj/item/tool/warning_cone, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "gDI" = ( /obj/structure/bed/chair{ dir = 4 @@ -7489,6 +10323,12 @@ icon_state = "purple" }, /area/varadero/interior/research) +"gEz" = ( +/obj/structure/machinery/medical_pod/bodyscanner, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/medical) "gEO" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/m4a3, @@ -7500,6 +10340,10 @@ icon_state = "red" }, /area/varadero/interior/security) +"gEP" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves) "gES" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -7521,22 +10365,19 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"gFv" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor{ - icon_state = "white" - }, -/area/varadero/interior/toilets) "gFx" = ( /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"gFA" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/eastbeach) +"gFH" = ( +/obj/structure/inflatable/door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "gFW" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -7572,7 +10413,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) +/area/varadero/interior/cargo) "gIB" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva{ @@ -7580,6 +10421,13 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) +"gIE" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) "gJs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -7588,18 +10436,16 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"gJS" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access = null; - req_access_txt = null; - req_one_access = null +"gJy" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" }, -/turf/open/floor/plating, -/area/varadero/interior/maintenance/research) +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"gJN" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "gKn" = ( /obj/structure/machinery/light{ dir = 8 @@ -7612,22 +10458,18 @@ icon_state = "green" }, /area/varadero/interior/court) +"gKs" = ( +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/interior/oob) "gKw" = ( /obj/structure/surface/rack, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) -"gKH" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/dirt, -/area/varadero/interior_protected/caves/digsite) -"gKR" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) +/area/varadero/interior/cargo) "gLo" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -7636,13 +10478,14 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"gLK" = ( -/obj/structure/machinery/washing_machine, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "snow_mat" - }, -/area/varadero/interior/security) +"gLw" = ( +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"gLV" = ( +/obj/structure/closet/crate, +/obj/item/tool/lighter, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "gLZ" = ( /obj/structure/filingcabinet{ density = 0; @@ -7659,10 +10502,28 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/bunks) -"gMf" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating/icefloor, -/area/varadero/interior/maintenance/north) +"gMi" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/pontoon_beach) +"gMm" = ( +/obj/structure/platform/kutjevo/rock{ + dir = 1 + }, +/obj/structure/platform/kutjevo/rock, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/maintenance/south) "gMp" = ( /obj/structure/surface/table, /obj/item/paper_bin{ @@ -7672,26 +10533,17 @@ /obj/item/tool/pen/red/clicky, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"gMs" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/obj/effect/decal/cleanable/cobweb{ - dir = 4 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) -"gMU" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 +"gMV" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "multi_tiles" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/medical) +/area/varadero/interior/caves/north_research) "gNb" = ( /obj/structure/closet/wardrobe/chaplain_black, /turf/open/floor/wood, @@ -7708,13 +10560,6 @@ /obj/structure/inflatable/door, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"gNQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) "gOe" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/access/arrivals, /turf/open/floor/shiva{ @@ -7722,13 +10567,17 @@ icon_state = "green" }, /area/varadero/interior/records) -"gOJ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) +"gOj" = ( +/obj/item/tool/warning_cone, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/digsite) +"gOp" = ( +/obj/item/tool/wirecutters, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"gPi" = ( +/turf/open/gm/coast/west, +/area/varadero/exterior/monsoon) "gPA" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -7742,6 +10591,20 @@ icon_state = "desert2" }, /area/varadero/exterior/lz1_near) +"gPL" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/west, +/area/varadero/exterior/pontoon_beach) "gPZ" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -7754,6 +10617,25 @@ icon_state = "red" }, /area/varadero/interior/administration) +"gQa" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/item/ammo_casing/shell{ + icon_state = "cartridge_3_1" + }, +/turf/open/floor/shiva{ + icon_state = "wredfull" + }, +/area/varadero/interior/medical) +"gRj" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/grown/log, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "gRN" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -7778,14 +10660,45 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/security) +"gRU" = ( +/obj/structure/machinery/floodlight{ + name = "Floodlight"; + unacidable = 0; + wrenchable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) +"gSn" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) "gSC" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"gSE" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) "gSY" = ( /obj/structure/largecrate/random/mini/ammo{ pixel_x = -6; @@ -7799,31 +10712,45 @@ "gTe" = ( /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) -"gTr" = ( -/obj/structure/closet/crate/ammo/alt, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "gTC" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/disposals) -"gUb" = ( -/obj/structure/surface/table, -/obj/item/bodybag, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "red" - }, -/area/varadero/interior/morgue) "gUP" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior_protected/caves) +"gVd" = ( +/obj/structure/fence, +/turf/open/gm/coast/north, +/area/varadero/exterior/lz2_near) +"gVq" = ( +/obj/structure/largecrate/random/case, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "gVO" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/varadero/exterior/pontoon_beach) +"gVP" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/lz2_near) +"gVQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/shield/riot, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "gWd" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 16 @@ -7834,18 +10761,30 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"gWA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/largecrate/random/mini/ammo{ - pixel_y = 4 - }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) "gWL" = ( /obj/structure/surface/table, /obj/structure/machinery/faxmachine, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"gXf" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "gXh" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -7855,46 +10794,64 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"gXK" = ( -/obj/structure/sign/safety/bulkhead_door, -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) +"gXw" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "gXN" = ( -/obj/structure/machinery/portable_atmospherics/canister/air, +/obj/structure/machinery/recharge_station, /turf/open/floor/shiva{ dir = 8; icon_state = "yellowfull" }, /area/varadero/interior/electrical) -"gYY" = ( -/obj/structure/surface/table, +"gXO" = ( +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/shiva{ - dir = 10; + dir = 4; icon_state = "yellow" }, -/area/varadero/interior/cargo) +/area/varadero/interior/comms3) +"gYg" = ( +/obj/item/toy/beach_ball/holoball, +/obj/structure/surface/rack, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) +"gYh" = ( +/turf/closed/wall/wood, +/area/varadero/interior/beach_bar) "gZq" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/morgue) -"gZN" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 +"gZI" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 }, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "red" +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 }, -/area/varadero/interior/morgue) -"gZP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/obj/effect/landmark/objective_landmark/medium, +/obj/item/reagent_container/food/drinks/flask/vacuumflask{ + pixel_x = 9; + pixel_y = 25 }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/turf/open/floor/wood, +/area/varadero/interior/bunks) "haq" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -7919,11 +10876,34 @@ icon_state = "redfull" }, /area/varadero/interior/security) +"haC" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "wred" + }, +/area/varadero/interior/medical) +"haP" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/comms1) +"haR" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/pontoon_beach) "haT" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/technical_storage) +"haV" = ( +/obj/structure/closet/crate/secure, +/obj/effect/landmark/objective_landmark/medium, +/obj/item/trash/kepler, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "haX" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/green, @@ -7931,6 +10911,36 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"hbi" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"hbD" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) +"hbP" = ( +/obj/structure/surface/table, +/obj/item/storage/firstaid/regular{ + pixel_x = 4; + pixel_y = 12 + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "hca" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7953,14 +10963,30 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"hcT" = ( -/obj/structure/machinery/light/small{ - dir = 4 +"hcI" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) +"hds" = ( +/turf/open/gm/coast/north, +/area/varadero/exterior/eastocean) +"hdV" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/comms2) +"hej" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "hek" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva{ @@ -7974,6 +11000,24 @@ icon_state = "floor3" }, /area/varadero/interior/mess) +"heu" = ( +/obj/item/device/flashlight/lamp/tripod, +/obj/structure/machinery/power/apc{ + dir = 8; + pixel_x = -24; + start_charge = 0 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) +"hfn" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "hfo" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -8009,6 +11053,24 @@ dir = 1 }, /area/varadero/interior/research) +"hfZ" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"hgc" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "hgB" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -8017,13 +11079,18 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"hht" = ( -/obj/structure/blocker/fog, -/turf/open/gm/river, -/area/varadero/interior/oob) "hhM" = ( /turf/closed/wall/r_wall, /area/varadero/interior/caves/north_research) +"hhW" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/stamp{ + icon_state = "stamp-ce" + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/records) "hic" = ( /obj/structure/machinery/light{ dir = 1 @@ -8033,10 +11100,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"hih" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating, -/area/varadero/interior/security) "hiD" = ( /turf/open/floor/shiva{ dir = 1; @@ -8047,27 +11110,42 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"hjj" = ( -/obj/item/ammo_magazine/handful/shotgun/buckshot{ - pixel_x = 4; - pixel_y = -16 +"hjf" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 }, -/turf/open/floor/carpet, -/area/varadero/exterior/lz1_near) -"hjD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"hjn" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 }, +/obj/structure/girder, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"hjK" = ( /obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) -"hkc" = ( -/obj/structure/surface/table, -/obj/item/device/binoculars, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/comms2) +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) +"hkQ" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "hkZ" = ( /obj/structure/surface/table/woodentable, /obj/item/folder/red, @@ -8085,6 +11163,20 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) +"hli" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/medical) "hlp" = ( /obj/structure/closet/toolcloset, /obj/effect/landmark/objective_landmark/close, @@ -8092,6 +11184,34 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"hlw" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) +"hlF" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"hlG" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) "hlK" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/box/drinkingglasses{ @@ -8115,6 +11235,11 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"hmh" = ( +/turf/open/gm/dirt{ + icon_state = "desert_dug" + }, +/area/varadero/exterior/lz2_near) "hmm" = ( /obj/structure/machinery/light, /obj/structure/surface/table, @@ -8133,24 +11258,35 @@ icon_state = "floor3" }, /area/varadero/interior/laundry) -"hmu" = ( -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/eastbeach) +"hmp" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "greenfull" + }, +/area/varadero/interior/hall_N) +"hmR" = ( +/obj/item/tool/crowbar, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "hni" = ( /obj/structure/sign/safety/fire_haz{ pixel_y = 7 }, /turf/closed/wall/rock/brown, /area/varadero/interior/oob) -"hnS" = ( +"hnR" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, /obj/structure/machinery/light{ - dir = 8 + dir = 4 }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellow" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/electrical) +/area/varadero/exterior/comms4) "hoC" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, @@ -8175,6 +11311,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"hoP" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/maintenance) "hoU" = ( /obj/effect/decal/cleanable/blood{ basecolor = "#20d450"; @@ -8184,13 +11324,6 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"hpQ" = ( -/obj/structure/largecrate/random, -/turf/open/shuttle/elevator, -/area/varadero/interior/hall_N) -"hqL" = ( -/turf/open/floor/carpet, -/area/varadero/exterior/lz1_near) "hre" = ( /turf/open/gm/dirt, /area/varadero/interior_protected/caves/digsite) @@ -8207,12 +11340,26 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) +"hsa" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "hsl" = ( /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" }, /area/varadero/interior/maintenance/north) +"hso" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "hst" = ( /obj/structure/sign/safety/high_voltage, /turf/closed/wall/r_wall, @@ -8235,7 +11382,18 @@ "hte" = ( /turf/closed/wall/rock/brown, /area/varadero/interior_protected/vessel) -"hto" = ( +"hti" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"hto" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) @@ -8251,9 +11409,37 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"huc" = ( -/turf/closed/wall, -/area/varadero/interior/comms1) +"htU" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = -7; + pixel_y = 13 + }, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/wood, +/area/varadero/interior/records) +"huf" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/comms4) +"hus" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/comms3) "hux" = ( /obj/structure/bed/chair/office/light, /turf/open/floor/shiva{ @@ -8268,26 +11454,12 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"huz" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/surface/table/reinforced/prison{ - dir = 8; - flipped = 1 - }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"huE" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/area/varadero/interior/hall_SE) -"huD" = ( -/obj/item/stack/sheet/metal, /turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/area/varadero/exterior/monsoon) "huF" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/interior/oob) @@ -8303,10 +11475,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"hvj" = ( -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/plating, -/area/varadero/interior/disposals) "hvO" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" @@ -8318,18 +11486,17 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"hwz" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +"hwE" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/comms1) +/area/varadero/exterior/monsoon) +"hwL" = ( +/obj/structure/prop/dam/crane/damaged, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "hwN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8356,6 +11523,19 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"hxa" = ( +/obj/structure/closet/secure_closet/security, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "red" + }, +/area/varadero/interior/administration) +"hxO" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "hyd" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8378,18 +11558,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"hyN" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -16; - pixel_y = 13 +"hys" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/dirt, -/area/varadero/interior/maintenance/north) +/area/varadero/interior/hall_SE) "hyQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, @@ -8416,6 +11590,22 @@ icon_state = "red" }, /area/varadero/interior/security) +"hzx" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"hzK" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "hAg" = ( /obj/structure/largecrate/random/case/double, /turf/open/gm/dirt, @@ -8424,12 +11614,38 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/wood, /area/varadero/interior/court) +"hAI" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"hBA" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) "hBX" = ( /turf/open/floor/shiva{ dir = 10; icon_state = "purple" }, /area/varadero/interior/research) +"hCw" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "hCZ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -8439,20 +11655,30 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) -"hDA" = ( +"hDk" = ( +/obj/structure/bedsheetbin, +/obj/item/storage/box/attachments{ + pixel_x = -2; + pixel_y = 8 + }, +/obj/item/ammo_magazine/rifle/m4ra, /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/varadero/interior/research) -"hDV" = ( -/obj/effect/decal/cleanable/cobweb{ - dir = 8; - pixel_x = 11 +/area/varadero/interior/bunks) +"hDw" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"hDA" = ( +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/area/varadero/interior/maintenance) +/area/varadero/interior/research) "hDX" = ( /obj/structure/machinery/cryo_cell, /obj/structure/pipes/standard/cap, @@ -8460,12 +11686,30 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"hEE" = ( -/obj/structure/closet/toolcloset, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"hDY" = ( +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "windsock"; + pixel_x = 18; + pixel_y = 23 }, -/area/varadero/interior/comms2) +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"hEs" = ( +/obj/structure/machinery/landinglight/ds2{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"hEv" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/eastocean) "hEN" = ( /obj/structure/closet/l3closet/scientist, /turf/open/floor/shiva{ @@ -8473,6 +11717,14 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"hET" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "hFA" = ( /obj/structure/window/reinforced{ dir = 4 @@ -8488,65 +11740,51 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor{ - icon_state = "dark2" +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" }, /area/varadero/interior/hall_N) -"hGm" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clipboard{ - pixel_x = -2; - pixel_y = 5 - }, -/obj/item/tool/pen/red{ - pixel_x = 6; - pixel_y = 9 - }, -/obj/item/paper{ - pixel_x = -7; - pixel_y = 7 - }, +"hFM" = ( +/obj/structure/window_frame/wood, /turf/open/floor/wood, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/beach_bar) +"hGl" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "hGz" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/shiva{ icon_state = "wredfull" }, /area/varadero/interior/medical) -"hGZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +"hHn" = ( +/obj/effect/landmark/hunter_secondary, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"hHE" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) -"hHt" = ( -/obj/structure/machinery/light{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_x = 16; - pixel_y = -8 +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Underground Power Substation" }, /turf/open/floor/shiva{ - dir = 4; - icon_state = "green" + dir = 1; + icon_state = "multi_tiles" }, -/area/varadero/interior/hall_SE) -"hHA" = ( +/area/varadero/interior/electrical) +"hHK" = ( +/obj/structure/machinery/bot/mulebot, /turf/open/floor/shiva{ - dir = 4; - icon_state = "red" + icon_state = "floor3" }, -/area/varadero/interior/medical) +/area/varadero/interior/cargo) "hHR" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -8558,6 +11796,15 @@ }, /turf/closed/wall/r_wall, /area/varadero/interior/security) +"hIo" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/varadero/interior/court) "hJl" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -8568,6 +11815,18 @@ icon_state = "red" }, /area/varadero/interior/security) +"hJq" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/item/reagent_container/glass/bucket{ + pixel_x = 9; + pixel_y = 9 + }, +/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "hJw" = ( /obj/structure/largecrate/random, /obj/item/storage/photo_album{ @@ -8575,6 +11834,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"hJB" = ( +/obj/structure/blocker/fog, +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/exterior/farocean) "hJO" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ @@ -8585,18 +11848,6 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) -"hJQ" = ( -/obj/structure/surface/table, -/obj/item/tool/kitchen/utensil/fork, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice8"; - pixel_x = 16; - pixel_y = 24 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/mess) "hKe" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -8609,14 +11860,28 @@ "hKK" = ( /turf/open/gm/coast/west, /area/varadero/exterior/pontoon_beach) -"hLA" = ( -/obj/structure/pipes/standard/simple/hidden/green{ +"hLt" = ( +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"hLE" = ( +/obj/structure/pipes/vents/pump{ dir = 4 }, +/obj/effect/landmark/corpsespawner/doctor, +/obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/shiva{ - icon_state = "floor3" + icon_state = "redfull" }, -/area/varadero/interior/mess) +/area/varadero/interior/medical) "hLF" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/invuln/overhead_pipe{ @@ -8634,14 +11899,31 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"hMf" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/landmark/objective_landmark/close, +"hLQ" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/shiva{ + icon_state = "blue" + }, +/area/varadero/interior/maintenance) +"hLY" = ( +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, /turf/open/floor/shiva{ dir = 1; - icon_state = "yellow" + icon_state = "blue" }, -/area/varadero/interior/electrical) +/area/varadero/interior/maintenance) +"hMg" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "hMh" = ( /obj/structure/filingcabinet, /obj/item/paper/research_notes, @@ -8649,6 +11931,39 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"hMC" = ( +/obj/item/clothing/ears/earmuffs{ + layer = 3.1; + pixel_x = 2; + pixel_y = 18 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) +"hMG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/trash/candle, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) +"hMI" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/exterior/eastbeach) +"hMV" = ( +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "red" + }, +/area/varadero/interior/medical) "hNb" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -8667,18 +11982,29 @@ icon_state = "redfull" }, /area/varadero/interior/hall_SE) -"hNC" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"hNq" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/electrical) -"hOe" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) +"hOp" = ( +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" + }, +/obj/effect/decal/warning_stripes, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/dirt, /area/varadero/exterior/lz1_near) "hOv" = ( /obj/structure/desertdam/decals/road_edge{ @@ -8697,6 +12023,13 @@ icon_state = "floor3" }, /area/varadero/interior/bunks) +"hPj" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior/security) +"hPq" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "hPD" = ( /turf/open/floor/shiva{ icon_state = "floor3" @@ -8718,31 +12051,48 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) -"hQn" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/secure{ - dir = 2; - icon_state = "door_locked"; - locked = 1; - name = "Underground Secure Technical Storage"; - req_access_txt = "100" +"hQl" = ( +/obj/structure/girder, +/turf/open/gm/dirt{ + icon_state = "desert3" }, -/turf/open/floor/plating, -/area/varadero/interior/technical_storage) -"hQq" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior_protected/caves/central) -"hQH" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/machinery/light{ - dir = 1 +/area/varadero/exterior/eastbeach) +"hQo" = ( +/obj/structure/bed/roller, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/shiva{ +/area/varadero/interior/maintenance) +"hQP" = ( +/obj/item/ammo_magazine/handful/shotgun/buckshot{ + pixel_x = 4; + pixel_y = -16 + }, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) +"hQV" = ( +/obj/structure/prop/structure_lattice{ dir = 1; - icon_state = "yellow" + health = 300 }, -/area/varadero/interior/electrical) +/obj/structure/prop/structure_lattice{ + dir = 1; + layer = 3.1; + pixel_y = 10 + }, +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "vent4"; + pixel_y = 25 + }, +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "windsock"; + pixel_x = 18; + pixel_y = 23 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "hRs" = ( /obj/structure/machinery/power/smes/magical{ capacity = 9e+008; @@ -8759,29 +12109,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) -"hSx" = ( -/obj/structure/bed/roller, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "red" - }, -/area/varadero/interior/morgue) -"hSN" = ( -/turf/open/floor/plating, -/area/varadero/interior/administration) -"hSU" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/landmark/hunter_primary, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" - }, -/area/varadero/interior/electrical) "hTd" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8804,6 +12131,21 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/vessel) +"hTQ" = ( +/obj/structure/airlock_assembly, +/turf/open/shuttle{ + icon_state = "floor6" + }, +/area/varadero/interior_protected/vessel) +"hTX" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/monsoon) "hTZ" = ( /obj/structure/surface/table, /obj/structure/prop/server_equipment/laptop/closed{ @@ -8826,13 +12168,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"hUq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/effect/overlay/palmtree_r, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "hUs" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -8847,17 +12182,6 @@ icon_state = "red" }, /area/varadero/interior/hall_SE) -"hUK" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) "hUU" = ( /obj/structure/machinery/requests_console{ icon_state = "req_comp_open" @@ -8870,25 +12194,46 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) -"hVM" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" +"hVL" = ( +/obj/item/stack/sandbags/large_stack{ + pixel_y = 4; + pixel_x = -12 }, -/area/varadero/interior/electrical) -"hWm" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Underground Main Hallway"; - req_access_txt = "100" +/turf/open/gm/dirt{ + icon_state = "desert0" }, -/turf/open/floor/plating, -/area/varadero/interior/hall_NW) +/area/varadero/exterior/lz2_near) +"hWv" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_3" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastocean) +"hWA" = ( +/obj/structure/surface/table, +/obj/item/tool/kitchen/utensil/fork, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) "hWG" = ( /obj/effect/landmark/xeno_spawn, -/turf/open/auto_turf/sand_white/layer0, +/turf/open/gm/dirt, /area/varadero/interior_protected/caves) +"hXe" = ( +/obj/structure/surface/table, +/obj/item/tool/kitchen/knife{ + pixel_x = 7; + pixel_y = -1 + }, +/obj/item/reagent_container/food/snacks/carpmeat, +/obj/item/prop/helmetgarb/helmet_nvg/cosmetic{ + pixel_x = -8; + pixel_y = 9 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "hXg" = ( /obj/structure/bed/chair{ dir = 1 @@ -8898,12 +12243,11 @@ icon_state = "green" }, /area/varadero/interior/court) -"hXj" = ( -/obj/item/weapon/gun/rifle/m41a, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"hXq" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/bunks) +/area/varadero/interior_protected/caves/digsite) "hXv" = ( /obj/structure/surface/table, /turf/open/floor/shiva{ @@ -8911,24 +12255,15 @@ icon_state = "red" }, /area/varadero/interior/security) -"hXN" = ( -/obj/structure/largecrate/random/mini, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/interior/comms3) -"hYf" = ( -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, -/obj/structure/machinery/light{ - dir = 1 - }, +"hXR" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) +"hYp" = ( +/obj/structure/window/framed/colony, /turf/open/floor/shiva{ - icon_state = "green" + icon_state = "multi_tiles" }, -/area/varadero/interior/hall_N) +/area/varadero/interior/maintenance) "hZo" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -8939,32 +12274,35 @@ }, /area/varadero/interior/medical) "hZD" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, -/obj/item/handcuffs{ - pixel_x = 2; - pixel_y = 16 - }, -/obj/item/book/manual/marine_law{ - pixel_x = 8 - }, -/obj/item/reagent_container/food/drinks/bottle/vodka{ - pixel_x = -5; - pixel_y = 1 - }, /turf/open/floor/shiva{ icon_state = "redfull" }, /area/varadero/interior/security) +"hZE" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/coast/north, +/area/varadero/exterior/lz1_near) "iad" = ( /turf/open/floor/shiva{ dir = 1; icon_state = "green" }, /area/varadero/interior/hall_SE) +"iah" = ( +/obj/item/tool/pickaxe, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/comms1) +"ias" = ( +/obj/structure/machinery/camera/autoname/lz_camera, +/obj/structure/machinery/landinglight/ds1/spoke{ + pixel_y = -5; + pixel_x = 13 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "iat" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -8973,29 +12311,53 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"iaC" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"iax" = ( +/turf/open/gm/coast/south, +/area/varadero/interior/oob) +"iaH" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 24 }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"iaM" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/coast/east, -/area/varadero/interior/oob) +/area/varadero/interior_protected/maintenance/south) "iaO" = ( /turf/closed/wall/r_wall/elevator{ dir = 9 }, /area/varadero/interior/hall_N) +"iaT" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"ibi" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "ibo" = ( /obj/structure/prop/broken_arcade, /turf/open/floor{ icon_state = "wood" }, /area/varadero/interior/library) +"ibs" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "iby" = ( /obj/structure/machinery/light{ dir = 4 @@ -9016,6 +12378,38 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"ibV" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/hall_SE) +"icb" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/device/camera{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/newspaper{ + layer = 2.99; + pixel_x = 7; + pixel_y = 4 + }, +/obj/structure/surface/table, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"icl" = ( +/obj/structure/prop/rock/brown, +/turf/closed/wall/rock/brown, +/area/varadero/interior/oob) +"icm" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_2" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "icn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9038,6 +12432,19 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"icJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "icM" = ( /obj/structure/bed/chair{ dir = 8 @@ -9047,20 +12454,6 @@ icon_state = "green" }, /area/varadero/interior/hall_NW) -"icX" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/security{ - dir = 1; - name = "\improper Underground Security Interrogation Observation"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) -"icZ" = ( -/turf/closed/wall/r_wall/elevator/arrivals{ - icon_state = "wall_dorm" - }, -/area/varadero/interior/hall_N) "idn" = ( /obj/structure/window/reinforced{ dir = 4; @@ -9079,52 +12472,16 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"idr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "idw" = ( /turf/open/floor/wood, /area/varadero/interior/security) -"idF" = ( -/obj/item/reagent_container/glass/bucket{ - pixel_x = -11; - pixel_y = -4 - }, -/turf/open/gm/coast/beachcorner2/south_west, -/area/varadero/exterior/pontoon_beach) -"idI" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 5 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) -"ieh" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) -"ies" = ( -/obj/effect/spawner/random/tool, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "iet" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, +/obj/structure/machinery/light/small, /turf/open/floor{ icon_state = "wood" }, @@ -9136,9 +12493,6 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) -"ifw" = ( -/turf/open/floor/plating, -/area/varadero/interior/security) "ifx" = ( /obj/item/weapon/gun/smg/nailgun{ pixel_y = 3 @@ -9155,6 +12509,41 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/comms4) +"ifO" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + desc = "A high-power hydroelectric generator."; + name = "hydroelectric generator" + }, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/farocean) +"ifZ" = ( +/obj/structure/desertdam/decals/road_edge{ + pixel_x = 2 + }, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/wood, +/area/varadero/interior/court) +"igB" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"igQ" = ( +/obj/structure/machinery/power/port_gen/pacman, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "igU" = ( /obj/item/roller{ pixel_x = 2; @@ -9178,56 +12567,87 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"ihF" = ( +"iht" = ( +/obj/structure/surface/table, +/obj/item/paper/janitor{ + pixel_y = 8 + }, +/obj/item/storage/belt/utility, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) +"ihC" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/monsoon) +"ihX" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 1 + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 }, -/area/varadero/interior/comms1) -"ihG" = ( -/obj/structure/largecrate/random/case, /turf/open/gm/dirt, -/area/varadero/interior/maintenance/north) -"iiV" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null +/area/varadero/exterior/eastbeach) +"ihY" = ( +/turf/closed/wall/rock/brown, +/area/varadero/exterior/eastbeach) +"iig" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 }, -/turf/open/floor/plating, -/area/varadero/interior/hall_N) +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" + }, +/obj/effect/decal/warning_stripes, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"iiX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/secure{ + dir = 2; + icon_state = "door_locked"; + locked = 1; + name = "Underground Secure Technical Storage"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/technical_storage) "ijo" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/shuttle{ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"ijy" = ( -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) -"ijR" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast/east, -/area/varadero/interior/oob) +"ijO" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/varadero/interior/beach_bar) +"ijZ" = ( +/obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "iks" = ( /obj/item/tool/shovel/spade, /turf/open/gm/dirt, /area/varadero/interior/maintenance/north) -"ilr" = ( -/obj/structure/bed{ - can_buckle = 0; - desc = "A lightweight support lattice."; - icon = 'icons/obj/structures/structures.dmi'; - icon_state = "latticefull"; - layer = 2.1; - name = "lattice" - }, -/turf/open/gm/river, -/area/varadero/interior_protected/vessel) "ilQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9239,6 +12659,17 @@ icon_state = "floor3" }, /area/varadero/interior/administration) +"ilZ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Underground Security Armory"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) "imd" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -9246,20 +12677,26 @@ icon_state = "yellow" }, /area/varadero/interior/hall_N) +"imk" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) +"imu" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "imz" = ( /turf/closed/wall/r_wall/elevator/gears, /area/varadero/interior/records) -"imF" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Underground Men's Restroom"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/toilets) "imZ" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, @@ -9276,6 +12713,29 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"inN" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/pontoon_beach) +"inV" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "ioc" = ( /obj/structure/surface/table/woodentable, /obj/item/evidencebag, @@ -9290,6 +12750,23 @@ /obj/structure/closet/medical_wall, /turf/closed/wall, /area/varadero/interior/medical) +"ior" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "ioA" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva{ @@ -9297,29 +12774,40 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"ioM" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" - }, +"ipi" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" +/obj/structure/sign/double/barsign{ + name = "The Salty Cutlass"; + desc = "Come drown your troubles away! Mind the sway." }, -/area/varadero/interior_protected/vessel) -"ipv" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/turf/closed/wall/wood, +/area/varadero/interior/beach_bar) +"ipl" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" }, -/obj/structure/machinery/sleep_console, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_3"; + pixel_y = 11 }, -/area/varadero/interior/medical) +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) +"ipC" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_3" + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "ipZ" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -9327,20 +12815,6 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"iqq" = ( -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) "iqv" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -9360,7 +12834,10 @@ /area/varadero/interior_protected/vessel) "iqW" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/shotgun/incendiary, +/obj/item/paper{ + name = "Incendiary Ammunition Order"; + desc = "An order manifest for incendiary ammo that has yet to be filled out." + }, /turf/open/floor/shiva{ icon_state = "red" }, @@ -9369,15 +12846,6 @@ /obj/item/frame/apc, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) -"irc" = ( -/obj/item/ammo_casing{ - dir = 2; - icon_state = "casing_5" - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/bunks) "irj" = ( /turf/open/floor/shiva{ dir = 8; @@ -9419,11 +12887,35 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/varadero/interior/administration) +"itL" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "itP" = ( /turf/closed/wall/r_wall/elevator{ dir = 6 }, /area/varadero/interior/hall_N) +"itQ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/west, +/area/varadero/exterior/lz1_near) "itT" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/gm/dirt, @@ -9438,12 +12930,6 @@ icon_state = "floor3" }, /area/varadero/interior/cargo) -"iue" = ( -/obj/structure/machinery/power/port_gen/pacman, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/exterior/lz1_near) "ivg" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/landmark/objective_landmark/close, @@ -9451,18 +12937,10 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"ivp" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 1; - name = "\improper Theta-V Breakroom"; - req_access_txt = null; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/research) +"ivo" = ( +/obj/structure/airlock_assembly, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "ivD" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9500,13 +12978,14 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"iwd" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "multi_tiles" - }, -/area/varadero/interior/electrical) +"iwf" = ( +/mob/living/simple_animal/mouse, +/turf/open/floor/wood, +/area/varadero/interior/hall_SE) +"iwg" = ( +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/floor/wood, +/area/varadero/interior/court) "iwo" = ( /obj/structure/filingcabinet{ density = 0; @@ -9538,25 +13017,17 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/bunks) -"iwy" = ( -/obj/structure/bedsheetbin, -/obj/item/storage/box/attachments{ - pixel_x = -2; - pixel_y = 8 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/bunks) -"iwQ" = ( -/obj/structure/barricade/wooden{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"iwT" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"iwV" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" }, -/area/varadero/interior/maintenance/north) +/area/varadero/interior_protected/vessel) "ixd" = ( /obj/structure/machinery/computer/communications{ dir = 4 @@ -9578,6 +13049,25 @@ icon_state = "red" }, /area/varadero/interior/security) +"ixl" = ( +/obj/item/tool/pickaxe, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) +"ixq" = ( +/obj/item/device/flashlight, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/exterior/lz1_near) +"ixr" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/hall_SE) +"ixw" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "ixQ" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, @@ -9597,26 +13087,50 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) +"iyv" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) "izi" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/shuttle{ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"izp" = ( -/obj/structure/machinery/door/airlock/almayer/engineering{ +"izl" = ( +/obj/structure/platform/kutjevo/smooth{ dir = 1; - name = "\improper Underground Technical Storage"; - req_access_txt = "100" + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/plating, -/area/varadero/interior/technical_storage) +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) "izs" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ dir = 1 }, /area/varadero/interior/research) +"izy" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/wood, +/area/varadero/interior/security) "izB" = ( /obj/item/stool{ pixel_x = 7; @@ -9636,21 +13150,6 @@ icon_state = "blue" }, /area/varadero/interior/maintenance) -"izU" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) "iAa" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -9660,6 +13159,13 @@ icon_state = "white" }, /area/varadero/interior/toilets) +"iAc" = ( +/obj/effect/decal/strata_decals/grime/grime4{ + dir = 4 + }, +/obj/item/clothing/suit/armor/vest, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) "iAp" = ( /obj/effect/decal/strata_decals/grime/grime3{ dir = 8 @@ -9675,6 +13181,17 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"iAE" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/farocean) +"iAP" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/pontoon_beach) "iAX" = ( /turf/open/floor/carpet, /area/varadero/interior/administration) @@ -9693,31 +13210,36 @@ icon_state = "green" }, /area/varadero/interior/mess) -"iBH" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/disposals) "iCy" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/research) -"iCH" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/river, -/area/varadero/interior/oob) +"iCB" = ( +/obj/effect/landmark/queen_spawn, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "iDn" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) +"iDE" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz2_near) +"iDM" = ( +/obj/structure/machinery/bot/medbot{ + name = "FOXYBOT 3000"; + desc = "A little medical robot. He looks somewhat traumatized." + }, +/turf/open/floor/prison/chapel_carpet, +/area/varadero/interior/chapel) "iDS" = ( /obj/structure/closet/secure_closet/security, /obj/effect/landmark/objective_landmark/far, @@ -9726,11 +13248,38 @@ icon_state = "redfull" }, /area/varadero/interior/hall_SE) -"iEx" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"iEe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/boozeomat, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"iFb" = ( +/turf/closed/wall/r_wall, +/area/varadero/interior_protected/caves/central) +"iFc" = ( +/obj/structure/largecrate/random/mini/chest{ + pixel_x = -7; + pixel_y = -11; + desc = "A chest... filled with the wildest riches!" + }, +/turf/open/gm/dirt{ + icon_state = "desert_dug" + }, +/area/varadero/exterior/lz2_near) +"iFm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/guestpass{ + dir = 1 }, +/obj/item/ammo_magazine/shotgun/buckshot{ + pixel_x = 17; + pixel_y = -4 + }, +/turf/open/floor/wood, /area/varadero/interior/maintenance/north) "iFy" = ( /obj/structure/surface/table/reinforced/prison, @@ -9763,6 +13312,10 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"iFQ" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/digsite) "iFZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -9771,47 +13324,48 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"iGu" = ( -/obj/structure/machinery/light/small{ - dir = 1 +"iGm" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" }, -/obj/structure/machinery/recharge_station, -/turf/open/floor/shiva{ +/area/varadero/interior/court) +"iGM" = ( +/obj/effect/decal/cleanable/cobweb{ dir = 1 }, -/area/varadero/interior/morgue) -"iGW" = ( -/obj/item/reagent_container/glass/bucket{ - pixel_y = -3 +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/obj/item/tool/hatchet{ - pixel_x = 3; - pixel_y = 5 +/area/varadero/interior/maintenance/security) +"iGS" = ( +/obj/effect/landmark/corpsespawner/engineer, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" }, -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/pontoon_beach) +/area/varadero/interior/electrical) "iHh" = ( /obj/item/weapon/gun/shotgun/pump, /turf/open/floor/carpet, /area/varadero/interior/security) -"iHm" = ( -/obj/structure/machinery/power/apc{ - pixel_y = -24; - start_charge = 0 - }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor{ - icon_state = "white" - }, -/area/varadero/interior/toilets) -"iIr" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +"iHE" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/central) +"iHN" = ( +/turf/open/gm/dirt{ + icon_state = "desert1" }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/exterior/eastocean) +"iIc" = ( +/obj/item/device/flashlight/slime{ + mouse_opacity = 0; + invisibility = 1; + indestructible = 1; + alpha = 0 }, -/area/varadero/interior/comms2) +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/pool) "iIt" = ( /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/wood, @@ -9850,6 +13404,26 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) +"iIY" = ( +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) +"iJa" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"iJk" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "green" + }, +/area/varadero/interior/mess) "iJD" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva, @@ -9866,36 +13440,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"iKh" = ( -/obj/structure/machinery/light/small, -/obj/structure/closet/secure_closet/personal/patient, -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 - }, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/medical) -"iKy" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, +"iLc" = ( +/obj/structure/surface/table/woodentable, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior_protected/maintenance/south) -"iLa" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/medical) +/area/varadero/interior/maintenance/security) "iLd" = ( /obj/structure/window/reinforced{ dir = 4; @@ -9936,39 +13486,15 @@ /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/mess) -"iLL" = ( -/turf/open/gm/coast/beachcorner2/north_west, -/area/varadero/exterior/eastbeach) -"iLN" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) -"iLR" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/machinery/power/apc{ - dir = 1 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/interior/comms1) -"iMi" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/fancy/cigarettes/arcturian_ace{ - pixel_x = -5; - pixel_y = 5 +"iMa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, +/obj/item/prop/magazine/boots, /turf/open/floor/shiva{ - dir = 4; - icon_state = "red" + icon_state = "multi_tiles" }, -/area/varadero/interior/administration) +/area/varadero/interior/cargo) "iMp" = ( /obj/structure/machinery/light{ dir = 1 @@ -9978,13 +13504,6 @@ icon_state = "blue" }, /area/varadero/interior/hall_SE) -"iMq" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Underground Security Interrogation"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) "iMM" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva{ @@ -10020,25 +13539,29 @@ icon_state = "floor3" }, /area/varadero/interior/mess) -"iOE" = ( -/turf/open/gm/dirt{ - icon_state = "desert1" +"iNU" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/device/flashlight, +/turf/open/floor/shiva{ + icon_state = "redfull" }, -/area/varadero/interior/comms3) +/area/varadero/interior/medical) +"iOi" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"iOv" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) "iOQ" = ( /obj/structure/bed/chair/office/dark, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/varadero/interior/records) -"iPb" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "iPw" = ( /obj/structure/machinery/alarm{ dir = 4; @@ -10051,12 +13574,30 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) +"iPH" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/shiva{ + icon_state = "yellow" + }, +/area/varadero/interior/comms3) "iPI" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ icon_state = "red" }, /area/varadero/interior/security) +"iQl" = ( +/obj/item/storage/firstaid, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/morgue) +"iQr" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz2_near) "iQs" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -10079,33 +13620,30 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"iQN" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8; - pixel_y = 11 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) "iQS" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/comms2) -"iSc" = ( -/turf/closed/wall/r_wall/elevator/arrivals{ - icon_state = "wall_button_arrivals" +"iRw" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/area/varadero/interior/records) +/obj/effect/landmark/corpsespawner/engineer, +/turf/open/floor/shiva, +/area/varadero/interior/technical_storage) +"iRR" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_NW) +"iRZ" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) "iSi" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 @@ -10157,6 +13695,10 @@ pixel_x = 10; pixel_y = 2 }, +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/open/floor/shiva{ dir = 1; icon_state = "red" @@ -10180,16 +13722,6 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"iTO" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - name = "\improper Underground Security"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) "iTP" = ( /obj/structure/filingcabinet{ density = 0; @@ -10210,10 +13742,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) -"iUj" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior/oob) "iUx" = ( /obj/structure/machinery/constructable_frame, /obj/structure/machinery/light{ @@ -10224,26 +13752,42 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"iUA" = ( -/obj/item/toy/beach_ball, -/turf/open/gm/river, -/area/varadero/interior/maintenance) -"iUO" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/hypospray/tricordrazine{ - pixel_x = -14; - pixel_y = 2 +"iUH" = ( +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" }, -/obj/item/weapon/gun/energy/rxfm5_eva, -/turf/open/floor/shiva{ - icon_state = "blue" +/obj/effect/decal/warning_stripes, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/technical_storage) +/area/varadero/exterior/eastbeach) +"iUZ" = ( +/obj/structure/ore_box, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "iVt" = ( /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/electrical) +"iVD" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) "iWf" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -10252,6 +13796,19 @@ icon_state = "wredfull" }, /area/varadero/interior/medical) +"iWj" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/coast/south, +/area/varadero/exterior/farocean) +"iWE" = ( +/obj/item/ammo_casing/shell{ + icon_state = "cartridge_10" + }, +/obj/effect/landmark/corpsespawner/miner, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) "iWK" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -10261,6 +13818,23 @@ icon_state = "floor3" }, /area/varadero/interior/administration) +"iWX" = ( +/obj/structure/machinery/floodlight{ + name = "Floodlight"; + unacidable = 0; + wrenchable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"iXy" = ( +/obj/item/tool/warning_cone, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "iXR" = ( /obj/structure/bed/chair/office/dark{ dir = 8; @@ -10302,6 +13876,39 @@ /obj/item/device/camera_film, /turf/open/floor/wood, /area/varadero/interior/security) +"iZj" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"iZx" = ( +/obj/structure/machinery/door_control/brbutton{ + id = "cargobay"; + name = "Cargo Bay Lock"; + pixel_y = 20 + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/cargo) "iZH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -10311,6 +13918,27 @@ icon_state = "red" }, /area/varadero/interior/medical) +"iZP" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"iZT" = ( +/obj/structure/machinery/power/apc{ + dir = 8; + pixel_x = -24; + start_charge = 0 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + icon_state = "blue" + }, +/area/varadero/interior/maintenance) "jai" = ( /obj/structure/filingcabinet/security, /obj/effect/landmark/objective_landmark/far, @@ -10322,6 +13950,12 @@ "jaF" = ( /turf/open/gm/coast/east, /area/varadero/exterior/pontoon_beach) +"jaL" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "yellow" + }, +/area/varadero/interior/electrical) "jbh" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -10332,15 +13966,6 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"jbj" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/medical) "jbR" = ( /obj/item/device/flashlight/lamp/tripod{ pixel_x = 7; @@ -10350,6 +13975,9 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"jcr" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior_protected/caves/swcaves) "jcz" = ( /turf/open/floor/shiva{ dir = 4; @@ -10368,22 +13996,48 @@ icon_state = "purple" }, /area/varadero/interior/research) +"jcC" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/ammo_magazine/shotgun/buckshot{ + pixel_x = 6; + pixel_y = -4 + }, +/turf/open/floor/shiva{ + icon_state = "red" + }, +/area/varadero/interior/security) "jcT" = ( /turf/closed/wall, /area/varadero/interior/maintenance) -"jcZ" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" +"jcY" = ( +/obj/structure/window/framed/colony/reinforced, +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/records) +/area/varadero/interior/maintenance/security) "jdm" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) +"jdu" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/pontoon_beach) +"jek" = ( +/turf/open/gm/coast/west, +/area/varadero/exterior/eastocean) "jeo" = ( /obj/item/tool/mop, /turf/open/floor/shiva{ @@ -10405,6 +14059,32 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/varadero/interior/cargo) +"jeT" = ( +/obj/item/weapon/harpoon/yautja{ + anchored = 1; + name = "Alien Harpoon"; + pixel_x = 6 + }, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/varadero/interior_protected/caves/digsite) +"jeW" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) "jfn" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -10421,6 +14101,24 @@ icon_state = "wood-broken3" }, /area/varadero/interior/court) +"jfw" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"jfA" = ( +/obj/item/device/motiondetector/hacked, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) "jfD" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/fourway/hidden/green, @@ -10449,20 +14147,15 @@ icon_state = "wredfull" }, /area/varadero/interior/medical) -"jhb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/medical/advanced/bruise_pack/upgraded{ - amount = 1; - pixel_x = -3; - pixel_y = 11 - }, -/obj/item/stack/medical/advanced/ointment/upgraded{ - amount = 2; - pixel_x = 4; - pixel_y = 1 +"jgV" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) +"jgY" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/records) "jhe" = ( /obj/structure/bed/chair, /obj/structure/machinery/alarm{ @@ -10473,6 +14166,19 @@ icon_state = "red" }, /area/varadero/interior/security) +"jhu" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "jhv" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -10480,12 +14186,32 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"jhK" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "jhL" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva{ icon_state = "blue" }, /area/varadero/interior/administration) +"jhM" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/exterior/lz1_near) "jhW" = ( /obj/structure/barricade/handrail/wire{ dir = 8; @@ -10495,14 +14221,15 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"jiF" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Underground Staff Canteen"; - req_access_txt = "100" +"jif" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/plating, -/area/varadero/interior/mess) +/obj/item/device/flashlight, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "jjg" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -10511,6 +14238,14 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"jjj" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "jjl" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -10531,6 +14266,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) +"jju" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "jjE" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/firealarm{ @@ -10543,6 +14282,17 @@ icon_state = "red" }, /area/varadero/interior/security) +"jjN" = ( +/turf/open/gm/dirt{ + icon_state = "desert2" + }, +/area/varadero/interior/maintenance/north) +"jjS" = ( +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/varadero/interior/maintenance/north) "jjZ" = ( /obj/structure/prop/turbine, /obj/structure/prop/turbine_extras/border, @@ -10550,6 +14300,11 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) +"jks" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "jlt" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee{ @@ -10578,16 +14333,6 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) -"jmB" = ( -/obj/structure/surface/table/reinforced/prison{ - dir = 1; - flipped = 1 - }, -/obj/structure/bed/chair{ - icon_state = "chair_alt" - }, -/turf/open/floor/carpet, -/area/varadero/interior/hall_SE) "jnq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -10598,17 +14343,36 @@ icon_state = "purple" }, /area/varadero/interior/research) -"joh" = ( -/obj/structure/machinery/door_control{ - id = "undergroundhangarsouth"; - name = "Underground Hangar Lock"; - pixel_x = -24 +"jnA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/turf/open/floor/plating/icefloor{ +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/medical) +"joe" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_2" + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"joN" = ( +/obj/item/trash/candle, +/turf/open/floor/prison/chapel_carpet{ dir = 1; - icon_state = "warnplate" + icon_state = "doubleside" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/chapel) "joO" = ( /obj/structure/machinery/power/port_gen/pacman, /obj/structure/cable/heavyduty{ @@ -10616,6 +14380,10 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"joV" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) "jpm" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Underground Maintenance"; @@ -10634,6 +14402,41 @@ "jpD" = ( /turf/closed/wall/r_wall, /area/varadero/interior_protected/caves) +"jpM" = ( +/obj/effect/decal/warning_stripes/asteroid{ + dir = 1; + icon_state = "warning_s" + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) +"jpZ" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"jqd" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/landinglight/ds1/spoke{ + pixel_y = -5; + pixel_x = 13 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "jqu" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva, @@ -10642,9 +14445,56 @@ /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"jrK" = ( -/turf/open/gm/river, +"jqJ" = ( +/obj/structure/disposalpipe/segment, +/obj/item/key/cargo_train, +/turf/open/floor/shiva{ + icon_state = "yellowcorners" + }, +/area/varadero/interior/cargo) +"jqK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 + }, +/obj/item/tool/surgery/scalpel/manager, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) +"jrq" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/north) +"jrr" = ( +/obj/structure/prop/invuln/overhead_pipe, +/turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"jrv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) +"jsf" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/security) "jsh" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -10654,6 +14504,16 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) +"jsx" = ( +/obj/item/prop/almayer/comp_open, +/obj/structure/surface/table, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"jsG" = ( +/obj/structure/surface/rack, +/obj/item/device/flashlight, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "jsO" = ( /obj/structure/machinery/light{ dir = 4 @@ -10672,10 +14532,19 @@ icon_state = "asteroidplating" }, /area/varadero/interior/comms1) -"jtw" = ( -/obj/effect/overlay/palmtree_r, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +"jtx" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/flora/bush/ausbushes/var3/stalkybush{ + pixel_y = 9 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) "jty" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor/shiva{ @@ -10683,6 +14552,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) +"jtH" = ( +/turf/open/floor{ + dir = 8; + icon_state = "asteroidwarning" + }, +/area/varadero/exterior/lz2_near) "jtI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/donut_box{ @@ -10715,12 +14590,6 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"juC" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river, -/area/varadero/interior/oob) "juL" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/prop/invuln/lattice_prop{ @@ -10733,26 +14602,48 @@ icon_state = "green" }, /area/varadero/interior/mess) -"juT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) "juW" = ( /turf/closed/wall/r_wall, /area/varadero/interior/comms3) +"jvc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/implanter{ + pixel_x = 10 + }, +/obj/item/ashtray/bronze{ + icon_state = "ashtray_half_br" + }, +/obj/effect/landmark/objective_landmark/medium, +/obj/item/weapon/gun/lever_action/r4t, +/obj/item/ammo_magazine/handful/lever_action, +/turf/open/floor/carpet, +/area/varadero/interior/research) "jvh" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/records) +"jvF" = ( +/obj/item/ammo_magazine/revolver/cmb, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/research) "jwf" = ( /obj/structure/platform_decoration/kutjevo, /obj/item/tool/warning_cone, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"jwy" = ( +/obj/item/weapon/gun/revolver/cmb, +/turf/open/floor/shiva{ + icon_state = "purple" + }, +/area/varadero/interior/research) +"jwX" = ( +/obj/structure/largecrate/random, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "jxe" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -10794,30 +14685,42 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"jzQ" = ( -/obj/structure/surface/table, -/obj/item/storage/wallet/random{ - pixel_y = 3 +"jzB" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/comms2) +/area/varadero/exterior/lz2_near) +"jzL" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/item/tool/warning_cone, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/pontoon_beach) "jzZ" = ( /turf/open/floor/carpet, /area/varadero/interior/library) -"jAw" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - pixel_x = 12; - pixel_y = 11 +"jAx" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = 10; - pixel_y = 20 +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, +/area/varadero/interior/maintenance) +"jAI" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) "jBl" = ( /obj/structure/machinery/light{ @@ -10850,24 +14753,56 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) -"jBO" = ( +"jCr" = ( +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) +"jCs" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) +"jCA" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/engineering{ + dir = 1; + name = "\improper Underground Technical Storage"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/technical_storage) +"jCE" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + dir = 1; + name = "Underground Medical Laboratory Operating Theatre"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/medical) +"jCN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice2"; - pixel_x = 16; - pixel_y = 24 +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/floor{ + icon_state = "white" }, -/area/varadero/interior/maintenance/research) -"jCr" = ( -/turf/open/floor/shiva{ - icon_state = "floor3" +/area/varadero/interior/toilets) +"jDe" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/area/varadero/interior/mess) +/area/varadero/exterior/comms4) "jDO" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -10893,6 +14828,25 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) +"jEv" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"jEG" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) "jEZ" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -10900,6 +14854,22 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"jFt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/chair/wood/normal{ + dir = 8 + }, +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"jFL" = ( +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/monsoon) "jGk" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -10909,8 +14879,19 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, /area/varadero/interior/medical) +"jGm" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "jGz" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -10921,6 +14902,12 @@ icon_state = "white" }, /area/varadero/interior/toilets) +"jGA" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "jGT" = ( /obj/structure/prop/invuln/minecart_tracks, /obj/structure/platform_decoration/kutjevo{ @@ -10962,48 +14949,141 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) -"jJT" = ( -/obj/structure/bed/chair, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +"jIo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clothing/gloves/botanic_leather, +/obj/item/clothing/mask/cigarette/weed{ + pixel_x = -11; + pixel_y = 16 }, -/area/varadero/exterior/lz1_near) -"jKg" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/obj/item/clothing/mask/cigarette/weed{ + pixel_x = -9; + pixel_y = 13 }, -/obj/structure/barricade/wooden{ - dir = 1 +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + icon_state = "blue" }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/interior/technical_storage) +"jJf" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/interior/caves/east) +"jJn" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/south, +/area/varadero/exterior/lz2_near) +"jJp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stock_parts/matter_bin/adv{ + pixel_x = -5; + pixel_y = 11 }, -/area/varadero/interior/maintenance/security) -"jKz" = ( -/obj/structure/machinery/holosign/surgery{ - id = "otice" +/obj/item/stack/sheet/plasteel{ + amount = 24 }, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/medical{ - dir = 1; - name = "Underground Medical Laboratory Operating Theatre"; - req_access_txt = "100"; - req_one_access = null +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" }, -/turf/open/floor/plating, -/area/varadero/interior/medical) -"jLr" = ( +/area/varadero/interior/research) +"jJC" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"jJX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/security{ + dir = 1; + name = "\improper Underground Security Interrogation Observation"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) +"jKs" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz2_near) +"jKz" = ( +/obj/structure/machinery/holosign/surgery{ + id = "otice" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/medical{ + dir = 1; + name = "Underground Medical Laboratory Operating Theatre"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/medical) +"jKK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, /turf/open/floor/plating, -/area/varadero/interior/chapel) +/area/varadero/interior/toilets) +"jKW" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"jLS" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "jLU" = ( /obj/structure/reagent_dispensers/fueltank/gas, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"jMq" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.01 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "jMr" = ( /turf/open/floor/shiva{ dir = 6; @@ -11017,21 +15097,16 @@ icon_state = "purple" }, /area/varadero/interior/research) -"jMM" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - name = "\improper Underground Medical Laboratory"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/medical) -"jMU" = ( -/obj/structure/closet/secure_closet/security, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "red" +"jNn" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"jNE" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/area/varadero/interior/security) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "jNS" = ( /obj/structure/bed/chair/wheelchair, /turf/open/floor/shiva{ @@ -11064,7 +15139,6 @@ }, /area/varadero/interior/hall_SE) "jOR" = ( -/obj/effect/spawner/random/supply_kit, /obj/structure/closet/secure_closet/security_empty, /turf/open/floor/shiva{ dir = 4; @@ -11109,12 +15183,18 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"jPW" = ( -/turf/open/floor/shiva{ - dir = 8; - icon_state = "redfull" +"jPM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/varadero/interior/hall_N) +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) +"jQa" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "jQe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -11124,6 +15204,18 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"jQg" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Underground Security"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "red" + }, +/area/varadero/interior/security) "jQB" = ( /obj/structure/surface/table/woodentable, /obj/item/clipboard, @@ -11146,11 +15238,8 @@ /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" }, -/obj/item/clothing/head/xenos{ - desc = "A hollowed out skull of a Lurker, this mass of chitin has been polished and cleaned to perfection"; - name = "hollow lurker head" - }, /obj/structure/window/reinforced, +/obj/item/clothing/head/fedora, /turf/open/floor/strata{ color = "#5e5d5d"; icon_state = "multi_tiles" @@ -11180,11 +15269,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/comms1) -"jRC" = ( -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) "jSN" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/surface/table/woodentable{ @@ -11203,43 +15287,26 @@ "jSX" = ( /turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/pontoon_beach) -"jTe" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/electrical) -"jTn" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"jTj" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_2" }, -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null +/turf/open/gm/dirt, +/area/varadero/exterior/eastocean) +"jTL" = ( +/turf/open/floor{ + icon_state = "bcircuit" }, -/turf/open/floor/plating, -/area/varadero/interior/electrical) +/area/varadero/interior/maintenance/north) +"jTR" = ( +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/monsoon) "jUt" = ( /obj/item/tool/weldingtool/experimental, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/hall_SE) -"jUA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stock_parts/matter_bin/adv{ - pixel_x = -5; - pixel_y = 11 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" - }, -/area/varadero/interior/research) "jUM" = ( /obj/structure/urinal{ pixel_y = 32 @@ -11259,9 +15326,6 @@ dir = 1 }, /area/varadero/interior/hall_N) -"jVw" = ( -/turf/open/gm/coast/north, -/area/varadero/exterior/eastbeach) "jVK" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -11275,6 +15339,16 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"jXn" = ( +/obj/structure/bed/chair{ + icon_state = "chair_alt"; + pixel_x = 3; + pixel_y = 17 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "jXp" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 @@ -11311,11 +15385,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"jYB" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) "jYX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper{ @@ -11332,6 +15401,10 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"jYZ" = ( +/obj/item/tool/pickaxe, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "jZw" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -11381,6 +15454,19 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) +"kap" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "kaY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/pill_bottle/inaprovaline/skillless{ @@ -11419,10 +15505,10 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) -"kcj" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +"kcn" = ( +/obj/item/stack/sandbags_empty/full, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "kcE" = ( /obj/structure/largecrate/random/mini/med{ pixel_x = -6; @@ -11432,22 +15518,38 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"kdf" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/maintenance/north) +"kdq" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/prop/rock/brown, +/turf/open/gm/coast/west, +/area/varadero/exterior/farocean) "kdV" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/plating/icefloor{ - dir = 1; icon_state = "warnplate" }, -/area/varadero/exterior/lz1_near) -"keo" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Sports Center"; - req_access_txt = "100" +/area/varadero/interior/maintenance/north) +"keb" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/turf/open/floor/plating, -/area/varadero/interior/court) +/area/varadero/exterior/eastbeach) "keE" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -11463,12 +15565,20 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/cargo) "keY" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/security) +"kfc" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "kfj" = ( /obj/structure/pipes/standard/simple/visible{ dir = 5 @@ -11477,6 +15587,9 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"kfG" = ( +/turf/closed/wall, +/area/varadero/interior/caves/east) "kfJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/med_data/laptop{ @@ -11487,6 +15600,22 @@ icon_state = "bluefull" }, /area/varadero/interior/administration) +"kgm" = ( +/obj/effect/vehicle_spawner/van/decrepit{ + layer = 3.1 + }, +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) +"kgp" = ( +/turf/closed/wall/rock/brown, +/area/varadero/exterior/lz2_near) +"kgw" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/records) +"kgA" = ( +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/eastbeach) "kgC" = ( /obj/structure/prop/static_tank{ pixel_y = 8 @@ -11506,71 +15635,112 @@ icon_state = "floor3" }, /area/varadero/interior/court) -"khI" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) -"kiL" = ( +"khB" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 1 + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 2.991 }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 6 +/turf/open/floor/shiva{ + dir = 4; + icon_state = "blue" }, -/obj/structure/blocker/invisible_wall, +/area/varadero/interior/maintenance) +"kif" = ( +/obj/structure/ladder, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/oob) -"kiU" = ( -/obj/structure/machinery/light, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "red" +/area/varadero/exterior/farocean) +"kin" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 }, -/area/varadero/interior/hall_N) -"kjt" = ( -/obj/structure/machinery/power/smes/buildable{ - name = "colony distribution SMES" +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" }, +/obj/effect/decal/warning_stripes, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/exterior/lz1_near) -"kjA" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ - dir = 1; - name = "\improper Colony Offices"; - req_access_txt = "100" +/area/varadero/exterior/pontoon_beach) +"kiE" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/floor/plating, -/area/varadero/interior/administration) +/area/varadero/interior/maintenance) +"kiG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/clothing/under/CM_uniform, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) +"kjp" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice4"; + pixel_x = -16; + pixel_y = 24 + }, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/exterior/eastbeach) +"kjr" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "kjI" = ( /turf/open/shuttle{ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"kjJ" = ( -/obj/structure/machinery/light/small, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 - }, -/turf/open/floor/shiva{ - icon_state = "snow_mat" +"kjN" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/interior/caves/east) +"kkc" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"kkt" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/maintenance) +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "kkv" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"kkw" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"kkF" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/exterior/farocean) "klf" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -11579,6 +15749,22 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"kli" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "klu" = ( /obj/structure/bed/chair{ icon_state = "chair_alt" @@ -11591,16 +15777,6 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"klB" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "klP" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/item/storage/belt/medical{ @@ -11614,6 +15790,12 @@ "klT" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/interior/maintenance/research) +"klY" = ( +/obj/item/cell/high, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "kmb" = ( /obj/structure/machinery/light{ dir = 8 @@ -11628,6 +15810,12 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) +"kmo" = ( +/obj/structure/machinery/power/port_gen/pacman, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "kmu" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -11635,21 +15823,45 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"kmy" = ( -/turf/open/gm/river, -/area/varadero/exterior/eastocean) -"knW" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/shotgun/slugs, -/obj/item/ammo_magazine/shotgun/slugs{ - pixel_x = 6; - pixel_y = -4 +"kmI" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/shiva{ +/area/varadero/interior_protected/caves/central) +"kmW" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/interior_protected/caves/central) +"knN" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 5 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ dir = 8; - icon_state = "red" + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/security) +/obj/structure/platform_decoration/kutjevo, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"knP" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "kof" = ( /obj/structure/filingcabinet, /turf/open/floor/shiva{ @@ -11657,6 +15869,14 @@ icon_state = "red" }, /area/varadero/interior/security) +"koZ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "kpF" = ( /obj/structure/filingcabinet{ pixel_x = -8; @@ -11669,6 +15889,40 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/wood, /area/varadero/interior/research) +"kpN" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"kpS" = ( +/obj/item/clothing/head/helmet, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) +"kqe" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) +"kqs" = ( +/obj/structure/cargo_container/wy/mid, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) +"kqA" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "kqE" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/far, @@ -11676,6 +15930,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"kqN" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/gm/dirt, +/area/varadero/interior/caves/east) "kqQ" = ( /obj/structure/xenoautopsy/tank/broken, /turf/open/shuttle{ @@ -11693,6 +15951,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating, /area/varadero/interior/administration) +"krM" = ( +/obj/item/paper, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "krP" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -11718,43 +15980,37 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"ksX" = ( -/turf/closed/wall/r_wall, -/area/varadero/interior_protected/maintenance/south) -"ktt" = ( -/obj/effect/landmark/static_comms/net_two, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/exterior/comms4) -"ktE" = ( +"ksu" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) -"kua" = ( -/obj/structure/barricade/handrail/wire{ dir = 8; - layer = 3.5 + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform/kutjevo/smooth/stair_plate, /obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/prop/structure_lattice{ - density = 0; - desc = "If this is removed, you cannot escape."; - health = 300; - icon_state = "ladder10"; - name = "ladder" + dir = 4; + climb_delay = 1; + layer = 2.99 }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"ksX" = ( +/turf/closed/wall/r_wall, +/area/varadero/interior_protected/maintenance/south) +"ktN" = ( +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ - dir = 4; - icon_state = "blue" + icon_state = "multi_tiles" }, -/area/varadero/interior/maintenance) +/area/varadero/interior/comms3) +"kul" = ( +/obj/item/pizzabox/meat{ + pixel_x = -5; + pixel_y = 13 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "kus" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -11765,19 +16021,21 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"kux" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/bed/chair{ - icon_state = "chair_alt"; - pixel_x = -6; - pixel_y = 16 +"kuE" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) +"kuO" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/maintenance/security) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "kuX" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" @@ -11785,15 +16043,17 @@ /area/varadero/interior/hall_NW) "kvx" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/emps{ - pixel_x = -4; - pixel_y = 1 - }, /turf/open/floor/shiva{ dir = 8; icon_state = "purplefull" }, /area/varadero/interior/research) +"kvz" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "kvC" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass{ icon_state = "sparsegrass_3" @@ -11828,27 +16088,24 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/comms4) -"kwa" = ( -/obj/structure/closet/secure_closet/freezer/meat, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "green" - }, -/area/varadero/interior/mess) "kwB" = ( /turf/open/floor/shiva{ dir = 4; icon_state = "green" }, /area/varadero/interior/hall_NW) -"kxg" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 +"kxe" = ( +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/interior_protected/caves/central) +"kxU" = ( +/obj/structure/bed/chair{ + dir = 4; + icon_state = "chair_alt" }, -/turf/open/floor/shiva{ - icon_state = "wredfull" +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/medical) +/area/varadero/interior/comms2) "kxW" = ( /obj/structure/window/reinforced{ dir = 4; @@ -11877,10 +16134,28 @@ /obj/item/clothing/gloves/marine/veteran/insulated, /turf/open/floor/wood, /area/varadero/interior/bunks) -"kyr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +"kyh" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + name = "\improper Underground Medical Laboratory"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) +"kyj" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/monsoon) +"kyp" = ( +/turf/open/gm/dirt, +/area/varadero/exterior/eastocean) +"kyr" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -11889,6 +16164,14 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"kyz" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/autoname, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"kyD" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "kyG" = ( /turf/closed/wall, /area/varadero/interior/disposals) @@ -11918,6 +16201,12 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"kyP" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "kzo" = ( /obj/structure/bed/chair{ dir = 8 @@ -11932,6 +16221,15 @@ /obj/item/tool/weldingtool, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"kzE" = ( +/obj/structure/surface/table/woodentable, +/obj/item/reagent_container/food/drinks/bottle/holywater, +/obj/item/tool/lighter/random{ + pixel_x = -9; + pixel_y = 15 + }, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "kzJ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -11951,11 +16249,24 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"kAQ" = ( -/turf/open/floor/shiva{ - dir = 1 +"kAH" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_2" }, -/area/varadero/interior/morgue) +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"kAL" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) +"kAN" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "kBo" = ( /obj/structure/surface/table/woodentable, /obj/structure/pipes/standard/simple/hidden/green{ @@ -11972,6 +16283,17 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) +"kBZ" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior/maintenance/security) +"kCb" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/sheet/mineral/phoron/medium_stack, +/obj/item/stack/sheet/metal/med_small_stack, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "kCy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/camera{ @@ -11991,17 +16313,6 @@ dir = 1 }, /area/varadero/interior/electrical) -"kCF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/implanter{ - pixel_x = 10 - }, -/obj/item/ashtray/bronze{ - icon_state = "ashtray_half_br" - }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/wood, -/area/varadero/interior/research) "kCT" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/security/glass{ @@ -12009,7 +16320,9 @@ name = "\improper Underground Security Lobby"; req_access_txt = "100" }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/security) "kDd" = ( /obj/structure/pipes/standard/simple/hidden/green{ @@ -12025,8 +16338,15 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) -"kDy" = ( -/turf/open/gm/coast/west, +"kDh" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"kDk" = ( +/obj/item/tool/screwdriver, +/turf/open/gm/dirt, /area/varadero/exterior/eastbeach) "kDF" = ( /obj/structure/disposalpipe/segment{ @@ -12054,17 +16374,23 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"kEg" = ( -/obj/structure/machinery/door_control{ - id = "colony_sec_armory"; - name = "Colony Secure Armory"; - pixel_y = 26 - }, +"kDO" = ( +/obj/structure/closet/crate, +/obj/effect/landmark/objective_landmark/close, +/obj/item/trash/chunk, /turf/open/floor/shiva{ - dir = 1; - icon_state = "red" + icon_state = "floor3" }, -/area/varadero/interior/security) +/area/varadero/interior/cargo) +"kEB" = ( +/obj/structure/prop/invuln/static_corpse/afric_zimmer{ + desc = "A card lays in his lap. 'Happy birthday, Steve. Here's to another fruitful year!'"; + name = "Rep. Steve Haifisch"; + layer = 3 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "kEK" = ( /obj/item/stack/sheet/metal, /turf/open/floor/strata{ @@ -12072,6 +16398,30 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"kEV" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) +"kFn" = ( +/obj/structure/machinery/floodlight/landing/floor, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz2_near) +"kFH" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/device/flashlight/flare, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/varadero/exterior/lz2_near) "kFT" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva{ @@ -12096,35 +16446,59 @@ icon_state = "red" }, /area/varadero/interior/medical) -"kGM" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/varadero/interior/hall_NW) -"kGT" = ( -/obj/structure/machinery/door_control{ - id = "colony_sec_armory"; - name = "Colony Secure Armory"; - pixel_y = -26 - }, -/turf/open/floor/shiva{ - icon_state = "red" +"kGq" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/hall_SE) +"kGB" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 }, -/area/varadero/interior/security) -"kHE" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/chapel_carpet{ +/obj/structure/platform/kutjevo/smooth{ dir = 1; - icon_state = "doubleside" + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/chapel) -"kHJ" = ( -/obj/item/ammo_casing/shell{ - icon_state = "cartridge_10" +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/closet/crate/miningcar{ + layer = 3.1; + name = "\improper materials storage bin"; + pixel_y = 8 }, +/obj/structure/blocker/invisible_wall/water, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior_protected/caves) +/area/varadero/interior/oob) +"kGD" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt{ + icon_state = "desert_dug" + }, +/area/varadero/exterior/pontoon_beach) +"kGF" = ( +/obj/item/paper_bin{ + pixel_y = 6 + }, +/obj/item/tool/pen/blue{ + pixel_x = 7 + }, +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/flash, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/security) +"kGJ" = ( +/turf/open/gm/coast/east, +/area/varadero/exterior/eastocean) +"kGM" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/hall_NW) "kIb" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -12148,6 +16522,20 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) +"kIz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "kIJ" = ( /turf/open/floor{ dir = 10; @@ -12174,21 +16562,22 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"kJu" = ( -/turf/open/floor/shiva{ - dir = 4; - icon_state = "multi_tiles" - }, -/area/varadero/interior/morgue) -"kJX" = ( -/obj/structure/tunnel{ - id = "south_tcomms_tunnel" - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/east) "kKS" = ( /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"kKX" = ( +/obj/item/device/reagent_scanner{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/structure/prop/server_equipment/laptop{ + pixel_x = -13; + pixel_y = 6 + }, +/obj/structure/surface/table, +/obj/item/paper_bin, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "kLd" = ( /turf/open/floor/shiva{ dir = 8; @@ -12205,6 +16594,10 @@ icon_state = "yellowfull" }, /area/varadero/interior/electrical) +"kLF" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "kMf" = ( /obj/structure/window/framed/colony/reinforced/tinted, /turf/open/floor/plating, @@ -12220,6 +16613,16 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"kMy" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) "kME" = ( /obj/structure/machinery/light{ dir = 8 @@ -12249,6 +16652,13 @@ icon_state = "red" }, /area/varadero/interior/medical) +"kNa" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Toilet Unit" + }, +/turf/open/floor/plating, +/area/varadero/interior/toilets) "kNe" = ( /obj/item/reagent_container/glass/bucket/mopbucket{ pixel_x = -9; @@ -12270,20 +16680,26 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"kPl" = ( -/obj/structure/surface/rack, -/obj/item/clothing/under/shorts/red{ - pixel_x = -2; - pixel_y = -4 +"kOS" = ( +/obj/structure/machinery/light{ + dir = 8 }, -/obj/item/clothing/head/hardhat/red{ - pixel_x = -2; - pixel_y = 9 +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellow" + }, +/area/varadero/interior/electrical) +"kPj" = ( +/obj/structure/machinery/alarm{ + pixel_y = 24 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ - icon_state = "multi_tiles" + dir = 1; + icon_state = "green" }, -/area/varadero/interior/bunks) +/area/varadero/interior/mess) "kPX" = ( /obj/structure/surface/table, /obj/item/toy/deck/uno{ @@ -12299,6 +16715,11 @@ icon_state = "green" }, /area/varadero/interior/hall_NW) +"kPZ" = ( +/obj/structure/surface/rack, +/obj/item/tool/weldpack, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "kQb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -12307,6 +16728,53 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"kQy" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) +"kRp" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"kRH" = ( +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/lz1_near) +"kRU" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 2; + pixel_y = 15; + indestructible = 1; + unacidable = 1; + layer = 4.1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) "kSd" = ( /obj/structure/machinery/alarm{ dir = 1; @@ -12324,10 +16792,36 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"kSJ" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +"kSD" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) +"kSN" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/comms3) "kTo" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva{ @@ -12345,17 +16839,6 @@ /obj/item/tool/pickaxe/silver, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"kTx" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/obj/effect/decal/cleanable/cobweb{ - dir = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) "kTD" = ( /obj/structure/machinery/computer/cameras{ pixel_y = 6 @@ -12366,25 +16849,85 @@ icon_state = "red" }, /area/varadero/interior/hall_N) +"kTG" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "wred" + }, +/area/varadero/interior/medical) "kTI" = ( /obj/structure/machinery/light/small, /turf/open/floor{ icon_state = "white" }, /area/varadero/interior/security) -"kTX" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river/ocean, -/area/varadero/exterior/eastocean) +"kUj" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "kVp" = ( /turf/open/floor/shiva{ dir = 9; icon_state = "yellow" }, /area/varadero/interior/cargo) +"kVq" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/lz2_near) +"kVE" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) +"kVL" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) +"kWf" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"kWj" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) "kWB" = ( /turf/open/shuttle/elevator/grating, /area/varadero/interior/records) +"kWR" = ( +/turf/open/gm/dirt{ + icon_state = "desert_dug" + }, +/area/varadero/interior/maintenance/north) "kWZ" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -12427,6 +16970,18 @@ icon_state = "red" }, /area/varadero/interior/security) +"kYF" = ( +/obj/item/tool/weldingtool, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) +"kYM" = ( +/obj/effect/landmark/static_comms/net_one, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/comms4) "kYN" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice1"; @@ -12437,6 +16992,14 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"kZe" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/exterior/eastbeach) "kZg" = ( /obj/structure/closet/emcloset, /turf/open/floor/shiva{ @@ -12451,6 +17014,19 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"kZn" = ( +/obj/structure/surface/table, +/obj/item/tool/kitchen/utensil/knife, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = 24 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) "laa" = ( /obj/structure/bed/chair{ dir = 1; @@ -12497,18 +17073,6 @@ icon_state = "green" }, /area/varadero/interior/hall_N) -"lbD" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior_protected/maintenance/south) "lbK" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -12529,9 +17093,35 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) -"lcP" = ( -/turf/open/floor/plating, -/area/varadero/interior/electrical) +"lch" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"lci" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/exterior/eastocean) +"ldr" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"ldw" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/interior/caves/east) "ldJ" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -12551,6 +17141,27 @@ icon_state = "floor3" }, /area/varadero/interior/morgue) +"leG" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 5 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 8 + }, +/obj/structure/platform_decoration/kutjevo, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) "leI" = ( /obj/structure/sink{ dir = 1; @@ -12561,6 +17172,19 @@ icon_state = "purple" }, /area/varadero/interior/research) +"leO" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/surface/table, +/obj/item/weapon/gun/flamer, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "leP" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor{ @@ -12568,6 +17192,11 @@ icon_state = "asteroidwarning" }, /area/varadero/exterior/lz1_near) +"leT" = ( +/obj/structure/machinery/conveyor, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/plating, +/area/varadero/interior/cargo) "leU" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/icefloor{ @@ -12582,24 +17211,17 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) -"lfQ" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"lgb" = ( +/obj/structure/bedsheetbin, +/obj/item/ammo_magazine/rifle/m4ra, +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) -"lgi" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/area/varadero/interior/bunks) "lgP" = ( /obj/structure/machinery/light{ dir = 8 @@ -12609,9 +17231,6 @@ icon_state = "green" }, /area/varadero/interior/hall_N) -"lhb" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/varadero/interior/comms1) "lhm" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, @@ -12628,6 +17247,18 @@ icon_state = "red" }, /area/varadero/interior/administration) +"lhn" = ( +/obj/structure/catwalk, +/obj/structure/platform{ + dir = 1; + layer = 2.25; + density = 0; + climb_delay = 0 + }, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) "lhp" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -12636,6 +17267,13 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"lhB" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) "lhJ" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -12645,10 +17283,22 @@ }, /turf/open/floor/plating, /area/varadero/interior/records) -"liD" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +"liq" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"liz" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "liE" = ( /obj/structure/closet/crate/secure/weapon, /obj/effect/landmark/objective_landmark/medium, @@ -12657,27 +17307,12 @@ icon_state = "red" }, /area/varadero/interior/security) -"lje" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) -"ljs" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"liM" = ( +/obj/structure/pipes/binary/passive_gate, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 }, -/area/varadero/interior/maintenance) +/area/varadero/interior/maintenance/north) "ljt" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -12698,6 +17333,13 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"lkz" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor/prison/chapel_carpet{ + dir = 1; + icon_state = "doubleside" + }, +/area/varadero/interior/chapel) "lkH" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/shuttle/elevator, @@ -12708,18 +17350,25 @@ icon_state = "multi_tiles" }, /area/varadero/interior/technical_storage) -"lkK" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/caves/east) -"llE" = ( -/obj/structure/closet/secure_closet/medical3{ - req_access_txt = "100" +"llj" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"lmd" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null }, -/obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva{ - icon_state = "wred" + icon_state = "floor3" }, -/area/varadero/interior/medical) +/area/varadero/interior/hall_SE) "lms" = ( /obj/structure/machinery/door/airlock/strata/autoname{ autoname = 0; @@ -12742,6 +17391,26 @@ icon_state = "doubleside" }, /area/varadero/interior/chapel) +"lmS" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "lnw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -12766,19 +17435,24 @@ "lnO" = ( /turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) -"lod" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/eastright{ - dir = 1; - pixel_y = 17 - }, -/obj/item/weapon/gun/revolver/cmb{ - pixel_y = 2 - }, +"loh" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/shiva{ - icon_state = "floor3" + dir = 1 }, -/area/varadero/interior/security) +/area/varadero/interior/electrical) +"loA" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves) +"loO" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/exterior/farocean) "loP" = ( /obj/structure/machinery/meter{ pixel_x = -1; @@ -12807,6 +17481,12 @@ icon_state = "white" }, /area/varadero/interior/laundry) +"lpJ" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "bcircuit" + }, +/area/varadero/interior/maintenance/north) "lqa" = ( /obj/item/tool/warning_cone{ pixel_x = -11 @@ -12816,18 +17496,40 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"lqF" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "lqM" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"lqV" = ( -/obj/effect/landmark/corpsespawner/scientist, +"lrp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/fancy/cigarettes/arcturian_ace{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/effect/spawner/random/supply_kit, /turf/open/floor/shiva{ - icon_state = "floor3" + dir = 4; + icon_state = "red" }, -/area/varadero/interior/research) +/area/varadero/interior/administration) +"lrR" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "lss" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12841,6 +17543,12 @@ /obj/effect/overlay/palmtree_r, /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) +"lsR" = ( +/obj/item/ammo_magazine/rifle/m4ra, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/bunks) "lsT" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -12853,18 +17561,19 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/hall_N) -"lth" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/river, -/area/varadero/interior/oob) "ltA" = ( /turf/open/floor/shiva{ dir = 1; icon_state = "green" }, /area/varadero/interior/records) +"ltB" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "ltI" = ( /obj/structure/surface/table, /obj/item/paper, @@ -12885,6 +17594,20 @@ dir = 1 }, /area/varadero/interior/research) +"lum" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"lun" = ( +/obj/item/device/mass_spectrometer, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "lur" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -12899,6 +17622,59 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"luz" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"luC" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/eastbeach) +"luZ" = ( +/obj/structure/closet/secure_closet/miner, +/obj/item/clothing/accessory/storage/black_vest/brown_vest, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) +"lvt" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) +"lvG" = ( +/obj/structure/curtain/red, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/varadero/interior/bunks) "lvS" = ( /obj/structure/machinery/door/airlock/strata/autoname{ autoname = 0; @@ -12923,11 +17699,32 @@ icon_state = "warnplate" }, /area/varadero/interior/disposals) +"lwm" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "lxe" = ( /obj/item/stack/sheet/wood, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/plating, /area/varadero/interior/research) +"lxi" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/eastbeach) "lxr" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -12943,6 +17740,22 @@ icon_state = "red" }, /area/varadero/interior/security) +"lxR" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "lxT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -12956,12 +17769,37 @@ icon_state = "floor3" }, /area/varadero/interior/medical) +"lyp" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "red" + }, +/area/varadero/interior/security) +"lyP" = ( +/turf/closed/wall/rock/brown, +/area/varadero/exterior/comms4) +"lze" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "lzu" = ( /turf/open/floor/shiva{ dir = 8; icon_state = "greenfull" }, /area/varadero/interior/hall_N) +"lzD" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/pontoon_beach) "lzP" = ( /obj/structure/machinery/autolathe, /turf/open/floor/shiva{ @@ -12969,9 +17807,19 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) -"lzU" = ( -/obj/item/lightstick/variant/planted, -/turf/open/gm/dirt, +"lzT" = ( +/turf/closed/wall/rock/brown, +/area/varadero/exterior/monsoon) +"lzX" = ( +/obj/structure/machinery/door_control{ + id = "undergroundhangarsouth"; + name = "South Dock Door"; + pixel_x = -24; + indestructible = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "warnplate" + }, /area/varadero/interior/maintenance/north) "lAk" = ( /obj/structure/disposalpipe/segment{ @@ -12982,25 +17830,6 @@ icon_state = "floor3" }, /area/varadero/interior/medical) -"lAu" = ( -/obj/structure/machinery/door_control/brbutton{ - id = "undergroundhangarwest"; - name = "Underground Hangar Lock"; - pixel_x = 8 - }, -/obj/structure/sign/safety/bulkhead_door, -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) -"lAJ" = ( -/obj/structure/surface/rack, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/toolbox/mechanical, -/obj/effect/landmark/crap_item, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellow" - }, -/area/varadero/interior/electrical) "lBf" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 5; @@ -13011,21 +17840,12 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) -"lBS" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "greenfull" - }, -/area/varadero/interior/hall_SE) -"lCh" = ( -/obj/structure/surface/table/reinforced/prison{ - flipped = 1 - }, +"lBw" = ( +/obj/structure/window/framed/colony/reinforced, /turf/open/floor/shiva{ - icon_state = "multi_tiles" + dir = 1 }, -/area/varadero/interior/hall_SE) +/area/varadero/interior/research) "lCK" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -13080,6 +17900,14 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) +"lDS" = ( +/obj/structure/bed/roller, +/obj/structure/machinery/iv_drip, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "wred" + }, +/area/varadero/interior/medical) "lEc" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -13092,6 +17920,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"lEm" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/varadero/exterior/lz1_near) "lEw" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -13101,18 +17935,26 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"lEB" = ( -/obj/structure/closet/secure_closet/personal/patient, -/obj/item/clothing/accessory/medal/gold/captain, -/obj/item/weapon/pole/wooden_cane, +"lEM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ - icon_state = "multi_tiles" + dir = 4; + icon_state = "snow_mat" }, -/area/varadero/interior/bunks) -"lEP" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river, -/area/varadero/exterior/eastocean) +/area/varadero/interior/medical) +"lEV" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 4 + }, +/obj/structure/platform{ + dir = 1 + }, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) "lEY" = ( /obj/structure/machinery/alarm{ dir = 8; @@ -13124,6 +17966,12 @@ /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"lFl" = ( +/turf/open/floor/plating/icefloor{ + dir = 8; + icon_state = "warnplate" + }, +/area/varadero/interior/cargo) "lFr" = ( /obj/structure/platform_decoration/kutjevo{ dir = 4 @@ -13133,6 +17981,44 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"lFA" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/wood, +/area/varadero/interior/hall_SE) +"lFE" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) +"lFI" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 1; + layer = 3.1; + pixel_y = 10 + }, +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "vent4"; + pixel_y = 25 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 22; + indestructible = 1; + unacidable = 1; + layer = 4.1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/comms4) "lFS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -13150,13 +18036,23 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"lHE" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" +"lGp" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/medical) +"lGD" = ( +/obj/structure/largecrate/random, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) +"lGT" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4; + layer = 4 }, -/area/varadero/interior/electrical) +/obj/structure/platform{ + dir = 1 + }, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) "lHH" = ( /obj/structure/bed/chair{ dir = 1 @@ -13174,6 +18070,28 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"lId" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "lIo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -13182,6 +18100,17 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"lIE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/shuttle/dropship/flight/lz1{ + dir = 1; + name = "LZ1 Pontoon Dock computer" + }, +/turf/open/floor{ + dir = 8; + icon_state = "asteroidwarning" + }, +/area/varadero/exterior/lz1_console) "lIO" = ( /obj/structure/prop/ice_colony/tiger_rug{ icon_state = "White"; @@ -13206,32 +18135,17 @@ /obj/effect/spawner/random/attachment, /turf/open/floor/carpet, /area/varadero/interior/administration) -"lIZ" = ( -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ +"lJo" = ( +/obj/structure/machinery/light{ dir = 8 }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) -"lJu" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/effect/landmark/objective_landmark/close, +/obj/structure/surface/rack, /turf/open/floor/shiva{ - dir = 4; - icon_state = "yellow" + dir = 10; + icon_state = "wred" }, -/area/varadero/interior/technical_storage) +/area/varadero/interior/medical) "lKI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/glass/beaker/ethanol{ @@ -13274,6 +18188,32 @@ icon_state = "red" }, /area/varadero/interior/hall_N) +"lMb" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) +"lMl" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"lMq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/effect/landmark/crap_item, +/obj/effect/spawner/random/supply_kit, +/turf/open/floor/shiva{ + dir = 5; + icon_state = "blue" + }, +/area/varadero/interior/administration) "lMv" = ( /turf/open/floor/shiva{ dir = 8; @@ -13286,6 +18226,13 @@ icon_state = "asteroidfloor" }, /area/varadero/interior/comms1) +"lMD" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) "lMP" = ( /obj/structure/filingcabinet, /turf/open/floor/shiva{ @@ -13293,22 +18240,31 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"lMY" = ( -/obj/structure/shuttle/engine/router{ - dir = 4 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" +"lNb" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/hall_SE) +"lNd" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior_protected/vessel) +/area/varadero/exterior/eastbeach) "lNw" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/prop/server_equipment/laptop/closed{ pixel_y = 3 }, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/varadero/interior/research) +"lNL" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "lNX" = ( /obj/structure/machinery/light{ dir = 4 @@ -13328,14 +18284,24 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"lOJ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"lPj" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 }, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/hall_NW) +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) "lPk" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 1; @@ -13379,6 +18345,26 @@ icon_state = "green" }, /area/varadero/interior/mess) +"lQW" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/pontoon_beach) +"lRy" = ( +/obj/structure/surface/table, +/obj/item/circuitboard/machine/batteryrack, +/obj/item/stack/cable_coil{ + pixel_x = 2; + pixel_y = 7 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/morgue) "lRz" = ( /obj/item/ammo_casing{ icon_state = "casing_7_1" @@ -13393,20 +18379,11 @@ icon_state = "purplecorners" }, /area/varadero/interior/research) -"lSd" = ( -/obj/structure/lz_sign/new_varadero, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/exterior/lz1_near) -"lSD" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ - pixel_x = -1; - pixel_y = 22 +"lSg" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/cargo) "lSG" = ( /obj/structure/curtain/shower, /turf/open/floor/interior/plastic/alt, @@ -13420,6 +18397,9 @@ icon_state = "green" }, /area/varadero/interior/court) +"lTg" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "lTv" = ( /obj/item/tool/warning_cone{ pixel_x = -13; @@ -13430,6 +18410,12 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"lTR" = ( +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "lUe" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -13438,20 +18424,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"lUi" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular{ - pixel_x = 4; - pixel_y = 12 - }, -/obj/item/storage/firstaid/rad{ - pixel_y = 4 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "purplefull" +"lUG" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/area/varadero/interior/research) +/area/varadero/exterior/farocean) "lUT" = ( /obj/structure/machinery/smartfridge, /turf/open/floor/shiva{ @@ -13459,6 +18438,16 @@ icon_state = "green" }, /area/varadero/interior/mess) +"lVa" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/varadero/interior/comms1) "lVc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/icefloor{ @@ -13478,9 +18467,6 @@ /obj/item/device/camera, /turf/open/floor/wood, /area/varadero/interior/security) -"lVM" = ( -/turf/open/gm/river, -/area/varadero/interior/oob) "lVP" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -13538,6 +18524,20 @@ icon_state = "floor3" }, /area/varadero/interior/hall_N) +"lWB" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/light/small, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "lWJ" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -13559,6 +18559,31 @@ icon_state = "yellow" }, /area/varadero/interior/technical_storage) +"lXv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/holostool, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"lXT" = ( +/obj/structure/plasticflaps/mining, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) "lYi" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/cup{ @@ -13569,6 +18594,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"lYo" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) "lYr" = ( /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) @@ -13579,10 +18608,24 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"lYD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sheet/wood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/monsoon) "lYF" = ( /obj/structure/largecrate/random/case, /turf/open/shuttle/elevator, /area/varadero/interior/hall_N) +"lYQ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "lZa" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -13704,8 +18747,15 @@ icon_state = "red" }, /area/varadero/interior/security) -"mcm" = ( -/turf/open/gm/river/ocean, +"mcp" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt{ + icon_state = "desert1" + }, /area/varadero/exterior/eastbeach) "mcr" = ( /obj/structure/machinery/light, @@ -13714,26 +18764,94 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"mcX" = ( +"mcs" = ( +/obj/structure/surface/table, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "greenfull" + }, +/area/varadero/interior/hall_SE) +"mcB" = ( +/obj/structure/platform_decoration/kutjevo, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = 2; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"mcN" = ( +/obj/structure/coatrack{ + pixel_x = 14; + pixel_y = 9 + }, +/obj/item/clothing/head/bowlerhat{ + pixel_x = 12; + pixel_y = 23 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_x = 9; + pixel_y = -4 + }, +/obj/item/device/flashlight, +/turf/open/floor/wood, +/area/varadero/interior/administration) +"mdg" = ( /turf/open/gm/dirt{ - icon_state = "desert3" + icon_state = "desert0" }, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/lz2_near) "mdj" = ( /obj/item/clothing/head/helmet, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"mdU" = ( -/obj/structure/surface/table, -/obj/item/paper/janitor{ - pixel_y = 8 +"mdy" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, -/area/varadero/interior/electrical) +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"mdL" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) +"mdM" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) +"mdN" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/maintenance/south) "mee" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/brigdoor/westleft{ @@ -13762,28 +18880,14 @@ pixel_x = 1; pixel_y = 6 }, +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/laundry) -"meD" = ( -/obj/structure/prop/structure_lattice{ - dir = 1; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 1; - layer = 3.1; - pixel_y = 10 - }, -/obj/structure/prop/invuln/ice_prefab/roof_greeble{ - icon_state = "vent4"; - pixel_y = 25 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) "meS" = ( /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand_white/layer1, @@ -13800,6 +18904,32 @@ /obj/item/weapon/gun/rifle/m41a, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) +"mgT" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"mhf" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"mio" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/obj/structure/machinery/constructable_frame, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"miy" = ( +/obj/structure/window/framed/colony/reinforced, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating, +/area/varadero/interior/hall_NW) "miF" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 @@ -13823,7 +18953,7 @@ /turf/open/floor/wood{ icon_state = "wood-broken3" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) "miT" = ( /obj/item/stool, /turf/open/floor{ @@ -13839,14 +18969,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) -"mje" = ( -/obj/item/stack/sheet/metal, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/caves/east) +/area/varadero/interior/cargo) "mjA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13858,18 +18981,6 @@ icon_state = "floor3" }, /area/varadero/interior/administration) -"mka" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - dir = 1; - name = "\improper Underground Library"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor{ - icon_state = "wood" - }, -/area/varadero/interior/library) "mkc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/cell_charger, @@ -13928,15 +19039,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"mln" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/largecrate/random, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/research) "mlN" = ( /obj/vehicle/powerloader/ft, /turf/open/shuttle/elevator/grating, @@ -13949,7 +19051,9 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/maintenance) "mmq" = ( /obj/structure/fence, @@ -13965,6 +19069,20 @@ }, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"mmO" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "mnc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -13996,6 +19114,35 @@ /obj/effect/spawner/random/attachment, /turf/open/floor/wood, /area/varadero/interior/bunks) +"mnz" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/prop/invuln/fire{ + pixel_x = -5; + pixel_y = -15; + density = 0; + layer = 4.1 + }, +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) +"mnL" = ( +/obj/structure/window/framed/colony/reinforced, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating, +/area/varadero/interior_protected/caves/central) +"mnU" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"mol" = ( +/obj/structure/window/phoronreinforced{ + dir = 4; + icon_state = "phoronrwindow" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "mos" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14038,13 +19185,17 @@ icon_state = "multi_tiles" }, /area/varadero/interior/research) -"mpt" = ( -/obj/structure/machinery/vending/security, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "red" +"mpH" = ( +/obj/structure/largecrate/random, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/area/varadero/interior/security) +/area/varadero/exterior/lz1_near) +"mpL" = ( +/obj/structure/machinery/light/small, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "mqe" = ( /obj/structure/cryofeed, /turf/open/floor/strata{ @@ -14061,21 +19212,6 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"mqK" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river, -/area/varadero/interior/oob) "mrd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14092,30 +19228,81 @@ icon_state = "asteroidwarning" }, /area/varadero/exterior/lz1_near) -"mrF" = ( -/obj/structure/machinery/space_heater, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) "mrP" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/structure/machinery/alarm{ + dir = 4; + pixel_x = -24 + }, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"msE" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +"mrR" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"mrT" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/accessory/storage/black_vest/brown_vest, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/area/varadero/interior/electrical) +"mrY" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) +"msj" = ( +/obj/structure/prop/rock/brown, +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/turf/open/gm/river, -/area/varadero/interior/oob) +/area/varadero/exterior/farocean) +"msx" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Underground Requesitions Bay" + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellow" + }, +/area/varadero/interior/cargo) +"mtp" = ( +/obj/structure/machinery/floodlight{ + name = "Floodlight"; + unacidable = 0; + wrenchable = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"mtx" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/obj/structure/barricade/wooden, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) +"mtJ" = ( +/obj/structure/barricade/wooden, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"mtT" = ( +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/lz2_near) "mtU" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/plating/icefloor{ @@ -14127,7 +19314,7 @@ dir = 5; icon_state = "green" }, -/area/varadero/interior/hall_SE) +/area/varadero/interior/hall_N) "muE" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -14147,23 +19334,13 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"mvo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; +"mvi" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/dirt{ - icon_state = "desert3" + icon_state = "yellow" }, -/area/varadero/exterior/pontoon_beach) +/area/varadero/interior/electrical) "mvv" = ( /obj/effect/decal/remains/xeno{ pixel_y = 25 @@ -14172,65 +19349,93 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"mvA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "mvI" = ( /turf/open/floor/shiva{ dir = 4; icon_state = "green" }, /area/varadero/interior/hall_SE) -"mwH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light, -/obj/item/circuitboard/computer/powermonitor, -/obj/item/stack/cable_coil/cut{ - pixel_y = 12 +"mvO" = ( +/obj/structure/machinery/floodlight{ + name = "Floodlight"; + unacidable = 0; + wrenchable = 1 }, /turf/open/floor/shiva{ - icon_state = "blue" + dir = 1; + icon_state = "yellow" }, -/area/varadero/interior/technical_storage) -"mxb" = ( -/obj/structure/machinery/door/poddoor/two_tile/four_tile/secure{ - id = "undergroundhangarsouth"; - name = "Underground Hangar" +/area/varadero/interior/electrical) +"mwd" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/court) +"mwm" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) -"mxn" = ( -/obj/structure/window/reinforced{ +/obj/structure/platform/kutjevo/smooth{ dir = 4; - pixel_x = -2; - pixel_y = 4 + climb_delay = 1; + layer = 2.99 }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 +/obj/item/reagent_container/food/snacks/carpmeat{ + desc = "This leathery protofish was named the gullible toothfish for the combination of its near identical dentata to that of Homo sapiens sapiens and the fact that if released after being caught, it is not uncommon to catch the same one; it not having learned its lesson. Its meat is said to taste like bitter clove."; + icon = 'icons/obj/items/fishing_atoms.dmi'; + icon_state = "gullible_toothfish_gutted"; + name = "gullible toothfish"; + pixel_x = 1; + pixel_y = -2 }, -/obj/structure/bed{ - can_buckle = 0 +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 +/area/varadero/exterior/comms4) +"mwD" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 + }, +/obj/structure/closet/crate/supply, +/turf/open/shuttle/elevator, +/area/varadero/interior/records) +"mwH" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/light, +/obj/item/circuitboard/computer/powermonitor, +/obj/item/stack/cable_coil/cut{ + pixel_y = 12 }, -/obj/structure/machinery/light/small, -/obj/item/toy/farwadoll, /turf/open/floor/shiva{ - icon_state = "floor3" + icon_state = "blue" }, -/area/varadero/interior/medical) +/area/varadero/interior/technical_storage) +"mwI" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/coast/east, +/area/varadero/exterior/lz2_near) "mxv" = ( /obj/structure/largecrate/random, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) -"mxz" = ( -/obj/effect/landmark/hunter_secondary, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"mxx" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_N) +/area/varadero/interior/maintenance/research) "mxB" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/sand_white/layer1, @@ -14279,13 +19484,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"mzr" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) "mzt" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -14352,16 +19550,26 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"mAz" = ( -/obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/oob) "mAB" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"mAP" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/shotgun/slugs{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/item/ammo_magazine/shotgun/slugs{ + pixel_x = -2; + pixel_y = -4 + }, +/turf/open/floor/shiva{ + icon_state = "red" + }, +/area/varadero/interior/security) "mAX" = ( /obj/structure/prop/dam/van{ desc = "An older Weyland Yutani space crawler. These things are most commonly seen along former trails on shake and bake colonies."; @@ -14378,6 +19586,13 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) +"mCe" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "mCx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -14406,6 +19621,13 @@ }, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) +"mCX" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "mCY" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -14427,15 +19649,31 @@ icon_state = "doubleside" }, /area/varadero/interior/chapel) -"mDW" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Toilet Unit"; - req_access_txt = "100"; - req_one_access = null +"mDm" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_3" }, -/turf/open/floor/plating, -/area/varadero/interior/toilets) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"mEs" = ( +/obj/structure/machinery/light/small, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"mEy" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "mEA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper{ @@ -14459,12 +19697,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"mFF" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/varadero/interior/maintenance/north) "mFY" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva{ @@ -14489,22 +19721,25 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"mHo" = ( -/obj/structure/platform/kutjevo/smooth{ +"mHM" = ( +/obj/structure/prop/invuln/minecart_tracks{ dir = 8 }, -/obj/item/device/camera{ - pixel_x = -2; - pixel_y = 9 +/obj/structure/plasticflaps/mining, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/obj/item/newspaper{ - layer = 2.99; - pixel_x = 7; - pixel_y = 4 +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/obj/structure/surface/table, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) "mIG" = ( /obj/structure/bed, /obj/item/bedsheet/orange, @@ -14518,6 +19753,45 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"mIQ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) +"mIU" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/pontoon_beach) +"mJe" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/caves/north_research) +"mJh" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) +"mJH" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "mKb" = ( /obj/structure/sign/safety/medical, /turf/closed/wall, @@ -14538,6 +19812,13 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"mLg" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) "mLt" = ( /obj/structure/sign/goldenplaque{ pixel_y = 32 @@ -14563,14 +19844,52 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) -"mNj" = ( -/obj/structure/filingcabinet/security, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/shiva{ +"mMz" = ( +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) +"mMJ" = ( +/obj/item/stack/sheet/wood/small_stack, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) +"mMX" = ( +/obj/structure/platform/kutjevo/smooth{ dir = 8; - icon_state = "redfull" + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/hall_SE) +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) +"mMZ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/surface/rack, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"mNm" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/floodlight{ + name = "Floodlight"; + unacidable = 0; + wrenchable = 1 + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/electrical) "mNO" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -14579,6 +19898,28 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"mNT" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_2"; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"mOx" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "bluefull" + }, +/area/varadero/interior/maintenance) "mOG" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -14590,10 +19931,6 @@ /area/varadero/interior_protected/maintenance/south) "mOO" = ( /obj/structure/machinery/vending/coffee, -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -14606,6 +19943,21 @@ icon_state = "multi_tiles" }, /area/varadero/interior/records) +"mPk" = ( +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) +"mPl" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) "mPI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/survivor_spawner, @@ -14619,6 +19971,23 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"mPW" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"mPX" = ( +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" + }, +/obj/effect/decal/warning_stripes, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "mQh" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/effect/landmark/objective_landmark/close, @@ -14634,6 +20003,29 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"mQF" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/north_research) +"mQG" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"mRk" = ( +/obj/structure/prop/rock/brown, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) "mRq" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, @@ -14666,12 +20058,50 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) +"mSf" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) +"mSu" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "mSD" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/shiva{ dir = 1 }, /area/varadero/interior/electrical) +"mSS" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/plasticflaps/mining, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"mTD" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood, +/area/varadero/interior/hall_SE) +"mUv" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/lattice, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "mUy" = ( /obj/structure/bed/sofa/pews/flipped{ dir = 4 @@ -14682,6 +20112,11 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"mUz" = ( +/turf/open/gm/dirt{ + icon_state = "desert_dug" + }, +/area/varadero/exterior/eastbeach) "mUP" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/icefloor{ @@ -14695,6 +20130,35 @@ icon_state = "purple" }, /area/varadero/interior/research) +"mVj" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) +"mVn" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "mVF" = ( /obj/structure/prop/souto_land/pole{ dir = 1 @@ -14723,32 +20187,22 @@ icon_state = "bluefull" }, /area/varadero/interior/hall_SE) -"mWi" = ( -/obj/structure/closet/crate, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) -"mWN" = ( +"mVY" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) -"mXc" = ( -/obj/structure/surface/table/woodentable, -/obj/item/reagent_container/food/drinks/bottle/holywater, -/turf/open/floor/carpet, -/area/varadero/interior/chapel) -"mXo" = ( -/obj/structure/machinery/door/airlock/almayer/command{ - dir = 1; - name = "\improper Underground Command Center"; - req_access_txt = "100" +/obj/item/clothing/under/shorts/grey, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/turf/open/floor/plating, -/area/varadero/interior/administration) +/area/varadero/exterior/pool) +"mXi" = ( +/obj/effect/landmark/objective_landmark/far, +/turf/open/shuttle/elevator, +/area/varadero/interior/records) "mXs" = ( /obj/structure/machinery/light{ dir = 4 @@ -14758,6 +20212,31 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"mXx" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Underground Sports Center" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/court) +"mXO" = ( +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/item/ammo_magazine/handful/shotgun/buckshot{ + pixel_x = -9 + }, +/obj/item/clothing/suit/armor/vest, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "red" + }, +/area/varadero/interior/hall_N) "mXV" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -14766,22 +20245,6 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) -"mXZ" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0; - pixel_x = 11; - pixel_y = 9 - }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = 10; - pixel_y = 20 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) "mYd" = ( /obj/structure/bed/chair, /turf/open/floor/shiva{ @@ -14789,6 +20252,18 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"mYA" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "mYR" = ( /obj/item/facepaint/sunscreen_stick, /turf/open/floor/plating/icefloor{ @@ -14801,6 +20276,21 @@ icon_state = "yellowcorners" }, /area/varadero/interior/cargo) +"mZi" = ( +/turf/open/floor/shiva{ + icon_state = "green" + }, +/area/varadero/interior/court) +"mZk" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/item/prop/magazine/dirty/torn/alt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "mZC" = ( /obj/structure/surface/table/woodentable{ icon_state = "reinf_table" @@ -14828,6 +20318,11 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) +"mZH" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/farocean) "mZI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14839,13 +20334,15 @@ dir = 1 }, /area/varadero/interior/electrical) -"nap" = ( -/obj/structure/window_frame/colony/reinforced, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"nak" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 }, -/area/varadero/interior/caves/east) +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/eastbeach) "nau" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -14855,21 +20352,15 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"naw" = ( -/turf/open/floor/shiva{ - dir = 10; - icon_state = "yellow" - }, -/area/varadero/interior/cargo) -"naW" = ( -/turf/open/floor/plating, -/area/varadero/interior/medical) "nbA" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"nbB" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/comms4) "ncd" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, @@ -14885,6 +20376,18 @@ icon_state = "red" }, /area/varadero/interior/morgue) +"nch" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"ncn" = ( +/obj/item/trash/cheesie, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "ncv" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -14898,6 +20401,14 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"ncC" = ( +/obj/item/ammo_magazine/handful/lever_action, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/wood, +/area/varadero/interior/research) "ncL" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, @@ -14909,17 +20420,6 @@ }, /turf/open/floor/plating, /area/varadero/interior/hall_SE) -"ndl" = ( -/obj/structure/surface/rack, -/obj/item/ammo_magazine/shotgun/buckshot, -/obj/item/ammo_magazine/shotgun/buckshot{ - pixel_x = 6; - pixel_y = -4 - }, -/turf/open/floor/shiva{ - icon_state = "red" - }, -/area/varadero/interior/security) "ndp" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -14930,6 +20430,15 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"nee" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"neq" = ( +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves) "new" = ( /obj/structure/barricade/handrail/wire{ dir = 8 @@ -14939,25 +20448,6 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"neC" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 5 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) "neD" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -14974,16 +20464,31 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"neU" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_N) +"nfk" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) "nfv" = ( /obj/structure/bedsheetbin, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/laundry) -"nfD" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast/south, -/area/varadero/exterior/eastbeach) "nfX" = ( /obj/item/reagent_container/glass/bucket{ pixel_x = -11; @@ -14992,7 +20497,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) +/area/varadero/interior/cargo) "nfZ" = ( /obj/structure/machinery/conveyor_switch, /obj/effect/decal/warning_stripes{ @@ -15002,6 +20507,9 @@ dir = 1 }, /area/varadero/interior/cargo) +"ngg" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior/hall_SE) "ngm" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -15016,13 +20524,81 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"nhc" = ( +"ngC" = ( +/obj/structure/largecrate/random/mini/chest, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/maintenance/north) +"ngY" = ( +/obj/item/stack/sheet/metal/med_small_stack, +/obj/structure/prop/server_equipment/laptop{ + pixel_x = 5; + pixel_y = 6 + }, /obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/shuttle/dropship/flight/lz2{ - dir = 4 +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"nhI" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_console) +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"nhX" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/comms4) +"nhY" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "nih" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -15037,12 +20613,29 @@ "nio" = ( /turf/closed/wall/r_wall/elevator/gears, /area/varadero/interior/hall_N) +"nit" = ( +/obj/structure/closet/crate/construction, +/obj/item/storage/belt/utility, +/obj/item/device/floor_painter, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "niF" = ( /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/medical) +"njC" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "nkd" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/o2, @@ -15071,16 +20664,6 @@ }, /turf/open/floor/carpet, /area/varadero/interior/records) -"nkJ" = ( -/obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/caves/east) -"nkP" = ( -/turf/open/floor/shiva{ - dir = 1; - icon_state = "greencorners" - }, -/area/varadero/interior/hall_SE) "nma" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/largecrate/random/mini/small_case/c{ @@ -15115,6 +20698,16 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"nmN" = ( +/obj/structure/window/reinforced/tinted{ + dir = 4 + }, +/obj/structure/surface/table, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/varadero/interior/security) "nmQ" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -15123,6 +20716,12 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"nnb" = ( +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) "nni" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -15137,15 +20736,14 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"nnr" = ( -/obj/structure/machinery/alarm{ - pixel_y = 24 +"nnt" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Underground Requesitions Lobby" }, /turf/open/floor/shiva{ - dir = 1; - icon_state = "green" + icon_state = "floor3" }, -/area/varadero/interior/mess) +/area/varadero/interior/cargo) "nnw" = ( /obj/structure/bed/chair{ dir = 1 @@ -15154,12 +20752,6 @@ icon_state = "floor3" }, /area/varadero/interior/hall_N) -"nnD" = ( -/turf/closed/wall/mineral/gold{ - desc = "A wall plated with gold that details the rules of the pool. Don't run, walk!"; - desc_lore = "Pool's closed" - }, -/area/varadero/interior/maintenance) "nnF" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva{ @@ -15167,26 +20759,37 @@ icon_state = "greenfull" }, /area/varadero/interior/medical) -"noG" = ( -/obj/item/storage/belt/shotgun/full/quackers, -/turf/open/gm/river, -/area/varadero/interior/maintenance) -"noO" = ( -/obj/structure/surface/table, -/obj/item/reagent_container/food/drinks/bottle/holywater, -/obj/structure/machinery/light, +"noj" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) +"noC" = ( +/obj/structure/pipes/vents/pump/on, /turf/open/floor/shiva{ - dir = 1; - icon_state = "red" + icon_state = "multi_tiles" }, -/area/varadero/interior/morgue) -"npB" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +/area/varadero/interior/comms3) +"noR" = ( +/obj/item/shard{ + icon_state = "medium" }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"npi" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/obj/structure/largecrate/random, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"npF" = ( +/obj/effect/landmark/survivor_spawner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "npW" = ( /obj/item/tool/warning_cone{ pixel_x = -8 @@ -15196,6 +20799,10 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) +"nqf" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/central) "nqN" = ( /obj/item/stool{ icon_state = "stool_alt" @@ -15205,21 +20812,15 @@ icon_state = "yellowfull" }, /area/varadero/interior/technical_storage) +"nqQ" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor, +/area/varadero/interior/dock_control) "nrd" = ( /turf/open/floor{ icon_state = "white" }, /area/varadero/interior/security) -"nrR" = ( -/obj/effect/overlay/palmtree_r{ - icon_state = "palm2" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) -"nsa" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) "nsc" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -15237,13 +20838,18 @@ dir = 1 }, /area/varadero/interior/electrical) -"nss" = ( -/obj/structure/bed/chair/wheelchair, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "wred" +"nsn" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/medical) +/area/varadero/interior/cargo) +"nsN" = ( +/turf/open/gm/coast/south, +/area/varadero/exterior/lz2_near) +"nti" = ( +/turf/closed/wall/r_wall, +/area/varadero/exterior/lz2_near) "ntw" = ( /obj/structure/closet/hydrant{ pixel_y = 32 @@ -15252,10 +20858,16 @@ icon_state = "green" }, /area/varadero/interior/hall_N) -"ntL" = ( -/obj/structure/window/framed/colony, -/turf/open/floor/plating, -/area/varadero/exterior/lz1_near) +"nuv" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "nuQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -15265,70 +20877,32 @@ icon_state = "purple" }, /area/varadero/interior/research) -"nvF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) -"nwO" = ( -/obj/structure/curtain/black, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "multi_tiles" - }, -/area/varadero/interior/bunks) -"nxf" = ( -/obj/structure/bed/chair{ - dir = 8; - icon_state = "chair_alt" +"nvv" = ( +/obj/structure/blocker/fog, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, +/area/varadero/exterior/farocean) +"nwi" = ( +/obj/structure/machinery/power/port_gen/pacman/mrs, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/security) -"nxF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +/area/varadero/interior/maintenance/north) +"nwq" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"nxl" = ( +/obj/structure/closet/wardrobe/engineering_yellow, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/river, -/area/varadero/interior/maintenance) +/area/varadero/interior/comms2) "nxW" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/medical) -"nxZ" = ( -/obj/item/reagent_container/food/snacks/carpmeat{ - desc = "This leathery protofish was named the gullible toothfish for the combination of its near identical dentata to that of Homo sapiens sapiens and the fact that if released after being caught, it is not uncommon to catch the same one; it not having learned its lesson. Its meat is said to taste like bitter clove."; - icon = 'icons/obj/items/fishing_atoms.dmi'; - icon_state = "gullible_toothfish_gutted"; - name = "gullible toothfish"; - pixel_x = 1; - pixel_y = -2 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) -"nyj" = ( -/obj/effect/overlay/palmtree_l, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) -"nyH" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/surface/rack, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "nyJ" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -15338,13 +20912,6 @@ icon_state = "purple" }, /area/varadero/interior/hall_NW) -"nyO" = ( -/obj/structure/surface/rack, -/obj/item/toy/beach_ball/holoball, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "nzb" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -15369,21 +20936,27 @@ icon_state = "green" }, /area/varadero/interior/mess) -"nzO" = ( -/obj/structure/machinery/light/small, -/obj/structure/closet/secure_closet/personal/patient, -/obj/structure/barricade/handrail/wire{ +"nzS" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/surface/rack, +/obj/item/tool/pickaxe/drill{ + pixel_y = 4 }, -/area/varadero/interior/medical) -"nAQ" = ( /turf/open/floor{ - icon_state = "bcircuit" + dir = 1; + icon_state = "asteroidfloor" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/comms1) +"nBc" = ( +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/lz2_near) "nBj" = ( /obj/structure/closet/emcloset, /obj/effect/landmark/objective_landmark/medium, @@ -15415,15 +20988,35 @@ icon_state = "floor3" }, /area/varadero/interior/mess) +"nBH" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 1; + name = "\improper Theta-V Research Laboratory"; + req_one_access = null; + req_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_NW) +"nCl" = ( +/obj/structure/fence, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "nCE" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ icon_state = "green" }, /area/varadero/interior/hall_SE) +"nCF" = ( +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/exterior/eastocean) "nCV" = ( /obj/effect/decal/cleanable/blood, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/varadero/interior/research) "nDk" = ( /obj/structure/largecrate/random, @@ -15442,8 +21035,20 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/court) +"nDL" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "nEE" = ( /obj/structure/prop/server_equipment/laptop/on{ pixel_x = -5 @@ -15472,6 +21077,21 @@ icon_state = "multi_tiles" }, /area/varadero/interior/disposals) +"nFp" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "nFy" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -15482,42 +21102,90 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) -"nGs" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null +"nFB" = ( +/obj/structure/machinery/floodlight/landing, +/obj/effect/decal/warning_stripes, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/turf/open/floor/plating, -/area/varadero/interior/technical_storage) -"nHb" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/turf/open/floor/wood, /area/varadero/exterior/lz1_near) +"nFD" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"nFH" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"nFK" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) +"nFX" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"nGE" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/engineering{ + dir = 1; + name = "\improper Underground Engineering Locker Room"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/comms3) +"nHy" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/tool/warning_cone, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "nHA" = ( /turf/open/floor/shiva{ icon_state = "red" }, /area/varadero/interior/security) -"nHD" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/caves/north_research) -"nIw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +"nHC" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/obj/structure/pipes/standard/simple/hidden/green{ +/area/varadero/interior_protected/caves) +"nHH" = ( +/obj/structure/platform_decoration/kutjevo{ dir = 4 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 1; - name = "\improper Underground Medical Laboratory"; - req_access_txt = "100" +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -18; + pixel_y = -8 }, -/turf/open/floor/plating, -/area/varadero/interior/medical) +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + pixel_x = -17; + pixel_y = -19 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "nIF" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -15542,23 +21210,26 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"nJq" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +"nJd" = ( +/obj/item/stack/sheet/wood/small_stack, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"nJn" = ( +/obj/structure/bed/chair, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) +/area/varadero/exterior/lz1_near) "nKd" = ( /obj/structure/prop/turbine_extras, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) +"nKf" = ( +/obj/item/tool/hatchet, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "nKr" = ( /obj/structure/surface/table, /obj/item/storage/box/sprays{ @@ -15569,6 +21240,21 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"nKy" = ( +/obj/structure/surface/rack, +/obj/item/tool/pickaxe, +/obj/item/tool/pickaxe{ + pixel_y = -4 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) +"nKR" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/monsoon) "nLw" = ( /obj/structure/machinery/r_n_d/server, /turf/open/floor/shiva{ @@ -15576,6 +21262,21 @@ icon_state = "purple" }, /area/varadero/interior/research) +"nLH" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 3.5 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) "nLI" = ( /turf/open/floor/shiva{ dir = 4; @@ -15592,10 +21293,21 @@ /obj/item/tool/pickaxe, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"nNw" = ( -/obj/item/storage/belt/marine/quackers, -/turf/open/gm/river, -/area/varadero/interior/maintenance) +"nNe" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior_protected/caves/central) +"nNv" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/security) "nNz" = ( /obj/structure/machinery/light{ dir = 4 @@ -15603,6 +21315,19 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"nNB" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"nNZ" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_N) "nOg" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/secure{ @@ -15616,7 +21341,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/electrical) "nOj" = ( /obj/effect/landmark/hunter_secondary, /turf/open/floor/shiva{ @@ -15624,15 +21349,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) -"nOw" = ( -/obj/structure/prop/structure_lattice{ - dir = 1; - health = 300 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/research) "nOz" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/station_alert{ @@ -15640,22 +21356,23 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) -"nOA" = ( -/obj/structure/machinery/power/apc{ - dir = 8; - pixel_x = -24; - start_charge = 0 - }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "green" - }, -/area/varadero/interior/hall_NW) "nOI" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/auto_turf/sand_white/layer0, +/turf/open/gm/dirt, /area/varadero/interior_protected/caves) +"nOM" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) "nOO" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -15671,6 +21388,21 @@ /obj/item/tool/lighter/zippo/gold, /turf/open/floor/carpet, /area/varadero/interior/research) +"nPx" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/largecrate/random, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/comms1) "nPE" = ( /obj/structure/safe, /obj/item/reagent_container/food/drinks/bottle/whiskey, @@ -15709,6 +21441,13 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) +"nPK" = ( +/obj/structure/closet/crate/trashcart, +/obj/item/trash/chips, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "nPR" = ( /obj/structure/machinery/light{ dir = 4 @@ -15730,7 +21469,7 @@ pixel_y = 22 }, /turf/closed/wall/r_wall/unmeltable, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) "nQH" = ( /obj/structure/machinery/light{ dir = 4 @@ -15740,11 +21479,49 @@ icon_state = "purple" }, /area/varadero/interior/research) +"nQR" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"nRk" = ( +/obj/structure/closet/crate, +/obj/item/stack/sheet/metal/med_large_stack, +/obj/item/trash/boonie, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) +"nRy" = ( +/obj/structure/bed/chair, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "green" + }, +/area/varadero/interior/mess) "nRH" = ( /turf/open/gm/dirt{ icon_state = "desert3" }, /area/varadero/interior/maintenance/north) +"nRP" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 + }, +/obj/item/cell/high, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/technical_storage) "nRT" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -15753,6 +21530,16 @@ icon_state = "wredfull" }, /area/varadero/interior/medical) +"nRU" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "nRW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -15766,44 +21553,12 @@ /obj/structure/largecrate/random/case, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/research) -"nSv" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - pixel_x = -17; - pixel_y = -19 - }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = -18; - pixel_y = -8 - }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) "nSP" = ( /obj/structure/sign/safety/airlock{ pixel_x = 8 }, /turf/closed/wall, /area/varadero/interior/medical) -"nSY" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/obj/structure/machinery/alarm{ - pixel_y = 24 - }, -/obj/effect/decal/warning_stripes/asteroid{ - dir = 8; - icon_state = "warning_c" - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/hall_N) -"nSZ" = ( -/obj/item/ammo_magazine/revolver/pkd, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) "nTj" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -15811,15 +21566,10 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, -/area/varadero/interior/laundry) -"nTq" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) +/area/varadero/interior/laundry) "nTG" = ( /turf/closed/wall/r_wall, /area/varadero/interior/hall_SE) @@ -15850,19 +21600,13 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) -"nUv" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"nUf" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" }, -/area/varadero/interior/oob) +/area/varadero/interior/electrical) "nVk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/invuln/overhead_pipe{ @@ -15888,6 +21632,26 @@ icon_state = "warnplate" }, /area/varadero/interior/disposals) +"nVv" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 22; + indestructible = 1; + unacidable = 1; + layer = 4.1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) "nVy" = ( /obj/structure/closet/coffin, /turf/open/floor/shiva{ @@ -15904,23 +21668,21 @@ icon_state = "green" }, /area/varadero/interior/hall_NW) -"nWA" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"nWS" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 }, -/obj/structure/machinery/light/small, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/area/varadero/interior/maintenance/research) +/turf/open/floor/wood, +/area/varadero/interior/hall_SE) "nXB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ pixel_y = 6 }, -/obj/structure/machinery/alarm{ - pixel_y = 24 - }, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -15945,6 +21707,16 @@ icon_state = "asteroidplating" }, /area/varadero/interior/hall_NW) +"nYx" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "purple" + }, +/area/varadero/interior/research) "nYy" = ( /obj/structure/machinery/light/small, /turf/open/floor/shiva{ @@ -15960,21 +21732,36 @@ dir = 1 }, /area/varadero/interior/cargo) -"nYP" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/colonist/burst, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "nZd" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/medical) +"nZi" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "multi_tiles" + }, +/area/varadero/interior/medical) "nZk" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -15983,31 +21770,12 @@ /obj/structure/barricade/handrail/wire, /turf/open/floor/wood, /area/varadero/interior/court) -"nZZ" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/weapon/harpoon/yautja{ - anchored = 1; - name = "Alien Harpoon"; - pixel_x = 6 - }, -/obj/item/clothing/mask/yautja_flavor{ - anchored = 1; - unacidable = 0 - }, -/turf/open/floor/corsat{ - dir = 1; - icon_state = "squareswood" +"nZP" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior_protected/vessel) +/area/varadero/interior/caves/east) "oam" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -16021,12 +21789,14 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"oaG" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/green, -/turf/open/floor/shiva{ - icon_state = "floor3" +"oaO" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/storage/firstaid/regular{ + pixel_x = 4; + pixel_y = -6 }, -/area/varadero/interior/medical) +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "oaR" = ( /turf/open/floor/wood{ icon_state = "wood-broken6" @@ -16041,19 +21811,31 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"obR" = ( -/obj/structure/machinery/light{ - dir = 1 +"obr" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) +"obN" = ( +/obj/structure/machinery/door_control{ + id = "undergroundhangarsouth"; + name = "South Dock Door"; + pixel_x = -32; + pixel_y = -18; + indestructible = 1 + }, +/turf/open/floor/plating/icefloor{ + dir = 1; + icon_state = "warnplate" }, +/area/varadero/exterior/lz1_near) +"obS" = ( +/obj/structure/window/framed/colony/reinforced, /turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" + icon_state = "snow_mat" }, -/area/varadero/interior/electrical) +/area/varadero/interior/security) "ocr" = ( /obj/structure/bed, /obj/item/bedsheet/orange, @@ -16062,6 +21844,35 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"ocz" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 1; + layer = 3.1; + pixel_y = 10 + }, +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "vent4"; + pixel_y = 25 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) +"ocQ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/weapon/gun/shotgun/pump, +/obj/item/ammo_magazine/shotgun/buckshot{ + pixel_x = 6; + pixel_y = -4 + }, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "odw" = ( /obj/structure/machinery/photocopier, /obj/item/storage/firstaid/regular{ @@ -16088,6 +21899,22 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"oef" = ( +/obj/effect/decal/warning_stripes/asteroid{ + icon_state = "warning_s" + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"oep" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "oeF" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -16107,23 +21934,17 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"ofs" = ( -/obj/structure/surface/rack, -/obj/item/storage/firstaid/adv{ - pixel_x = 3; - pixel_y = 5 - }, -/obj/item/storage/firstaid/adv, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) -"ofu" = ( -/obj/item/shard, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, +"ofC" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"ofJ" = ( +/obj/structure/shuttle/engine/router{ + dir = 4; + unacidable = 0 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "oga" = ( /obj/structure/bed/chair{ dir = 8 @@ -16160,11 +21981,6 @@ }, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) -"ogX" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "ohi" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/handcuffs, @@ -16182,20 +21998,58 @@ icon_state = "red" }, /area/varadero/interior/security) +"ohC" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/pontoon_beach) "ohM" = ( /obj/structure/barricade/wooden{ dir = 8 }, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"oiB" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 24 + }, +/obj/structure/surface/table/woodentable, +/obj/item/reagent_container/food/drinks/bottle/vodka/chess/b_bishop{ + pixel_x = -10; + pixel_y = 15 + }, +/obj/item/reagent_container/blood/empty{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/storage/box/cups{ + pixel_x = -13; + pixel_y = 3 + }, +/turf/open/floor/prison/chapel_carpet{ + dir = 1; + icon_state = "doubleside" + }, +/area/varadero/interior/chapel) "oiM" = ( /turf/open/floor/shiva{ dir = 8; icon_state = "multi_tiles" }, /area/varadero/interior/administration) +"ojm" = ( +/obj/structure/closet/toolcloset, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) "ojF" = ( /obj/item/tool/surgery/bonegel/predatorbonegel, /turf/open/shuttle{ @@ -16212,32 +22066,27 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null +/obj/structure/window/framed/colony, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/plating, /area/varadero/interior/maintenance) -"ojK" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno/up, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) "oke" = ( /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/cargo) -"okm" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 +"okf" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/adv{ + pixel_x = 3; + pixel_y = 5 }, -/turf/open/floor/shiva{ - dir = 10; - icon_state = "blue" +/obj/item/storage/firstaid/adv, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/administration) +/area/varadero/interior/maintenance/north) "okB" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, @@ -16260,16 +22109,36 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"ola" = ( +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "olD" = ( /turf/open/floor{ dir = 4; icon_state = "asteroidwarning" }, /area/varadero/exterior/lz1_near) -"olU" = ( -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Underground Security Checkpoint"; +"olP" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2; + name = "\improper Underground Requesitions Freezer"; + req_access_txt = "100" + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/varadero/interior/cargo) +"olU" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Underground Security Checkpoint"; req_access_txt = "100" }, /turf/open/floor/plating, @@ -16280,6 +22149,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"onj" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "onr" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 @@ -16310,14 +22183,28 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) -"opA" = ( -/obj/structure/machinery/light/small, -/turf/open/gm/dirt, -/area/varadero/interior/comms3) -"opW" = ( -/obj/structure/machinery/light{ - dir = 1 +"opd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/wood{ + icon_state = "wood-broken3" }, +/area/varadero/interior/beach_bar) +"opP" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"opW" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/stack/sheet/wood{ pixel_x = -14 @@ -16335,14 +22222,17 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) -"opY" = ( -/obj/structure/machinery/light, -/obj/structure/closet/crate/hydroponics/prespawned, -/obj/effect/landmark/objective_landmark/medium, +"oqh" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, /turf/open/floor/shiva{ - icon_state = "blue" + dir = 8; + icon_state = "yellowfull" }, -/area/varadero/interior/technical_storage) +/area/varadero/interior/cargo) "orb" = ( /obj/structure/bed/chair{ dir = 4 @@ -16351,6 +22241,13 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"orr" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "orH" = ( /obj/structure/filingcabinet{ pixel_x = -8; @@ -16358,14 +22255,13 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) -"orL" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +"orK" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/turf/open/gm/river, -/area/varadero/interior/oob) +/turf/open/gm/dirt, +/area/varadero/interior/maintenance/north) "orT" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -16376,6 +22272,11 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) +"osn" = ( +/obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/swcaves) "osr" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -16384,12 +22285,29 @@ icon_state = "asteroidplating" }, /area/varadero/interior/electrical) +"ost" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_N) +"osE" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "osX" = ( /obj/structure/machinery/shower{ dir = 8 }, /turf/open/floor/interior/plastic, /area/varadero/interior/laundry) +"otH" = ( +/obj/structure/closet/crate/construction, +/obj/item/tool/pickaxe, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "otL" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 4 @@ -16409,6 +22327,12 @@ "ouy" = ( /turf/closed/wall/r_wall, /area/varadero/interior/caves/east) +"ouP" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "ouV" = ( /obj/effect/spawner/random/bomb_supply, /turf/open/floor/shiva{ @@ -16433,6 +22357,24 @@ }, /turf/open/gm/dirt, /area/varadero/interior/maintenance/north) +"ovT" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/farocean) +"owk" = ( +/obj/structure/machinery/light/small, +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"owM" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/closed/wall/r_wall, +/area/varadero/interior_protected/caves/central) "owY" = ( /obj/structure/window/reinforced{ dir = 4; @@ -16468,13 +22410,28 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"oxs" = ( -/obj/structure/surface/rack, -/obj/item/storage/pouch/medkit/full_advanced, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"oxi" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/command{ + dir = 1; + name = "\improper Underground Administration Office"; + req_access_txt = "100" }, -/area/varadero/interior/maintenance) +/turf/open/floor/wood, +/area/varadero/interior/administration) +"oxA" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "greenfull" + }, +/area/varadero/interior/hall_N) "oyb" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -16492,6 +22449,20 @@ dir = 1 }, /area/varadero/interior/research) +"oyl" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 10; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"oyv" = ( +/obj/item/device/flashlight, +/turf/open/gm/dirt{ + icon_state = "desert2" + }, +/area/varadero/exterior/lz2_near) "oyx" = ( /obj/structure/bed/chair{ icon_state = "chair_alt" @@ -16529,6 +22500,23 @@ icon_state = "yellow" }, /area/varadero/interior/hall_SE) +"ozC" = ( +/obj/item/weapon/gun/shotgun/pump, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_SE) +"ozD" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) "oAm" = ( /obj/structure/toilet{ dir = 1 @@ -16538,31 +22526,59 @@ icon_state = "white" }, /area/varadero/interior/toilets) -"oAS" = ( -/obj/structure/prop/structure_lattice{ - dir = 4; - health = 300 - }, -/obj/structure/prop/structure_lattice{ - dir = 4; - layer = 3.1; - pixel_y = 10 - }, -/obj/structure/prop/invuln/ice_prefab/roof_greeble{ - icon_state = "vent4"; - pixel_y = 25 +"oAC" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/exterior/pontoon_beach) +"oAE" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) +"oAJ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 }, -/area/varadero/interior/oob) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "oBj" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/hall_N) +"oBq" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) +"oBs" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/cargo) "oBG" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, /turf/open/floor/shiva{ dir = 5; icon_state = "green" @@ -16637,19 +22653,19 @@ icon_state = "desert0" }, /area/varadero/exterior/lz1_near) -"oDg" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 +"oDz" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/interior/hall_SE) +"oDB" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/area/varadero/interior/comms3) -"oDF" = ( -/turf/closed/wall/r_wall/elevator/arrivals, -/area/varadero/interior/records) +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "oDN" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -16663,6 +22679,15 @@ /obj/structure/sign/safety/hvac_old, /turf/closed/wall, /area/varadero/interior/cargo) +"oDU" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 2; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "oDX" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -16675,37 +22700,16 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"oEl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river, -/area/varadero/interior/maintenance) -"oEx" = ( -/obj/structure/prop/ice_colony/dense/planter_box/plated{ - dir = 9; - icon_state = "planter_box_soil" - }, -/obj/structure/flora/bush/ausbushes/pointybush{ - icon_state = "pointybush_3"; - pixel_y = 11 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/research) "oET" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/interior/maintenance/security) +"oEX" = ( +/obj/structure/closet/crate, +/obj/item/clothing/head/helmet, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "oFd" = ( /obj/structure/bed/chair/office/dark{ dir = 4; @@ -16732,6 +22736,16 @@ "oGv" = ( /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) +"oHo" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) +"oIc" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/exterior/comms4) "oIq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -16748,11 +22762,26 @@ icon_state = "yellowfull" }, /area/varadero/interior/electrical) -"oIN" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +"oJb" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"oJm" = ( +/obj/structure/machinery/door/airlock/almayer/secure{ + dir = 2; + name = "Underground Hangar Power Substation"; + req_access = null + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/maintenance/north) "oJv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -16766,14 +22795,29 @@ dir = 1 }, /area/varadero/interior/cargo) -"oJY" = ( -/obj/structure/closet/secure_closet/engineering_welding, -/obj/structure/machinery/light, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +"oJW" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/maintenance/security) +"oJX" = ( +/obj/item/stack/sheet/metal, +/obj/structure/shuttle/engine/heater{ + dir = 8; + unacidable = 0 + }, +/obj/item/device/flashlight/slime, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) +"oKi" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/medium, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "oKo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -16792,17 +22836,17 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"oKt" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +"oKx" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = 24 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/obj/structure/largecrate/random, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" }, -/turf/open/gm/river, -/area/varadero/interior/oob) +/area/varadero/interior/hall_SE) "oKy" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -16812,6 +22856,16 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"oKN" = ( +/obj/item/weapon/gun/shotgun/pump, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "red" + }, +/area/varadero/interior/hall_N) "oLa" = ( /obj/item/trash/barcardine, /turf/open/floor{ @@ -16825,6 +22879,23 @@ }, /turf/closed/wall, /area/varadero/interior/cargo) +"oLZ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "oMa" = ( /obj/structure/surface/table, /obj/item/storage/pill_bottle/packet/bicaridine, @@ -16838,6 +22909,11 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"oMg" = ( +/obj/effect/landmark/objective_landmark/medium, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "oMl" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -16852,22 +22928,18 @@ icon_state = "floor3" }, /area/varadero/interior/hall_N) -"oML" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0 - }, -/obj/structure/flora/bush/desert{ - pixel_y = 12 +"oNa" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/farocean) "oNy" = ( /turf/open/shuttle/elevator, /area/varadero/interior/hall_N) -"oOg" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river, -/area/varadero/exterior/eastbeach) "oOF" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -16891,17 +22963,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"oPj" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access = null; - req_access_txt = null; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/maintenance/research) "oPr" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, @@ -16917,25 +22978,18 @@ "oPV" = ( /turf/open/floor/plating, /area/varadero/interior/maintenance/security) -"oRj" = ( -/obj/item/facepaint/sunscreen_stick, -/turf/open/gm/dirt{ - icon_state = "desert0" - }, -/area/varadero/exterior/pontoon_beach) -"oRo" = ( -/obj/item/reagent_container/food/snacks/carpmeat{ - desc = "Revolting beyond description."; - icon = 'icons/obj/items/fishing_atoms.dmi'; - icon_state = "gullible_toothfish_teeth"; - name = "human-ish teeth"; - pixel_x = 1; - pixel_y = -2 +"oRx" = ( +/obj/structure/closet/crate/secure, +/obj/item/trash/eat, +/obj/item/trash/cheesie, +/obj/item/reagent_container/food/drinks/flask/vacuumflask{ + pixel_x = 4; + pixel_y = 7 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/area/varadero/interior/oob) +/area/varadero/interior/cargo) "oRB" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -16949,24 +23003,43 @@ icon_state = "floor3" }, /area/varadero/interior/hall_NW) -"oSb" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0; - pixel_x = 11; - pixel_y = 9 +"oRD" = ( +/obj/structure/prop/rock/brown, +/obj/structure/prop/invuln/lattice_prop, +/turf/open/gm/coast/north, +/area/varadero/exterior/pool) +"oRK" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = 10; - pixel_y = 20 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) +/obj/effect/landmark/objective_landmark/far, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) +"oSe" = ( +/obj/structure/surface/table, +/obj/item/stack/sheet/metal/med_large_stack, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "oSX" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/electrical) +"oTs" = ( +/obj/structure/blocker/fog, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/farocean) +"oTE" = ( +/obj/item/tool/crowbar/red, +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) "oTJ" = ( /obj/structure/machinery/alarm{ dir = 4; @@ -16980,6 +23053,17 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"oTX" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/comms1) "oUh" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -17008,6 +23092,15 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) +"oVm" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellow" + }, +/area/varadero/interior/comms3) "oVn" = ( /turf/open/floor/shiva{ dir = 4; @@ -17039,6 +23132,20 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) +"oWf" = ( +/obj/structure/machinery/floodlight/landing{ + desc = "A powerful light stationed near construction zones to provide better visibility."; + name = "Construction Light" + }, +/obj/effect/decal/warning_stripes, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastocean) +"oWg" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "oWr" = ( /obj/structure/machinery/power/apc{ dir = 1; @@ -17047,13 +23154,20 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) -"oWA" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +"oWs" = ( +/obj/effect/decal/strata_decals/grime/grime4, +/obj/item/reagent_container/food/drinks/bottle/sake{ + layer = 3.1; + pixel_x = 13; + pixel_y = 21 }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) +/obj/item/ammo_magazine/rifle, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) +"oWx" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "oWO" = ( /obj/structure/toilet, /turf/open/floor{ @@ -17084,6 +23198,10 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"oXo" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/digsite) "oXp" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva{ @@ -17091,6 +23209,12 @@ icon_state = "red" }, /area/varadero/interior/security) +"oXw" = ( +/obj/docking_port/stationary/marine_dropship/lz1{ + name = "LZ1 - Pontoon Dock" + }, +/turf/open/floor/plating/icefloor, +/area/varadero/exterior/lz1_near) "oXC" = ( /obj/structure/surface/table, /obj/structure/prop/server_equipment/laptop/on, @@ -17125,16 +23249,6 @@ icon_state = "red" }, /area/varadero/interior/medical) -"oZl" = ( -/obj/item/clothing/ears/earmuffs{ - layer = 3.1; - pixel_x = 2; - pixel_y = 18 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior_protected/caves) "oZw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -17151,6 +23265,20 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"oZJ" = ( +/obj/structure/fence, +/turf/open/gm/coast/south, +/area/varadero/exterior/lz2_near) +"paq" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) "paB" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ @@ -17183,9 +23311,13 @@ /obj/effect/decal/strata_decals/grime/grime4, /turf/open/floor/wood, /area/varadero/interior/bunks) -"pbk" = ( -/turf/open/floor/plating, -/area/varadero/interior/cargo) +"pbf" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/paper/research_notes, +/obj/item/paper/research_notes, +/obj/item/clothing/accessory/storage/black_vest/brown_vest, +/turf/open/floor/wood, +/area/varadero/interior/administration) "pbp" = ( /turf/open/floor{ dir = 1; @@ -17207,19 +23339,21 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"pcg" = ( -/obj/structure/machinery/door_control{ - id = "undergroundhangarpower"; - name = "Underground Hangar Lock"; - pixel_y = -24 - }, -/obj/structure/machinery/power/terminal{ - dir = 8 +"pbM" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Underground Staff Canteen" }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/mess) +"pbT" = ( +/obj/structure/prop/rock/brown, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) "pco" = ( /obj/structure/surface/rack, /obj/item/tool/surgery/scalpel, @@ -17244,30 +23378,12 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) -"pcJ" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, -/turf/open/floor/shiva{ - icon_state = "green" - }, -/area/varadero/interior/hall_N) "pcK" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/shiva{ icon_state = "yellow" }, /area/varadero/interior/technical_storage) -"pcQ" = ( -/obj/structure/bed, -/obj/item/bedsheet/orange, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "snow_mat" - }, -/area/varadero/interior/security) "pdc" = ( /obj/structure/largecrate/random{ anchored = 1 @@ -17276,6 +23392,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/caves) +"pdn" = ( +/obj/item/tool/shovel/spade, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "pdr" = ( /obj/structure/surface/table, /obj/item/trash/chips{ @@ -17286,6 +23406,38 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) +"pdK" = ( +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/lz2_near) +"pea" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/interior/caves/north_research) +"per" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "peA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17295,12 +23447,9 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"peE" = ( -/obj/structure/bookcase, -/turf/open/floor{ - icon_state = "wood" - }, -/area/varadero/interior/library) +"pfd" = ( +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/exterior/pontoon_beach) "pfr" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -17325,6 +23474,18 @@ icon_state = "freezerfloor" }, /area/varadero/interior/cargo) +"pgg" = ( +/obj/item/tool/pickaxe, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) +"pgn" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 + }, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/eastbeach) "phd" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/medium, @@ -17333,6 +23494,16 @@ icon_state = "red" }, /area/varadero/interior/security) +"phk" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"phw" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "phA" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers{ icon_state = "brflowers_2" @@ -17356,6 +23527,18 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"pjk" = ( +/obj/structure/sink{ + pixel_y = 15 + }, +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "pjm" = ( /obj/effect/decal/remains/xeno{ pixel_y = -25 @@ -17368,6 +23551,7 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, +/obj/item/book/manual/research_and_development, /turf/open/floor/carpet, /area/varadero/interior/library) "pjs" = ( @@ -17376,23 +23560,31 @@ icon_state = "floor3" }, /area/varadero/interior/research) -"pjz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/stamp{ - icon_state = "stamp-ce" +"pjD" = ( +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/eastocean) +"pjH" = ( +/obj/structure/surface/table, +/obj/item/paper/janitor{ + pixel_y = 8 }, -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 +/obj/item/circuitboard/apc, +/turf/open/floor/shiva, +/area/varadero/interior/technical_storage) +"pkj" = ( +/obj/item/tool/weldingtool, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"pkl" = ( +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + desc = "A high-power hydroelectric generator."; + name = "hydroelectric generator" }, -/turf/open/floor/shiva{ - icon_state = "floor3" +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/area/varadero/interior/records) -"pkn" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/varadero/interior/cargo) +/area/varadero/exterior/farocean) "pku" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -17413,14 +23605,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) -"pkR" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "red" - }, -/area/varadero/interior/morgue) +/area/varadero/interior/cargo) "pkT" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor{ @@ -17445,13 +23630,41 @@ icon_state = "purple" }, /area/varadero/interior/research) -"plg" = ( -/obj/structure/machinery/light, +"pll" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"plm" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor{ dir = 1; icon_state = "asteroidfloor" }, -/area/varadero/interior/comms1) +/area/varadero/exterior/lz1_near) +"plq" = ( +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/exterior/eastocean) +"plF" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + desc = "Revolting beyond description."; + icon = 'icons/obj/items/fishing_atoms.dmi'; + icon_state = "gullible_toothfish_teeth"; + name = "human-ish teeth"; + pixel_x = 1; + pixel_y = -2 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/comms4) "plN" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -17463,9 +23676,17 @@ "plT" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"pmh" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "pmy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, @@ -17484,43 +23705,39 @@ icon_state = "bluefull" }, /area/varadero/interior/administration) -"poh" = ( -/obj/item/paper, -/obj/effect/landmark/corpsespawner/colonist/random/burst, -/turf/open/floor/carpet, -/area/varadero/interior/chapel) -"pol" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/carpet, -/area/varadero/interior/library) -"pom" = ( -/obj/item/weapon/gun/revolver/m44/custom/pkd_special{ - pixel_x = 1; - pixel_y = 1 - }, +"pmM" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/oob) -"pop" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/area/varadero/exterior/monsoon) +"pmW" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 5 +/area/varadero/exterior/eastbeach) +"pnn" = ( +/obj/item/ammo_magazine/shotgun/slugs, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 +/area/varadero/interior/research) +"pnL" = ( +/obj/structure/machinery/light, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" }, -/area/varadero/interior/oob) +/area/varadero/interior/comms3) +"pol" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/carpet, +/area/varadero/interior/library) "pot" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -17532,6 +23749,17 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) +"pox" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) +"poz" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/hall_SE) "poC" = ( /obj/item/reagent_container/food/snacks/eat_bar, /obj/item/reagent_container/food/snacks/eat_bar{ @@ -17553,12 +23781,6 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) -"poK" = ( -/obj/structure/tunnel{ - id = "construction_tunnel" - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/east) "poU" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -17567,6 +23789,10 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"ppl" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "ppw" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -17575,18 +23801,29 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"ppY" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"pqf" = ( +/obj/structure/window/phoronreinforced{ + dir = 4; + icon_state = "phoronrwindow" }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) "pqj" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/carpet, /area/varadero/interior/records) +"pqC" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "green" + }, +/area/varadero/interior/hall_SE) "pqG" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -17633,6 +23870,13 @@ icon_state = "red" }, /area/varadero/interior/medical) +"prl" = ( +/obj/item/grown/log, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"prC" = ( +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/eastbeach) "prY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17652,6 +23896,20 @@ }, /turf/open/floor/carpet, /area/varadero/interior/security) +"psd" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) +"psk" = ( +/obj/structure/closet/secure_closet/bar, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/varadero/interior/beach_bar) "pth" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe/plasmacutter, @@ -17665,12 +23923,37 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"ptp" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) "ptw" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/laundry) +"ptC" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_one_access = null; + req_access = null + }, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/north) +"ptM" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/laundry) "ptP" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp/green{ @@ -17688,20 +23971,16 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"pun" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/exterior/pontoon_beach) "puq" = ( /obj/item/lightstick/variant/planted, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"puK" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - dir = 1; - name = "\improper Underground Medical Laboratory"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/medical) "pvk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17714,8 +23993,26 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, /area/varadero/interior/medical) +"pvs" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance) +"pvQ" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "pwc" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -17728,6 +24025,16 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"pxa" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/largecrate/random/mini/ammo{ + pixel_y = 4 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood, +/area/varadero/interior/dock_control) "pxg" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -17736,11 +24043,6 @@ dir = 1 }, /area/varadero/interior/cargo) -"pxK" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/paper/research_notes, -/turf/open/floor/wood, -/area/varadero/interior/administration) "pyk" = ( /obj/item/reagent_container/food/snacks/wrapped/barcardine{ pixel_y = 7 @@ -17755,6 +24057,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"pyz" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "pAa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17770,13 +24078,13 @@ icon_state = "warnplate" }, /area/varadero/exterior/lz1_near) -"pAu" = ( -/obj/structure/machinery/door/airlock/almayer/engineering{ - name = "\improper Underground Engineering Locker Room"; - req_access_txt = "100" +"pAX" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/turf/open/floor/plating, -/area/varadero/interior/electrical) +/area/varadero/exterior/pontoon_beach) "pAZ" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/glass/phoronglass{ @@ -17793,6 +24101,23 @@ icon_state = "red" }, /area/varadero/interior/security) +"pBf" = ( +/obj/structure/prop/rock/brown{ + layer = 2 + }, +/obj/structure/bed{ + can_buckle = 0; + desc = "A lightweight support lattice."; + icon = 'icons/obj/structures/structures.dmi'; + icon_state = "latticefull"; + layer = 2.1; + name = "lattice" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/vessel) "pBo" = ( /obj/structure/coatrack, /obj/item/clothing/head/fedora{ @@ -17801,6 +24126,12 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"pBx" = ( +/obj/item/device/flashlight, +/turf/open/floor/shiva{ + icon_state = "yellow" + }, +/area/varadero/interior/cargo) "pBK" = ( /obj/structure/filingcabinet{ pixel_x = -8 @@ -17821,6 +24152,11 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"pCa" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/south, +/area/varadero/exterior/farocean) "pCc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/largecrate/random/mini/ammo{ @@ -17831,10 +24167,21 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"pCj" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) +"pCf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Underground Main Hallway" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_N) "pCp" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -17843,13 +24190,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) -"pCz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/toolbox/mechanical/green, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) "pCO" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/phoron/medium_stack, @@ -17857,6 +24197,15 @@ icon_state = "bcircuit" }, /area/varadero/interior/electrical) +"pCP" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + dir = 2; + name = "\improper Theta-V Research Laboratory Director's Office"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/research) "pCV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/cable_coil/blue, @@ -17867,6 +24216,10 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) +"pDl" = ( +/obj/structure/girder, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "pDD" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -17876,6 +24229,28 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) +"pDF" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/obj/structure/closet/firecloset, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"pDW" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"pDX" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "pEE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17887,6 +24262,27 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"pFd" = ( +/obj/item/storage/pouch/construction, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"pFF" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/limb, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"pGc" = ( +/obj/structure/window/framed/colony/reinforced, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating, +/area/varadero/interior/research) "pGi" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17896,6 +24292,10 @@ icon_state = "redfull" }, /area/varadero/interior/hall_SE) +"pGj" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/pool) "pGs" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/oob) @@ -17912,19 +24312,21 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"pHn" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2; - name = "\improper Underground Requesitions Freezer"; - req_access_txt = "100"; - req_one_access = null +"pIe" = ( +/obj/item/stack/sheet/wood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/plating, -/area/varadero/interior/cargo) -"pHX" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) +/area/varadero/interior/maintenance/north) +"pIj" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "pIz" = ( /obj/structure/surface/table, /obj/item/trash/plate{ @@ -17970,18 +24372,19 @@ icon_state = "floor3" }, /area/varadero/interior/security) -"pJy" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, +"pJp" = ( +/obj/structure/closet/toolcloset, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/electrical) +/area/varadero/interior/maintenance/north) +"pJs" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/bed/chair{ + icon_state = "chair_alt" + }, +/turf/open/floor/carpet, +/area/varadero/interior/hall_SE) "pJA" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice8"; @@ -17994,17 +24397,14 @@ /area/varadero/interior/maintenance/research) "pJF" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/sand_white/layer0, +/turf/open/gm/dirt, /area/varadero/interior_protected/caves) -"pJS" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/engineering{ - dir = 1; - name = "\improper Underground Engineering Locker Room"; - req_access_txt = "100" +"pJQ" = ( +/obj/item/book/manual/evaguide, +/turf/open/floor{ + icon_state = "wood" }, -/turf/open/floor/plating, -/area/varadero/interior/electrical) +/area/varadero/interior/library) "pJZ" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/medium, @@ -18013,10 +24413,36 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"pKg" = ( +/obj/item/book/manual/nuclear, +/turf/open/floor/carpet, +/area/varadero/interior/library) "pKs" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/hall_SE) +"pKK" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves) +"pLp" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"pLF" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) "pLV" = ( /obj/structure/machinery/alarm{ dir = 4; @@ -18037,40 +24463,34 @@ icon_state = "multi_tiles" }, /area/varadero/interior/morgue) -"pMC" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) -"pNn" = ( -/obj/structure/machinery/power/apc{ +"pMG" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor{ dir = 8; - pixel_x = -24; - start_charge = 0 + icon_state = "asteroidwarning" }, -/obj/structure/closet/athletic_mixed{ - anchored = 0; - density = 0; - pixel_x = -8; - pixel_y = 22 +/area/varadero/exterior/lz1_near) +"pNa" = ( +/obj/structure/catwalk, +/obj/structure/barricade/handrail/wire{ + layer = 3.01 }, -/obj/structure/closet/athletic_mixed{ - anchored = 0; - density = 0; - pixel_x = 6; - pixel_y = 21 +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "snow_mat" +/area/varadero/interior/maintenance/north) +"pNf" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/varadero/interior/maintenance) +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/hall_SE) +"pNk" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/barricade/wooden, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "pNI" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 6; @@ -18087,13 +24507,63 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) -"pOf" = ( -/obj/structure/dispenser, -/turf/open/floor/shiva{ +"pNR" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/lz2_near) +"pNT" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 3.5 + }, +/obj/structure/platform/kutjevo/smooth{ dir = 1; - icon_state = "yellow" + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/technical_storage) +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "If this is removed, you cannot escape."; + health = 300; + icon_state = "ladder10"; + name = "ladder" + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "blue" + }, +/area/varadero/interior/maintenance) +"pNZ" = ( +/obj/structure/prop/rock/brown, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) +"pOa" = ( +/obj/structure/largecrate/supply, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"pOg" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "pOz" = ( /obj/structure/machinery/computer/card{ dir = 8 @@ -18108,16 +24578,67 @@ /obj/item/tool/wirecutters/clippers, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) +"pPf" = ( +/obj/structure/surface/table, +/obj/item/prop/helmetgarb/flair_uscm, +/obj/item/storage/box/uscm_mre{ + pixel_x = -4; + pixel_y = 13 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/laundry) +"pPl" = ( +/obj/structure/machinery/light, +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/varadero/interior/comms1) "pQp" = ( /turf/closed/wall/r_wall, /area/varadero/interior/technical_storage) -"pRl" = ( -/obj/structure/machinery/door/window/northright{ - name = "Disposals Chute" +"pQw" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/floor/plating{ - dir = 1; - icon_state = "warnplate" +/obj/structure/largecrate/random, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"pQF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "yellow" + }, +/area/varadero/interior/technical_storage) +"pRa" = ( +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"pRb" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) +"pRl" = ( +/obj/structure/machinery/door/window/northright{ + name = "Disposals Chute" + }, +/turf/open/floor/plating{ + dir = 1; + icon_state = "warnplate" }, /area/varadero/interior/disposals) "pRs" = ( @@ -18144,6 +24665,27 @@ icon_state = "yellowfull" }, /area/varadero/interior/hall_SE) +"pRR" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"pRV" = ( +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/exterior/comms4) "pRX" = ( /turf/open/floor/shiva{ icon_state = "yellow" @@ -18181,17 +24723,58 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"pTg" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"pTI" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/lz2_near) "pTO" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"pTZ" = ( -/obj/structure/machinery/light, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"pTQ" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"pUi" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, +/turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz1_near) "pUW" = ( /obj/item/stack/tile/plasteel{ @@ -18253,18 +24836,6 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"pWI" = ( -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) "pXp" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -18276,7 +24847,7 @@ /turf/open/floor/shiva{ icon_state = "multi_tiles" }, -/area/varadero/interior/hall_SE) +/area/varadero/interior/hall_N) "pXG" = ( /obj/structure/closet/emcloset, /turf/open/floor/shiva{ @@ -18293,9 +24864,26 @@ icon_state = "floor3" }, /area/varadero/interior/hall_N) +"pXT" = ( +/obj/structure/machinery/landinglight/ds1/spoke{ + pixel_y = -5; + pixel_x = 13 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "pYn" = ( /turf/closed/wall, /area/varadero/interior/records) +"pYt" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/cargo) "pYv" = ( /turf/open/floor/shiva{ icon_state = "floor3" @@ -18328,6 +24916,18 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) +"pYI" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"pYK" = ( +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/monsoon) "pYV" = ( /obj/structure/pipes/vents/pump, /obj/structure/prop/invuln/lattice_prop{ @@ -18351,23 +24951,45 @@ icon_state = "floor3" }, /area/varadero/interior/electrical) -"pZq" = ( -/obj/item/tool/shovel/spade, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "pZD" = ( /obj/structure/closet/crate, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"pZS" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"pZT" = ( +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/exterior/lz2_near) "qaE" = ( /turf/open/floor/wood, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) +"qaX" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "qaY" = ( /obj/structure/sign/safety/water, /turf/closed/wall, /area/varadero/interior/library) +"qbX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "qcC" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -18392,7 +25014,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/comms2) "qcN" = ( /turf/closed/wall, /area/varadero/interior/medical) @@ -18404,6 +25026,21 @@ icon_state = "multi_tiles" }, /area/varadero/interior/records) +"qdk" = ( +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/comms3) +"qdL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/book/manual/security_space_law{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/item/clothing/head/helmet, +/turf/open/floor/wood, +/area/varadero/interior/dock_control) "qeh" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -18441,6 +25078,57 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) +"qeK" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_SE) +"qfb" = ( +/obj/structure/closet/crate/ammo/alt, +/obj/item/ammo_magazine/revolver/cmb, +/obj/item/ammo_magazine/revolver/cmb{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/ammo_magazine/revolver/cmb{ + pixel_x = -4; + pixel_y = -5 + }, +/obj/item/ammo_magazine/revolver/cmb, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) +"qfr" = ( +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) +"qfu" = ( +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"qfC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 8; + pixel_y = 6 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 9; + pixel_y = 1 + }, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"qfL" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = -4; + pixel_y = 9 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "qgm" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/varadero/exterior/pontoon_beach) @@ -18453,17 +25141,15 @@ icon_state = "floor3" }, /area/varadero/interior/hall_N) -"qgP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"qgR" = ( +/obj/item/storage/firstaid/regular{ + pixel_x = 4; + pixel_y = -6 }, -/area/varadero/exterior/lz1_near) -"qhd" = ( -/obj/effect/overlay/palmtree_r, -/turf/closed/wall/rock/brown, -/area/varadero/interior/oob) +/turf/open/floor/shiva{ + icon_state = "red" + }, +/area/varadero/interior/hall_N) "qhF" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/wood, @@ -18480,6 +25166,28 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) +"qhO" = ( +/obj/effect/spawner/random/tool, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"qhQ" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"qhZ" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) "qio" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/maintenance) @@ -18490,6 +25198,26 @@ icon_state = "wred" }, /area/varadero/interior/medical) +"qis" = ( +/obj/item/paper{ + pixel_y = -6; + pixel_x = -8; + name = "help"; + desc = "A recent storm washed away any legible text" + }, +/obj/item/tool/pen, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"qiv" = ( +/obj/structure/surface/table, +/obj/item/stack/sheet/plasteel{ + amount = 24 + }, +/turf/open/floor/shiva{ + dir = 10; + icon_state = "yellow" + }, +/area/varadero/interior/cargo) "qiP" = ( /obj/structure/bed/chair/comfy/beige{ dir = 8 @@ -18510,24 +25238,29 @@ icon_state = "multi_tiles" }, /area/varadero/interior/laundry) +"qjg" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/remains/human, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "qjU" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"qkr" = ( -/obj/structure/surface/table, -/obj/item/prop/helmetgarb/flair_uscm, -/obj/item/storage/box/uscm_mre{ - pixel_x = -4; - pixel_y = 13 - }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/shiva{ - icon_state = "floor3" +"qkq" = ( +/obj/structure/largecrate/random, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"qkF" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/laundry) +/area/varadero/interior/maintenance/north) "qlj" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -18538,6 +25271,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"qlw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/monsoon) "qlx" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/carpet, @@ -18549,6 +25288,21 @@ icon_state = "floor3" }, /area/varadero/interior/mess) +"qmF" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "qnf" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/junction, @@ -18563,14 +25317,6 @@ icon_state = "yellowfull" }, /area/varadero/interior/hall_SE) -"qnn" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ - dir = 1; - name = "\improper Underground Medical Laboratory"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/medical) "qnp" = ( /obj/item/shard{ icon_state = "large"; @@ -18579,10 +25325,31 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"qnN" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) "qnW" = ( /obj/structure/closet/fireaxecabinet, /turf/closed/wall/r_wall, /area/varadero/interior/electrical) +"qoj" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/overlay/palmtree_r, +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) "qoy" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva{ @@ -18595,16 +25362,9 @@ icon_state = "asteroidwarning" }, /area/varadero/exterior/lz1_near) -"qoS" = ( -/turf/open/floor/shiva{ - dir = 4; - icon_state = "snow_mat" - }, -/area/varadero/interior/security) -"qpg" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +"qoI" = ( +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/monsoon) "qps" = ( /obj/structure/machinery/light{ dir = 8 @@ -18623,6 +25383,14 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"qpK" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/north) "qpZ" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" @@ -18644,20 +25412,48 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"qsc" = ( -/obj/structure/shuttle/engine/heater{ - dir = 8 +"qqJ" = ( +/obj/structure/sign/safety/bulkhead_door, +/obj/structure/machinery/door_control/brbutton{ + id = "undergroundhangarwest"; + name = "West Dock Door"; + pixel_x = 3; + indestructible = 1 }, -/obj/structure/window/phoronreinforced{ - dir = 4; - icon_state = "phoronrwindow" +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/exterior/lz1_near) +"qqM" = ( +/obj/structure/largecrate/random/mini, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/obj/item/device/flashlight/slime, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" +/area/varadero/interior/maintenance/north) +"qqR" = ( +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." }, -/area/varadero/interior_protected/vessel) +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"qsb" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) "qsh" = ( /obj/structure/closet/secure_closet/security, /obj/structure/machinery/light{ @@ -18672,13 +25468,30 @@ icon_state = "red" }, /area/varadero/interior/security) -"qsk" = ( -/obj/structure/closet/secure_closet/security, +"qto" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Underground Security Interrogation"; + req_access_txt = "100" + }, /turf/open/floor/shiva{ - dir = 5; - icon_state = "red" + icon_state = "floor3" }, -/area/varadero/interior/hall_N) +/area/varadero/interior/security) +"qtr" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"qtv" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice2"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/closed/wall/rock/brown, +/area/varadero/interior/oob) "qtQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ @@ -18696,6 +25509,16 @@ "qul" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/caves/north_research) +"qus" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/wood, +/area/varadero/interior/hall_SE) +"quP" = ( +/obj/effect/landmark/static_comms/net_two, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "quR" = ( /obj/item/stack/sheet/metal, /turf/open/floor/wood, @@ -18704,15 +25527,13 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/administration) -"qvK" = ( -/obj/structure/bed/chair{ +"qvv" = ( +/obj/effect/landmark/corpsespawner/colonist, +/turf/open/floor/shiva{ dir = 4; - icon_state = "chair_alt" - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" + icon_state = "multi_tiles" }, -/area/varadero/interior_protected/maintenance/south) +/area/varadero/interior/morgue) "qvO" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -18730,6 +25551,9 @@ icon_state = "floor3" }, /area/varadero/interior/mess) +"qvS" = ( +/turf/open/gm/coast/south, +/area/varadero/exterior/eastocean) "qwB" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -18740,6 +25564,16 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"qwE" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) +"qwQ" = ( +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "qwU" = ( /obj/structure/xenoautopsy/tank/hugger, /turf/open/floor/corsat{ @@ -18747,6 +25581,15 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"qxa" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/glass/bucket/mopbucket, +/obj/item/tool/mop, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/electrical) "qxb" = ( /obj/structure/bed/alien{ can_buckle = 0; @@ -18773,14 +25616,11 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) -"qxL" = ( -/obj/structure/surface/table/reinforced/prison{ - flipped = 1 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" +"qxu" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_SE) +/area/varadero/interior/hall_N) "qyk" = ( /obj/structure/machinery/light{ dir = 8 @@ -18796,16 +25636,61 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"qym" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/structure/closet/crate/trashcart{ + pixel_y = 8 + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/disposals) "qyH" = ( /obj/structure/window/framed/colony/reinforced, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior_protected/caves) +"qyJ" = ( +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/lz1_near) "qyT" = ( /obj/structure/largecrate/random/case, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"qyW" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/varadero/interior/beach_bar) +"qza" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) +"qzb" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "qzd" = ( /obj/structure/filingcabinet/filingcabinet, /obj/item/paper/research_notes, @@ -18818,10 +25703,21 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"qzi" = ( +/obj/structure/sign/safety/high_voltage, +/obj/structure/sign/safety/hazard{ + pixel_x = 15 + }, +/turf/closed/wall/r_wall, +/area/varadero/interior/maintenance/north) "qzq" = ( /obj/structure/machinery/door/airlock/almayer/engineering/autoname, -/turf/open/floor/plating/icefloor, -/area/varadero/exterior/lz1_near) +/turf/open/floor/wood, +/area/varadero/interior/dock_control) +"qzZ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/swcaves) "qAd" = ( /obj/structure/machinery/door/airlock/strata/autoname{ autoname = 0; @@ -18838,6 +25734,10 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"qAp" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/north) "qAr" = ( /obj/structure/machinery/light{ dir = 8 @@ -18847,17 +25747,36 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) -"qAU" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/flashbangs{ - pixel_x = 3; - pixel_y = -2 +"qAy" = ( +/obj/item/tool/shovel, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"qAI" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, -/obj/item/storage/box/flashbangs, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/security) +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"qAS" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "qBn" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/cobweb{ @@ -18878,6 +25797,16 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) +"qBO" = ( +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) "qBQ" = ( /obj/structure/coatrack, /obj/item/clothing/suit/armor/bulletproof, @@ -18905,6 +25834,14 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"qCE" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/bottle/gin{ + pixel_x = 4; + pixel_y = 4 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "qCI" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -18918,21 +25855,21 @@ /obj/structure/inflatable, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"qDa" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, +"qCY" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 + climb_delay = 1; + layer = 2.99 }, /obj/structure/platform/kutjevo/smooth{ - dir = 8 + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/oob) +/area/varadero/exterior/comms4) "qDh" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice2"; @@ -18943,12 +25880,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"qDk" = ( -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/turf/open/floor/shiva{ - icon_state = "floor3" +"qDr" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/hall_SE) +/turf/closed/wall/rock/brown, +/area/varadero/exterior/pontoon_beach) "qDs" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva{ @@ -18979,6 +25917,25 @@ icon_state = "red" }, /area/varadero/interior/security) +"qDR" = ( +/obj/item/device/flashlight, +/turf/open/floor/shiva, +/area/varadero/interior/technical_storage) +"qEa" = ( +/obj/item/explosive/grenade/incendiary{ + pixel_x = -4; + pixel_y = -2 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) +"qEc" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "qEf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -18996,24 +25953,38 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"qEt" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "qEG" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"qFc" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"qFe" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" }, -/turf/open/floor/plating, -/area/varadero/interior/medical) +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/pontoon_beach) "qFC" = ( /turf/open/floor{ dir = 8; icon_state = "asteroidwarning" }, /area/varadero/exterior/lz1_near) +"qFI" = ( +/obj/item/tool/wet_sign, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "qFO" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19026,13 +25997,6 @@ icon_state = "floor3" }, /area/varadero/interior/administration) -"qFS" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ - pixel_x = -1; - pixel_y = 22 - }, -/turf/closed/wall/r_wall/unmeltable, -/area/varadero/interior/oob) "qFZ" = ( /turf/open/floor/wood, /area/varadero/interior/bunks) @@ -19043,6 +26007,16 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"qHc" = ( +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/caves/north_research) +"qHl" = ( +/obj/structure/prop/fishing/line/long/part2, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "qHu" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor/shiva{ @@ -19075,16 +26049,9 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) -"qIT" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/security{ - name = "\improper Underground Security Custodial Closet"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) +"qIF" = ( +/turf/open/gm/dirt, +/area/varadero/interior/caves/east) "qJF" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, @@ -19104,15 +26071,57 @@ /obj/structure/closet/secure_closet/RD, /turf/open/floor/wood, /area/varadero/interior/research) -"qLa" = ( -/obj/structure/bed/chair{ - dir = 4; - icon_state = "chair_alt" +"qKM" = ( +/obj/structure/surface/rack, +/obj/item/tool/shovel, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"qKZ" = ( +/turf/open/gm/coast/west, +/area/varadero/exterior/lz1_near) +"qLf" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"qLq" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_2"; + pixel_y = 11 }, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/hall_SE) +"qLs" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3"; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/court) "qLH" = ( /obj/item/shard{ icon_state = "large"; @@ -19123,32 +26132,18 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"qMo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +"qMl" = ( +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/area/varadero/interior/comms1) +/area/varadero/interior/hall_N) "qMr" = ( /obj/item/tool/minihoe, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"qMC" = ( -/obj/structure/machinery/optable, -/obj/effect/landmark/corpsespawner/colonist/random/burst, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "snow_mat" - }, -/area/varadero/interior/medical) "qMD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/cassette_tape/nam{ @@ -19165,10 +26160,6 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"qMH" = ( -/obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior_protected/caves) "qMW" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/sand_white/layer1, @@ -19181,6 +26172,20 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"qNr" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_2" + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/eastocean) +"qNu" = ( +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/lz2_near) "qNC" = ( /obj/structure/surface/table, /obj/item/tool/weldpack{ @@ -19196,6 +26201,13 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) +"qNE" = ( +/obj/structure/largecrate/random/secure, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) "qNI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper/janitor{ @@ -19219,6 +26231,9 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"qNX" = ( +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/lz2_near) "qOh" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor, @@ -19240,11 +26255,35 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) +"qOO" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) "qOS" = ( /obj/item/reagent_container/glass/bucket, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/research) +"qOV" = ( +/obj/effect/decal/warning_stripes/asteroid{ + icon_state = "warning_s" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "qPk" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/shiva{ dir = 9; icon_state = "red" @@ -19260,7 +26299,7 @@ /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/varadero/interior/hall_SE) +/area/varadero/interior/hall_N) "qPG" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -19270,6 +26309,24 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) +"qQd" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"qQe" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "qQk" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -19311,15 +26368,6 @@ dir = 1 }, /area/varadero/interior/research) -"qQM" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/surface/rack, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "qQN" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice8"; @@ -19331,13 +26379,18 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"qQQ" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"qRe" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor{ + icon_state = "asteroidwarning" }, -/turf/open/gm/river, -/area/varadero/interior/oob) +/area/varadero/interior/comms1) +"qRi" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/north_research) "qRy" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2 @@ -19350,6 +26403,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"qSj" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/shiva{ + icon_state = "yellow" + }, +/area/varadero/interior/comms3) "qSJ" = ( /obj/structure/machinery/power/apc{ dir = 4; @@ -19360,28 +26419,73 @@ icon_state = "floor3" }, /area/varadero/interior/morgue) -"qSK" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 +"qSR" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"qTh" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 }, -/area/varadero/interior/maintenance/security) +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/monsoon) +"qTs" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/pontoon_beach) "qTz" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; pixel_y = 8 }, +/obj/structure/machinery/light/small{ + dir = 8 + }, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/records) +"qTE" = ( +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/eastbeach) +"qTZ" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/pontoon_beach) +"qUf" = ( +/obj/structure/machinery/door/airlock/almayer/security/glass{ + name = "\improper Underground Security"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "red" + }, +/area/varadero/interior/security) "qUj" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, @@ -19399,6 +26503,27 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"qUW" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/gm/dirt, +/area/varadero/interior/maintenance/north) +"qVb" = ( +/obj/item/stack/cable_coil/cyan, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"qVl" = ( +/obj/structure/closet/secure_closet/personal/patient, +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 2.991 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "qVp" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -19422,6 +26547,15 @@ }, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) +"qVO" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "qVS" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -19434,10 +26568,6 @@ /area/varadero/interior/security) "qWt" = ( /obj/structure/filingcabinet/security, -/obj/structure/machinery/alarm{ - dir = 1; - pixel_y = -24 - }, /turf/open/floor/shiva{ dir = 1; icon_state = "red" @@ -19463,21 +26593,6 @@ icon_state = "green" }, /area/varadero/interior/mess) -"qXM" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/sink{ - dir = 1; - pixel_y = -10 - }, -/obj/structure/mirror{ - pixel_y = -28 - }, -/turf/open/floor{ - icon_state = "white" - }, -/area/varadero/interior/toilets) "qXO" = ( /obj/structure/window_frame/colony/reinforced, /turf/open/floor/shiva{ @@ -19491,6 +26606,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"qYg" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "qYE" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/suit/fire/firefighter{ @@ -19501,10 +26623,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"qYR" = ( -/obj/structure/bookcase, -/turf/open/floor/carpet, -/area/varadero/interior/library) "qZr" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor{ @@ -19521,39 +26639,49 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) -"rak" = ( -/obj/item/coin/uranium, -/obj/structure/foamed_metal/iron, -/turf/open/floor/plating/icefloor, -/area/varadero/exterior/lz1_near) -"rav" = ( -/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ - icon_state = "sparsegrass_3" +"qZJ" = ( +/obj/item/tool/warning_cone, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"qZR" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/central) +"qZV" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_full" }, /turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/area/varadero/exterior/lz2_near) "rbd" = ( /obj/item/stack/sheet/wood/small_stack, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"rbq" = ( -/obj/structure/closet/secure_closet/medical3{ - req_access_txt = "100" +"rbp" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 }, -/turf/open/floor/shiva{ - icon_state = "wred" +/obj/structure/platform_decoration/kutjevo{ + dir = 1 }, -/area/varadero/interior/medical) -"rby" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/curtain/black, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "multi_tiles" +/obj/structure/prop/invuln/minecart_tracks{ + dir = 5 }, -/area/varadero/interior/bunks) +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform_decoration/kutjevo, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) "rbU" = ( /turf/open/floor/wood, /area/varadero/interior/research) @@ -19567,6 +26695,10 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall, /area/varadero/interior/medical) +"rcu" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) "rcA" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -19589,13 +26721,29 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) +/area/varadero/interior/cargo) "rdx" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 }, /turf/open/floor/carpet, /area/varadero/interior/library) +"red" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) +"res" = ( +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/exterior/eastbeach) "rex" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -19606,9 +26754,6 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"rey" = ( -/turf/open/gm/river, -/area/varadero/interior/maintenance) "reA" = ( /obj/structure/xenoautopsy/tank/broken, /obj/effect/decal/cleanable/blood/xeno, @@ -19652,16 +26797,19 @@ icon_state = "green" }, /area/varadero/interior/hall_NW) -"rgr" = ( -/obj/structure/surface/table/reinforced/prison{ - dir = 1; - flipped = 1 +"rgf" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/obj/structure/bed/chair{ - icon_state = "chair_alt" +/turf/open/gm/dirt{ + icon_state = "desert1" }, -/turf/open/floor/wood, -/area/varadero/interior/hall_SE) +/area/varadero/exterior/lz1_near) +"rgg" = ( +/obj/structure/girder/displaced, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "rgy" = ( /obj/structure/noticeboard{ pixel_y = 32 @@ -19672,6 +26820,11 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"rgz" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves/swcaves) "rgZ" = ( /obj/item/tool/kitchen/knife, /obj/structure/surface/table, @@ -19680,6 +26833,10 @@ icon_state = "asteroidwarning" }, /area/varadero/exterior/lz1_near) +"rhu" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "ria" = ( /obj/structure/bed/sofa/pews/flipped, /turf/open/floor/carpet, @@ -19689,25 +26846,25 @@ /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/court) -"rjf" = ( -/obj/structure/platform/kutjevo/smooth, +"riM" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 10 + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"rja" = ( +/obj/item/toy/beach_ball, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/oob) +/area/varadero/exterior/pool) "rjn" = ( /turf/closed/wall/r_wall/elevator{ dir = 6 @@ -19748,24 +26905,62 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"rjS" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; +"rjM" = ( +/obj/structure/surface/table/woodentable, +/obj/item/reagent_container/food/drinks/cans/beer{ pixel_x = -8; - pixel_y = 11 + pixel_y = -1 }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8; - pixel_y = 11 +/obj/item/ammo_magazine/shotgun/buckshot{ + pixel_x = 6; + pixel_y = -4 }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"rjZ" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/area/varadero/interior/maintenance/security) +/obj/item/ammo_magazine/revolver/cmb, +/turf/open/floor/shiva{ + icon_state = "purple" + }, +/area/varadero/interior/research) +"rkA" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"rkC" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) +"rkH" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = 2; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"rlw" = ( +/obj/item/tool/pickaxe, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"rlI" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) "rlJ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -19787,6 +26982,32 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"rmf" = ( +/obj/structure/barricade/wooden, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) +"rmo" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/stack/medical/advanced/bruise_pack/upgraded{ + amount = 1; + pixel_x = -3; + pixel_y = 11 + }, +/obj/item/stack/medical/advanced/ointment/upgraded{ + amount = 2; + pixel_x = 4; + pixel_y = 1 + }, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"rmr" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "rmB" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -19801,12 +27022,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"rmN" = ( -/obj/effect/landmark/corpsespawner/chef, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/hall_SE) "rmS" = ( /obj/structure/xenoautopsy/tank/alien, /turf/open/floor/corsat{ @@ -19814,6 +27029,10 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"rmV" = ( +/obj/effect/spawner/random/powercell, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "rmZ" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva{ @@ -19831,6 +27050,28 @@ icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"rnL" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/lz2_near) +"rnP" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/glass{ + req_access = null; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/cargo) +"ron" = ( +/obj/structure/tunnel{ + id = "north_research_tunnel" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "roy" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -19851,11 +27092,48 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + dir = 1 + }, /area/varadero/interior/cargo) +"roT" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + density = 0; + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "If this is removed, you cannot escape."; + health = 300; + icon_state = "ladder10"; + name = "ladder" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) +"rpd" = ( +/obj/structure/bed/chair, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "rpu" = ( /turf/closed/wall, /area/varadero/interior/oob) +"rpw" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves) "rpH" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/lights, @@ -19872,27 +27150,40 @@ icon_state = "asteroidplating" }, /area/varadero/interior/electrical) +"rpN" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "blue" + }, +/area/varadero/interior/maintenance) "rpT" = ( /obj/item/ammo_casing/shell{ icon_state = "shell_9_1" }, /turf/open/floor/wood, /area/varadero/interior/security) -"rqe" = ( -/obj/structure/sign/safety/bulkhead_door, -/obj/structure/machinery/door_control/brbutton{ - id = "undergroundhangarwest"; - name = "Underground Hangar Lock"; - pixel_x = 8 +"rqa" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/attachment, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) +/area/varadero/interior_protected/maintenance/south) +"rqg" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/monsoon) "rql" = ( /obj/structure/noticeboard{ desc_lore = "Glup Shitto lives!" }, /turf/closed/wall/r_wall, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/comms2) "rqn" = ( /obj/item/storage/donut_box{ pixel_y = 8 @@ -19912,6 +27203,21 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) +"rqG" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "rrp" = ( /obj/item/paper_bin, /obj/item/tool/stamp{ @@ -19940,6 +27246,10 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"rsf" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/dirt, +/area/varadero/interior/caves/east) "rsh" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor/shiva{ @@ -19960,22 +27270,20 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"rsw" = ( -/obj/structure/surface/table/reinforced/prison{ - dir = 8; - flipped = 1 - }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" - }, -/area/varadero/interior/hall_SE) "rsB" = ( /turf/open/floor/shiva{ icon_state = "yellow" }, /area/varadero/interior/electrical) +"rsL" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Underground Security Checkpoint"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) "rsM" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19984,25 +27292,32 @@ icon_state = "floor3" }, /area/varadero/interior/medical) -"rsR" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +"rsO" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/turf/open/gm/dirt, -/area/varadero/interior/oob) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "rtm" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating/icefloor, /area/varadero/exterior/lz1_near) +"rtr" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 1; + name = "\improper Underground Medical Laboratory"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) "rtu" = ( /obj/structure/bed/chair{ dir = 1 @@ -20028,6 +27343,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"rtR" = ( +/obj/item/tool/wirecutters, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/electrical) "rtV" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -20070,15 +27391,9 @@ icon_state = "purple" }, /area/varadero/interior/research) -"rvd" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "snow_mat" - }, -/area/varadero/interior/maintenance) +"rvD" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "rwh" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -20092,31 +27407,17 @@ icon_state = "redfull" }, /area/varadero/interior/security) -"rwS" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = -2; - pixel_y = 4 - }, -/obj/structure/window/reinforced{ - dir = 8; - layer = 3.3; - pixel_y = 4 - }, -/obj/structure/bed{ - can_buckle = 0 - }, -/obj/structure/bed{ - buckling_y = 13; - layer = 3.5; - pixel_y = 13 +"rwP" = ( +/obj/structure/closet/crate/ammo/alt/flame, +/obj/item/ammo_magazine/shotgun/buckshot, +/obj/item/ammo_magazine/shotgun/slugs{ + pixel_x = -6; + pixel_y = 6 }, -/obj/structure/machinery/light/small, /turf/open/floor/shiva{ - dir = 8; - icon_state = "multi_tiles" + icon_state = "floor3" }, -/area/varadero/interior/medical) +/area/varadero/interior/cargo) "rwV" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -20135,44 +27436,40 @@ }, /area/varadero/interior/maintenance) "rxe" = ( -/obj/structure/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, /turf/open/floor/shiva{ dir = 5; icon_state = "yellow" }, /area/varadero/interior/cargo) -"rxp" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 +"rxI" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) -"rxq" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/shiva{ - icon_state = "wred" +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/medical) -"rxO" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river/ocean, -/area/varadero/exterior/eastbeach) +/area/varadero/interior/maintenance/research) "ryD" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/security) -"ryE" = ( -/obj/structure/machinery/door/airlock/almayer/secure{ - dir = 2; - name = "Underground Hangar Power Substation"; - req_access_txt = "100" +"ryG" = ( +/obj/structure/surface/rack, +/obj/item/clothing/under/shorts/red{ + pixel_x = -2; + pixel_y = -4 }, -/turf/open/floor/plating, -/area/varadero/exterior/lz1_near) +/obj/item/clothing/head/hardhat/red{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/ammo_magazine/rifle, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/bunks) "rzg" = ( /turf/open/floor/shiva{ dir = 1; @@ -20194,6 +27491,13 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"rzU" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/suit/armor/vest, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "rAf" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -20218,13 +27522,6 @@ icon_state = "floor3" }, /area/varadero/interior/bunks) -"rAF" = ( -/obj/structure/machinery/light/small, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/research) "rBa" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -20232,10 +27529,17 @@ }, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) -"rBz" = ( -/obj/structure/prop/rock/brown_degree, +"rBi" = ( +/obj/structure/filingcabinet/security, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, +/area/varadero/interior/hall_SE) +"rBq" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/area/varadero/exterior/lz2_near) "rBP" = ( /turf/open/floor/shiva{ dir = 8; @@ -20246,6 +27550,20 @@ /obj/structure/largecrate/random/case/small, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"rCs" = ( +/obj/structure/platform/kutjevo/rock{ + dir = 1 + }, +/obj/structure/platform/kutjevo/rock, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/hall_SE) "rCB" = ( /obj/structure/filingcabinet/chestdrawer{ pixel_x = -8 @@ -20255,10 +27573,6 @@ }, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"rCI" = ( -/obj/structure/prop/invuln/static_corpse/afric_zimmer, -/turf/open/floor/wood, -/area/varadero/interior/administration) "rDz" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -20266,6 +27580,7 @@ /obj/item/ammo_casing/shell{ icon_state = "cartridge_3_1" }, +/obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, @@ -20278,25 +27593,27 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"rEY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/fourway/hidden/green, -/turf/open/floor/shiva{ +"rDK" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/item/stack/sheet/metal, +/turf/open/floor/strata{ + color = "#5e5d5d"; icon_state = "multi_tiles" }, -/area/varadero/interior/electrical) -"rFa" = ( -/obj/structure/bed/roller, +/area/varadero/interior_protected/vessel) +"rFj" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva{ - icon_state = "wred" + dir = 8; + icon_state = "purplefull" }, -/area/varadero/interior/medical) -"rFd" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/east) +/area/varadero/interior/research) +"rFv" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) "rFD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -20312,19 +27629,14 @@ }, /turf/open/floor/wood, /area/varadero/interior/research) -"rFL" = ( -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -24 +"rGl" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, /turf/open/floor/shiva{ - icon_state = "multi_tiles" + icon_state = "blue" }, -/area/varadero/interior/laundry) -"rGe" = ( -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) +/area/varadero/interior/hall_SE) "rGA" = ( /obj/structure/largecrate/random, /obj/structure/largecrate/random/mini{ @@ -20347,15 +27659,22 @@ icon_state = "green" }, /area/varadero/interior/hall_N) -"rHQ" = ( -/obj/structure/machinery/light{ - dir = 8 +"rHE" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "red" +/turf/closed/wall/wood, +/area/varadero/interior/beach_bar) +"rIF" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 }, -/area/varadero/interior/security) +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "rIG" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass{ icon_state = "sparsegrass_3" @@ -20371,6 +27690,12 @@ icon_state = "green" }, /area/varadero/interior/court) +"rIU" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/chapel) "rJq" = ( /obj/structure/surface/table, /obj/item/pamphlet/skill/engineer{ @@ -20379,6 +27704,10 @@ }, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) +"rJv" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/farocean) "rJI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20388,28 +27717,6 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) -"rJK" = ( -/obj/effect/decal/strata_decals/grime/grime4, -/obj/item/reagent_container/food/drinks/bottle/sake{ - layer = 3.1; - pixel_x = 13; - pixel_y = 21 - }, -/turf/open/floor/carpet, -/area/varadero/interior/bunks) -"rKe" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/hall_SE) "rKf" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva{ @@ -20422,6 +27729,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/electrical) +"rKy" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/obj/item/clothing/suit/armor/vest, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) "rKB" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/device/flashlight/lamp/green{ @@ -20439,39 +27753,77 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) -"rLb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/light, -/obj/structure/machinery/computer/guestpass{ - dir = 1 +"rKM" = ( +/turf/open/gm/dirt{ + icon_state = "desert1" }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) -"rLq" = ( +/area/varadero/exterior/pontoon_beach) +"rKS" = ( /obj/structure/platform/kutjevo/smooth{ - layer = 2 - }, -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "blue" +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 }, -/area/varadero/interior/maintenance) +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "rLC" = ( /obj/structure/machinery/photocopier, /turf/open/floor/shiva{ icon_state = "wredfull" }, /area/varadero/interior/medical) +"rLK" = ( +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + density = 0; + pixel_x = 11; + pixel_y = 9 + }, +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = 10; + pixel_y = 20 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/caves/north_research) "rLU" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"rLW" = ( +/obj/structure/closet/crate/secure, +/obj/item/trash/chunk, +/obj/item/trash/raisins, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) +"rMb" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"rMl" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) "rMM" = ( /obj/structure/prop/turbine, /obj/structure/prop/turbine_extras/border, @@ -20484,6 +27836,24 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) +"rMP" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/gm/dirt, +/area/varadero/interior/caves/east) +"rNf" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/comms4) +"rNm" = ( +/obj/item/stack/sheet/wood, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/research) "rNo" = ( /obj/structure/machinery/holosign_switch{ id = "otice"; @@ -20496,19 +27866,6 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"rNN" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms1) "rOL" = ( /obj/structure/closet/secure_closet/personal{ density = 0; @@ -20524,15 +27881,11 @@ icon_state = "white" }, /area/varadero/interior/laundry) -"rPe" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) +"rPB" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "rPD" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/simple/hidden/green, @@ -20546,6 +27899,38 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"rQe" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms1) +"rQk" = ( +/obj/effect/decal/warning_stripes/asteroid{ + dir = 1; + icon_state = "warning_s" + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "greencorners" + }, +/area/varadero/interior/hall_SE) +"rQU" = ( +/obj/structure/girder, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "rQV" = ( /turf/open/floor/shiva{ dir = 8; @@ -20557,6 +27942,13 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) +"rRm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/circuitboard/apc, +/turf/open/floor/shiva, +/area/varadero/interior/technical_storage) "rRq" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/icefloor{ @@ -20570,6 +27962,16 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"rSl" = ( +/obj/item/tool/wrench, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"rSu" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_N) "rSx" = ( /obj/structure/surface/table, /obj/structure/largecrate/random/mini/chest{ @@ -20642,8 +28044,14 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) -"rTu" = ( -/obj/structure/surface/table/woodentable, +"rTi" = ( +/obj/structure/window_frame/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) +"rTu" = ( +/obj/structure/surface/table/woodentable, /obj/item/handcuffs, /obj/item/weapon/baton, /turf/open/floor/wood, @@ -20665,6 +28073,30 @@ }, /turf/open/floor/plating, /area/varadero/interior/disposals) +"rUa" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"rUc" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "rUw" = ( /obj/structure/window/reinforced{ dir = 4 @@ -20675,6 +28107,26 @@ icon_state = "purple" }, /area/varadero/interior/research) +"rUI" = ( +/obj/structure/closet/crate/construction, +/obj/item/reagent_container/food/snacks/wrapped/chunk, +/obj/item/tool/hatchet, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"rVi" = ( +/obj/item/tool/candle, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) +"rVl" = ( +/obj/structure/surface/table, +/obj/structure/machinery/computer/shuttle/dropship/flight/lz2{ + dir = 5; + name = "LZ2 Palm Airfield computer" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_console/two) "rVI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -20682,6 +28134,13 @@ icon_state = "floor3" }, /area/varadero/interior/administration) +"rVS" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "yellow" + }, +/area/varadero/interior/comms3) "rVZ" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice4"; @@ -20704,10 +28163,6 @@ icon_state = "white" }, /area/varadero/interior/toilets) -"rWB" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/east) "rWJ" = ( /obj/item/stool, /turf/open/floor/shiva{ @@ -20718,27 +28173,48 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"rWX" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 +"rWY" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" }, -/obj/structure/machinery/medical_pod/sleeper, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_3"; + pixel_y = 11 }, -/area/varadero/interior/medical) +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "rXf" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/shiva{ icon_state = "redcorners" }, /area/varadero/interior/morgue) +"rXk" = ( +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/lz2_near) +"rXS" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "rYi" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"rYC" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "rYO" = ( /obj/structure/prop/static_tank/water{ pixel_y = 8 @@ -20747,6 +28223,19 @@ icon_state = "multi_tiles" }, /area/varadero/interior/disposals) +"rYR" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 22; + indestructible = 1; + unacidable = 1; + layer = 4.1 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "rZr" = ( /obj/structure/prop/ice_colony/flamingo{ dir = 6 @@ -20770,17 +28259,6 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"rZS" = ( -/obj/structure/machinery/light, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" - }, -/area/varadero/interior/electrical) "sah" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -20788,20 +28266,8 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/wood, /area/varadero/interior/administration) -"saj" = ( -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) "saq" = ( /obj/item/storage/firstaid/o2{ layer = 3.1; @@ -20819,19 +28285,21 @@ icon_state = "greenfull" }, /area/varadero/interior/medical) -"sau" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/hand_labeler, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/records) "saC" = ( /turf/open/floor/shiva{ dir = 4; icon_state = "yellow" }, /area/varadero/interior/cargo) +"saQ" = ( +/obj/structure/barricade/wooden, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "sbX" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -20859,6 +28327,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_NW) +"sdy" = ( +/turf/open/floor/shiva{ + dir = 4; + icon_state = "green" + }, +/area/varadero/interior/maintenance/north) "sdz" = ( /turf/closed/wall/r_wall, /area/varadero/interior/hall_NW) @@ -20878,6 +28352,10 @@ pixel_y = 7 }, /obj/effect/spawner/random/technology_scanner, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, @@ -20903,6 +28381,21 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"sfj" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"sfo" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) "sfs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20911,16 +28404,13 @@ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) -"sfB" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/command{ - dir = 1; - name = "\improper Underground Administration Office"; - req_access_txt = "100" +"sfF" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 }, -/turf/open/floor/plating, -/area/varadero/interior/administration) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "sfM" = ( /obj/structure/barricade/handrail/wire, /obj/structure/machinery/light{ @@ -20935,12 +28425,34 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"sgo" = ( -/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ - icon_state = "sparsegrass_2" +"sgl" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/area/varadero/interior_protected/maintenance/south) +"sgn" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"sgp" = ( +/obj/structure/barricade/wooden, +/turf/open/shuttle/elevator, +/area/varadero/interior/records) "sgq" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -20971,10 +28483,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"sgK" = ( -/obj/structure/closet/crate, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "shb" = ( /turf/closed/wall/r_wall, /area/varadero/interior/medical) @@ -20998,14 +28506,12 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) -"shR" = ( -/obj/structure/machinery/light{ - dir = 1 - }, +"shP" = ( +/obj/item/clothing/suit/armor/vest, /turf/open/floor/shiva{ - icon_state = "purple" + icon_state = "floor3" }, -/area/varadero/interior/research) +/area/varadero/interior/security) "sia" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -21013,12 +28519,29 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) +"sic" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/obj/structure/machinery/alarm{ + pixel_y = 24 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/comms3) "sid" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/window/framed/colony, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/turf/open/gm/dirt, -/area/varadero/interior/oob) +/area/varadero/interior/maintenance/north) "sjD" = ( /obj/structure/machinery/light{ dir = 1 @@ -21048,6 +28571,17 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/comms4) +"skY" = ( +/obj/effect/landmark/objective_landmark/far, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/wood, +/area/varadero/interior/hall_SE) +"slw" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "slA" = ( /obj/structure/bed/chair/comfy{ dir = 8; @@ -21080,6 +28614,9 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) +"slE" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/electrical) "slG" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/wood, @@ -21130,12 +28667,36 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"snE" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) +"snP" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/curtain/red, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "multi_tiles" + }, +/area/varadero/interior/bunks) "snS" = ( /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" }, /area/varadero/interior_protected/vessel) +"sou" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "cargobay"; + name = "\improper Requesitions Storage Shutters" + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellow" + }, +/area/varadero/interior/cargo) "spd" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -21145,6 +28706,15 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) +"spv" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/eastocean) "spP" = ( /obj/structure/bed/chair, /obj/structure/pipes/standard/simple/hidden/green, @@ -21154,18 +28724,6 @@ icon_state = "green" }, /area/varadero/interior/court) -"sqb" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Underground Chapel"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/chapel) -"sqZ" = ( -/obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "sre" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light/small{ @@ -21175,34 +28733,16 @@ icon_state = "floor3" }, /area/varadero/interior/records) -"srq" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms3) -"srr" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) -"srL" = ( -/obj/structure/sign/safety/reception, -/obj/structure/sign/safety/one{ - pixel_x = 15 +"srg" = ( +/turf/open/gm/dirt, +/area/varadero/interior/caves/north_research) +"srU" = ( +/obj/item/reagent_container/glass/bucket{ + pixel_x = -12; + pixel_y = -3 }, -/turf/closed/wall, -/area/varadero/exterior/lz1_near) +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/pontoon_beach) "srW" = ( /turf/closed/wall/r_wall/elevator{ dir = 4 @@ -21255,6 +28795,13 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"ssZ" = ( +/obj/item/storage/belt/marine, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) +"stl" = ( +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/pontoon_beach) "stv" = ( /obj/structure/closet/secure_closet/medical1{ req_access_txt = "100" @@ -21263,12 +28810,35 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"stC" = ( -/obj/structure/bigDelivery, -/turf/open/floor{ - icon_state = "freezerfloor" +"stw" = ( +/obj/structure/platform/kutjevo/rock{ + dir = 1 }, -/area/varadero/interior/cargo) +/obj/structure/platform/kutjevo/rock, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/maintenance/security) +"stK" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves/digsite) +"stU" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) "stV" = ( /obj/structure/reagent_dispensers/water_cooler{ density = 0; @@ -21279,20 +28849,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"suv" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) -"sux" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/shiva{ - icon_state = "wred" - }, -/area/varadero/interior/medical) "suC" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -21302,10 +28858,37 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"suE" = ( +/obj/item/tool/wet_sign, +/turf/open/floor/shiva{ + icon_state = "blue" + }, +/area/varadero/interior/maintenance) +"suY" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) +"svt" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "svD" = ( /obj/structure/largecrate/random/case/double, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) +"svG" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz1_near) "svH" = ( /obj/structure/surface/table/woodentable, /obj/item/book/manual/marine_law{ @@ -21322,17 +28905,6 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) -"svP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/clothing/ears/earmuffs{ - icon_state = "earmuffs2"; - pixel_x = 2; - pixel_y = 8 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/security) "swf" = ( /obj/structure/bed/chair{ dir = 4 @@ -21354,6 +28926,35 @@ /obj/item/storage/pouch/machete/full, /turf/open/floor/wood, /area/varadero/interior/security) +"swk" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"swv" = ( +/obj/structure/surface/rack, +/obj/item/pizzabox/meat, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"swV" = ( +/obj/structure/closet/crate/construction, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) +"sxL" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "sxR" = ( /obj/structure/surface/table, /obj/item/stack/cable_coil{ @@ -21362,16 +28963,69 @@ /obj/item/weapon/gun/energy/yautja/plasmapistol, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"syK" = ( -/obj/structure/pipes/standard/simple/hidden/green{ +"sxY" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"syb" = ( +/obj/structure/surface/rack, +/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/ammo_magazine/pistol/mod88{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/ammo_magazine/pistol/mod88{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/ammo_magazine/pistol/mod88{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/ammo_magazine/pistol/mod88{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/ammo_magazine/pistol/mod88, +/obj/structure/machinery/light{ dir = 4 }, -/obj/effect/landmark/corpsespawner/colonist/random/burst, +/obj/item/ammo_magazine/pistol{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/pistol, +/obj/item/ammo_magazine/pistol{ + pixel_x = 4 + }, /turf/open/floor/shiva{ dir = 4; - icon_state = "snow_mat" + icon_state = "red" }, -/area/varadero/interior/medical) +/area/varadero/interior/security) +"syl" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "cargobay"; + name = "\improper Requesitions Storage Shutters" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) +"syt" = ( +/obj/item/device/flashlight, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "syL" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" @@ -21402,10 +29056,24 @@ dir = 4 }, /area/varadero/interior/records) +"szp" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/comms3) "szw" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"szS" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 4; + pixel_y = -6 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "szZ" = ( /obj/structure/curtain/red, /turf/open/shuttle{ @@ -21419,18 +29087,17 @@ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) -"sBb" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - name = "\improper Theta-V Research Laboratory Sample Isolation"; - req_access = null; - req_access_txt = null; +"sAY" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, -/area/varadero/interior/research) +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/morgue) "sBk" = ( /obj/structure/bed/chair{ dir = 1 @@ -21443,12 +29110,27 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"sBF" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ + name = "\improper Colony Administration"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/administration) "sBN" = ( /obj/structure/target/syndicate, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/security) +"sBX" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/laundry) "sCk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -21459,15 +29141,22 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) -"sCo" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" +"sCp" = ( +/obj/item/stack/sheet/metal, +/obj/item/shard{ + icon_state = "medium" }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "greenfull" +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_N) +/area/varadero/interior/caves/east) +"sCA" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "sCJ" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/shiva{ @@ -21495,17 +29184,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"sDc" = ( -/obj/structure/machinery/landinglight/ds2/spoke{ - pixel_x = -1; - pixel_y = 22 - }, -/obj/structure/sign/safety/debark_lounge, -/obj/structure/sign/safety/south{ - pixel_x = 15 - }, -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) "sDf" = ( /obj/structure/machinery/light, /turf/open/floor/shiva{ @@ -21529,11 +29207,43 @@ icon_state = "multi_tiles" }, /area/varadero/interior/technical_storage) +"sDE" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_3"; + pixel_y = 11 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"sDH" = ( +/obj/item/grown/log, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "sDM" = ( /turf/open/floor/shiva{ icon_state = "purple" }, /area/varadero/interior/research) +"sDQ" = ( +/obj/structure/machinery/power/apc{ + dir = 4; + pixel_x = 24; + start_charge = 0 + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "wred" + }, +/area/varadero/interior/medical) "sDZ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -21543,27 +29253,37 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"sEG" = ( -/obj/structure/closet/secure_closet/medical1{ - req_access_txt = "100" - }, -/obj/effect/landmark/objective_landmark/close, +"sFc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/trash/barcardine, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"sFJ" = ( +/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ - icon_state = "wred" + icon_state = "floor3" }, -/area/varadero/interior/medical) -"sFH" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/area/varadero/interior/morgue) +"sFN" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_2" + }, +/turf/open/gm/dirt{ + icon_state = "desert3" }, -/turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"sFJ" = ( +"sGb" = ( /obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/engineering{ + dir = 1; + name = "\improper Underground Disposals"; + req_access_txt = "100" + }, /turf/open/floor/shiva{ icon_state = "floor3" }, -/area/varadero/interior/morgue) +/area/varadero/interior/disposals) "sGo" = ( /turf/open/floor{ icon_state = "white" @@ -21574,21 +29294,30 @@ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) -"sHa" = ( -/turf/open/shuttle/elevator, -/area/varadero/interior/records) -"sHr" = ( -/obj/structure/closet/athletic_mixed{ - anchored = 0; - density = 0; - pixel_x = -8; - pixel_y = 22 - }, +"sHs" = ( +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva{ - dir = 4; - icon_state = "snow_mat" + dir = 1 }, -/area/varadero/interior/maintenance) +/area/varadero/interior/electrical) +"sHJ" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"sHO" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) "sHV" = ( /obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor{ @@ -21606,15 +29335,39 @@ icon_state = "red" }, /area/varadero/interior/medical) -"sIg" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/machinery/door/airlock/almayer/engineering{ +"sIn" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "purple" + }, +/area/varadero/interior/hall_NW) +"sIK" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/turf/open/floor{ dir = 1; - name = "\improper Underground Technical Storage"; - req_access_txt = "100" + icon_state = "asteroidfloor" }, -/turf/open/floor/plating, -/area/varadero/interior/technical_storage) +/area/varadero/exterior/eastbeach) +"sIQ" = ( +/obj/item/stack/sheet/wood/small_stack, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) "sIU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21649,18 +29402,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) -"sJr" = ( -/obj/item/device/reagent_scanner{ - pixel_x = 7; - pixel_y = 8 - }, -/obj/structure/prop/server_equipment/laptop{ - pixel_x = -13; - pixel_y = 6 - }, -/obj/structure/surface/table, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "sJx" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/snacks/chips, @@ -21714,6 +29455,21 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"sKz" = ( +/obj/structure/closet/crate/supply, +/obj/item/storage/box/wy_mre, +/obj/item/storage/beer_pack, +/obj/item/spacecash, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"sKC" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/morgue) +"sKF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "sKL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -21722,6 +29478,12 @@ icon_state = "purple" }, /area/varadero/interior/research) +"sKN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) "sLi" = ( /obj/structure/machinery/power/geothermal, /obj/structure/machinery/light{ @@ -21731,13 +29493,18 @@ icon_state = "asteroidplating" }, /area/varadero/interior/electrical) -"sLu" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/coast/east, -/area/varadero/interior/oob) +"sLO" = ( +/obj/item/device/flashlight/slime{ + mouse_opacity = 0; + invisibility = 1; + indestructible = 1; + alpha = 0 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "sLU" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/shiva{ @@ -21749,12 +29516,11 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/carpet, /area/varadero/interior/records) -"sMT" = ( -/obj/item/device/mass_spectrometer, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior_protected/maintenance/south) +"sMJ" = ( +/obj/structure/closet/crate, +/obj/item/prop/magazine/dirty, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) "sNa" = ( /obj/structure/window/reinforced/tinted, /turf/open/floor{ @@ -21778,12 +29544,25 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"sOe" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"sNx" = ( +/turf/closed/wall/rock/brown, +/area/varadero/exterior/farocean) +"sNy" = ( +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/comms4) +"sNT" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/maintenance/north) "sOj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/junction, @@ -21791,14 +29570,28 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"sPm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +"sOw" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) +"sPh" = ( +/obj/structure/machinery/constructable_frame, /turf/open/floor/shiva{ - icon_state = "yellow" + dir = 8; + icon_state = "yellowfull" }, -/area/varadero/interior/cargo) +/area/varadero/interior/electrical) +"sPs" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/wood, +/area/varadero/interior/security) +"sPD" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/toolbox/mechanical/green, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) "sPY" = ( /turf/open/floor/shiva{ dir = 8; @@ -21811,10 +29604,39 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"sQs" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/item/storage/pill_bottle/inaprovaline/skillless{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/rifle, +/turf/open/floor/wood, +/area/varadero/interior/bunks) "sQN" = ( /obj/effect/landmark/xeno_spawn, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) +"sQR" = ( +/obj/item/ore/coal, +/obj/item/ore/silver{ + pixel_x = 8; + pixel_y = 11 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "sRs" = ( /turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/pontoon_beach) @@ -21829,15 +29651,11 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) -"sSm" = ( -/obj/structure/machinery/alarm{ - pixel_y = 24 - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" - }, -/area/varadero/interior/electrical) +"sSp" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/gun/shotgun/pump, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) "sSz" = ( /obj/item/device/camera{ pixel_x = -4; @@ -21853,6 +29671,16 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"sSU" = ( +/obj/structure/machinery/door/airlock/almayer/command{ + dir = 1; + name = "\improper Underground Command Center"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/administration) "sSZ" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -21872,80 +29700,164 @@ icon_state = "yellow" }, /area/varadero/interior/disposals) +"sTT" = ( +/obj/structure/machinery/light, +/obj/structure/closet/toolcloset, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"sTW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 1; + name = "\improper Underground Medical Laboratory"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) +"sUj" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 6 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"sUp" = ( +/obj/item/toy/beach_ball, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "sUG" = ( /obj/item/tool/pickaxe/plasmacutter, /turf/open/shuttle{ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) +"sUK" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -1; + pixel_y = 12 + }, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + density = 0 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "sVk" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"sVr" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) +"sVH" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 + }, +/turf/closed/wall/rock/brown, +/area/varadero/interior/oob) "sWp" = ( /turf/open/floor/shiva{ dir = 1; icon_state = "red" }, /area/varadero/interior/medical) -"sWs" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance) "sXb" = ( /turf/closed/wall, /area/varadero/interior/library) -"sXm" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/hall_N) -"sYS" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) +"sXc" = ( +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/lz2_near) +"sXn" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/farocean) +"sYi" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/comms3) +"sZd" = ( +/obj/structure/girder/displaced, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "sZe" = ( /obj/item/paper, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) -"tam" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/hall_N) -"taO" = ( -/obj/structure/platform/kutjevo/smooth, +"sZW" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 8 + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) -"tbN" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/exterior/comms4) +"tak" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/carpet, +/area/varadero/interior/hall_SE) +"tam" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" }, -/area/varadero/interior/comms1) +/area/varadero/interior/hall_N) "tbQ" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/machinery/light{ @@ -21964,33 +29876,38 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) -"tcM" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" - }, -/area/varadero/interior/technical_storage) "tcS" = ( -/obj/structure/machinery/light{ - dir = 4 - }, /obj/structure/pipes/vents/pump, /turf/open/floor{ icon_state = "white" }, /area/varadero/interior/toilets) -"tdq" = ( -/obj/structure/largecrate/random/mini/chest, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +"tcX" = ( +/obj/structure/surface/rack, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, +/obj/item/frame/table, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/comms3) +/area/varadero/interior_protected/maintenance/south) +"tdp" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/swcaves) +"tdt" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "tdy" = ( /obj/item/storage/box/donkpockets{ pixel_x = 6; @@ -22006,6 +29923,56 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"tdN" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior_protected/maintenance/south) +"tdX" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"teg" = ( +/obj/structure/girder, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"ten" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/closet/crate/miningcar{ + layer = 3.1; + name = "\improper materials storage bin"; + pixel_y = 8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz1_near) "teu" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 9; @@ -22027,10 +29994,24 @@ icon_state = "floor3" }, /area/varadero/interior/medical) +"tez" = ( +/obj/item/toy/bikehorn/rubberducky, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/lz2_near) +"teH" = ( +/obj/structure/window/framed/colony, +/obj/structure/sign/banners/happybirthdaysteve, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "teT" = ( /obj/structure/largecrate/random/case/small, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) +"tfc" = ( +/turf/open/floor{ + icon_state = "asteroidwarning" + }, +/area/varadero/exterior/lz2_near) "tfj" = ( /obj/effect/decal/warning_stripes/asteroid{ dir = 1; @@ -22041,6 +30022,31 @@ icon_state = "green" }, /area/varadero/interior/hall_N) +"tfC" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/weapon/harpoon/yautja{ + anchored = 1; + name = "Alien Harpoon"; + pixel_x = 6 + }, +/obj/item/clothing/mask/yautja_flavor{ + anchored = 1; + unacidable = 0 + }, +/turf/open/floor/corsat{ + dir = 1; + icon_state = "squareswood" + }, +/area/varadero/interior_protected/caves/digsite) "tgk" = ( /obj/structure/filingcabinet{ density = 0; @@ -22057,15 +30063,35 @@ /obj/item/limb/foot/l_foot, /turf/open/floor/wood, /area/varadero/interior/administration) +"tgC" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "tgE" = ( /turf/open/gm/dirt{ icon_state = "desert_dug" }, /area/varadero/exterior/pontoon_beach) +"tgK" = ( +/obj/structure/closet/crate/construction, +/obj/item/stack/sandbags_empty/half, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "thn" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) +"thS" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/north) "thY" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/closet/crate/trashcart, @@ -22076,10 +30102,49 @@ icon_state = "floor3" }, /area/varadero/interior/bunks) +"tia" = ( +/obj/structure/machinery/conveyor, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "tiw" = ( /obj/structure/machinery/photocopier, /turf/open/floor/wood, /area/varadero/interior/security) +"tiF" = ( +/obj/item/tool/pickaxe, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance) +"tjn" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/obj/structure/prop/structure_lattice{ + dir = 1; + layer = 3.1; + pixel_y = 10 + }, +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "vent4"; + pixel_y = 25 + }, +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "windsock"; + pixel_x = 18; + pixel_y = 23 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/monsoon) +"tjs" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "tju" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -22109,14 +30174,36 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"tkH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/effect/landmark/crap_item, +"tkh" = ( +/turf/open/gm/dirt{ + icon_state = "desert2" + }, +/area/varadero/exterior/eastbeach) +"tkr" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"tkw" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 1; + name = "\improper Theta-V Breakroom"; + req_one_access = null; + req_access = null + }, /turf/open/floor/shiva{ - dir = 5; - icon_state = "blue" + dir = 1 }, -/area/varadero/interior/administration) +/area/varadero/interior/research) +"tkF" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) "tkT" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -22125,6 +30212,49 @@ icon_state = "multi_tiles" }, /area/varadero/interior/administration) +"tkV" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"tlq" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = 2; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"tlE" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "tlG" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -22133,11 +30263,37 @@ icon_state = "white" }, /area/varadero/interior/toilets) +"tlM" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "tlT" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"tmm" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + dir = 1; + name = "\improper Underground Engineering Locker Room"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/comms3) +"tmC" = ( +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/pontoon_beach) +"tmZ" = ( +/turf/open/gm/coast/west, +/area/varadero/exterior/lz2_near) "tng" = ( /obj/item/stool{ layer = 2.5; @@ -22147,7 +30303,7 @@ /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/research) +/area/varadero/interior/cargo) "tnA" = ( /obj/structure/filingcabinet{ density = 0; @@ -22167,6 +30323,23 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"tnD" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/reagent_container/food/drinks/bottle/absinthe, +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/varadero/interior/beach_bar) +"tnN" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + dir = 1; + name = "\improper Theta-V Research Laboratory"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/research) "toN" = ( /obj/item/tool/warning_cone{ pixel_x = 5; @@ -22180,6 +30353,10 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) +"tpa" = ( +/obj/effect/landmark/hunter_secondary, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "tpB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/autopsy_scanner{ @@ -22204,6 +30381,10 @@ icon_state = "green" }, /area/varadero/interior/court) +"tpO" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) "tpV" = ( /obj/item/reagent_container/glass/bucket{ pixel_x = -13; @@ -22216,16 +30397,25 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) +"tqa" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) "tqh" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/research) -"tql" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) "tqr" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -22239,15 +30429,30 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"tqR" = ( -/turf/open/floor/plating, -/area/varadero/interior/research) -"trv" = ( -/obj/structure/machinery/iv_drip, +"tqV" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"trh" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/shiva{ - icon_state = "wred" + icon_state = "multi_tiles" }, -/area/varadero/interior/medical) +/area/varadero/interior/comms3) +"trB" = ( +/obj/item/stack/sheet/wood{ + amount = 40 + }, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "trC" = ( /obj/structure/window/reinforced{ dir = 4; @@ -22276,17 +30481,43 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) -"tsN" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0 +"trI" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_3" }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = -1; - pixel_y = 12 +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"trQ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) +/area/varadero/interior_protected/caves) +"tso" = ( +/obj/structure/closet/athletic_mixed, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "bluefull" + }, +/area/varadero/interior/maintenance) +"tsz" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) +"tsC" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ + icon_state = "sparsegrass_3" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "tsX" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/shiva{ @@ -22301,11 +30532,28 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_SE) -"tuO" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/maintenance/security) +"tuR" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/caves/north_research) +"tuT" = ( +/obj/item/stack/cable_coil/cut, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) +"tuV" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating, +/area/varadero/interior/disposals) +"tuZ" = ( +/obj/item/storage/toolbox/mechanical{ + pixel_x = 1; + pixel_y = 7 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "tvv" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -22323,6 +30571,17 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"twh" = ( +/obj/structure/machinery/washing_machine, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/security) "twm" = ( /obj/structure/bed/chair{ dir = 1 @@ -22331,37 +30590,6 @@ icon_state = "green" }, /area/varadero/interior/hall_SE) -"twZ" = ( -/obj/structure/machinery/power/monitor, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/exterior/lz1_near) -"txs" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/coast/beachcorner/north_west, -/area/varadero/exterior/eastbeach) -"tyc" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river, -/area/varadero/interior/oob) -"tyd" = ( -/obj/structure/barricade/handrail/wire{ - dir = 4 - }, -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/exterior/comms4) -"tym" = ( -/turf/open/floor/shiva{ - dir = 4; - icon_state = "greencorners" - }, -/area/varadero/interior/hall_SE) "tyT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22378,9 +30606,6 @@ }, /area/varadero/interior/medical) "tzp" = ( -/obj/structure/bed/chair{ - dir = 1 - }, /obj/structure/machinery/light{ dir = 8 }, @@ -22402,13 +30627,21 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"tBC" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ - icon_state = "sparsegrass_3" +"tAT" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/swcaves) +"tBm" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/area/varadero/interior/maintenance/security) +"tCA" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/caves/east) "tCG" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -22423,6 +30656,13 @@ icon_state = "red" }, /area/varadero/interior/security) +"tCV" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz2_near) "tDh" = ( /obj/structure/pipes/portables_connector{ dir = 8 @@ -22432,6 +30672,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"tDo" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) "tDF" = ( /turf/open/floor/shiva{ dir = 1; @@ -22444,33 +30690,61 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/caves) -"tEf" = ( +"tEc" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 4 + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor{ - icon_state = "asteroidwarning" +/turf/closed/wall/rock/brown, +/area/varadero/exterior/lz1_near) +"tEF" = ( +/obj/structure/prop/rock/brown, +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 }, -/area/varadero/interior/comms1) -"tEH" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river, -/area/varadero/interior/oob) +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) "tEJ" = ( /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"tFf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/flashlight/lamp/green{ +"tEM" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; pixel_x = -14; - pixel_y = 14 + pixel_y = 13 }, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"tER" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/comms4) +"tFQ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) +"tFX" = ( +/obj/structure/closet/secure_closet/security_empty, +/obj/item/ammo_box/magazine/shotgun/buckshot, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "blue" + }, +/area/varadero/interior/administration) "tGl" = ( /turf/open/floor/shiva{ dir = 5; @@ -22486,11 +30760,25 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) +"tGw" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/exterior/pontoon_beach) "tGV" = ( /turf/closed/wall/r_wall/elevator{ dir = 1 }, /area/varadero/interior/hall_N) +"tHc" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) "tIT" = ( /obj/structure/closet/crate/trashcart{ pixel_y = 8 @@ -22549,15 +30837,28 @@ icon_state = "white" }, /area/varadero/interior/toilets) -"tKx" = ( -/obj/structure/machinery/photocopier, -/obj/structure/machinery/power/apc{ - dir = 4; - pixel_x = 24; - start_charge = 0 +"tKI" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/hand_labeler, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/records) +"tLu" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/security) +"tLS" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "tMx" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/key/cargo_train, @@ -22596,6 +30897,18 @@ /obj/item/clothing/suit/suspenders, /turf/open/floor/wood, /area/varadero/interior/bunks) +"tMZ" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/exterior/lz2_near) +"tNy" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/pontoon_beach) "tNE" = ( /obj/structure/filingcabinet{ density = 0; @@ -22625,6 +30938,12 @@ /obj/effect/spawner/random/tool, /turf/open/floor/carpet, /area/varadero/interior/administration) +"tOd" = ( +/obj/item/clothing/suit/armor/vest, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "tOp" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -22635,10 +30954,28 @@ icon_state = "yellowfull" }, /area/varadero/interior/hall_NW) -"tOK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/camera{ - pixel_y = 5 +"tOx" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"tOK" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/camera{ + pixel_y = 5 }, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva{ @@ -22646,6 +30983,10 @@ icon_state = "bluefull" }, /area/varadero/interior/administration) +"tOV" = ( +/obj/item/tool/warning_cone, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "tPz" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -22670,16 +31011,14 @@ icon_state = "floor3" }, /area/varadero/interior/cargo) -"tPL" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"tPK" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 24 }, -/area/varadero/interior/medical) +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "tPS" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ @@ -22697,6 +31036,12 @@ icon_state = "red" }, /area/varadero/interior/morgue) +"tQy" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) "tQz" = ( /obj/structure/sink{ pixel_y = 15 @@ -22729,26 +31074,14 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, -/area/varadero/interior/medical) -"tRu" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice8"; - pixel_x = 16; - pixel_y = 24 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/floor/shiva{ + icon_state = "wredfull" }, -/area/varadero/interior/maintenance) +/area/varadero/interior/medical) "tRN" = ( -/obj/structure/reagent_dispensers/water_cooler{ - density = 0; - pixel_y = 19 - }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/digsite) "tSg" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -22757,11 +31090,22 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"tSK" = ( +/obj/structure/window/framed/wood, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "tSQ" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) +"tSR" = ( +/obj/structure/window_frame/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) "tTo" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -22783,6 +31127,10 @@ icon_state = "multi_tiles" }, /area/varadero/interior/disposals) +"tTU" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) "tUd" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -22795,34 +31143,43 @@ icon_state = "redfull" }, /area/varadero/interior/security) -"tUI" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/security/glass{ - dir = 1; - name = "\improper Underground Security Marshal's Office"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/security) +"tVf" = ( +/obj/structure/closet/crate, +/obj/item/tool/stamp, +/obj/item/tool/wet_sign, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "tVj" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/caves/east) +"tVl" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "greenfull" + }, +/area/varadero/interior/hall_SE) "tVo" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) -"tVA" = ( -/obj/structure/surface/table, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "greenfull" +"tVD" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 }, -/area/varadero/interior/hall_SE) +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "tVX" = ( /obj/structure/surface/rack, /obj/item/maintenance_jack, @@ -22834,6 +31191,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/security) +"tWT" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/coast/west, +/area/varadero/exterior/farocean) "tXg" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -22850,6 +31211,14 @@ "tXu" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/interior/caves/east) +"tXv" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "tXE" = ( /turf/open/floor/wood, /area/varadero/interior/administration) @@ -22874,6 +31243,17 @@ icon_state = "red" }, /area/varadero/interior/medical) +"tYw" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "tYP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -22888,6 +31268,34 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"tYT" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/shiva{ + icon_state = "purple" + }, +/area/varadero/interior/research) +"tZl" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/monsoon) +"tZm" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + dir = 1; + name = "\improper Underground Engineering Locker Room"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "tZr" = ( /obj/item/toy/deck/uno{ pixel_y = 6 @@ -22921,34 +31329,43 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"ubn" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"uaY" = ( +/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{ + id = "undergroundhangarwest"; + unacidable = 1; + name = "Pontoon West Door"; + openspeed = 17; + dir = 4 }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; +/turf/open/floor/plating/icefloor{ + dir = 4; + icon_state = "warnplate" + }, +/area/varadero/interior/cargo) +"ubF" = ( +/obj/structure/disposalpipe/segment{ dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" + icon_state = "pipe-c" }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) -"ubB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/medical_pod/sleeper, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ +/area/varadero/interior/medical) +"ubH" = ( +/obj/structure/closet/secure_closet/personal/patient, +/obj/structure/barricade/handrail/wire{ dir = 4 }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/gm/river, -/area/varadero/interior/oob) +/area/varadero/interior/medical) +"ubJ" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "ubK" = ( /obj/structure/machinery/power/geothermal, /turf/open/floor/plating/icefloor{ @@ -22963,6 +31380,9 @@ /obj/structure/machinery/firealarm{ pixel_y = 24 }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/shiva{ dir = 8; icon_state = "yellowfull" @@ -22978,9 +31398,13 @@ icon_state = "purple" }, /area/varadero/interior/research) -"ucx" = ( -/turf/open/gm/river/ocean, -/area/varadero/exterior/eastocean) +"ucL" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/monsoon) "udg" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/effect/landmark/objective_landmark/medium, @@ -22989,17 +31413,25 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) -"udX" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/varadero/interior/cargo) +"udp" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "ueg" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/shiva{ icon_state = "blue" }, /area/varadero/interior/hall_SE) +"uet" = ( +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/interior/caves/east) +"ueB" = ( +/obj/structure/cable, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "ueP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -23024,6 +31456,15 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) +"ufB" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Underground Men's Restroom" + }, +/turf/open/floor/plating, +/area/varadero/interior/toilets) "ufE" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -23042,15 +31483,6 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"ufH" = ( -/obj/structure/bed/chair{ - buckling_y = 18; - dir = 8 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/security) "ufV" = ( /turf/open/floor/shiva{ dir = 4; @@ -23080,6 +31512,16 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"uhi" = ( +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + desc = "A high-power hydroelectric generator."; + name = "hydroelectric generator" + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) "uhD" = ( /obj/structure/machinery/light, /turf/open/floor/shiva{ @@ -23087,45 +31529,16 @@ icon_state = "redfull" }, /area/varadero/interior/hall_SE) -"uhJ" = ( -/obj/item/trash/boonie, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/exterior/lz1_near) -"uhW" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/ashtray/plastic, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = 5; - pixel_y = 12 - }, -/obj/item/trash/cigbutt/ucigbutt, -/obj/item/trash/cigbutt/cigarbutt{ - pixel_x = 5; - pixel_y = 11 - }, -/obj/item/tool/lighter/zippo{ - pixel_x = -8; - pixel_y = 14 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/exterior/lz1_near) +"uhV" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/swcaves) "uiq" = ( /obj/structure/surface/table, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/hall_N) -"uiv" = ( -/obj/structure/sign/safety/airlock{ - pixel_x = 8 - }, -/turf/closed/wall, -/area/varadero/interior/morgue) "uiy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/taperecorder, @@ -23134,21 +31547,12 @@ icon_state = "red" }, /area/varadero/interior/security) -"ujo" = ( -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"ujg" = ( +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/shuttle{ + icon_state = "floor6" }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +/area/varadero/interior_protected/vessel) "ujp" = ( /obj/structure/bed/chair{ buckling_y = 18; @@ -23163,6 +31567,17 @@ icon_state = "yellow" }, /area/varadero/interior/hall_NW) +"ujR" = ( +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) "ukw" = ( /obj/structure/window/reinforced{ dir = 1 @@ -23186,6 +31601,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"ulb" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/eastocean) "uli" = ( /obj/structure/bed/chair/hunter{ dir = 4 @@ -23212,6 +31634,11 @@ /obj/structure/bed/chair{ dir = 1 }, +/obj/structure/machinery/power/apc{ + dir = 8; + pixel_x = -24; + start_charge = 0 + }, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -23240,13 +31667,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"unm" = ( -/obj/structure/largecrate/random, -/turf/open/floor/shiva{ - dir = 4; - icon_state = "multi_tiles" - }, -/area/varadero/interior/hall_SE) "unw" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -23266,12 +31686,81 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/security) +"unH" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"uoh" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -18; + pixel_y = -8 + }, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + pixel_x = -17; + pixel_y = -19 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"uon" = ( +/obj/structure/largecrate/random, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "uoO" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/security) +"uoU" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"upb" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 3.5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) +"upH" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"upL" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior_protected/maintenance/south) "upO" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/condiment/saltshaker, @@ -23294,13 +31783,28 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"uqA" = ( -/obj/structure/platform/kutjevo/smooth{ +"uqx" = ( +/obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/effect/overlay/palmtree_r, +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/maintenance) +"uqU" = ( +/obj/structure/surface/table/woodentable, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) +"uqW" = ( +/obj/structure/prop/rock/brown, /turf/open/gm/dirt, -/area/varadero/interior/oob) +/area/varadero/interior/caves/east) "urd" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -23314,19 +31818,18 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) +"urD" = ( +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/lz2_near) "urE" = ( /obj/structure/bed/chair/comfy/lime{ dir = 8 }, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/varadero/interior/research) -"usp" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) "usB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23336,6 +31839,19 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"usQ" = ( +/obj/item/facepaint/sunscreen_stick, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"uti" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/comms2) +"utZ" = ( +/obj/structure/surface/rack, +/obj/item/tool/wirecutters, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "uuj" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -23383,6 +31899,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"uvr" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "uvw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23403,27 +31925,6 @@ /obj/structure/machinery/door/window/westleft, /turf/open/floor/interior/plastic, /area/varadero/interior/security) -"uvG" = ( -/obj/structure/surface/table, -/obj/item/tool/kitchen/utensil/knife, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_x = 16; - pixel_y = 24 - }, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/mess) -"uvV" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/closet/crate/ammo/alt, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "uvX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23433,17 +31934,27 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) -"uwu" = ( -/obj/structure/closet/crate/secure, -/turf/open/floor/shiva{ - icon_state = "floor3" - }, -/area/varadero/interior/cargo) "uww" = ( /turf/open/floor/shiva{ icon_state = "yellow" }, /area/varadero/interior/hall_N) +"uwJ" = ( +/obj/structure/surface/rack, +/obj/item/tool/screwdriver, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"uwN" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Underground Women's Restroom" + }, +/turf/open/floor/plating, +/area/varadero/interior/toilets) "uwQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/lightstick, @@ -23452,36 +31963,27 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) -"uxF" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) -"uxO" = ( -/obj/structure/surface/table/woodentable, -/obj/item/paper_bin/uscm{ - pixel_x = 12; - pixel_y = 14 - }, -/turf/open/floor/carpet, -/area/varadero/interior/library) -"uxQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"uxi" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" }, -/obj/structure/platform/kutjevo/smooth, /obj/structure/platform/kutjevo/smooth{ - dir = 8 + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +/area/varadero/interior_protected/vessel) +"uxM" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/west, +/area/varadero/exterior/farocean) "uyd" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -23531,14 +32033,28 @@ icon_state = "floor3" }, /area/varadero/interior/administration) -"uzP" = ( -/obj/structure/surface/table/reinforced/prison{ +"uAt" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; - flipped = 1 + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/wood, -/area/varadero/interior/hall_SE) +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"uAM" = ( +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"uBV" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "uBX" = ( /obj/vehicle/train/cargo/engine, /turf/open/floor/shiva{ @@ -23562,6 +32078,18 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"uDr" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) "uDw" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -23587,18 +32115,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) -"uEx" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/coast/west, -/area/varadero/exterior/pontoon_beach) "uEz" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -23617,6 +32133,16 @@ icon_state = "doubleside" }, /area/varadero/interior/chapel) +"uEF" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/structure/platform, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) "uEI" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -23624,6 +32150,11 @@ icon_state = "yellowfull" }, /area/varadero/interior/hall_SE) +"uFq" = ( +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/monsoon) "uFE" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds2/delaythree{ @@ -23634,19 +32165,19 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"uFI" = ( -/obj/structure/sign/safety/high_voltage, -/obj/structure/sign/safety/hazard{ - pixel_x = 15 - }, -/turf/closed/wall/r_wall, -/area/varadero/exterior/lz1_near) "uFJ" = ( /turf/open/floor/shiva{ dir = 8; icon_state = "red" }, /area/varadero/interior/security) +"uFO" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "uGf" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -23656,34 +32187,21 @@ icon_state = "yellowcorners" }, /area/varadero/interior/cargo) -"uGZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/folder/black_random{ - pixel_x = 6; - pixel_y = -3 - }, -/obj/item/folder/black_random{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/folder/black_random{ - pixel_x = -3; - pixel_y = -1 - }, -/obj/structure/machinery/light/small{ - dir = 1 +"uGs" = ( +/obj/structure/machinery/power/terminal{ + dir = 8 }, -/turf/open/floor/shiva{ - icon_state = "floor3" +/turf/open/floor{ + icon_state = "bcircuit" }, -/area/varadero/interior/records) -"uHt" = ( -/obj/structure/machinery/door/poddoor/two_tile/secure{ - id = "colony_sec_armory"; - name = "Secure Armory" +/area/varadero/interior/maintenance/north) +"uHD" = ( +/obj/structure/machinery/landinglight/ds1/spoke{ + pixel_y = -5; + pixel_x = -13 }, -/turf/open/floor/plating, -/area/varadero/interior/security) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "uHY" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, @@ -23743,24 +32261,23 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/turf/open/floor/plating, -/area/varadero/interior/security) -"uJk" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) +/area/varadero/interior/security) +"uIW" = ( +/turf/open/gm/coast/north, +/area/varadero/exterior/lz2_near) "uJO" = ( /obj/structure/sign/safety/airlock{ pixel_x = 8 }, /turf/closed/wall, /area/varadero/interior/chapel) +"uJT" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/closed/wall/r_wall, +/area/varadero/interior/research) "uKr" = ( /obj/structure/machinery/photocopier{ pixel_y = 4 @@ -23768,11 +32285,35 @@ /turf/open/floor/wood{ icon_state = "wood-broken6" }, -/area/varadero/exterior/lz1_near) -"uLa" = ( -/obj/item/clothing/mask/rebreather, -/turf/open/floor/carpet, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) +"uKY" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"uKZ" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "uLP" = ( /obj/structure/surface/rack, /obj/item/clothing/head/caphat{ @@ -23815,6 +32356,41 @@ icon_state = "yellow" }, /area/varadero/interior/technical_storage) +"uMN" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = -2; + pixel_y = 4 + }, +/obj/structure/window/reinforced{ + dir = 8; + layer = 3.3; + pixel_y = 4 + }, +/obj/structure/bed{ + can_buckle = 0 + }, +/obj/structure/bed{ + buckling_y = 13; + layer = 3.5; + pixel_y = 13 + }, +/obj/item/toy/farwadoll, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/medical) +"uMQ" = ( +/obj/item/ammo_casing/shell{ + icon_state = "cartridge_1_1" + }, +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/gun/pistol/mod88, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) "uNh" = ( /obj/structure/closet/secure_closet/personal{ density = 0; @@ -23835,20 +32411,11 @@ icon_state = "multi_tiles" }, /area/varadero/interior/laundry) -"uNy" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/shiva{ - icon_state = "redfull" - }, -/area/varadero/interior/medical) -"uND" = ( -/obj/structure/closet/firecloset, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" - }, -/area/varadero/exterior/lz1_near) +"uNz" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/farocean) "uNJ" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -23859,25 +32426,38 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) -"uOb" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 +"uOk" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 4 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 10 + }, +/obj/structure/platform_decoration/kutjevo{ + dir = 4 }, +/obj/structure/blocker/invisible_wall/water, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/maintenance/north) -"uOz" = ( -/obj/structure/closet/secure_closet/medical3{ - req_access_txt = "100" - }, +/area/varadero/interior/oob) +"uOo" = ( +/obj/structure/pipes/vents/pump, +/obj/structure/bed/roller, /turf/open/floor/shiva{ - dir = 10; - icon_state = "wred" + dir = 8; + icon_state = "red" }, -/area/varadero/interior/medical) +/area/varadero/interior/morgue) "uOC" = ( /obj/structure/closet/emcloset, /turf/open/floor/shiva{ @@ -23885,22 +32465,25 @@ icon_state = "green" }, /area/varadero/interior/hall_N) +"uOF" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "snow_mat" + }, +/area/varadero/interior/maintenance) "uOL" = ( /turf/open/floor/shiva{ dir = 1; icon_state = "purple" }, /area/varadero/interior/hall_NW) -"uOQ" = ( -/obj/item/paper/crumpled/bloody, -/turf/open/floor/carpet, -/area/varadero/exterior/lz1_near) -"uPo" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/maintenance/security) "uQa" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -23909,10 +32492,6 @@ "uQi" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/interior/cargo) -"uQC" = ( -/obj/structure/bed/chair/comfy/beige, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) "uQH" = ( /obj/structure/bed/chair{ dir = 1 @@ -23934,29 +32513,46 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"uRL" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +"uRa" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/gm/dirt{ + icon_state = "desert3" }, -/turf/open/gm/dirt, /area/varadero/exterior/eastbeach) "uRU" = ( /turf/closed/wall/r_wall/elevator, /area/varadero/interior/hall_N) -"uTr" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/plasticflaps/mining, +"uSx" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/cargo) +"uSF" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 1 + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/invisible_wall, +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"uTj" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"uTq" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/comms1) +/area/varadero/interior/maintenance/security) +"uTu" = ( +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/pontoon_beach) "uTA" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat{ @@ -23970,6 +32566,11 @@ icon_state = "wred" }, /area/varadero/interior/medical) +"uTY" = ( +/obj/structure/prop/rock/brown, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "uTZ" = ( /obj/structure/pipes/standard/manifold/visible{ dir = 1 @@ -24017,6 +32618,12 @@ icon_state = "greenfull" }, /area/varadero/interior/medical) +"uVe" = ( +/turf/open/floor/shiva{ + dir = 6; + icon_state = "yellow" + }, +/area/varadero/interior/cargo) "uVo" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice4"; @@ -24041,6 +32648,17 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"uVR" = ( +/obj/structure/barricade/wooden{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/varadero/interior/beach_bar) "uVV" = ( /obj/structure/machinery/light{ dir = 8 @@ -24062,6 +32680,12 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"uWo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/eastocean) "uWA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -24069,12 +32693,15 @@ /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/mess) -"uXo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +"uWW" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +/obj/structure/pipes/binary/passive_gate, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) "uXw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -24083,6 +32710,13 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"uXR" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/north) "uXS" = ( /turf/closed/wall, /area/varadero/interior/toilets) @@ -24107,6 +32741,13 @@ icon_state = "floor3" }, /area/varadero/interior/mess) +"uYJ" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "uYL" = ( /obj/item/stack/tile/plasteel{ pixel_x = 8; @@ -24122,17 +32763,27 @@ icon_state = "asteroidplating" }, /area/varadero/interior/electrical) -"uZp" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/carpet, +"uZK" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/varadero/exterior/lz1_near) -"vao" = ( -/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ - icon_state = "sparsegrass_2" +"uZY" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/glass{ + req_access = null; + req_one_access = null }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/cargo) "vap" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -24146,12 +32797,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"vaF" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/coast/south, -/area/varadero/exterior/eastbeach) "vaV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -24178,12 +32823,19 @@ icon_state = "purple" }, /area/varadero/interior/hall_NW) -"vbB" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"vbH" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" }, -/area/varadero/interior/electrical) +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"vbS" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2"; + pixel_x = 21 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "vcc" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -24203,7 +32855,9 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/administration) "vcj" = ( /obj/structure/surface/table/reinforced/prison, @@ -24221,6 +32875,22 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"vct" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves/swcaves) +"vcz" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"vcR" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush{ + pixel_x = -4 + }, +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/interior/caves/east) "vdq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -24229,9 +32899,17 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"vdV" = ( -/obj/item/tool/warning_cone{ - pixel_x = -9 +"vdL" = ( +/obj/effect/landmark/xeno_spawn, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/swcaves) +"vdQ" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves) +"vdV" = ( +/obj/item/tool/warning_cone{ + pixel_x = -9 }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) @@ -24243,6 +32921,9 @@ /obj/structure/machinery/door/window/westleft, /turf/open/floor/interior/plastic/alt, /area/varadero/interior/security) +"veV" = ( +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/monsoon) "veW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -24300,21 +32981,38 @@ icon_state = "asteroidwarning" }, /area/varadero/exterior/lz1_near) -"vfS" = ( -/obj/item/ammo_casing/shell{ - icon_state = "cartridge_1_1" +"vfH" = ( +/obj/structure/surface/table, +/obj/item/bodybag, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "red" }, -/obj/item/weapon/gun/pistol/m1911, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/interior/morgue) +"vgu" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null }, -/area/varadero/interior_protected/caves) +/turf/open/floor/shiva{ + icon_state = "wred" + }, +/area/varadero/interior/medical) "vgA" = ( /obj/item/stool{ icon_state = "stool_alt" }, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) +"vgH" = ( +/obj/structure/blocker/fog, +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/farocean) "vhb" = ( /obj/structure/machinery/light{ dir = 1 @@ -24337,15 +33035,42 @@ }, /turf/closed/wall, /area/varadero/interior/library) -"vil" = ( -/obj/structure/machinery/light{ - dir = 4 +"vhB" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +/area/varadero/exterior/farocean) +"vhI" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/exterior/lz1_near) +/area/varadero/interior_protected/caves/central) +"vhJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/clipboard{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/item/tool/pen/red{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/item/paper{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -14; + pixel_y = 14 + }, +/obj/structure/machinery/light, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "vio" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -24364,6 +33089,22 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"viP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Underground Power Substation" + }, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/comms3) "viY" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -24387,12 +33128,6 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"vjv" = ( -/obj/structure/closet/crate/freezer/rations, -/turf/open/floor{ - icon_state = "freezerfloor" - }, -/area/varadero/interior/cargo) "vjA" = ( /obj/structure/reagent_dispensers/beerkeg/alt, /obj/structure/machinery/light{ @@ -24402,6 +33137,31 @@ icon_state = "freezerfloor" }, /area/varadero/interior/cargo) +"vjO" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"vjZ" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) +"vke" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + name = "\improper Underground Visitor Entrance" + }, +/turf/open/floor/plating, +/area/varadero/interior/hall_SE) "vku" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/stool, @@ -24410,16 +33170,41 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"vlJ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +"vll" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/item/reagent_container/glass/bucket{ + pixel_y = -3 }, -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"vlm" = ( +/obj/item/lightstick/variant/planted, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) +/area/varadero/exterior/farocean) +"vlw" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"vlB" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"vlL" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice8"; + pixel_x = 16; + pixel_y = 24 + }, +/obj/structure/window_frame/colony, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "vmc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -24430,24 +33215,16 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"vmy" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/closet/crate/miningcar{ - layer = 3.1; - name = "\improper materials storage bin"; - pixel_y = 8 +"vmY" = ( +/obj/item/stack/rods, +/obj/item/shard{ + icon_state = "medium" }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/item/stack/sheet/metal, +/turf/open/shuttle{ + icon_state = "floor6" }, -/area/varadero/interior/oob) +/area/varadero/interior_protected/vessel) "vnb" = ( /obj/structure/bed/chair/hunter, /turf/open/floor/corsat{ @@ -24485,24 +33262,54 @@ icon_state = "red" }, /area/varadero/interior/security) -"vpB" = ( -/obj/structure/closet/crate/trashcart, +"vom" = ( +/obj/item/storage/beer_pack, /turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) -"vpF" = ( -/obj/structure/machinery/light/small{ - dir = 8 +/area/varadero/exterior/pontoon_beach) +"voJ" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 }, -/obj/structure/surface/rack, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"vph" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 }, -/area/varadero/interior/maintenance/security) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"vpr" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"vpQ" = ( +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/gm/coast/west, +/area/varadero/exterior/pool) "vpV" = ( /turf/open/floor/shiva{ icon_state = "snow_mat" }, /area/varadero/interior/security) +"vqd" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) "vqw" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -24519,15 +33326,45 @@ icon_state = "asteroidplating" }, /area/varadero/interior/caves/east) -"vqV" = ( -/obj/structure/largecrate/random/secure, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"vqK" = ( +/obj/item/stack/sheet/wood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"vqR" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 8 }, -/area/varadero/interior/comms2) +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) +"vqU" = ( +/obj/effect/landmark/corpsespawner/chef, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/mess) "vqY" = ( /turf/open/floor/carpet, /area/varadero/interior/security) +"vqZ" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -16; + pixel_y = 13 + }, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/interior/maintenance/north) "vrh" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -24543,21 +33380,41 @@ icon_state = "floor3" }, /area/varadero/interior/hall_SE) -"vrp" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +"vru" = ( +/obj/structure/bed/chair/comfy/beige, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "vrw" = ( /obj/structure/machinery/conveyor, /turf/open/floor/plating, /area/varadero/interior/cargo) -"vrB" = ( -/obj/structure/platform/kutjevo/smooth{ +"vrO" = ( +/obj/structure/pipes/vents/pump{ dir = 8 }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/obj/structure/bed/chair{ + buckling_y = 18; + dir = 8 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) +"vsa" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/cargo) +"vss" = ( +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/pontoon_beach) "vsJ" = ( /obj/structure/machinery/light{ dir = 4 @@ -24604,25 +33461,27 @@ icon_state = "red" }, /area/varadero/interior/security) -"vui" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/landmark/corpsespawner/colonist/random/burst, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/cargo) -"vuj" = ( +"vus" = ( /obj/structure/stairs/perspective{ - color = "#b29082"; + color = "#6b675e"; icon_state = "p_stair_full" }, /obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) +"vuA" = ( +/obj/structure/barricade/handrail/wire{ dir = 4 }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) "vuE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -24636,6 +33495,14 @@ }, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) +"vuQ" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/eastbeach) "vvh" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -24660,22 +33527,18 @@ icon_state = "redcorners" }, /area/varadero/interior/security) -"vwl" = ( -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/structure/pipes/vents/pump{ - dir = 1 +"vwT" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "red" +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_N) -"vxA" = ( -/turf/open/gm/coast/east, -/area/varadero/interior/oob) +/area/varadero/interior/maintenance/research) +"vxi" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "vxM" = ( /obj/structure/machinery/light{ dir = 8 @@ -24686,19 +33549,33 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"vxW" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/caves/east) -"vyU" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform_decoration/kutjevo{ +"vyp" = ( +/obj/structure/machinery/light/small{ dir = 1 }, -/turf/open/gm/river, -/area/varadero/interior/oob) +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"vyy" = ( +/obj/structure/catwalk, +/obj/structure/platform{ + layer = 2.15; + density = 0; + climb_delay = 0 + }, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) +"vyI" = ( +/obj/structure/catwalk, +/obj/structure/filtration/flacculation_arm{ + density = 0; + layer = 2.1 + }, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) "vyX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/evidence, @@ -24708,10 +33585,33 @@ icon_state = "red" }, /area/varadero/interior/security) -"vzy" = ( -/obj/structure/prop/rock/brown, -/turf/open/gm/river, -/area/varadero/interior/maintenance) +"vzq" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"vzt" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/hall_SE) +"vzB" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/item/tool/warning_cone, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 2; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "vzH" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -24726,22 +33626,6 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) -"vzX" = ( -/obj/structure/coatrack{ - pixel_x = 14; - pixel_y = 9 - }, -/obj/item/clothing/head/bowlerhat{ - pixel_x = 12; - pixel_y = 23 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_x = 9; - pixel_y = -4 - }, -/turf/open/floor/wood, -/area/varadero/interior/administration) "vzY" = ( /obj/structure/sink{ pixel_y = 15 @@ -24759,6 +33643,22 @@ icon_state = "red" }, /area/varadero/interior/security) +"vAz" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_y = 13 + }, +/obj/structure/prop/invuln/pipe_water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"vAF" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/hall_N) "vAI" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/icefloor{ @@ -24773,6 +33673,12 @@ icon_state = "redfull" }, /area/varadero/interior/hall_SE) +"vAZ" = ( +/obj/item/facepaint/sunscreen_stick, +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/lz1_near) "vBk" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -24788,6 +33694,38 @@ icon_state = "multi_tiles" }, /area/varadero/interior/research) +"vBC" = ( +/obj/structure/platform/kutjevo/rock{ + dir = 1 + }, +/obj/structure/platform/kutjevo/rock, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior/cargo) +"vBF" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) "vBW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24807,6 +33745,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, +/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) "vCf" = ( @@ -24815,6 +33754,16 @@ icon_state = "redfull" }, /area/varadero/interior/administration) +"vCE" = ( +/obj/structure/disposalpipe/segment, +/obj/item/trash/chunk{ + pixel_x = 3; + pixel_y = 6 + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/technical_storage) "vDe" = ( /obj/structure/barricade/handrail/wire{ dir = 8 @@ -24828,6 +33777,19 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) +"vDf" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/gm/coast/north, +/area/varadero/exterior/pool) +"vDl" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/shiva{ + icon_state = "red" + }, +/area/varadero/interior/morgue) "vDm" = ( /turf/open/floor/shiva{ dir = 8; @@ -24843,6 +33805,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"vDw" = ( +/obj/item/fishing_pole{ + anchored = 1 + }, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/pontoon_beach) "vDC" = ( /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/blood/oil, @@ -24850,6 +33818,33 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"vDI" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Underground Requesitions Freezer"; + req_access_txt = "100" + }, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/varadero/interior/cargo) +"vDP" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "vEa" = ( /obj/structure/closet/crate/medical, /obj/item/tool/wirecutters/clippers, @@ -24861,6 +33856,42 @@ icon_state = "red" }, /area/varadero/interior/security) +"vEe" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -15; + pixel_y = 5; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) +"vEg" = ( +/obj/structure/flora/bush/ausbushes/var3/fernybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) +"vEi" = ( +/obj/structure/window_frame/colony/reinforced, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) "vEJ" = ( /obj/structure/bed/chair, /turf/open/floor/shiva{ @@ -24868,6 +33899,35 @@ icon_state = "green" }, /area/varadero/interior/hall_NW) +"vEM" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"vEU" = ( +/obj/structure/plasticflaps/mining, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"vFl" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/gm/dirt, +/area/varadero/interior/maintenance/north) "vFs" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, @@ -24882,61 +33942,74 @@ dir = 1 }, /area/varadero/interior/hall_N) -"vGb" = ( -/obj/structure/blocker/fog, -/turf/open/gm/river/ocean, -/area/varadero/interior/oob) -"vGj" = ( -/obj/structure/platform/kutjevo/smooth{ - density = 0; - dir = 1 - }, -/obj/structure/barricade/handrail{ - density = 0; - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/prop/structure_lattice{ - density = 0; - desc = "If this is removed, you cannot escape."; - health = 300; - icon_state = "ladder10"; - name = "ladder" - }, -/turf/open/gm/river, -/area/varadero/interior/maintenance) -"vGq" = ( -/obj/structure/platform/kutjevo/smooth{ - layer = 2 +"vGn" = ( +/obj/effect/overlay/palmtree_r{ + pixel_x = -11; + pixel_y = 20 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"vGQ" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/turf/open/gm/river, -/area/varadero/interior/caves/north_research) -"vGD" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Visitor Entrance"; - req_access_txt = "100" +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/turf/open/floor/plating, -/area/varadero/interior/hall_SE) +/obj/item/lightstick/variant/planted, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "vHs" = ( /turf/closed/wall/r_wall, /area/varadero/interior/records) -"vKa" = ( -/obj/structure/flora/bush/desert{ - pixel_x = 15; - pixel_y = 21 +"vHY" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) +"vJg" = ( +/obj/item/tool/shovel, +/turf/open/gm/dirt{ + icon_state = "desert_dug" }, +/area/varadero/exterior/lz1_near) +"vJk" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 8 + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) +"vJp" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"vKv" = ( +/obj/structure/window/framed/colony/reinforced/hull{ + indestructible = 1 + }, +/turf/open/floor/plating/icefloor, +/area/varadero/interior/maintenance/north) "vKD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/pen/blue/clicky, @@ -24966,6 +34039,10 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/comms4) +"vLh" = ( +/obj/structure/platform_decoration/kutjevo, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "vLk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -24976,6 +34053,23 @@ icon_state = "multi_tiles" }, /area/varadero/interior/laundry) +"vLo" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2"; + pixel_x = 7; + pixel_y = 29 + }, +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"vLt" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/cargo) "vLw" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ name = "computer" @@ -24983,14 +34077,48 @@ /turf/open/floor/prison{ icon_state = "darkredfull2" }, +/area/varadero/interior/dock_control) +"vLU" = ( +/obj/structure/machinery/vending/security, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "red" + }, +/area/varadero/interior/security) +"vLV" = ( +/obj/structure/machinery/landinglight/ds2/spoke{ + pixel_x = -1; + pixel_y = 22 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, /area/varadero/exterior/lz1_near) -"vLS" = ( -/obj/item/reagent_container/glass/bucket{ - pixel_x = -12; - pixel_y = -3 +"vMe" = ( +/obj/structure/largecrate/random/mini/med{ + layer = 3.01; + pixel_x = -13; + pixel_y = 11 }, -/turf/open/gm/coast/west, -/area/varadero/exterior/pontoon_beach) +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"vMo" = ( +/obj/item/tool/shovel, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) +"vMq" = ( +/obj/item/stack/sheet/metal/med_large_stack, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/interior/comms1) "vMU" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -25001,6 +34129,14 @@ "vNu" = ( /turf/open/floor/carpet, /area/varadero/interior/bunks) +"vNy" = ( +/obj/structure/cargo_container/wy/left, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"vNB" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "vNG" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/computer/cameras/telescreen/entertainment{ @@ -25036,6 +34172,10 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) +"vOo" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) "vOr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25045,8 +34185,14 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/security) +"vOW" = ( +/obj/item/clothing/suit/armor/vest, +/turf/open/floor/wood, +/area/varadero/interior/administration) "vPe" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -25055,6 +34201,21 @@ icon_state = "floor3" }, /area/varadero/interior/administration) +"vPh" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) "vPi" = ( /obj/structure/closet/secure_closet/personal, /obj/item/attachable/magnetic_harness, @@ -25086,12 +34247,26 @@ }, /turf/open/floor/wood, /area/varadero/interior/chapel) +"vQe" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "vQz" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"vQK" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "vQL" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/frame/light_fixture, @@ -25100,26 +34275,6 @@ icon_state = "yellow" }, /area/varadero/interior/electrical) -"vRt" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/strata{ - color = "#5e5d5d"; - icon_state = "multi_tiles" - }, -/area/varadero/interior_protected/vessel) -"vRC" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river, -/area/varadero/interior/oob) "vRI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -25153,12 +34308,19 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"vSP" = ( -/obj/structure/machinery/medical_pod/bodyscanner, -/turf/open/floor/shiva{ - icon_state = "floor3" +"vSu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/area/varadero/interior/medical) +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"vSN" = ( +/obj/structure/machinery/portable_atmospherics/hydroponics, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/research) "vSY" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -25167,6 +34329,11 @@ dir = 1 }, /area/varadero/interior/research) +"vTd" = ( +/obj/structure/machinery/conveyor, +/obj/item/paper_bin, +/turf/open/floor/plating, +/area/varadero/interior/cargo) "vTe" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/icefloor{ @@ -25188,21 +34355,15 @@ pixel_y = 4 }, /obj/effect/landmark/objective_landmark/science, -/turf/open/floor/wood, +/turf/open/floor/carpet, /area/varadero/interior/research) -"vTq" = ( +"vUx" = ( +/obj/structure/girder/displaced, +/obj/structure/prop/invuln/overhead_pipe, /turf/open/floor/plating/icefloor{ - icon_state = "warnplate" - }, -/area/varadero/exterior/lz1_near) -"vUi" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/shiva{ - icon_state = "redfull" + icon_state = "asteroidplating" }, -/area/varadero/interior/medical) +/area/varadero/exterior/eastbeach) "vUE" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -25226,6 +34387,13 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) +"vUT" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Underground Chapel" + }, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "vUZ" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -25250,25 +34418,51 @@ icon_state = "multi_tiles" }, /area/varadero/interior/research) -"vVC" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/trackimp, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "red" +"vVz" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 }, -/area/varadero/interior/security) -"vXu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/prop/invuln/lattice_prop, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pool) +"vVH" = ( +/turf/closed/wall/r_wall, +/area/varadero/interior/comms2) +"vVJ" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/closed/wall/rock/brown, +/area/varadero/interior_protected/caves/central) +"vWn" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/pontoon_beach) +"vWG" = ( +/obj/structure/bed/chair, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ - dir = 4; - icon_state = "snow_mat" + icon_state = "floor3" }, -/area/varadero/interior/medical) +/area/varadero/interior/hall_NW) +"vXx" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) +"vXG" = ( +/obj/structure/closet/crate/construction, +/obj/item/grown/log, +/turf/open/gm/dirt{ + icon_state = "desert2" + }, +/area/varadero/exterior/monsoon) "vXW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25277,8 +34471,35 @@ name = "\improper Underground Security Showers"; req_access_txt = "100" }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/security) +"vYp" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"vYr" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/maintenance/north) +"vYy" = ( +/obj/item/tool/shovel, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "vYW" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) @@ -25320,6 +34541,42 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"vZN" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_half_cap" + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 2; + indestructible = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"vZO" = ( +/obj/effect/landmark/corpsespawner/miner, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) +"vZR" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "vZS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -25348,17 +34605,6 @@ /obj/structure/largecrate/random, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"wbk" = ( -/obj/structure/machinery/power/apc{ - dir = 1; - pixel_y = 24; - start_charge = 0 - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "blue" - }, -/area/varadero/interior/administration) "wbB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -25367,6 +34613,16 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"wcb" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/farocean) "wcl" = ( /obj/item/tool/mop{ pixel_x = -16; @@ -25387,6 +34643,9 @@ /area/varadero/exterior/lz1_near) "wcE" = ( /obj/effect/decal/cleanable/blood/drip, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, /turf/open/floor/prison/chapel_carpet{ dir = 1; icon_state = "doubleside" @@ -25412,7 +34671,9 @@ /turf/open/floor/wood, /area/varadero/interior/security) "wdh" = ( -/obj/structure/machinery/computer/operating, +/obj/structure/machinery/computer/operating{ + density = 0 + }, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva{ dir = 4; @@ -25443,10 +34704,10 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) -"wdA" = ( -/obj/effect/decal/strata_decals/grime/grime2, -/turf/open/floor/carpet, -/area/varadero/interior/bunks) +"wdI" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/shuttle/elevator, +/area/varadero/interior/records) "wdX" = ( /obj/structure/filingcabinet/filingcabinet, /obj/effect/landmark/objective_landmark/medium, @@ -25455,12 +34716,60 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"weG" = ( +/obj/structure/catwalk, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) +"weJ" = ( +/obj/structure/machinery/landinglight/ds2/spoke{ + pixel_x = -1; + pixel_y = 22 + }, +/turf/closed/wall/r_wall, +/area/varadero/interior/maintenance/north) +"wff" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"wfh" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/eastbeach) "wfr" = ( /turf/open/floor/shiva{ dir = 4; icon_state = "purple" }, /area/varadero/interior/hall_NW) +"wft" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "wfy" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" @@ -25469,6 +34778,34 @@ icon_state = "floor3" }, /area/varadero/interior/bunks) +"wfK" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"wfR" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/prop/rock/brown{ + indestructible = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/farocean) +"wfS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/guestpass{ + dir = 1 + }, +/obj/item/card/id/silver/clearance_badge{ + pixel_x = 14 + }, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) "wfT" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25478,10 +34815,6 @@ icon_state = "yellow" }, /area/varadero/interior/hall_NW) -"wga" = ( -/obj/item/device/motiondetector/hacked, -/turf/open/floor/carpet, -/area/varadero/exterior/lz1_near) "wgv" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -25490,22 +34823,25 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) -"wgM" = ( -/obj/structure/closet/crate/ammo/alt/flame, -/turf/open/floor/shiva{ - icon_state = "floor3" +"wgU" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 }, -/area/varadero/interior/cargo) -"wgT" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 }, -/obj/structure/closet/crate, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/cargo) +/obj/structure/blocker/invisible_wall/water, +/obj/structure/plasticflaps/mining, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) "wic" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -25516,6 +34852,28 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) +"wir" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1; + name = "\improper Underground Main Hallway" + }, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/hall_NW) +"wiL" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/paper/research_notes, +/obj/item/storage/belt/shotgun, +/turf/open/floor/shiva{ + icon_state = "blue" + }, +/area/varadero/interior/administration) +"wjd" = ( +/obj/item/book/manual/robotics_cyborgs, +/turf/open/floor/carpet, +/area/varadero/interior/library) "wjf" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -25530,19 +34888,27 @@ icon_state = "asteroidwarning" }, /area/varadero/interior/comms1) -"wjG" = ( -/obj/structure/prop/structure_lattice{ +"wjV" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/security) +"wkp" = ( +/obj/structure/platform/kutjevo/smooth{ dir = 1; - health = 300 + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/maintenance/north) -"wjM" = ( -/obj/item/weapon/gun/shotgun/pump, -/turf/open/floor/carpet, -/area/varadero/exterior/lz1_near) +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/interior_protected/caves) "wkq" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/firealarm{ @@ -25550,6 +34916,24 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) +"wkt" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + name = "\improper Underground Engineering Locker Room"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/electrical) +"wku" = ( +/obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{ + id = "colony_sec_armory"; + name = "Secure Armory" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/security) "wkC" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 6; @@ -25563,17 +34947,17 @@ icon_state = "multi_tiles" }, /area/varadero/interior/technical_storage) -"wkF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper, -/obj/item/tool/pen/blue{ - pixel_x = 6; - pixel_y = 5 +"wkJ" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/area/varadero/interior/records) +/area/varadero/exterior/farocean) "wkM" = ( /obj/structure/window/reinforced{ dir = 4; @@ -25611,14 +34995,13 @@ icon_state = "white" }, /area/varadero/interior/toilets) -"wlx" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/shiva{ - icon_state = "red" - }, -/area/varadero/interior/morgue) +"wlB" = ( +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"wlH" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/lz2_near) "wlQ" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -25635,6 +35018,10 @@ icon_state = "purplefull" }, /area/varadero/interior/research) +"wmt" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) "wmC" = ( /obj/structure/machinery/light{ dir = 8 @@ -25653,7 +35040,9 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, /area/varadero/interior/hall_NW) "wng" = ( /obj/structure/pipes/standard/manifold/hidden/green{ @@ -25669,11 +35058,66 @@ icon_state = "green" }, /area/varadero/interior/mess) +"wns" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"wnw" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/effect/landmark/objective_landmark/far, +/obj/item/trash/crushed_cup, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) +"wnA" = ( +/obj/effect/decal/cleanable/blood/drip{ + pixel_y = 21; + pixel_x = 10 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"wnE" = ( +/obj/structure/tunnel{ + id = "north_research_tunnel" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) "wnK" = ( /turf/open/floor/shiva{ icon_state = "wredfull" }, /area/varadero/interior/medical) +"woj" = ( +/obj/effect/spawner/random/toolbox, +/turf/open/floor/shiva{ + icon_state = "multi_tiles" + }, +/area/varadero/interior/technical_storage) +"won" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8; + pixel_y = 11 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"wop" = ( +/obj/structure/girder/displaced, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "wot" = ( /turf/open/floor/shiva{ icon_state = "floor3" @@ -25704,14 +35148,13 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"woP" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +"woJ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/explosive/grenade/incendiary/molotov{ + pixel_x = -3 }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior/oob) +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "wph" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/shiva, @@ -25754,6 +35197,11 @@ icon_state = "snow_mat" }, /area/varadero/interior/security) +"wpX" = ( +/obj/effect/decal/strata_decals/grime/grime2, +/obj/item/weapon/gun/rifle/m41a, +/turf/open/floor/carpet, +/area/varadero/interior/bunks) "wqb" = ( /turf/closed/wall/r_wall, /area/varadero/interior/maintenance/security) @@ -25765,18 +35213,6 @@ icon_state = "asteroidplating" }, /area/varadero/interior/comms1) -"wqK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 8; - pixel_y = 6 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 9; - pixel_y = 1 - }, -/turf/open/floor/wood, -/area/varadero/exterior/lz1_near) "wrg" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -25808,15 +35244,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"wrQ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/research) "wsa" = ( /obj/structure/closet/crate/hydroponics/prespawned, /turf/open/floor/shiva{ @@ -25824,6 +35251,10 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"wsn" = ( +/obj/item/storage/toolbox/mechanical, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "wsG" = ( /obj/structure/window/phoronreinforced{ dir = 4; @@ -25848,9 +35279,16 @@ icon_state = "floor3" }, /area/varadero/interior/medical) -"wty" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/shiva{ +"wtk" = ( +/obj/structure/barricade/wooden, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) +"wty" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/shiva{ icon_state = "multi_tiles" }, /area/varadero/interior/cargo) @@ -25866,15 +35304,16 @@ icon_state = "asteroidplating" }, /area/varadero/interior/hall_NW) -"wug" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"wtU" = ( +/obj/structure/bed/chair{ + dir = 4; + icon_state = "chair_alt" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) +/area/varadero/interior_protected/maintenance/south) "wuA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25884,22 +35323,21 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) -"wvi" = ( -/obj/structure/closet/radiation, -/obj/effect/landmark/crap_item, +"wuR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" + icon_state = "multi_tiles" }, -/area/varadero/interior/electrical) -"wvk" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - pixel_x = -15; - pixel_y = 11 +/area/varadero/interior/comms3) +"wvI" = ( +/obj/structure/tunnel{ + id = "north_research_tunnel" }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/hall_SE) "wvK" = ( /obj/structure/closet/crate/freezer, /obj/effect/landmark/objective_landmark/close, @@ -25923,22 +35361,60 @@ icon_state = "snow_mat" }, /area/varadero/interior/medical) +"wwq" = ( +/obj/structure/catwalk, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/filtration/flacculation_arm{ + density = 0; + layer = 2.1 + }, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) "wws" = ( /obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"wxf" = ( +/obj/structure/machinery/power/monitor, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "wxu" = ( /obj/structure/bed/chair, /turf/open/floor{ icon_state = "white" }, /area/varadero/interior/laundry) -"wAj" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast/beachcorner2/south_west, -/area/varadero/exterior/pontoon_beach) +"wxD" = ( +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = -8 + }, +/obj/structure/filingcabinet{ + density = 0; + icon_state = "chestdrawer"; + pixel_x = 8 + }, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/comms2) +"wyE" = ( +/obj/item/storage/belt/marine/quackers, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "wAx" = ( /obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood, @@ -25946,16 +35422,26 @@ icon_state = "multi_tiles" }, /area/varadero/interior/research) -"wBx" = ( -/obj/structure/closet/toolcloset, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +"wBc" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) +"wBp" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/exterior/farocean) +"wBD" = ( +/obj/structure/surface/table/woodentable, +/obj/item/paper_bin/uscm{ + pixel_x = 12; + pixel_y = 14 }, -/area/varadero/interior/comms2) +/obj/item/weapon/twohanded/fireaxe, +/turf/open/floor/carpet, +/area/varadero/interior/library) "wBN" = ( /turf/open/floor/shiva{ dir = 4; @@ -25983,25 +35469,20 @@ }, /turf/open/floor/carpet, /area/varadero/interior/records) -"wCH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/stamp, -/obj/item/paper_bin, -/obj/structure/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "yellowfull" - }, -/area/varadero/interior/cargo) "wCR" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) +"wDi" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/pontoon_beach) +"wDv" = ( +/obj/structure/largecrate/random/mini/ammo, +/turf/open/shuttle/elevator, +/area/varadero/interior/records) "wDG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -26010,6 +35491,16 @@ dir = 1 }, /area/varadero/interior/cargo) +"wDH" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 3.5 + }, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/eastbeach) "wDN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26019,6 +35510,13 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"wEn" = ( +/obj/structure/largecrate/random, +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "wEL" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/shiva{ @@ -26034,6 +35532,31 @@ icon_state = "snow_mat" }, /area/varadero/interior/maintenance) +"wFx" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) +"wFJ" = ( +/obj/structure/prop/dam/crane/damaged, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/farocean) +"wFP" = ( +/obj/structure/machinery/door_control/brbutton{ + id = "undergroundhangarwest"; + name = "West Dock Door"; + pixel_x = 8; + indestructible = 1 + }, +/obj/structure/sign/safety/bulkhead_door, +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/cargo) "wFX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26051,6 +35574,25 @@ icon_state = "floor3" }, /area/varadero/interior/cargo) +"wGs" = ( +/obj/effect/landmark/hunter_primary, +/obj/structure/machinery/power/apc{ + dir = 1; + pixel_y = 24; + start_charge = 0 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "yellowfull" + }, +/area/varadero/interior/comms3) +"wGQ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "wGV" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -26059,6 +35601,14 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"wHk" = ( +/turf/closed/wall, +/area/varadero/interior/maintenance/north) +"wHt" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/farocean) "wHu" = ( /obj/structure/prop/static_tank/fuel{ pixel_y = 8 @@ -26067,15 +35617,16 @@ icon_state = "multi_tiles" }, /area/varadero/interior/disposals) -"wHW" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/shiva{ +"wIg" = ( +/obj/structure/platform/kutjevo/smooth{ dir = 1; - icon_state = "yellow" + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/electrical) +/turf/open/gm/dirt{ + icon_state = "desert1" + }, +/area/varadero/exterior/lz1_near) "wIm" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -26101,6 +35652,38 @@ icon_state = "bluefull" }, /area/varadero/interior/administration) +"wJl" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pontoon_beach) +"wJu" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "cargobay"; + name = "\improper Requesitions Storage Shutters" + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "yellow" + }, +/area/varadero/interior/cargo) "wJB" = ( /obj/item/device/motiondetector/hacked, /turf/open/floor/shiva{ @@ -26113,19 +35696,30 @@ }, /turf/open/floor/shiva, /area/varadero/interior/disposals) -"wLf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/stack/sheet/mineral/phoron/medium_stack, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, +"wKW" = ( +/obj/item/stack/sandbags/large_stack, +/turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"wLq" = ( +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/comms4) "wLv" = ( /obj/item/weapon/gun/rifle/m41a, /turf/open/floor/shiva{ icon_state = "floor3" }, /area/varadero/interior/bunks) +"wLB" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/farocean) "wLF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/shaker{ @@ -26141,12 +35735,20 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"wLN" = ( -/obj/structure/pipes/standard/manifold/hidden/green, +"wLR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/hypospray/tricordrazine{ + pixel_x = -14; + pixel_y = 2 + }, /turf/open/floor/shiva{ - icon_state = "wredfull" + icon_state = "blue" }, -/area/varadero/interior/medical) +/area/varadero/interior/technical_storage) +"wMj" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior/hall_SE) "wMn" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/icefloor{ @@ -26166,6 +35768,13 @@ icon_state = "redfull" }, /area/varadero/interior/medical) +"wNz" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) "wNI" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 @@ -26187,13 +35796,12 @@ icon_state = "wred" }, /area/varadero/interior/medical) -"wOk" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Security Checkpoint"; - req_access_txt = "100" +"wOC" = ( +/obj/item/stack/tile/plasteel, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/plating, -/area/varadero/interior/security) +/area/varadero/interior_protected/maintenance/south) "wOL" = ( /obj/effect/landmark/crap_item, /obj/structure/window/reinforced{ @@ -26207,31 +35815,60 @@ "wOO" = ( /turf/closed/wall/r_wall, /area/varadero/interior/electrical) -"wOQ" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice8"; - pixel_x = 16; - pixel_y = 24 +"wOR" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/central) +"wOS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/evidencebag, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/shiva{ + icon_state = "floor3" }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/area/varadero/interior/security) +"wPl" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/area/varadero/interior/maintenance/research) -"wPN" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Underground Power Substation"; - req_access_txt = "100" +/area/varadero/exterior/pontoon_beach) +"wPv" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 }, -/turf/open/floor/plating, -/area/varadero/interior/electrical) +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"wPE" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"wPH" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "wQd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26240,6 +35877,22 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"wQh" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/caves/east) +"wQi" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ + dir = 1; + name = "\improper Colony Offices"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/administration) "wRi" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp/green{ @@ -26250,6 +35903,14 @@ icon_state = "multi_tiles" }, /area/varadero/interior/electrical) +"wRu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/shiva{ + icon_state = "wred" + }, +/area/varadero/interior/medical) "wRB" = ( /obj/structure/machinery/light, /obj/structure/flora/pottedplant{ @@ -26260,9 +35921,33 @@ icon_state = "greenfull" }, /area/varadero/interior/hall_N) +"wRR" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/oob) "wSx" = ( /turf/closed/wall, /area/varadero/interior/laundry) +"wSL" = ( +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" + }, +/area/varadero/exterior/pool) "wSX" = ( /obj/structure/platform_decoration/kutjevo{ dir = 8 @@ -26272,12 +35957,6 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) -"wTq" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "wTE" = ( /obj/structure/bed/chair{ icon_state = "chair_alt"; @@ -26292,6 +35971,9 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"wTJ" = ( +/turf/open/floor/plating, +/area/varadero/interior/disposals) "wTM" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -26301,12 +35983,23 @@ icon_state = "yellowfull" }, /area/varadero/interior/disposals) -"wTQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"wUj" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/comms3) +"wUr" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, +/area/varadero/interior_protected/caves) +"wUF" = ( +/obj/effect/overlay/palmtree_r, /turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/eastbeach) "wUU" = ( /turf/closed/shuttle{ dir = 1; @@ -26323,6 +36016,28 @@ "wVf" = ( /turf/closed/wall/r_wall, /area/varadero/interior/security) +"wVp" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/east) +"wVA" = ( +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/effect/landmark/objective_landmark/science, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/morgue) "wVD" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -26345,15 +36060,10 @@ }, /turf/closed/wall/r_wall, /area/varadero/interior/hall_N) -"wWn" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/shiva{ - dir = 8; - icon_state = "wred" - }, -/area/varadero/interior/medical) +"wWd" = ( +/obj/structure/largecrate/random, +/turf/open/shuttle/elevator, +/area/varadero/interior/records) "wWx" = ( /obj/structure/surface/table/reinforced, /obj/item/paper_bin, @@ -26373,6 +36083,16 @@ }, /turf/open/floor/plating, /area/varadero/interior/hall_SE) +"wXc" = ( +/obj/item/reagent_container/glass/bucket{ + pixel_y = -3 + }, +/obj/item/tool/hatchet{ + pixel_x = 3; + pixel_y = 5 + }, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/lz1_near) "wXs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26430,17 +36150,19 @@ dir = 1 }, /area/varadero/interior/electrical) -"wZs" = ( -/turf/open/floor/shiva{ - icon_state = "blue" - }, -/area/varadero/interior/technical_storage) "wZF" = ( /obj/structure/bed/chair/wood/normal{ dir = 4 }, /turf/open/floor/carpet, /area/varadero/interior/library) +"xag" = ( +/obj/effect/decal/cleanable/blood/xeno, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "xaK" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -26455,10 +36177,20 @@ icon_state = "asteroidplating" }, /area/varadero/interior/caves/north_research) -"xbD" = ( -/obj/structure/machinery/shower{ - dir = 1 +"xbm" = ( +/obj/structure/machinery/photocopier, +/turf/open/floor/wood, +/area/varadero/interior/maintenance/north) +"xbA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + icon_state = "floor3" }, +/area/varadero/interior/mess) +"xbD" = ( /obj/structure/window/reinforced/tinted{ dir = 8 }, @@ -26466,19 +36198,35 @@ icon_state = "multi_tiles" }, /area/varadero/interior/research) +"xce" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "xcf" = ( /turf/closed/wall/r_wall/elevator, /area/varadero/interior/records) -"xdy" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +"xcz" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 +/area/varadero/interior/caves/east) +"xcE" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" }, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/lz1_near) "xdz" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26500,38 +36248,38 @@ icon_state = "red" }, /area/varadero/interior/security) -"xes" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"xdW" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/gm/river, -/area/varadero/interior_protected/caves) -"xeV" = ( -/obj/structure/prop/souto_land/streamer{ - pixel_y = 24 +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, -/area/varadero/interior/hall_NW) -"xfb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 +/area/varadero/interior/electrical) +"xeO" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 }, -/obj/item/tool/stamp{ - pixel_x = -6; - pixel_y = -2 +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"xeU" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 }, -/obj/item/storage/box/masks{ - pixel_x = 6; - pixel_y = 3 +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/monsoon) +"xeV" = ( +/obj/structure/prop/souto_land/streamer{ + pixel_y = 24 }, /turf/open/floor/shiva{ - icon_state = "redfull" + icon_state = "multi_tiles" }, -/area/varadero/interior/medical) +/area/varadero/interior/hall_NW) "xff" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva{ @@ -26540,19 +36288,23 @@ /area/varadero/interior/hall_SE) "xfo" = ( /turf/closed/wall/r_wall/unmeltable, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) +"xfz" = ( +/obj/structure/girder, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "xfD" = ( /obj/structure/platform_decoration/kutjevo{ dir = 4 }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"xfQ" = ( +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/monsoon) "xgG" = ( /turf/closed/wall/r_wall, /area/varadero/interior/administration) -"xgH" = ( -/turf/open/gm/coast/beachcorner2/south_west, -/area/varadero/exterior/eastbeach) "xgU" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -26589,26 +36341,6 @@ /obj/effect/overlay/palmtree_r, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"xhb" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/prop/rock/brown, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) -"xhj" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/maintenance/security) "xhs" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -26628,6 +36360,21 @@ }, /turf/open/floor/plating, /area/varadero/interior/research) +"xhA" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/maintenance/south) +"xiV" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/closet/crate/ammo/alt, +/obj/item/storage/belt/utility, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "xjp" = ( /obj/structure/machinery/power/geothermal, /obj/structure/machinery/light/small, @@ -26657,6 +36404,10 @@ icon_state = "bluefull" }, /area/varadero/interior/administration) +"xke" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "xkj" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -26684,15 +36435,6 @@ icon_state = "floor3" }, /area/varadero/interior/disposals) -"xmi" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "xml" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26701,26 +36443,36 @@ icon_state = "yellowcorners" }, /area/varadero/interior/cargo) -"xnr" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"xmL" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 }, -/area/varadero/interior/maintenance/research) -"xnO" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"xne" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - name = "\improper Theta-V Research Laboratory Storage"; - req_access = null; - req_access_txt = null; - req_one_access = null +/turf/open/floor/shiva{ + dir = 8; + icon_state = "snow_mat" }, -/turf/open/floor/plating, -/area/varadero/interior/research) +/area/varadero/interior/maintenance) +"xnr" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"xnS" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/exterior/eastbeach) "xnV" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva{ @@ -26728,6 +36480,22 @@ icon_state = "red" }, /area/varadero/interior/morgue) +"xpe" = ( +/obj/structure/surface/rack, +/obj/item/tool/extinguisher, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"xpk" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "xpw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/circuitboard/computer/crew{ @@ -26748,6 +36516,14 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) +"xpL" = ( +/obj/structure/machinery/camera/autoname/lz_camera, +/obj/structure/machinery/landinglight/ds1/spoke{ + pixel_y = -5; + pixel_x = -13 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "xpP" = ( /turf/closed/wall/r_wall, /area/varadero/interior/comms1) @@ -26769,6 +36545,16 @@ icon_state = "white" }, /area/varadero/interior/security) +"xqN" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ + name = "\improper Colony Administration"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/administration) "xqP" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -26781,6 +36567,57 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"xqS" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 8; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/strata{ + color = "#5e5d5d"; + icon_state = "multi_tiles" + }, +/area/varadero/interior_protected/vessel) +"xqY" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/machinery/vending/snack, +/obj/structure/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "yellow" + }, +/area/varadero/interior/cargo) +"xrl" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 1; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "xrA" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva{ @@ -26788,16 +36625,6 @@ icon_state = "purplefull" }, /area/varadero/interior/research) -"xrR" = ( -/obj/structure/bed/chair{ - buckling_y = 18; - dir = 8; - pixel_y = 18 - }, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" - }, -/area/varadero/interior/technical_storage) "xsi" = ( /obj/structure/bed/chair, /turf/open/floor/shiva{ @@ -26805,14 +36632,6 @@ icon_state = "red" }, /area/varadero/interior/security) -"xsF" = ( -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/exterior/lz1_near) "xsH" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 1 @@ -26822,10 +36641,6 @@ icon_state = "asteroidfloor" }, /area/varadero/exterior/lz1_near) -"xtD" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/maintenance/south) "xtZ" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -26836,6 +36651,13 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) +"xug" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/shiva{ + dir = 4; + icon_state = "snow_mat" + }, +/area/varadero/interior/medical) "xuB" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -26848,6 +36670,15 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) +"xuJ" = ( +/obj/structure/machinery/atm{ + name = "Weyland-Yutani Automatic Teller Machine"; + pixel_y = 30 + }, +/obj/item/reagent_container/food/snacks/wrapped/barcardine, +/obj/structure/bed/chair/wood/normal, +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "xuN" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -26872,6 +36703,15 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_N) +"xuX" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/turf/open/shuttle{ + icon_state = "floor6" + }, +/area/varadero/interior_protected/vessel) "xvj" = ( /obj/structure/machinery/light/small, /turf/open/floor/shiva{ @@ -26883,9 +36723,6 @@ /turf/open/floor/plating, /area/varadero/interior/security) "xwk" = ( -/obj/structure/machinery/light{ - dir = 4 - }, /obj/structure/surface/table/reinforced/prison, /obj/item/packageWrap, /obj/item/tool/hand_labeler, @@ -26894,16 +36731,26 @@ icon_state = "yellowfull" }, /area/varadero/interior/cargo) -"xxc" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +"xwG" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/records) +/area/varadero/interior/maintenance/research) +"xwY" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/item/tool/wet_sign, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "xxk" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) @@ -26925,23 +36772,33 @@ icon_state = "multi_tiles" }, /area/varadero/interior/bunks) -"xxr" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, +"xxs" = ( +/obj/structure/closet/crate, /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, -/area/varadero/interior/oob) +/area/varadero/interior/maintenance/security) +"xxE" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + name = "\improper Theta-V Research Laboratory Storage"; + req_access = null; + req_one_access = null + }, +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/research) "xxI" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"xxO" = ( +/obj/item/ammo_magazine/handful/lever_action, +/turf/open/floor/wood, +/area/varadero/interior/research) "xxV" = ( /obj/structure/sign/safety/debark_lounge, /turf/closed/wall/r_wall, @@ -27000,33 +36857,45 @@ /obj/structure/machinery/door/airlock/multi_tile/elevator/research, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) +"xza" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security) +"xzc" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/pontoon_beach) +"xzd" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "xzj" = ( /obj/structure/sign/safety/airlock{ pixel_x = 8 }, /turf/closed/wall, /area/varadero/interior/library) -"xzC" = ( -/obj/structure/machinery/cm_vending/sorted/medical/no_access, +"xzr" = ( /turf/open/floor/shiva{ - dir = 1; - icon_state = "wred" - }, -/area/varadero/interior/medical) -"xzN" = ( -/obj/structure/machinery/portable_atmospherics/hydroponics, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/caves/north_research) -"xAD" = ( -/obj/structure/surface/table/reinforced/prison{ - dir = 8; - flipped = 1 + icon_state = "yellow" }, -/turf/open/floor/shiva{ - dir = 6; - icon_state = "multi_tiles" +/area/varadero/interior/comms3) +"xAg" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/comms2) +"xAs" = ( +/obj/structure/largecrate/random/mini/chest/b, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/hall_SE) +/area/varadero/interior/maintenance/north) +"xAx" = ( +/turf/open/gm/coast/east, +/area/varadero/interior/caves/east) "xAK" = ( /turf/open/floor/shiva{ dir = 4; @@ -27039,10 +36908,38 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) -"xBb" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river, -/area/varadero/exterior/pontoon_beach) +"xBv" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Underground Lavatory"; + req_access_txt = "100" + }, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/laundry) +"xBw" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"xBH" = ( +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "xBO" = ( /obj/structure/closet/emcloset, /obj/effect/landmark/objective_landmark/far, @@ -27069,6 +36966,17 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/research) +"xCJ" = ( +/obj/effect/landmark/objective_landmark/medium, +/obj/structure/closet/secure_closet/medical3{ + req_access_txt = "100" + }, +/obj/structure/machinery/light, +/turf/open/floor/shiva{ + dir = 6; + icon_state = "wred" + }, +/area/varadero/interior/medical) "xCM" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/icefloor{ @@ -27082,6 +36990,21 @@ icon_state = "yellowcorners" }, /area/varadero/interior/cargo) +"xCZ" = ( +/obj/structure/prop/tower, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"xDd" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "xDf" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -27091,10 +37014,6 @@ dir = 1 }, /area/varadero/interior/research) -"xDl" = ( -/obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior_protected/caves/digsite) "xDy" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27104,13 +37023,42 @@ req_access_txt = "100"; req_one_access = null }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, /area/varadero/interior/court) +"xDE" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/coast/south, +/area/varadero/exterior/farocean) +"xEc" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/light, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) +"xEl" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/caves) "xEG" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) +"xFb" = ( +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/eastocean) "xFw" = ( /obj/structure/bed/chair{ buckling_y = 18; @@ -27124,6 +37072,18 @@ "xFE" = ( /turf/open/floor/wood, /area/varadero/interior/records) +"xFO" = ( +/obj/item/device/flashlight, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) +"xFS" = ( +/obj/structure/platform_decoration/kutjevo{ + dir = 1 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/pontoon_beach) "xFZ" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light{ @@ -27133,15 +37093,6 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"xGf" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/flora/bush/ausbushes/var3/sparsegrass{ - icon_state = "sparsegrass_3" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "xGp" = ( /turf/open/floor/wood{ icon_state = "wood-broken6" @@ -27166,19 +37117,36 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"xHK" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - dir = 2; - name = "\improper Theta-V Research Laboratory Director's Office"; - req_access = null; - req_one_access = null +"xHz" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/plating, -/area/varadero/interior/research) -"xJn" = ( -/obj/structure/blocker/fog, -/turf/open/gm/coast/south, -/area/varadero/interior/oob) +/area/varadero/interior/caves/east) +"xIA" = ( +/obj/structure/closet/secure_closet/freezer/fridge/groceries, +/turf/open/floor{ + icon_state = "freezerfloor" + }, +/area/varadero/interior/cargo) +"xJb" = ( +/obj/structure/machinery/landinglight/ds2/spoke{ + pixel_x = -1; + pixel_y = 22 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"xJt" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "xJx" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light{ @@ -27189,11 +37157,27 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"xJH" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/lz2_near) "xJZ" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/security) +"xKo" = ( +/obj/structure/surface/table, +/obj/item/storage/wallet/random{ + pixel_y = 3 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/north) "xKq" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -27223,20 +37207,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"xKz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1; - name = "\improper Underground Main Hallway"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/hall_N) "xKC" = ( /obj/structure/machinery/light{ dir = 8 @@ -27277,6 +37247,23 @@ icon_state = "red" }, /area/varadero/interior/security) +"xKS" = ( +/obj/structure/lz_sign/new_varadero, +/turf/open/floor{ + dir = 1; + icon_state = "asteroidfloor" + }, +/area/varadero/exterior/lz1_near) +"xLB" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/pontoon_beach) "xLE" = ( /obj/structure/noticeboard{ pixel_y = 32 @@ -27304,18 +37291,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior/morgue) -"xMH" = ( -/obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior_protected/caves/central) -"xMI" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/comms2) "xNb" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -27324,6 +37299,14 @@ icon_state = "multi_tiles" }, /area/varadero/interior/hall_SE) +"xNw" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/carpet, +/area/varadero/interior/research) +"xNA" = ( +/obj/structure/fence, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "xNR" = ( /turf/closed/wall, /area/varadero/interior/bunks) @@ -27340,6 +37323,14 @@ icon_state = "floor3" }, /area/varadero/interior/security) +"xOx" = ( +/obj/structure/closet/crate/secure, +/obj/item/trash/popcorn, +/obj/item/hardpoint/locomotion/van_wheels, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) "xOz" = ( /obj/structure/machinery/light{ dir = 8 @@ -27360,6 +37351,15 @@ icon_state = "asteroidplating" }, /area/varadero/exterior/lz1_near) +"xOX" = ( +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz1_near) "xPj" = ( /obj/structure/machinery/light{ dir = 8 @@ -27369,26 +37369,31 @@ icon_state = "blue" }, /area/varadero/interior/administration) -"xPR" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"xPx" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + dir = 2; + name = "\improper Theta-V Research Laboratory Director's Office"; + req_access = null; + req_one_access = null }, -/area/varadero/interior/comms2) +/turf/open/floor/shiva{ + dir = 1 + }, +/area/varadero/interior/research) "xPV" = ( /obj/structure/machinery/light, /turf/open/floor/shiva{ icon_state = "yellow" }, /area/varadero/interior/electrical) -"xQh" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/shiva{ - icon_state = "multi_tiles" +"xQJ" = ( +/obj/structure/surface/table/woodentable/poor, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + pixel_x = -7 }, -/area/varadero/interior/hall_N) +/turf/open/floor/wood, +/area/varadero/interior/beach_bar) "xRt" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -27410,18 +37415,24 @@ "xRF" = ( /turf/closed/wall, /area/varadero/interior/hall_N) -"xRR" = ( +"xSl" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/central) +"xSZ" = ( /obj/structure/platform/kutjevo/smooth{ - dir = 8 + dir = 8; + climb_delay = 1; + layer = 2.99 }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) -"xSM" = ( -/obj/structure/machinery/space_heater, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + indestructible = 1; + unacidable = 1 }, -/area/varadero/interior/comms2) +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "xTd" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -27430,14 +37441,13 @@ dir = 1 }, /area/varadero/interior/cargo) -"xTh" = ( -/obj/structure/closet/secure_closet/security, -/obj/effect/spawner/random/supply_kit, -/turf/open/floor/shiva{ - dir = 10; - icon_state = "red" +"xTA" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/river{ + name = "shallow ocean"; + default_name = "shallow ocean" }, -/area/varadero/interior/administration) +/area/varadero/exterior/farocean) "xTH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27447,12 +37457,38 @@ icon_state = "multi_tiles" }, /area/varadero/interior/medical) +"xUp" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "xUq" = ( /turf/open/floor/shiva{ dir = 1; icon_state = "blue" }, /area/varadero/interior/administration) +"xUs" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/obj/effect/landmark/objective_landmark/medium, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/research) +"xUu" = ( +/obj/structure/surface/table/woodentable, +/obj/item/weapon/shield/riot, +/turf/open/floor/carpet, +/area/varadero/interior/library) +"xUH" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken3" + }, +/area/varadero/interior/court) "xVe" = ( /obj/item/prop/helmetgarb/bullet_pipe{ pixel_x = -8; @@ -27466,6 +37502,14 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/research) +"xVw" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "xVA" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -27475,13 +37519,27 @@ icon_state = "redfull" }, /area/varadero/interior/medical) -"xVK" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor{ - dir = 1; - icon_state = "asteroidfloor" +"xVC" = ( +/obj/structure/closet/crate/secure, +/obj/item/trash/sosjerky, +/obj/item/ammo_magazine/shotgun/buckshot, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/cargo) +"xVQ" = ( +/obj/structure/sign/safety/reception, +/obj/structure/sign/safety/one{ + pixel_x = 15 }, +/turf/closed/wall, /area/varadero/interior/maintenance/north) +"xVX" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/exterior/lz2_near) "xWj" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -27491,15 +37549,18 @@ icon_state = "red" }, /area/varadero/interior/security) -"xWD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ +"xWL" = ( +/obj/structure/machinery/light/small{ dir = 8 }, -/turf/open/gm/dirt, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, /area/varadero/exterior/eastbeach) +"xWU" = ( +/obj/item/trash/candle, +/turf/open/floor/wood, +/area/varadero/interior/chapel) "xWY" = ( /turf/open/floor/shiva{ icon_state = "green" @@ -27521,17 +37582,18 @@ icon_state = "blue" }, /area/varadero/interior/technical_storage) -"xXg" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/reinforced/prison, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/shiva{ +"xXr" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/gibs/xeno/body, +/turf/open/floor{ dir = 1; - icon_state = "blue" + icon_state = "asteroidfloor" }, -/area/varadero/interior/technical_storage) +/area/varadero/exterior/lz1_near) +"xYB" = ( +/obj/item/tool/pickaxe, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "xYC" = ( /obj/item/device/camera_film{ pixel_x = 4; @@ -27554,6 +37616,10 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"xZa" = ( +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/interior_protected/caves/swcaves) "xZv" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -27612,20 +37678,6 @@ icon_state = "floor6" }, /area/varadero/interior_protected/vessel) -"yaK" = ( -/obj/structure/machinery/door_control{ - id = "req_sec_storage"; - name = "Requesition Secure Storage"; - normaldoorcontrol = 1; - pixel_y = 24; - req_access_txt = "100"; - specialfunctions = 4 - }, -/turf/open/floor/shiva{ - dir = 1; - icon_state = "yellow" - }, -/area/varadero/interior/cargo) "yba" = ( /obj/structure/machinery/space_heater, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -27658,14 +37710,18 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/carpet, /area/varadero/interior/library) -"ybC" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ - name = "\improper Colony Administration"; - req_access_txt = "100" +"ybt" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" }, -/turf/open/floor/plating, -/area/varadero/interior/administration) +/obj/structure/flora/bush/ausbushes/pointybush{ + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior/maintenance/security) "ybY" = ( /obj/structure/surface/table, /obj/item/paper_bin, @@ -27685,10 +37741,22 @@ /obj/structure/machinery/door/window/westleft, /turf/open/floor/interior/plastic, /area/varadero/interior/security) +"ycY" = ( +/obj/item/trash/ceramic_plate{ + pixel_x = -8; + pixel_y = 12 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/carpet, +/area/varadero/interior/maintenance/north) +"ydx" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/bunks) "ydy" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/r_wall/unmeltable, -/area/varadero/exterior/lz1_near) +/area/varadero/interior/dock_control) "ydI" = ( /turf/open/floor/carpet, /area/varadero/interior/records) @@ -27728,13 +37796,6 @@ icon_state = "multi_tiles" }, /area/varadero/interior_protected/vessel) -"yev" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Main Hallway"; - req_access_txt = "100" - }, -/turf/open/floor/plating, -/area/varadero/interior/hall_SE) "yeF" = ( /obj/item/reagent_container/glass/bucket/mopbucket, /obj/item/tool/mop, @@ -27762,10 +37823,14 @@ }, /turf/open/gm/dirt, /area/varadero/interior/maintenance/north) -"yeK" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/auto_turf/sand_white/layer0, -/area/varadero/interior/maintenance/security) +"yeR" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/research) "yeY" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/green, @@ -27774,6 +37839,14 @@ icon_state = "red" }, /area/varadero/interior/security) +"yfh" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/shiva{ + icon_state = "wredfull" + }, +/area/varadero/interior/medical) "yfQ" = ( /obj/structure/bed/chair{ dir = 4; @@ -27784,6 +37857,14 @@ icon_state = "blue" }, /area/varadero/interior/administration) +"yfT" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/caves/north_research) "yfV" = ( /obj/structure/cable/heavyduty{ icon_state = "1-4-8" @@ -27801,6 +37882,14 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"ygn" = ( +/obj/structure/catwalk{ + indestructible = 1 + }, +/turf/open/gm/river/desert/deep{ + base_river_slowdown = 0 + }, +/area/varadero/interior/maintenance/north) "ygT" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/fire, @@ -27854,6 +37943,22 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) +"yhU" = ( +/obj/structure/flora/bush/ausbushes/var3/brflowers, +/turf/open/gm/grass/grass1/weedable, +/area/varadero/interior_protected/caves/swcaves) +"yhZ" = ( +/obj/structure/platform/kutjevo/smooth{ + dir = 4; + climb_delay = 1; + layer = 2.99 + }, +/obj/structure/platform/kutjevo/smooth{ + climb_delay = 1; + layer = 2.99 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "yil" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) @@ -27869,14 +37974,35 @@ icon_state = "wredfull" }, /area/varadero/interior/medical) +"yji" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/storage/firstaid/rad{ + pixel_y = 4 + }, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "purplefull" + }, +/area/varadero/interior/research) "yjp" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 1; name = "\improper Underground Security Checkpoint"; req_access_txt = "100" }, -/turf/open/floor/plating, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "redfull" + }, /area/varadero/interior/hall_N) +"yjH" = ( +/obj/structure/cargo_container/kelland/right, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "yjK" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -27898,27 +38024,24 @@ /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/technical_storage) -"ykC" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"ykx" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 }, -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Underground Women's Restroom"; - req_access_txt = "100"; - req_one_access = null +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/turf/open/floor/plating, -/area/varadero/interior/toilets) -"ykD" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/coast/west, -/area/varadero/exterior/pontoon_beach) +/area/varadero/interior/caves/east) +"ykA" = ( +/obj/structure/closet/crate/construction, +/obj/item/storage/belt/utility/full, +/turf/open/gm/dirt{ + icon_state = "desert0" + }, +/area/varadero/exterior/eastbeach) "ykE" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/storage/box/emps{ - pixel_x = 6; - pixel_y = 6 - }, /obj/item/storage/box/cdeathalarm_kit{ pixel_x = -8; pixel_y = 1 @@ -27928,44 +38051,37 @@ icon_state = "floor3" }, /area/varadero/interior/medical) -"ylc" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" - }, -/area/varadero/interior/oob) -"ylf" = ( -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = -8 - }, -/obj/structure/filingcabinet{ - density = 0; - icon_state = "chestdrawer"; - pixel_x = 8 - }, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +"ykM" = ( +/obj/effect/overlay/palmtree_r{ + icon_state = "palm2" }, -/area/varadero/interior/maintenance/security) -"ymf" = ( -/obj/structure/largecrate/random, -/obj/structure/barricade/wooden, -/turf/open/floor/plating/icefloor{ - icon_state = "asteroidplating" +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) +"ykS" = ( +/obj/structure/largecrate/random/barrel/green, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"ykU" = ( +/obj/item/tool/shovel, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"ylB" = ( +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"ylX" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/security/glass{ + dir = 1; + name = "\improper Underground Security Marshal's Office"; + req_access_txt = "100" }, -/area/varadero/interior/comms2) +/turf/open/floor/wood, +/area/varadero/interior/security) +"ymb" = ( +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/farocean) (1,1,1) = {" wUU @@ -28190,30 +38306,30 @@ pGs pGs pGs pGs -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -28372,32 +38488,32 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +pGs pGs -aFr pGs pGs pGs @@ -28554,36 +38670,30 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -28614,16 +38724,22 @@ pGs pGs pGs pGs +srg +srg +xCn +xCn pGs pGs pGs pGs +xCn +xYB dxK +srg pGs pGs pGs -pGs -uHY +dxK pGs pGs pGs @@ -28736,31 +38852,30 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk pGs pGs pGs @@ -28788,26 +38903,27 @@ pGs pGs pGs pGs -uHY -pGs -pGs -pGs pGs -pGs -pGs -pGs -hto -pGs -pGs -dxK -nHD +srg +xCn +xCn +xCn +srg +xCn +xCn +xCn +xCn +xCn +xCn xCn -uHY xCn xCn xCn +xCn +xCn +srg ljt -uHY +dxK pGs pGs pGs @@ -28918,32 +39034,32 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pGs pGs -qhd pGs pGs pGs @@ -28966,42 +39082,42 @@ pGs pGs uHY ljt -pGs -pGs xCn xCn xCn -alL -pGs -pGs -pGs xCn -tSQ -uHY xCn +mCX xCn xCn xCn xCn +tSQ xCn xCn xCn xCn xCn -oPQ +srg +srg +xCn +xCn xCn xCn +oPQ xCn +cBI xCn +emt ljt pGs pGs pGs pGs pGs -pGs -pGs -pGs +geo +geo +jQa pGs pGs pGs @@ -29100,30 +39216,30 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk +mPk +mPk pGs pGs pGs @@ -29140,8 +39256,8 @@ pGs pGs pGs pGs -nHD -nHD +srg +srg ljt pGs pGs @@ -29151,9 +39267,9 @@ oPQ xCn xCn xCn -azH xCn -oPQ +xCn +qRi oPQ xCn xCn @@ -29163,24 +39279,34 @@ xCn oPQ xCn xCn +srg +fHk xCn xCn -xCn -nHD oVt xCn xCn oPQ xCn -xCn +cBI xCn oPQ oPQ +xCn pGs pGs pGs +jQa +jQa +jQa +jQa +jQa pGs pGs +gxQ +jQa +jQa +jQa pGs pGs pGs @@ -29219,20 +39345,10 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vdL +geo +jQa +jQa pGs pGs pGs @@ -29282,31 +39398,31 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk pGs pGs pGs @@ -29315,54 +39431,76 @@ pGs pGs pGs dxK -dxK +uHY xCn xCn uHY pGs -xCn +srg xCn xCn xCn oPQ uHY xCn -xCn +qYg xCn oPQ +srg xCn -xCn -xCn +srg xCn oPQ oPQ oPQ xCn xCn +srg +srg xCn +oPQ xCn xCn -oPQ xCn xCn -uHY -uHY -nHD -nHD -nHD xCn xCn xCn xCn xCn +srg +xCn +cBI xCn xCn oPQ +kAL +xCn +fHk +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo pGs pGs pGs pGs pGs +geo +xZa +jQa +jQa +geo +geo pGs pGs pGs @@ -29380,13 +39518,29 @@ pGs pGs pGs pGs +xZa +geo +jQa pGs pGs +gxQ +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs pGs pGs +wUU +"} +(9,1,1) = {" +wUU pGs pGs pGs @@ -29421,82 +39575,44 @@ pGs pGs pGs pGs -wUU -"} -(9,1,1) = {" -wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs pGs pGs +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk pGs pGs pGs pGs pGs -pGs -pGs -pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -pHX -pGs -qhd -pGs -pGs -pGs dxK -nHD +srg xCn xCn xCn @@ -29504,7 +39620,7 @@ xCn uHY xCn xCn -xCn +fHk xCn oPQ xCn @@ -29518,12 +39634,12 @@ xCn xCn xCn oPQ -ljt +oPQ xCn xCn oVt xCn -xCn +sfF ljt uHY qul @@ -29532,59 +39648,42 @@ qul qul qul qul -nHD xCn -uHY -uHY +srg +srg xCn +fzc xCn oVt xCn -qMH -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +xCn +kAL +xCn +gxQ +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs pGs pGs +geo +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -29599,6 +39698,23 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -29646,39 +39762,39 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -pHX +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk pGs pGs pGs pGs -nHD -aBE +xCn +xCn xCn xCn xCn @@ -29693,17 +39809,17 @@ xCn oPQ xCn xCn -nHD +hGl tMJ wpG -yks +vYp tMJ ncL yks yks ncL tMJ -yks +vYp tMJ yks yks @@ -29714,62 +39830,43 @@ fay fay fay fay -fay -fay -fay -fay -fay -vYW -vYW -vYW -vYW -hto -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +tqh +tqh +tqh +tqh +uJT +srg +xCn +xCn +xCn +xCn +xCn +jQa +jQa +jQa +geo +geo +jQa +jQa +jQa +geo +jQa +jQa +jQa +jQa pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -29781,6 +39878,25 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +nFK +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -29828,33 +39944,33 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -pHX -pHX +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk +mPk +mPk +mPk +mPk pGs pGs pGs @@ -29872,11 +39988,11 @@ xCn xCn oPQ xCn -uHY xCn +srg xCn -nHD -ncL +hGl +efw kXQ efw kXQ @@ -29885,10 +40001,10 @@ fND xCq kXQ efw +jGA efw efw -efw -gKw +awu fay jMK cqB @@ -29900,60 +40016,41 @@ fWA mEA sBk ksn -fay -crY -vYW -vYW -vYW -vYW -vYW -vYW -vYW -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +pGc +srg +xCn +xCn +xCn +xCn +xCn +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa +jQa +jYZ +jQa +geo pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo +geo pGs pGs pGs @@ -29963,6 +40060,25 @@ pGs pGs pGs pGs +jQa +jQa +jQa +tAT +jQa +jQa +jQa +jQa +ppl +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +gxQ pGs pGs pGs @@ -30010,33 +40126,33 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -pHX -pHX +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +sNx +mPk +imk +mPk +imk pGs pGs pGs @@ -30053,12 +40169,12 @@ xCn xCn xCn oPQ -uHY +xCn uHY xCn -nHD -nHD -yks +xCn +mQF +efw kXQ efw efw @@ -30080,71 +40196,71 @@ cJa hDA pjs aJc -lqV +hDA xrA -fay -crY -crY -vYW -vYW -vYW -vYW -vYW -vYW -vYW -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +pGc +srg +xCn +xCn +xCn +xCn +xCn +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa +jQa +faB +jQa +jQa +jQa +pGs +jQa +jQa +jQa +tpO +tpO +jQa +jQa +nFK +jQa +jQa +jQa +jQa +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +geo +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jcr +ppl +jQa +jQa +nFK +jQa +nFK +jQa +jQa +jQa +jQa pGs pGs pGs @@ -30192,141 +40308,141 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +sNx +mPk +mPk +rYR +pGs pGs -qhd pGs pGs uHY xCn xCn xCn +srg xCn -xCn -xCn +srg qul uHY -uHY -xCn +srg +srg ljt qul qul qul -dxK -dxK -yks +uHY +hhM qDh qlj +qlj yks +aoE yks yks -yks -yks +aoE yks yks efw qMY efw -fay +dkr rUw hfX hFA -fay +dkr qMD hDA iAp gwC hDA tMx -fay -qMH -crY -crY -vYW -vYW -vYW +tqh +dxK +xCn +xCn +xCn +xCn +xCn vYW vYW vYW vYW hto pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +tpO +tpO +jQa +geo +jQa +jQa +jQa +jQa +jQa +jQa +pGs +pGs +pGs +pGs +pGs +pGs +pGs +geo +jQa +jQa +jQa +jQa +uhV +jQa +jQa +jQa +jQa +jQa +jQa +geo +geo +geo +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -30374,38 +40490,38 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -lVM -lVM -pHX -lVM -emx -emx -pGs +cJL +mPk +mPk +mPk +cJL +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +vlm +imk +mPk +imk +xTA pGs pGs pGs +qul ljt oPQ oPQ @@ -30421,15 +40537,15 @@ qul qul qul qul -qul -yks +hhM +efw efw kYN yks aHs fla gkk -dhh +eGP nPE yks bag @@ -30447,12 +40563,12 @@ gwC odD rjE fay -ebr -ebr -qMH -ebr -ebr -vYW +qul +qul +uHY +xCn +xCn +srg vYW vYW vYW @@ -30461,54 +40577,54 @@ hto pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +geo +geo +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +nFK +geo +nFK +jQa +jQa +jQa +jQa pGs pGs pGs @@ -30556,44 +40672,43 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -lVM -lVM -lVM -lVM -tEH -vRC -fLo +wBp +wBp +rYC +xVw +wBp +wBp +wBp +rYC +xVw +wBp +wBp +wBp +wBp +xVw +rYC +wBp +wBp +wBp +xVw +wBp +rYC +wBp +wBp +wBp +oNa +mYA +cLV +eCB klT klT klT klT -yks +vYp ncL tMJ yks -yks -yks +vYp yks yks yks @@ -30607,6 +40722,7 @@ yks yks efw efw +efw yks mzJ rbU @@ -30615,35 +40731,57 @@ sdU rbU yks yks -gJS -yks +fdA +vYp fay fay -sBb +fKz fay fay fay -fay -tqR -ivp +lBw +ltW +tkw ftA fay fay fay ebr ebr -ebr -ebr -alL +pKK +vYW +loA uQa vYW vYW vYW +vYW pGs pGs pGs +jQa +jQa +jQa +jQa +abL +jQa +geo +geo +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs +gxQ +jQa +jQa +jQa +geo +jQa +jQa pGs pGs pGs @@ -30651,45 +40789,23 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jYZ +geo +jQa +jQa +geo +jQa +osn +geo +jQa +jQa +geo pGs pGs pGs @@ -30738,36 +40854,36 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -lVM -cBu -lVM -lVM -emx -lVM -lVM -orL +sNy +jDe +sNy +sNy +sNy +sNy +sNy +sNy +sNy +jDe +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +jDe +sNy +sNy +tER +sNy +dWH jhW jhW -efw -efw +jhW +mxx +jGm fND uVo kXQ @@ -30777,7 +40893,7 @@ fND uVo kXQ efw -fND +xwG xCq kXQ kXQ @@ -30789,8 +40905,8 @@ efw efw efw efw -yks -fYb +pCP +ovC ovC nOQ lIO @@ -30814,13 +40930,15 @@ xhx fay ebr ebr -ebr -ebr +vYW +vYW hto vYW vYW vYW vYW +vYW +vYW pGs pGs pGs @@ -30828,49 +40946,47 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa pGs pGs pGs pGs +jQa +jQa +jQa +geo +jQa +jQa +jQa pGs pGs pGs pGs pGs +gxQ +jQa +jQa +jQa +jQa +jQa pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +ppl +jQa +jQa +jQa +jQa +jQa +iCB +jQa +jQa +jQa pGs pGs pGs @@ -30920,58 +41036,58 @@ pGs pGs pGs pGs -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -lVM -lVM -lVM -lVM -lVM -lVM -lVM -orL +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +lyP +sNy +lyP +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +nVv +efw efw qVp sQn sQn -vSd -wOQ +rxI sQn sQn sQn sQn -wOQ +rxI sQn sQn sQn -edp -vSd +rxI sQn sQn sQn sQn -wOQ +tVD +rxI sQn +dTl vdq efw efw -yks +aoE vTl ovC ovC @@ -30982,7 +41098,7 @@ wIr qQF ltW cNT -ltW +aPQ qQF ltW ltW @@ -30997,27 +41113,15 @@ fay ebr ebr ebr -ebr -vYW vYW vYW vYW +uQa +uQa vYW +neq vYW -hto -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +icl pGs pGs pGs @@ -31025,22 +41129,56 @@ pGs pGs pGs pGs +jQa +jQa +geo +geo +jQa +jQa +jQa pGs pGs pGs pGs pGs +jQa +jQa +jQa +nFK +jQa +jQa +jQa pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs +jQa +jQa +jQa +jQa +geo +uhV +jQa +nFK +jQa +geo pGs pGs pGs pGs pGs pGs +wUU +"} +(18,1,1) = {" +wUU pGs pGs pGs @@ -31059,10 +41197,6 @@ pGs pGs pGs pGs -wUU -"} -(18,1,1) = {" -wUU pGs pGs pGs @@ -31084,79 +41218,61 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -lVM -lVM -lVM -tEH -fLo -fLo -fLo -fLo -msE -efw -qMY -yks -yks -yks -yks -yks -yks -yks -yks -yks -tMJ -ncL -yks -yks -yks -yks -yks -yks -yks -yks -mln +tER +sNy +sNy +sNy +sNy +lyP +sNy +sNy +sNy +lyP +sNy +sNy +sNy +sNy +sNy +sNy +wLq +lyP +lyP +sNy +dhV +ozD +nFH +ozD +jpZ +byU +byU qMY efw +efw +efw +pJA +jGA +efw +efw +efw +pJA +efw +efw +efw +pJA +efw +efw +efw +kXQ +kXQ +pJA +efw +jif +efw miP yks qBU rbU -rbU +ovC adC rbU aCz @@ -31166,7 +41282,7 @@ biF yba pVl xDf -wmg +rFj izs vku izs @@ -31179,9 +41295,9 @@ fay ebr ebr ebr -hto vYW vYW +uQa vYW vYW uQa @@ -31195,6 +41311,11 @@ pGs pGs pGs pGs +jQa +jQa +geo +geo +jQa pGs pGs pGs @@ -31202,40 +41323,35 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +ppl +jQa +jQa +geo +geo +ijZ +jQa +jQa +jQa +geo pGs pGs pGs @@ -31284,63 +41400,63 @@ pGs pGs pGs pGs -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -lVM -lVM -lVM -lVM -lVM -woP +sNy +sNy +tER +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +sNy +lyP +wLq +sNy +sNy +hlG +pVz skp skp -pVz vLc -skp -efw -qMY +qDh +qlj +vvh +qlj +yks +yks +yks +yks +yks +yks +yks +aoE +tMJ +ncL +yks +yks +yks +yks +yks +yks yks -qul -qul -qul -qul -qul -qul -qul -ljt -oPQ -oPQ -qul -qul -qul -qul -qul -qul -qul yks bvE qMY -efw +mxx cbv yks vNG rbU -kCF +jvc nCV -rbU +ovC fay wIr ltW @@ -31350,8 +41466,8 @@ qQF ltW dQl rWJ -jUA -ltW +jJp +aJI dQl rWJ ltW @@ -31360,14 +41476,15 @@ okB fay ebr ebr -ebr -vYW -vYW vYW vYW +uQa +jAI vYW uQa uQa +uQa +vYW vYW vYW pGs @@ -31376,6 +41493,10 @@ pGs pGs pGs pGs +gxQ +jQa +jQa +gxQ pGs pGs pGs @@ -31385,40 +41506,35 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +ppl +jQa +jQa +jQa +jQa +nFK +jQa +nFK +jQa +jQa +jQa +jQa pGs pGs pGs @@ -31466,44 +41582,44 @@ pGs pGs pGs pGs -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -lVM -lVM -woP +sNy +sNy +sNy +sNy +sNy +sNy +sNy +mLg +nFH +nFH +nFH +nFH +nFH +nFH +nFH +nFH +nFH +nFH +ozD +nFH +tdX ifB lCK ifB lCK -ifB efw -nWA +efw +qMY +cyT yks qul qul qul qul -qul uHY uHY -xCn -oPQ +qHc +qHc oPQ ljt qul @@ -31513,17 +41629,17 @@ qul qul qul yks -oEx +sDE wuA efw rme -yks +aoE qKq axY lNw urE -bhS -xHK +xNw +xPx wIr ltW pCc @@ -31541,8 +41657,8 @@ qQF eXr fay ebr -ebr vYW +neq vYW vYW vYW @@ -31552,6 +41668,8 @@ uQa uQa vYW vYW +vYW +vYW pGs pGs pGs @@ -31571,36 +41689,34 @@ pGs pGs pGs pGs +jQa +jQa +jQa +tAT +jQa +jQa pGs +jQa +jQa +nFK +jQa +jQa +jQa +jQa pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -31646,37 +41762,37 @@ pGs pGs pGs pGs -qhd pGs -cBu -lVM -cBu -cBu -lVM -cBu -cBu -cBu -cBu -lVM -cBu -lVM -cBu -cBu -lVM -cBu -lVM -lVM -lVM -lVM -woP +pGs +sNy +wLq +sNy +sNy +sNy +sNy +sNy +sHJ +ifB +ifB +ifB +ifB +ifB +ifB +ifB +ifB +ifB +ifB +ifB +ifB ifB ifB ifB ifB ifB efw +efw qMY -yks +efw yks qul qul @@ -31687,10 +41803,10 @@ xCn xCn oPQ oPQ +qHc xCn xCn -xCn -xCn +srg qul qul qul @@ -31701,9 +41817,9 @@ efw nKr yks kpF -rbU +xxO rFD -rbU +ncC qBQ fay jcB @@ -31721,18 +41837,22 @@ ltW ltW lRU leI -fay -ebr -ebr -vYW +tqh +rpw +neq vYW vYW vYW +ixl hto vYW uQa uQa vYW +vYW +vYW +vYW +vYW pGs pGs pGs @@ -31752,37 +41872,33 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +ppl +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -31830,40 +41946,40 @@ pGs pGs pGs pGs -pHX -cBu -lVM -pHX -cBu -cBu -lVM -cBu -cBu -lVM -cBu -lVM -lVM -cBu -cBu -cBu -lVM -lVM -lVM -lVM -woP -ifB +pRV +sNy +wLq +sNy +sNy +sNy +sNy +dsC +rNf +mdy +nQR +nQR +nQR +nQR +nQR +nQR +qOO +rNf +mdy +nQR +pTQ ifB ifB ifB ifB efw +efw qMY aoi yks yks qul qul -ljt +oPQ oPQ oPQ xCn @@ -31873,7 +41989,7 @@ xCn xCn xCn xCn -uHY +cgr qul qul yks @@ -31884,7 +42000,7 @@ efw yks yks yks -yks +aoE yks yks yks @@ -31894,7 +42010,7 @@ kCy bUR qQF ltW -lUi +yji ltW dQl ltW @@ -31903,46 +42019,24 @@ rWJ ltW sKL xbD -fay -ebr -ebr +dkr +rpw +neq vYW vYW ebr ebr ebr -alL +uQa uQa uQa vYW hto -pGs -pGs -crY -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW +vYW +vYW pGs pGs pGs @@ -31960,10 +42054,32 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa pGs pGs pGs pGs +ppl +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa +jQa pGs pGs pGs @@ -32011,33 +42127,33 @@ pGs pGs pGs pGs -pGs -lVM -emx -lVM -cBu -lVM -lVM -lVM -cBu -lVM -cBu -lVM -cBu -lVM -lVM -lVM -lVM -lVM -lVM -lVM -lVM -woP -ifB -ktt +lYo +cNt +sNy +tER +sNy +wLq +uTj +sNy +dsC +rNf +izl +sNy +wLq +sNy +wLq +lyP +sNy +sHJ +rNf +izl +ekO +aCd ifB ifB +kYM ifB +mPX efw qMY efw @@ -32053,25 +42169,25 @@ oPQ xCn xCn xCn +srg xCn -xCn -uHY -uHY +bdH +pea qul yks yks -wrQ +xUs sQn vSd sQn fdn -vSd +yeR sQn jQM sQn -oPj +bZg giq -izs +bSd izs hfD clv @@ -32086,44 +42202,24 @@ ltW sKL gka fay -ebr -ebr +rpw +vYW +vYW +vYW vYW -crY -crY ebr alL -alL +uQa uQa uQa vYW vYW -crY -crY +neq +vYW +neq +vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -32140,11 +42236,31 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +tpO +tpO +jQa +jQa +jQa +jQa pGs pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -32192,41 +42308,41 @@ pGs pGs pGs pGs -pGs -pGs -lVM -lVM -lVM -lVM -lVM -lVM -lVM -tyc -lth -juC -lVM -lVM -lVM -lVM -lVM -lVM -tyc -lth -juC -lVM -woP -ifB +qfr +nbB +cNt +wLq +wLq +sNy +sNy +sNy +sNy +dsC +rNf +izl +wLq +sNy +lyP +lyP +sNy +uTj +sHJ +rNf +izl +lyP +hlG ifB ifB ifB ifB efw +byU qMY efw -fPv +mbu yks qul -dxK +uHY xCn xCn xCn @@ -32235,23 +42351,23 @@ xCn xCn qul qul +srg xCn xCn -xCn -xCn +bdH qul qul yks -alG -xVe -kXQ -kXQ -qOS +kDh +efw +efw +efw +jGA efw neJ qMY -rAF -yks +byU +aoE tGl xAK xAK @@ -32261,18 +42377,18 @@ xAK xAK nQH mVc -xAK +nYx xAK ltW ltW fWn vVy fay -ebr -ebr +rpw +neq +vYW vYW vYW -crY vYW uQa uQa @@ -32283,30 +42399,10 @@ vYW vYW vYW vYW +neq +vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -32323,11 +42419,31 @@ pGs pGs pGs pGs +jQa +nFK +jQa +tpO +tpO +jQa +jQa +jQa pGs pGs pGs pGs pGs +ppl +jQa +jQa +nFK +jQa +ppl +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -32374,43 +42490,43 @@ pGs pGs pGs pGs -aFr -pGs -lVM -emx -lVM -emx -lVM -lVM -lVM -iUj -ubB -bvR -lVM -lVM -lVM -lVM -lVM -lVM -iUj -ubB -bvR -lVM -woP -ifB +nbB +qfr +dpW +oIc +wLq +wLq +tER +sNy +sNy +dsC +rNf +izl +wLq +sNy +lyP +sNy +sNy +sNy +sHJ +rNf +izl +wLq +hlG ifB ifB ifB ifB efw +efw qMY qUj yks yks qul -dxK -xCn +uHY xCn +qHc xCn xCn xCn @@ -32419,28 +42535,28 @@ qul uHY xCn xCn -xCn +srg xCn qul qul -hhM -hhM -hhM -xzN -xzN -hhM -hhM yks -qMY +alG +xVe +kXQ +kXQ +qOS +efw efw +qMY +knP yks dMm bcg bmt fay -xnO -fay +xxE fay +dkr fay fay fay @@ -32451,46 +42567,25 @@ icn afi fay ebr -ebr -hto vYW +hto vYW +neq vYW uQa uQa uQa uQa vYW -crY vYW vYW -crY vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW +vYW pGs pGs pGs @@ -32505,11 +42600,32 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs pGs pGs +geo +geo +jQa +jQa +jQa +jQa +jcr +ppl +jQa +nFK +jQa +jQa +jQa pGs pGs pGs @@ -32555,65 +42671,65 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -lVM -emx -lVM -lVM -emx -lVM -iUj -ubB -bvR -lVM -lVM -lVM -lVM -lVM -lVM -iUj -ubB -bvR -lVM -woP +qfr +nbB +rcu +fQK +dpW +pRV +wLq +wLq +wLq +wLq +dsC +plF +izl +wLq +uTj +sNy +sNy +sNy +sNy +sHJ +rNf +iVD +lyP +hlG ifB ifB kyI ifB -ifB efw +byU qMY yks -hhM +yks qul -dxK +uHY xCn hRv xCn -xCn +qHc xCn oPQ -uHY -uHY -xCn xCn xCn xCn +qHc xCn +qHc +srg uHY qul -qul -qul -qul -qul -qul -qul -qul yks -jBO +yks +yks +vSN +vSN +yks +yks +qDh +vBF qlj yks uuN @@ -32634,44 +42750,24 @@ hEN fay ebr ebr -hto +vYW ckM vYW vYW uQa uQa vYW -hto -ebr -ebr -ebr +vYW +vYW +neq +vYW ebr ebr vYW vYW vYW vYW -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW pGs pGs pGs @@ -32686,12 +42782,32 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs pGs pGs pGs +vdL +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -32737,57 +42853,56 @@ pGs pGs pGs pGs -pGs -pGs -pGs -aFr -pGs -lVM -emx -emx -lVM -tyc -iCH -ubB -mqK -juC -lVM -lVM -lVM -emx -tyc -iCH -ubB -mqK -juC -woP +nbB +qfr +nbB +nbB +qfr +dpW +oIc +wLq +wLq +dhV +mwm +rNf +iZj +vqR +wLq +wLq +wLq +llj +dhV +qCY +rNf +iZj +dkC +hlG xCM lCK ifB lCK -ifB -efw -nWA +qDh +qlj +lWB yks qul qul -dxK -xCn -xCn +uHY +qHc +qHc xCn xCn xCn oPQ +qHc xCn xCn +qHc xCn +qHc xCn +jgV xCn -xCn -xCn -xCn -xCn -qul qul qul qul @@ -32795,6 +42910,7 @@ qul qul qul yks +efw qMY kYN yks @@ -32808,9 +42924,9 @@ ltW ltW jHI fay -tqh -tqR -dOp +lBw +hDA +tnN cPR fay fay @@ -32821,39 +42937,20 @@ vYW vYW vYW uQa -uQa +wUr +vYW +vYW +vYW +vYW vYW -hto -ebr -ebr -ebr ebr ebr -crY +neq +vYW +vYW vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -32866,6 +42963,15 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -32873,6 +42979,16 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa +jQa +jQa pGs pGs pGs @@ -32918,68 +43034,68 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -vxA -vxA -eRc -iUj -jRC -jRC -jRC -iaC -vxA -vxA -fFD -lVM -iUj -jRC -jRC -jRC -bvR -woP +haP +haP +haP +haP +haP +nbB +ykM +dpW +iIY +oIc +dsC +ifB +ifB +ifB +kVL +iIY +iIY +pRV +uTj +dsC +ifB +ifB +ifB +iVD +hlG kvS laN rGE rGE -tyd efw -qMY +efw +ybj yks qul qul qul -xCn -xCn +qHc +mJe xCn xCn oPQ oPQ xCn -xCn +tuR xCn xCn xCn oVt xCn -xCn -xCn -xCn -xCn -uHY -uHY -qul +qHc +fUs +hhM +hhM +hhM +cYV qul qul yks +efw xnr sQn -oPj +bZg oOF izs izs @@ -33003,42 +43119,20 @@ vYW vYW vYW uQa -uQa -vYW +fFO +dGu hto +vYW +vYW ebr ebr ebr -ebr -ebr -crY +neq +vYW +vYW vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -33050,11 +43144,33 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +geo +jQa +jQa +jQa +jQa +jQa +geo pGs pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +geo +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -33100,36 +43216,36 @@ pGs pGs pGs huF -huF -huF -huF -huF -huF -pGs -qhd -pGs -pGs -fvL -ijR -jRC -meD -jRC -rsR -sid -uqA -dpl -ejN -sLu -jRC -meD -jRC -bvR -vyU -qQQ -qQQ -qQQ -qQQ -oKt +haP +rQe +vFs +iqv +haP +uQi +nbB +fQK +nbB +dpW +red +ifB +lFI +ifB +nhX +gor +qoj +avX +ehT +kQy +ifB +lFI +ifB +sZW +hnR +ptp +ptp +ptp +kRU +efw efw qMY yks @@ -33138,7 +43254,7 @@ qul qul xCn xCn -xCn +fHk xCn oPQ xCn @@ -33146,22 +43262,22 @@ xCn xCn xCn xCn -uHY -xCn -xCn -xCn xCn xCn xCn +qHc +qHc xCn +heu +vQe xCn uHY qul -qul yks -jBO +qDh +vvh qlj -yks +aoE ifx ruZ aJW @@ -33186,7 +43302,7 @@ vYW vYW uQa uQa -vYW +jAI vYW ebr ebr @@ -33198,32 +43314,8 @@ vYW vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +neq pGs pGs pGs @@ -33233,10 +43325,34 @@ pGs pGs pGs pGs +geo +geo +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -33282,53 +43398,53 @@ pGs pGs huF huF -lhb -lhb -lhb -lhb -lhb -uQi -uQi -uQi -uQi -uQi +eWp +lMB +lMB +lMB +jPh uQi -jRC -nxZ -oRo uQi -pkn -pkn -pkn -pkn uQi -jRC -jRC -jRC uQi uQi +ykc +ifB +huf +ifB +ykc +cog +ykc +cog +ykc +ykc +gkw +huf +ifB +ykc uQi uQi uQi uQi uQi -qDh -vvh +efw +efw +qMY yks qul qul xCn xCn -xCn +jCs xCn xCn oPQ xCn -xCn +qHc xCn xCn qul -uHY +xCn xCn xCn xCn @@ -33339,8 +43455,8 @@ xCn xCn xCn qul -uHY yks +efw qMY kYN yks @@ -33348,8 +43464,8 @@ fay fay fay fay -fay -fay +dkr +dkr fay fay fay @@ -33363,8 +43479,8 @@ ebr ebr ebr ebr -hto vYW +neq vYW uQa uQa @@ -33376,34 +43492,12 @@ ebr ebr ebr ebr -crY vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW pGs pGs pGs @@ -33415,8 +43509,30 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +geo +jQa +jQa +jQa +geo +jQa +jQa pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -33463,42 +43579,42 @@ pGs pGs pGs huF -lhb -lhb -iqv -vFs -iqv -huc +huF +oTX +tQT +tQT +fQW +jSP ykc ykc ykc ykc ykc -uQi -uQi -uQi -pkn -uQi +ykc +cog +ykc +uZY +ykc cAw lbi qNC rSx -uQi -pkn -uQi -uQi -uQi ykc +cog ykc +rnP ykc ykc ykc ykc -efw -ybj -yks +ykc +ykc +lSg +lSg +vLt +adw qul -dxK +uHY xCn xCn xCn @@ -33517,12 +43633,12 @@ xCn xCn xCn xCn +mJe xCn xCn xCn -xCn -xCn -nOw +efw +efw qMY efw nSi @@ -33530,8 +43646,8 @@ bMx qul qul qul -uHY -uHY +xCn +xCn qul qul qul @@ -33544,13 +43660,13 @@ fay ebr ebr ebr -hto vYW vYW -alL +vYW uQa uQa -vYW +uQa +neq vYW vYW ebr @@ -33562,30 +43678,8 @@ ebr vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +neq pGs pGs pGs @@ -33598,6 +43692,28 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa +jQa +jQa +jQa +jQa +nFK +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -33645,12 +43761,12 @@ pGs pGs pGs huF -lhb -ihF -lMB -lMB -lMB -jPh +huF +cne +tQT +tQT +rMM +wjB ykc akd eBL @@ -33659,7 +43775,7 @@ pfR pfR bRo ykc -eQU +kVp tjS tjS tjS @@ -33667,22 +43783,22 @@ tjS tjS iUx gXh -ykc +uXZ kVp aDF tjS tjS tjS aDF -naw -ykc -qDh -vvh -yks -dxK +uXZ +pYt +vsa +fcK +uSx xCn xCn xCn +tuR xCn qul ljt @@ -33695,16 +43811,16 @@ qul qul xCn xCn -xCn +qYg ljt hhM hhM -hhM -xCn -xCn xCn +qHc +qHc xCn kXQ +kXQ qMY kXQ kXQ @@ -33718,17 +43834,17 @@ uHY qul qul fay -sDM +tYT vBq iCy jnq fay ebr hto -ebr vYW vYW -alL +vYW +uQa alL uQa uQa @@ -33741,32 +43857,11 @@ ebr ebr ebr ebr -crY vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW pGs pGs pGs @@ -33780,6 +43875,27 @@ pGs pGs pGs pGs +jQa +jQa +jQa +ron +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +xZa +geo pGs pGs pGs @@ -33814,25 +43930,25 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs huF -lhb -ihF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +oTX tQT tQT -fQW -jSP +ssh +pPl ykc dro eBL @@ -33851,23 +43967,23 @@ sGY uQK oLM mIL -uwu -uwu +xOx +haV oke -fgS +baN wGl -uQK ykc -efw -ybj -yks -dxK -xCn -xCn +pkG +nsn +ehH +uSx xCn xCn -dxK xCn +qHc +qHc +uHY +cYV dNt oPQ oPQ @@ -33883,9 +43999,9 @@ oPQ oPQ oPQ oPQ +qHc oPQ -oPQ -oPQ +efw kXQ bRS efw @@ -33897,7 +44013,7 @@ oPQ oPQ xCn xCn -xCn +dcM oPQ deg sDM @@ -33905,7 +44021,7 @@ iCy iCy dlv lxe -uQa +tDo vYW vYW uQa @@ -33924,29 +44040,11 @@ ebr ebr vYW ckM -crY +vYW +neq +vYW vYW vYW -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -33959,6 +44057,24 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +nFK +jQa +jQa +jQa +jQa +jQa +jYZ +jQa +jQa +jQa +jQa +geo pGs pGs pGs @@ -33996,59 +44112,59 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs huF -lhb -hwz -tQT -tQT -rMM +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +fOG +lMB +lMB +vMq wjB -pHn +olP eBL eBL eBL eBL mzT -stC -ykc +fcg +uXZ foF oJB -wgT -cNk -oke +wnw +bWq +hHK oke wGl dpZ -aNz +sou myo sGY sGY sGY sGY sGY -uQK oLM -pkG -qMY -mCZ +lSg +lSg +vLt +bnm qul -nHD xCn xCn xCn xCn +qHc xCn oPQ oPQ @@ -34057,17 +44173,17 @@ oPQ oPQ xCn xCn -xCn +qHc xCn oPQ oPQ xCn xCn -oPQ +qHc oPQ oPQ xbc -oPQ +efw efw bRS efw @@ -34078,16 +44194,16 @@ oPQ oPQ xCn oVt -xCn +yfT oPQ oPQ doW sDM -iCy +pnn mpn dlv doW -uQa +tDo uQa vYW uQa @@ -34108,26 +44224,10 @@ vYW vYW vYW vYW -hto -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW +vYW pGs pGs pGs @@ -34140,6 +44240,22 @@ pGs pGs pGs pGs +geo +geo +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -34177,35 +44293,35 @@ pGs pGs pGs pGs -huF -huF -huF -huF -huF -huF -huF -huF -huF -huF -huF -huF -huF -huF -lhb -ihF -tQT -tQT -ssh -lMB -oLM -vjv -aPw +knN +cWu +cWu +cWu +cWu +cWu +cWu +cWu +cWu +cWu +cWu +leG +cWu +cWu +cUF +oVp +wqc +jts +arC +wjB +uXZ +cHS +wvK wvK eBL mzT -stC +xIA ykc -foF +iZx oJB sfs sGY @@ -34213,21 +44329,21 @@ sGY sGY sGY pxg -aNz +syl nYL oke -uwu +oRx hsF -uwu +rLW fjK -uQK keN -efw -qMY -mCZ +lSg +lSg +vLt +lSg qul qul -nHD +xCn xCn xCn xCn @@ -34239,7 +44355,7 @@ xCn oVt xCn xCn -xCn +qHc xCn xCn xCn @@ -34249,11 +44365,11 @@ xCn xCn xCn oPQ -oPQ +efw kXQ qMY kXQ -nOw +efw oPQ oPQ oPQ @@ -34268,8 +44384,8 @@ sDM wAx iCy dlv -lxe -uQa +rNm +tDo uQa xqy vYW @@ -34277,37 +44393,25 @@ vYW uQa uQa uQa -uQa -uQa +mdL +mdL uQa uQa alL hto -hto vYW vYW vYW +neq vYW vYW vYW vYW vYW vYW -crY -crY -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +neq +gEP pGs pGs pGs @@ -34320,6 +44424,18 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -34359,6 +44475,7 @@ pGs pGs pGs pGs +lPj huF huF huF @@ -34369,59 +44486,58 @@ huF huF huF huF +luz huF huF huF -huF -lhb -ihF -lMB -lMB +cne +dQK +wBY lMB -plg -ykc +wjB ykc ykc +uXZ ykc oLM -cNZ +vDI ykc ykc suC oJB cPI -gTr -cNk -mWi -fWi +bMG +fXX +kDO +nPK xuN -aNz +wJu uGf sGY sGY sGY sGY sGY -uQK -ykc -efw -qMY +uXZ +lSg +lSg +vLt nfX tng qul qul -dxK -dxK -xCn -xCn +uHY +uHY xCn xCn xCn xCn xCn xCn +qHc xCn xCn +mJe xCn xCn xCn @@ -34429,13 +44545,13 @@ ljt hhM hhM ljt -ljt -hhM +oPQ hhM kXQ +kXQ qMY kXQ -yks +efw uHY uHY xCn @@ -34443,15 +44559,15 @@ xCn uHY xCn xCn -uHY -uHY -fay -sDM -iCy +qYg +xCn +bCi +jwy +jvF iCy dlv -fay -hto +fHg +oAE vYW vYW vYW @@ -34459,17 +44575,17 @@ vYW vYW uQa uQa -uQa -uQa +mdL +mdL uQa uQa alL vYW +cmr vYW vYW vYW -vYW -vYW +neq vYW vYW vYW @@ -34491,17 +44607,17 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo +jQa +jQa +jQa pGs pGs pGs @@ -34539,58 +44655,58 @@ pGs pGs pGs pGs -pGs -pGs huF huF -idI -ylc -ylc -ylc -ylc -ylc -ylc -ylc -ylc -pop -ylc -ylc -tbN -oVp -wqc -jts +lPj +huF +huF +huF +huF +huF +huF +ebJ +ebJ +ebJ +ebJ +uOk +huF +rpu +huF +oTX +lMB +vUZ lMB wjB -mIL +eVn isK nma vxM -tjS +cdO pSK sfM odZ mYW -oJB +gso sfs sGY sGY sGY sGY -crK +uQK ykc -yaK -uwu +iZx +xVC wGl oke fgS wGl -uQK ykc -efw -qMY +fuF +lSg +bpH rdq -efw -efw +lSg +bAj qul qul qul @@ -34598,12 +44714,12 @@ qul qul qul uHY -uHY -uHY xCn xCn xCn xCn +qHc +xCn uHY qul qul @@ -34613,7 +44729,7 @@ qul qul qul qul -qul +mCZ kXQ bRS efw @@ -34623,20 +44739,20 @@ qul qul qul qul -xCn +cYV oVt uHY qul fay -shR +rjZ iCy iCy dlv fay ebr -hto -vYW +luZ vYW +neq vYW vYW uQa @@ -34652,7 +44768,7 @@ uQa vYW vYW vYW -uQa +lMb uQa vYW uQa @@ -34676,14 +44792,14 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +geo pGs pGs pGs @@ -34721,11 +44837,12 @@ pGs pGs pGs pGs -pGs -pGs huF huF -bIi +lPj +huF +huF +huF huF huF huF @@ -34734,11 +44851,10 @@ huF huF huF huF -nUv huF +rpu huF -lhb -hwz +oTX lMB wBY lMB @@ -34753,10 +44869,10 @@ oJB oJB oJB oJB -uvV -cNk +xiV +nRk wGl -oke +hHK oke uQK ykc @@ -34766,12 +44882,12 @@ saC saC saC sDZ -cgB ykc +lSg gKw -qMY +vLt miU -fXR +vBC gHT qul qul @@ -34795,15 +44911,15 @@ qul qul qul qul -qul yks -jBO +qDh +vvh qlj yks qul -eNa -cCO -vGq +kli +bTg +aYg qul qul qul @@ -34818,7 +44934,7 @@ fay ebr ebr hto -hto +vYW rZr vYW uQa @@ -34846,14 +44962,7 @@ vYW vYW vYW ckM -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gEP pGs pGs pGs @@ -34866,6 +44975,13 @@ pGs pGs pGs pGs +jQa +jQa +jQa +nFK +jQa +jQa +geo pGs pGs pGs @@ -34903,26 +45019,26 @@ pGs pGs pGs pGs -pGs -pGs huF huF -bIi +lPj huF huF huF huF -qDa -qDa -qDa -qDa -rjf huF -rpu -lhb -ihF -dQK -vUZ +huF +huF +huF +huF +huF +huF +huF +huF +huF +nPx +arC +lxr lMB wjB sGY @@ -34945,15 +45061,15 @@ ykc ykc ykc ykc +uXZ +uXZ ykc ykc -ykc -ykc -ykc +lSg bFV -qMY -efw -efw +vLt +lSg +lSg gKw qul qul @@ -34977,19 +45093,19 @@ qul qul qul qul -qul yks +vwT qMY kYN yks qul -gKR -tsN -uxF -cCO -cCO -mXZ -auy +gMV +eLZ +rIF +bTg +bTg +rLK +aYg qul fay sDM @@ -35003,8 +45119,8 @@ ebr ebr ebr fRl -oZl -kHJ +hMC +iWE csr uQa uQa @@ -35018,23 +45134,17 @@ vYW vYW vYW vYW -hto +vYW hto ebr -ebr +sQN vYW vYW vYW vYW vYW vYW -hto -pGs -pGs -pGs -pGs -pGs -pGs +neq pGs pGs pGs @@ -35048,6 +45158,12 @@ pGs pGs pGs pGs +jQa +jQa +jQa +qwE +jQa +geo pGs pGs pGs @@ -35067,9 +45183,8 @@ wUU "} (40,1,1) = {" wUU -vGb -cBu -pGs +nvv +mPk pGs pGs pGs @@ -35086,27 +45201,28 @@ pGs pGs pGs pGs -pGs -huF -huF -bIi -huF -huF -huF -huF -huF huF huF -huF -huF -huF -rpu -lhb -ihF -lMB -vUZ +rbp +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +ebJ +mSS +jGT +wqc +jRu lMB -wjB +qRe sGY enU enU @@ -35128,14 +45244,15 @@ gcK xYM gAl swf -gYY +qiv ykc xRF -xRF +rSu pGJ dRX wVI pGJ +lsU pGJ pGJ pGJ @@ -35144,10 +45261,10 @@ pGJ pGJ pGJ pGJ -sdz qul qul qul +pGJ sdz sdz sdz @@ -35157,21 +45274,20 @@ sdz sdz sdz sdz -sdz -qul qul yks +efw qMY kNN yks qul -cXo -mWN -mWN -mWN -mWN -mWN -gNQ +edD +cym +cym +cym +cym +cym +nFp qul fay rex @@ -35184,9 +45300,9 @@ ebr ebr ebr ebr -uQa +xEl rDz -vfS +uMQ uQa uQa uQa @@ -35195,31 +45311,24 @@ vYW vYW vYW vYW -hto vYW -crY +vYW +vYW vYW vYW vYW ebr ebr -qMH -vYW +sQN vYW vYW +uQa +uQa vYW vYW vYW vYW vYW -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -35230,6 +45339,13 @@ pGs pGs pGs pGs +jQa +jQa +qwE +jQa +jQa +jQa +geo pGs pGs pGs @@ -35249,11 +45365,9 @@ wUU "} (41,1,1) = {" wUU -vGb -cBu -cBu -pGs -pGs +nvv +mPk +mPk pGs pGs pGs @@ -35271,7 +45385,7 @@ pGs pGs huF huF -bIi +lPj huF huF huF @@ -35283,10 +45397,12 @@ huF huF huF huF -lhb -hwz -lMB -lxr +huF +huF +huF +oTX +iah +wBY lMB wjB lDN @@ -35305,17 +45421,17 @@ bMk bMk bMk cKZ -fGE +msx xCU tVo tVo nni dZT -ykc -xRF +oLM +fYA fYA fYA -eKt +cYc mGb lgP lzu @@ -35326,12 +45442,12 @@ lzu lgP uOC arg -sdz -sdz -sdz -sdz -sdz -gll +pGJ +pGJ +pGJ +pGJ +pGJ +vWG oRB tzp wtB @@ -35342,9 +45458,9 @@ umO sdz sdz sdz -sdz +iRR wmL -sdz +iRR sdz sdz kGM @@ -35355,41 +45471,41 @@ kGM kGM kGM sdz -fay -tqh -tqR -dOp -cPR -fay +sdz +kGM +aRr +nBH +miy +sdz sdz sdz sdz sdz ebr -qyH -jpD -hto -vYW +tSR +tDo vYW vYW vYW vYW +jAI +uQa vYW hto ebr -hto +sQN +vYW vYW -crY -crY -crY vYW vYW -crY vYW vYW vYW vYW vYW +uQa +uQa +vYW vYW vYW vYW @@ -35404,13 +45520,13 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +geo +jQa +jQa +tAT +qwE +jQa +jQa pGs pGs pGs @@ -35431,11 +45547,9 @@ wUU "} (42,1,1) = {" wUU -vGb -cBu -cBu -pGs -pGs +nvv +mPk +mPk pGs pGs pGs @@ -35453,28 +45567,30 @@ pGs pGs huF huF -neC -qDa -qDa -qDa -qDa -qDa -qDa -qDa -qDa -qDa -qDa -qDa -rNN -jGT -wqc -jRu +lPj +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +huF +cne +lMB +wBY lMB wjB mIL oke mAX -uQK +pBx oke sCJ oke @@ -35487,7 +45603,7 @@ saC saC saC saC -pbk +saC wBN sGY sGY @@ -35508,11 +45624,11 @@ hvO hvO hvO lzu -kwB -kwB -nOA -kwB -uVV +mGb +mGb +mGb +mGb +lgP kwB icM kwB @@ -35527,7 +45643,7 @@ kwB kwB nWg kwB -wfr +sIn fWr wfr vbr @@ -35546,26 +45662,25 @@ fWr nyJ bwz kZg -sdz -cQK -vKa -ebr -ebr +kGM +kSD +mMX +tDo +uQa hto vYW vYW vYW -vYW +uQa hto ebr ebr ebr +sQN vYW -crY -pJF -hWG gHJ vYW +gHJ vYW vYW vYW @@ -35578,21 +45693,22 @@ vYW vYW vYW vYW -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +xZa +geo pGs pGs pGs pGs pGs +geo +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -35613,12 +45729,10 @@ wUU "} (43,1,1) = {" wUU -vGb -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk pGs pGs pGs @@ -35635,7 +45749,10 @@ pGs pGs huF huF -bIi +lPj +huF +huF +huF huF huF huF @@ -35647,17 +45764,16 @@ huF huF huF huF -lhb xpP -iLR +bJv otL -qMo -tEf +nzS +lVa wSX oke oke uQK -gTr +cnv sCJ oke oJB @@ -35675,13 +45791,13 @@ ePb oJB sfs oke -erS +nnt oMs jVl uww tPz hvO -mxz +bpI hvO hvO hvO @@ -35690,11 +45806,11 @@ hvO uDw erE vUE -kuX -kuX -kuX -kuX -kuX +hvO +hvO +hvO +hvO +hvO kuX kuX wJB @@ -35729,53 +45845,53 @@ kuX kuX uOL kGM -xes -wvk -ebr -ebr -hto +hbD +jtx +lhB vYW +uQa vYW +uQa vYW vYW ebr ebr ebr ebr +sQN +vYW +vYW +vYW +vYW vYW vYW -hWG -crY -sQN vYW vYW vYW vYW vYW -crY -crY vYW vYW vYW uQa vYW vYW -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +nFK +jQa +jQa +jQa pGs pGs pGs @@ -35795,12 +45911,10 @@ wUU "} (44,1,1) = {" wUU -vGb -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk pGs pGs pGs @@ -35817,7 +45931,10 @@ pGs pGs huF huF -bIi +lPj +huF +huF +huF huF huF huF @@ -35829,17 +45946,16 @@ huF huF huF huF -lhb -lhb -lhb -uTr -lhb -lhb +huF +huF +mHM +huF +huF uQi uyd -wgM +rwP uQK -gTr +qfb sCJ oke oJB @@ -35847,9 +45963,9 @@ eZk nQo fjM jeO +vTd vrw -vrw -vrw +leT vrw jeO vrw @@ -35857,7 +45973,7 @@ eBG kXP ezd ukz -udX +ukz nOO vFu imd @@ -35872,11 +45988,11 @@ oZw sCk xuB bEj -lVP -ehD -lVP -ehD -lVP +oZw +kzJ +oZw +kzJ +oZw lVP lVP lVP @@ -35911,11 +46027,11 @@ fHs kuX uOL kGM -xes -jAw -ebr -ebr -ebr +hbD +dTS +qyH +vYW +uQa vYW vYW vYW @@ -35923,42 +46039,42 @@ vYW ebr ebr ebr -crY +neq vYW vYW pJF -hWG -gHJ +neq +trQ +vYW +vYW +vYW vYW vYW vYW vYW vYW -crY -qMH -hto vYW uQa uQa vYW vYW -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +vct +rgz +jQa +jQa +jQa +jQa +yhU +jQa +jQa +jQa +jQa pGs pGs pGs @@ -35977,13 +46093,11 @@ wUU "} (45,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk +mPk pGs pGs pGs @@ -35999,7 +46113,7 @@ pGs pGs huF huF -bIi +lPj huF huF huF @@ -36014,7 +46128,9 @@ huF huF huF huF -vmy +huF +huF +kGB huF huF ykc @@ -36030,8 +46146,8 @@ wDG afR oLM uDQ -uDQ -vui +iMa +gsw qZH hUU rrA @@ -36045,7 +46161,7 @@ oMs uww hvO tPz -xQh +nNZ hvO hvO hvO @@ -36054,11 +46170,11 @@ hvO hvO bih hvO -kuX -pCp -kuX -ddY -kuX +hvO +ost +hvO +tPz +hvO kuX kuX kuX @@ -36092,30 +46208,30 @@ kuX sDj kuX uOL -sdz -wug -eTX -ebr +kGM +wkp +tqa ebr vYW vYW vYW vYW +uQa vYW ebr ebr ebr -crY +hWG vYW -crY -crY -nOI vYW +neq +nOI vYW vYW vYW +jAI vYW -crY +neq ebr ebr hto @@ -36124,23 +46240,23 @@ uQa uQa vYW vYW -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +rgz +rgz +rgz +jQa +jQa +jQa +abL +jQa +jQa +jQa +jQa +fjg +fjg +jQa +jQa +jQa pGs pGs pGs @@ -36159,14 +46275,12 @@ wUU "} (46,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk pGs pGs pGs @@ -36181,7 +46295,9 @@ pGs pGs huF huF -bIi +lPj +huF +huF huF huF huF @@ -36196,7 +46312,7 @@ huF huF huF huF -bIi +lPj huF huF ykc @@ -36217,30 +46333,30 @@ wty vzN mZC kXn -wty -wty -cWU -sPm +aFu +jqJ +xqY +muE oLM -srY +fYA fYA fYA dQe lWo -oMs +vAF dQe yeH yeH -yeH +bUK lzu hvO bih lzu -rgb -rgb -auE -lOJ -aRr +yeH +yeH +dxn +lWo +oMs auE rgb rgb @@ -36258,7 +46374,7 @@ rgb wfT vDm vDm -mVF +fPU cnW foU ujp @@ -36281,22 +46397,22 @@ ebr ebr vYW vYW +uQa +uQa vYW vYW +hto +hto vYW vYW -qMH -qMH -vYW vYW -crY vYW fGP vYW vYW +uQa vYW -vYW -qMH +gEP ebr ebr ebr @@ -36306,24 +46422,24 @@ uQa uQa vYW vYW +jQa +rgz +rgz +jQa +jQa +jQa +jQa +jQa +jQa pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -36341,14 +46457,12 @@ wUU "} (47,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk pGs pGs pGs @@ -36363,22 +46477,24 @@ pGs pGs huF huF -xxr +wRR +huF +huF huF huF huF huF huF -qhd -pGs pGs pGs pGs pGs pGs pGs +bZv +iUZ huF -bIi +wgU huF huF ykc @@ -36389,40 +46505,40 @@ saC saC lDN saC -iAx mAm +iAx lMP ykc ubT xwk -wCH +lDN lzP ykc rxe saC -cek -atb -muE +uVe +ykc +uXZ ykc +vYr vnm -bLB -bLB +rIU vnm -jLr -sqb +brX +vUT uJO bLB bLB vnm -pcJ +xWY hvO bih rHv -mKb +cZR nxW nxW -qFc -qnn +rsM +rtr nxW nxW mKb @@ -36435,17 +46551,17 @@ nxW qcN qcN qcN -qcN -qcN -ojJ -jcT -pQp -pQp -pQp +lGp +hYp +uqx +hYp +bIt +bIt pQp +ykw dtj -pQp -pQp +bIt +bIt bIt ykw ykw @@ -36453,59 +46569,59 @@ ykw bIt bIt kGM -ctQ -hWm +sDj +wir kGM sdz ebr ebr -qMH -crY +gEP vYW vYW vYW vYW vYW vYW -crY -qMH +neq vYW +hto vYW -crY -pJF -hWG -pJF vYW vYW -qMH -ebr +gHJ +vYW +gHJ +vYW +vYW +hto ebr ebr ebr +ggX vYW vYW vYW -uQa -vYW +mdL +iOv vYW -hto -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs +jQa +jQa +jQa +jQa +tdp +jQa +jQa pGs pGs pGs @@ -36523,18 +46639,16 @@ wUU "} (48,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu +nvv +mPk +mPk +mPk +mPk +mPk +mPk pGs pGs pGs -aFr -pGs pGs pGs pGs @@ -36545,7 +46659,9 @@ pGs pGs huF huF -xxr +wRR +huF +huF huF huF huF @@ -36553,14 +46669,14 @@ huF huF pGs pGs -qjU +obr lYr +kcn lYr -pGs -aFr -pGs -huF -bIi +qjU +gvo +rlw +eWZ huF huF ykc @@ -36572,28 +46688,28 @@ sGY lDN ykc ykc +uXZ +uXZ ykc ykc +uXZ +oqh +uXZ ykc -ykc -ykc -ykc -ykc -ykc -ykc +uXZ jpm +uXZ ykc -ykc -ykc -ykc +hyr +npi +hyr vnm -vPY -efd +bPG vQz -brX -oXf +hMG +jZE vQz -uCe +iDM vPY bLB xWY @@ -36616,18 +46732,18 @@ tJT xLN qcN rsh -wWn -uOz +lJo qcN +lUe aQc -nyH -pQp +bft +ykw ani irw xpw hJO syM -pQp +ykw nPG egJ teu @@ -36641,53 +46757,53 @@ iNh nTG ebr ebr -qMH -crY -crY +neq vYW vYW vYW vYW +neq +neq +vYW +vYW vYW vYW vYW vYW -crY vYW -hWG cYC -hWG vYW vYW -qMH -ebr -ebr +vYW +hto ebr ebr +hto vYW vYW vYW +vYW +mdL +mdL uQa -uQa -alL -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa pGs +geo +geo pGs pGs pGs pGs pGs +jQa +jQa +jQa +nFK +fjg +jQa pGs pGs pGs @@ -36705,16 +46821,14 @@ wUU "} (49,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk pGs pGs pGs @@ -36727,7 +46841,9 @@ pGs pGs huF huF -xxr +wRR +huF +huF huF huF huF @@ -36735,14 +46851,14 @@ huF huF pGs pGs +iUZ +vJg lYr lYr +fwo lYr -pGs -pGs -pGs -huF -bIi +sQR +eWZ huF huF huF @@ -36752,30 +46868,30 @@ lDN tjS tjS lDN -ykc +uXZ rtP aqk -aXm -hyr -hyr -hyr -hyr -hyr -hyr -hyr -hyr +okf +wwq +qtr +wxf hyr +cTV +vyI +jEZ hyr -aXm +cTV +aAY +vyI +wPE hyr vnm -erC -kHE -oXf +oiB +rVi brX oXf -oXf -hfR +jZE +lkz bio bLB xWY @@ -36785,32 +46901,32 @@ lzu nxW fZI maN -jbj -maN +rsM +cbI maN maN maN maN maN aTh -nSP +qcN vhb kFT qcN -xzC -wnK -llE +cDr +aLl qcN +qqA aQc hwa -pQp +bIt ecb haT cQr qiP mwH -pQp -pOf +bIt +uCc vgA pOC qWC @@ -36824,42 +46940,37 @@ nTG jpD ebr ebr -qMH -crY +neq vYW vYW vYW vYW vYW vYW +neq vYW vYW -crY vYW -pJF -hWG +vYW +gHJ +vYW pJF vYW vYW vYW vYW -alL -alL -hto +uQa +uQa +vYW vYW vYW uQa uQa uQa -alL -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +uQa +jQa +jQa +jQa pGs pGs pGs @@ -36870,6 +46981,11 @@ pGs pGs pGs pGs +jQa +fjg +jQa +fjg +jQa pGs pGs pGs @@ -36887,44 +47003,44 @@ wUU "} (50,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk pGs pGs pGs -aFr pGs pGs pGs pGs huF huF -xxr +wRR huF huF huF huF huF -qpg +huF +huF +oWg cak -lYr +fwo lYr lYr qyT -pGs -pGs -huF -bIi +sJm +lYr +tia +ten huF huF huF @@ -36934,25 +47050,25 @@ stV sAR enU uQK -keN +oBs hyr hyr hyr +aXt hyr -leU -leU -ukX -ukX -cZZ hyr -cTV -jEZ hyr +omj +weG hyr hyr -vnm -apl -mDl +hyr +hyr +aXt +hyr +hyr +aGx +hfR gqE mUy uUl @@ -36964,10 +47080,10 @@ ePB hvO mrd ciH -jMM +kyh lAk nMe -oaG +ckF nMe nMe aaA @@ -36975,26 +47091,26 @@ wsZ wsZ csb nMe -puK +ejZ wVa wpr -qcN +nxW qir -cFV -rbq -qcN +haC +nxW +qqA aQc qqA -pQp +bIt tsX wkC fAO haT gBp -pQp +bIt gze qWC -qWC +eOv rJq dbg ykw @@ -37004,24 +47120,24 @@ tEJ cNu kyL jpD -ebr -ebr -ebr -crY -crY -crY -vYW +oAE +oAE +oAE vYW vYW vYW -crY -vYW vYW vYW +neq +neq +neq +neq +neq vYW vYW vYW vYW +neq vYW vYW vYW @@ -37031,17 +47147,12 @@ vYW vYW vYW uQa -uQa +lMb vYW vYW -hto -pGs -pGs -pGs -pGs -pGs -pGs +gxQ pGs +geo pGs pGs pGs @@ -37052,6 +47163,11 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -37069,21 +47185,19 @@ wUU "} (51,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +sNx pGs pGs huF @@ -37091,21 +47205,23 @@ huF huF huF huF -xxr +wRR huF pGs pGs huF huF -aWz +huF +huF +nJn oMa lYr +xgY +fwo lYr lYr -lYr -xgY -pGs -huF +gBW +phw huF huF huF @@ -37116,29 +47232,29 @@ wcl enU enU uQK -oLM +uXZ hyr ohM -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa hyr +weG +leU +pIe hyr -vnm -cSq +hyr +weG +hyr +omj +hyr +pIe +weG +fzx +hyr +bLB wcE oXf dbu xxI -xxI +woJ iXX cSq bLB @@ -37146,7 +47262,7 @@ xWY hvO anu lnG -bXH +cAX vsP cAX kDF @@ -37156,28 +47272,28 @@ maN maN maN maN -aRH +maN qcN seY gjw -qcN +nxW ygT -nRT -ffQ -qcN +wRu +nxW +qqA aQc qqA -pQp +ykw pqH sDo cXQ haT -iUO -pQp +wLR +ykw nBj -qWC -aqf -fUn +qDR +iRw +pjH nqN ykw pRP @@ -37186,30 +47302,30 @@ tEJ cNu upO gUP -cQK -ktE -ebr -crY -crY -crY -vYW +clG +mMX +oAE +uQa +uQa vYW vYW +vdQ vYW -crY vYW vYW vYW -hto vYW vYW +hto vYW +neq +neq vYW vYW vYW uQa uQa -vYW +cmr vYW vYW uQa @@ -37229,12 +47345,12 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -37251,44 +47367,44 @@ wUU "} (52,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +sNx +sNx huF huF huF huF huF -iqq +vEU huF pGs pGs huF huF -lYr +huF +huF +kFV vmw eaC -lYr +fwo oCR hAg -pGs -pGs -pGs -pGs +lYr +bVS +lYr +fwo huF huF huF @@ -37298,24 +47414,24 @@ hic enU enU sDf -ykc -hyr -hyr -cKa -iQS -dNJ -cRZ -iQS -iQS -hkc -jzQ -usp -ofs -cKa -hyr +oLM +omj +jMq +lEV +ygn +alD +aSU +ghI +lEV +ygn +alD +aSU +ghI +lEV +ygn +alD hyr -vnm -cSq +bLB mDl gqE mUy @@ -37340,48 +47456,48 @@ sdS gBi xkj nxW -syK +dmP wwk qcN wNV -nRT -sEG +wRu qcN +vMU aQc qqA -pQp +ykw udg haT hwN haT -wZs +dGh pQp lXc vgA bRg fXa pYv -izp +epY rMN sJZ tEJ cNu qNP gUP -xes -oSb -ebr -qMH -crY +bPe +dTS +oAE +nHC +vYW +vYW vYW vYW vYW vYW -crY vYW vYW ebr -hto +sQN vYW vYW vYW @@ -37389,8 +47505,8 @@ vYW vYW vYW vYW -alL -alL +uQa +uQa vYW vYW vYW @@ -37411,13 +47527,13 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +gxQ pGs pGs pGs @@ -37433,44 +47549,44 @@ wUU "} (53,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL +kkF huF huF -huF -qhd pGs -xRR +bJI +ahb wdy -xRR +vQK pGs pGs huF huF -lYr +huF +huF +fwo sJm lYr lYr -lYr +wKW lYr rGA hAg -pGs -qhd +lYr +xgY huF huF huF @@ -37480,31 +47596,31 @@ mIL enU nOj uQK -ykc -hyr -hyr -cKa -iQS -iQS -iQS -hza -iQS -iQS -iQS -iQS -iQS -cKa -hyr -hyr -vnm -cSq -hfR +uXZ +lhn +pNa +liM +ygn +uWW +weG +fys +liM +ygn +uWW +bQa +fys +liM +ygn +uWW +vyy +bLB +joN jZE mfa -oXf -poh +dhQ +krM uEE -cSq +xWU bLB xWY tam @@ -37520,24 +47636,24 @@ eLE paB bkG fiB -xfb +gfr nxW tGr cBW dOk mau -wLN -rxq -qcN +dnW +kTG +qqA aQc qqA -pQp +ykw tnA -haT +woj uyK lkI vZS -hQn +iiX vZS jqu qVL @@ -37548,29 +47664,29 @@ uEI jPC jjg cNu -nTG -jpD -xes -sYS -ebr +rMN +gUP +hbD +dTS +tDo ebr -crY +vYW ckM -crY -crY -crY vYW vYW +vYW +vYW +neq hto ebr ebr +sQN vYW +neq vYW -crY +neq vYW vYW -crY -crY ebr ebr hto @@ -37595,12 +47711,12 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +yhU +fjg +jQa +jQa +jQa pGs pGs pGs @@ -37615,44 +47731,44 @@ wUU "} (54,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg -huF -srr +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL +kkF +tOx huF pGs dfs -lYr +fwo eVW lYr -vpB +arF pGs huF -loQ -wMw -wMw -wMw -wMw +huF +huF +xKS +qFC +qFC +qFC +kIJ cRx lYr -lYr -lYr +pdn +fwo rCf -pGs +lYr huF huF huF @@ -37663,27 +47779,27 @@ saC saC lDN ykc -uOb -hyr -cIV -xMI -fZo -iQS -xPR -iQS -iQS -iQS -dPV -iQS -cIV -hyr +ldr +jMq +lGT +ygn +uEF +aSU +ghI +lGT +ygn +uEF +aSU +ghI +lGT +ygn +uEF hyr vnm -cSq hfR -oXf -jZE -oXf +ePz +pRb +ceJ oXf uEE cSq @@ -37699,7 +47815,7 @@ lKV sdS gjy jgQ -jgQ +gQa wnK jgQ wnK @@ -37708,38 +47824,39 @@ nRW fYQ nSP fJR -nRT -trv +wRu qcN -cEW +emC +aQc qqA -pQp +bIt uMx haT teu haT coc -pQp -tcM +bIt +nRP kvG +guz thn -thn -gtj -sIg +vCE +jCA iMM oIq tvv cNu -nTG -jpD -wug -axZ +rMN +gUP +wkp +tqa ebr ebr -crY -crY -vYW -vYW +oAE +oAE +oAE +neq +neq vYW vYW vYW @@ -37747,28 +47864,21 @@ vYW vYW vYW vYW +neq vYW vYW vYW -crY -crY -crY +ggX ebr ebr ebr -crY +ggX vYW vYW uQa vYW vYW -vYW -pGs -pGs -pGs -pGs -pGs -pGs +uQa pGs pGs pGs @@ -37783,6 +47893,12 @@ pGs pGs pGs pGs +jQa +jQa +jQa +tdp +jQa +jQa pGs pGs pGs @@ -37797,75 +47913,75 @@ wUU "} (55,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg -huF -srr +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL +kkF +tOx huF pGs ipZ lYr iSz -lYr +fwo rIG pGs -qFS -uND -wMw +huF +huF +dEJ wMw wMw +aHy wMw -hAg +mrC +lYr rjo gPG lYr -sgK +gLV avI -xfo huF huF huF -lAu -bkU -bkU -bkU -bkU -amu +huF +wFP +lFl +lFl +lFl +lFl +uQi hyr hyr -cIV -iQS -iQS -iQS -fZo -iQS -iQS -hza -iQS -iQS -cIV +hyr +weG +hyr +hyr +pIe +hyr +weG omj +hyr +hyr +hyr +weG omj -ghJ -cSq +hyr +aGx hfR fyP cwQ -mXc +kzE fyP uEE eul @@ -37881,27 +47997,27 @@ wFX gBi mKD iWf -qUQ -vUi -qUQ +rzU +hLE +fJw aEi nxW spd lBf -qcN +nxW nkd -nRT -trv -qcN -qQM +wRu +nxW qqA -pQp +aQc +qqA +ykw ibP haT teu haT dZZ -pQp +ykw cIB waB nTS @@ -37918,27 +48034,27 @@ gTC gTC kyG kyG +fuS kyG -kyG -crY -crY +oAE +vYW vYW -crY -crY -crY vYW +neq vYW vYW vYW vYW -qMH -crY -crY +vYW +vYW +hto +vYW +vYW ebr ebr ebr ebr -crY +vYW vYW vYW vYW @@ -37958,13 +48074,13 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -37979,71 +48095,71 @@ wUU "} (56,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL +kkF +tOx huF -srr huF -huF -aFo +tlE lYr iSz lYr lYr -uXo -xRR -bHT +hCw pbp +loQ +pDF wMw wMw +qNE wMw +mrC rCf nDk -kFV lYr +nJd rIG -sgK -xfo -xfo -xfo -xfo -amu -bZU -bZU -bZU -axX -amu +tVf +huF +huF +huF +huF +uQi +uaY +uaY +uaY +uaY +uQi aqw hyr -cKa -giU -hza -iQS -xPR -iQS -dPV -iQS -iQS -iQS -cKa +pIe +weG +xAs +omj +pJf +djC +weG +fzx hyr hyr +pIe +weG +klY +xEc vnm -cSq uCe lEY ksf @@ -38058,34 +48174,34 @@ bih rHv nxW qDv -maN +kpS wFX sdS -uNy +ocQ wnK -qUQ -woI +eTi +gVQ qUQ hMh nxW hyd -naW -qcN +gjw +nxW exH -nRT -rFa -qcN +wRu +nxW +hQo aQc qqA -pQp -acq +bIt +aVF haT teu haT -epr -pQp +jIo +bIt cgb -waB +rRm wph qWC pcK @@ -38094,26 +48210,26 @@ pRX uXw sIU cNu -kyG +gTC tIT fUZ fhM sTA ukw rTT -kyG -crY -crY -crY -crY -crY -crY -crY -crY -crY -crY -crY -qMH +fuS +oAE +vYW +vYW +vYW +vYW +vYW +neq +neq +vYW +vYW +vYW +hto ebr ebr ebr @@ -38121,20 +48237,13 @@ ebr ebr ebr ebr -crY vYW vYW vYW vYW -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW pGs pGs pGs @@ -38147,6 +48256,13 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -38161,78 +48277,78 @@ wUU "} (57,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -nsa -ccf -huF -kiL -izU -lIZ +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +lUG +rqG +kkF +sUj +vJk +lXT oDX wcq mLB -itT -lYr -lYr -lYr -eyh +aTg +ixq +dNh pbp wMw wMw wMw wMw -vUQ -wMw -wMw wMw +dob wMw -xfo -lSd +fhu +lIE +qFC +pMG +pMG +qFC +kME +paq gSY xBS -rqe +qqJ waP waP waP waP -amu +aMC hyr +cNb +fkF +weG +qkF +leU +wEn +xKo +weG +pJp +iJa +leU hyr -cKa -vqV -kAl -iQS -ymf -hcT -iIr -hEE -wBx -xSM -cKa +weG hyr -iEx -epQ -epQ -epQ +omj epQ +sKC epQ epQ epQ +sKC uvw -uiv +epQ epQ ntw hvO @@ -38242,58 +48358,58 @@ qcN uUW maN wFX -xkj +dLN oPr rLC aoo -woI -qUQ +fyH +iNU xFZ shb eSg fMq iop -nss -kxg -sux -iLa +lDS +yfh +vgu +kIK rLU qqA -pQp -xXg -haT -bZD -xrR -opY -pQp -uCc -waB -qWC -bug -gdm +ykw +xXe +oVn +jYX +iFK +wsa +bIt +eeg +pQF +jcz +jcz +mkn ykw pRX uXw sIU cNu -kyG +gTC tIT rqx aae qHF wOL -hvj -kyG -ebr -crY -crY -crY -crY -crY -crY -crY -crY -crY +wTJ +fuS +oAE +vYW +vYW +vYW +vYW +vYW +vYW +vYW +vYW +vYW ebr ebr ebr @@ -38303,21 +48419,13 @@ ebr ebr ebr ebr -qMH +hto hto vYW -crY -crY -crY -crY -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW +vYW pGs pGs pGs @@ -38330,6 +48438,14 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +gxQ pGs pGs pGs @@ -38343,34 +48459,30 @@ wUU "} (58,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL xfo xfo ydy xfo xfo -aFo -lYr -lYr -lYr +tlE +fwo itT lYr -khI -cPT +hkQ +bVQ pbp wMw wMw @@ -38381,49 +48493,53 @@ wMw wMw wMw wMw -nQA wMw +bnf +vMe +wMw +vLV wMw wMw -lSD wMw +xJb wMw wMw wMw -lSD -xsF -xsF -amu -amu -amu -xsF -amu -amu -amu -amu -amu -amu -amu +mcr +ccp +qpK +qAp +aMC +ptC +qAp +qAp +bgE +bgE +erK +qAp +bgE hyr +qtr +weG +gnm hyr -epQ -dUh +sKC dUh dUh vnN dUh -gZN +oUp cTg iSO -epQ +sKC xWY hvO bih euM qcN qcN -naW -nIw +maN +sTW qcN nxW nxW @@ -38436,71 +48552,63 @@ cTr tjF qcN jNS -vsJ -dwu +xCJ qcN -pMC +lUe +aQc qqA -pQp -xXe -oVn -jYX -iFK -wsa -pQp -eeg -lJu -jcz -jcz -mkn +bIt +ykw +cHl +bIt +ykw +ykw +bIt +ykw +bIt +cHl +ykw +bIt bIt sjD uXw sIU cNu kyG -gpd +qym rJI bRi mBG pRl -dqy +tuV kyG ebr -ebr -crY -crY -crY -crY -crY -crY -qMH +vYW +vYW +vYW +vYW +vYW +vYW +jAI +hto ebr ebr ksX ksX -mPT -mPT -mPT +wff +dEo +rqa ksX ebr ebr ebr ebr hto -crY -crY -crY -crY -qMH -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW +vYW +hto pGs pGs pGs @@ -38512,6 +48620,14 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +fjg +jQa pGs pGs pGs @@ -38525,33 +48641,29 @@ wUU "} (59,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL aQq eCj -gWA +pxa uKr ahg -aFo -lYr +wIg asx asx nKd -lYr -hOe +nDL new wMw wMw @@ -38563,40 +48675,44 @@ wMw wMw wMw wMw -kME wMw wMw wMw -kME wMw wMw wMw wMw -kME wMw wMw wMw wMw +wMw +wMw +kME +wMw +mpH hcz wMw -aCM +ojm huy -amu -twZ -qgP -kjt -amu +qAp +qVO +cOj +cfs +qAp hyr -omj -bRp -eYG +hyr +weG +hyr +hyr +sAY eYG ghr eYG eYG eYG cTg -gUb +vfH epQ xWY hvO @@ -38617,25 +48733,25 @@ tjF woI qUQ qcN +nxW +nxW qcN -qcN -qcN -qcN +qqA aQc qqA -pQp -pQp -nGs -pQp -pQp -pQp -pQp -bIt -bIt -nGs -bIt -bIt -bIt +qqA +qqA +qqA +qqA +qqA +qqA +mPl +qqA +qqA +qqA +qqA +gSC +jcT bMV uXw sIU @@ -38650,39 +48766,31 @@ nVn kyG ebr ebr -qMH -qMH -ebr +rpw +rpw +oAE +rpw +oAE ebr -crY ebr ebr -ebr -ksX ksX -cto -gLo +rmr cto cto -ksX +uKZ +xxk +ghs ksX ebr ebr ebr ebr -crY -crY -crY -crY -qMH -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +vYW +vYW +vYW +vYW +hto pGs pGs pGs @@ -38694,6 +48802,14 @@ pGs pGs pGs pGs +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -38707,33 +48823,29 @@ wUU "} (60,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL aQq boI -qaE +clA miR -ahg -aFo -lYr +nqQ +tlE asx asx jjZ -lYr -hOe +nDL wMw wMw wMw @@ -38758,28 +48870,32 @@ wMw wMw wMw wMw +sIQ wMw wMw +mpH wMw wMw wMw -uFI -asx -asx -pcg -amu -hyr +qzi +jTL +jTL +uGs +bgE +omj +cTV +weG +jEZ hyr -epQ -hSx +sKC hPF -pkR +uOo pqO pqO xnV wEL -noO -epQ +ewS +sKC xWY hvO bih @@ -38798,7 +48914,7 @@ yaf wVD myj qUQ -qcN +nxW cbe stv hwa @@ -38816,26 +48932,26 @@ kmu mtU qqA qqA -gSC -jcT +qqA +hoP pRX lbK sOj cug -gbl +sGb xlv xZD iJD gfp -iBH +ffY gvR -aFt -ksX -ksX +kyG ksX ksX +tdN +tdN +tdN ksX -jpD ebr ebr ebr @@ -38843,20 +48959,20 @@ ebr ksX cto cto -ksX -ksX +gLo cto +cLX cto ksX ebr ebr ebr ebr -crY -crY -crY -crY -crY +vYW +vYW +vYW +vYW +vYW hto pGs pGs @@ -38870,12 +48986,12 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +fjg +jQa +jQa +jQa pGs pGs pGs @@ -38889,87 +49005,87 @@ wUU "} (61,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -czg +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL aQq vLw qaE -dEl +qdL ahg -aFo -kSJ +tlE asx asx cQu -lYr -hOe +lqF wMw wMw wMw -iyd -qFC -qFC -qFC -qFC -qFC -leP -qFC -qFC -qFC -vfG -qFC -qFC -qFC -qFC -qFC -qFC -qFC -qFC -qFC -qFC -qFC -qFC -kIJ wMw wMw -ryE -asx -asx -asx -aZt +wMw +wMw +xcE +wMw +wMw +wMw +wMw +wMw +xcE +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +nFB +wMw +sIQ +wMw +wMw +wMw +wMw +oJm +hyr +hyr +hyr +uAt +lhn +weG +weG hyr hyr epQ -dcx -kAQ +wVA mRL -kAQ -kAQ +iQl +fyZ dgq cTg tQn epQ -xWY +gnx hvO bih rHv nxW sbX eIV -eIV +sDQ eIV pVh vsJ @@ -38980,7 +49096,7 @@ lWh vSh aMp igU -qcN +nxW vMU qqA qqA @@ -38993,13 +49109,13 @@ kIK jxi pti kIK +fqs kIK kIK kIK kIK kIK -kIK -mlT +kqe uEI obm tEJ @@ -39009,32 +49125,32 @@ nBl wKi bRi mBG -iBH +ffY xZN -aFt -cto +kyG +ghs cto cto tVX -mPT +swv ksX ksX ksX ksX ksX ksX -cto +kcE cto ksX -ksX +cDc cto cto ksX cty cty cty -hQq -hQq +mCF +mCF mCF mCF mCF @@ -39052,12 +49168,12 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +fjg +yhU +jQa +jQa +jQa pGs pGs pGs @@ -39071,97 +49187,97 @@ wUU "} (62,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -rGe -bOZ -nQA +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +vlm +fjv +wBp +gpJ +xfo bGC qzq ahg nQA -aFo -lYr +tlE eRM tCG aEf -lYr -hOe +nDL wMw wMw wMw -pbp -wCc -ygZ -efU -bNN -cYr -ygZ -efU -onr -ahK -ssv -efU -cgA -ahK -ygZ -efU -onr -ahK -uFE -efU -onr -ahK -wCc -mrC +aHy wMw wMw -amu -asx -asx -pTZ -amu +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +qAp hyr +eaQ hyr -epQ -kJu +qAp +hyr +okf +weG +qtr +hyr +sKC xMs -kJu +qvv rXf lPq oUp cTg nVy -uiv +sKC xWY hvO bih rHv +lGp qcN -qcN -qcN +nxW qcN nSP pvk qcN -qcN +nxW rcq +nxW qcN qcN -qcN -qcN -qcN +nxW +nxW qcN vMU qqA @@ -39172,17 +49288,17 @@ oeF aQc qqA xgG +qvo xgG xgG xgG +qvo xgG xgG +qvo xgG xgG -xgG -xgG -xgG -vUM +rGl sJZ tEJ cNu @@ -39191,9 +49307,9 @@ uzb wKi bRi mBG -iBH +ffY fYH -aFt +gTC fhh cto qMr @@ -39205,11 +49321,11 @@ cto lOc cto lOc -kcE -cto +kkw cto cto cto +pyz cto ksX cty @@ -39225,14 +49341,8 @@ mCF mCF mCF mCF +mCF hoC -hoC -pGs -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -39240,6 +49350,12 @@ pGs pGs pGs pGs +jQa +fjg +jQa +jQa +jQa +jQa pGs pGs pGs @@ -39253,71 +49369,71 @@ wUU "} (63,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -rGe -rGe -ijy -ijy -mzr -aHy -wMw -wMw +nvv +mPk +mPk +mPk +mPk +imk +mPk +mPk +wBp +fjv +qwQ +uYJ +bah +uZK +kME wMw +kME tzP -aFo -lYr +psd asx asx nKd -lYr -hOe +nDL wMw wMw wMw -pbp -sHV -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -rtm -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -xsH -mrC wMw -mcr -amu -nAQ -nAQ -nAQ -amu +wMw +wMw +wMw +wMw +wMw +xcE +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +xcE +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +sTT +bgE +jTL +jTL +lpJ +bgE +ldr hyr +weG hyr -epQ -iTd +hyr +sKC iTd iTd dCz @@ -39340,10 +49456,10 @@ mrP sWp kDH bzq -sdS -rwS +aZq qcN qBn +qqA eBf kIK kIK @@ -39356,26 +49472,26 @@ qqA xgG azK xPj -okm -xgG +ctw +qvo gvF pLV bLI -iMi +lrp pBK -xgG +qvo vUM sJZ tEJ cNu -kyG +gTC qPG mCx aLc mBG iSi tTN -aFt +gTC kQb mUP mUP @@ -39384,12 +49500,12 @@ mUP mUP gja mUP -gja +ior mUP gja mUP mUP -bpM +mUP mUP mUP qWw @@ -39402,7 +49518,7 @@ mCF mCF mCF mCF -mCF +vOo mCF mCF xGV @@ -39416,12 +49532,12 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa +jQa +gxQ pGs pGs pGs @@ -39435,73 +49551,73 @@ wUU "} (64,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -ijy -ijy -ijy -mzr +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +wBp +qwQ +uYJ +lTR +kap wMw wMw wMw mrC -klB +hzK eat -lYr asx asx jjZ -lYr -hOe +lqF +wMw +iyd +qFC +qFC +qFC +qFC +qFC +qFC +leP +qFC +qFC +qFC +vfG +qFC +qFC +qFC +qFC +qFC +qFC +qFC +qFC +qFC +qFC +qFC +qFC +kIJ wMw wMw wMw -pbp -irk -bZU -bZU -rtm -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -qOh -rtm -bZU -bQx -bwP -mrC wMw wMw -amu -arG -iue -wLf -amu +qAp +nwi +igQ +kCb +qAp +pJp +omj +weG hyr hyr epQ cpA cpA -cpA tpB eYG aQG @@ -39512,7 +49628,7 @@ ePB hvO bih rHv -qcN +nxW bFj dQT eJI @@ -39520,18 +49636,18 @@ hZo nJc wQd sWp -sdS -vSP -sdS +gEz +maN bzq -qcN -vMU +nxW +kmu +qqA aQc qqA qqA qqA iat -hDV +qqA clX vtP fqs @@ -39557,25 +49673,25 @@ wdx ses nFg nFg -mzt +aBO vAI cto fuj cto ghs -ksX -ksX -ksX -ksX -ksX -ksX +cto +nuv +cto +nuv +cto +nuv aCH ghs -ksX -ksX -cDc +swk +cto +cto etv -ksX +tdN hoC aOg aOg @@ -39583,10 +49699,10 @@ aOg mCF hoC mCF -mCF -hoC hoC mCF +mCF +mCF aOg aOg hiE @@ -39598,10 +49714,10 @@ pGs pGs pGs pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa pGs pGs pGs @@ -39617,71 +49733,71 @@ wUU "} (65,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -ijy -ijy -liD -ijy -mzr +nvv +mPk +mPk +mPk +mPk +mPk +rYC +fjv +uYJ +qwQ +pAX +lTR +kap wMw wMw wMw mrC -vuj -wTq -ies +qhQ +jhM asx asx cQu -lYr -hOe -wMw -wMw +nDL wMw pbp -cYZ -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -qOh -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -bZU -miF +wCc +ygZ +ygZ +efU +bNN +cYr +ygZ +efU +onr +ahK +ssv +efU +cgA +ahK +ygZ +efU +onr +ahK +uFE +efU +onr +ahK +wCc mrC wMw wMw -lSD -amu -amu -gXK -amu +wMw +wMw +wMw +weJ +qAp +coz +qAp +bgE hyr hyr -epQ -kJu +weG +hyr +leU +sKC pMe cOK rmZ @@ -39689,12 +49805,12 @@ eYG fAq ghr biz -epQ +sKC xWY hvO bih rHv -qcN +nxW ivg sdS tYg @@ -39702,32 +49818,32 @@ sdS xTH wQd sWp -sdS -dIT -sdS -mxn +dBB +maN +uMN qcN +oHo qqA aQc xgG xgG +qvo xgG +qvo xgG +qvo xgG xgG -xgG -xgG -xgG -wbk +xUq bNC ugW -xgG -xTh +qvo +hxa kLd kLd gPZ jlt -xgG +qvo hTZ sJZ tEJ @@ -39739,24 +49855,24 @@ uzr pOz qpZ qpZ -aFt +kyG rjH cto vTe wXC ghs ksX -cty -cty -cty -cty ksX ksX ksX ksX ksX -eIt -etv +ksX +ksX +ksX +mSu +iaM +hbi ksX mCF aOg @@ -39780,9 +49896,9 @@ hoC pGs pGs pGs -pGs -pGs -pGs +jQa +jQa +jQa pGs pGs pGs @@ -39799,38 +49915,32 @@ wUU "} (66,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -ijy -ijy -ijy -ijy -ijy -mzr +nvv +mPk +mPk +mPk +mPk +wBp +wBp +qwQ +qwQ +qwQ +lTR +qwQ +kap wMw wMw wMw wMw tzP -xmi -sFH -sFH -sFH -sFH -sFH -cGH -wMw -wMw +jhu +fFH +lNL +fFH +wPv wMw pbp -fXH +sHV bZU bZU bZU @@ -39842,6 +49952,7 @@ bZU bZU bZU bZU +rtm bZU bZU bZU @@ -39851,22 +49962,27 @@ bZU bZU bZU bZU -evX +xsH mrC wMw wMw wMw -oJY -amu -rak -amu +wMw +wMw +paq +rkA +wMw +mcr +aMC +aCY hyr +weG hyr +qkF epQ -iGu -frp +lRy dfJ -wlx +vDl qSJ vcj leF @@ -39881,15 +49997,15 @@ hDX kfj krl vrh -gMU +abf uNJ oYB -tPL -rWX -sdS +ubF +ckx bzq -qcN +nxW ojG +qqA aQc xgG qzd @@ -39897,7 +50013,7 @@ eQz vKD ixd xgW -dJO +tFX oTJ qvo pWm @@ -39917,11 +50033,11 @@ cNu kyG kyG kyG +gTC +gTC kyG kyG kyG -kyG -aFt etv cto cto @@ -39935,8 +50051,8 @@ cty cty cty cty -cty -ksX +iFb +kuE cto etv ksX @@ -39958,13 +50074,13 @@ aOg aBK mCF mCF +mCF pGs pGs -pGs -pGs -pGs -pGs -pGs +jQa +jQa +jQa +jQa pGs pGs pGs @@ -39981,21 +50097,19 @@ wUU "} (67,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -pHX -rGe -ijy -ijy -ijy -ijy -ijy -ijy -mzr +nvv +mPk +mPk +mPk +imk +wBp +qwQ +uYJ +qwQ +qwQ +qwQ +qwQ +kap sSz miT wMw @@ -40006,19 +50120,13 @@ new new new new -new -new -wMw -wMw wMw pbp -sHV -bZU -bZU -bZU +irk bZU bZU bZU +rtm bZU bZU bZU @@ -40032,31 +50140,39 @@ bZU bZU bZU bZU +qOh +rtm bZU -xsH +oXw +bwP mrC wMw wMw wMw wMw -lSD -amu -amu -gXK -sXm -epQ -epQ -epQ -epQ -epQ +wMw +wMw +wMw +vLV +wMw +aMC +coz +qzb +erK +qzb +qzb epQ +sKC epQ +sKC epQ +sKC epQ +sKC epQ lsU -eiC -xKz +oMs +pCf lsU nSP qcN @@ -40066,21 +50182,21 @@ sdS rcA sdS sWp -wQd -ipv -sdS -rwS -qcN +alM +rsM +nZi +nxW ojG -nYP -xgG +qqA +aQc +qvo xUq jMr kfJ fFI rzM rQY -fYB +wiL qvo xUq bNC @@ -40103,7 +50219,7 @@ oBR oBR oBR oBR -wSx +sBX etv cto oxa @@ -40117,13 +50233,13 @@ cty cty cty cty -cty -ksX +iFb +xxk cto etv iDn meS -aOg +xSl aOg mCF mCF @@ -40140,14 +50256,14 @@ mCF mCF mCF mCF +mCF pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +jQa +yhU +tdp +fjg +jQa +jQa pGs pGs pGs @@ -40163,21 +50279,19 @@ wUU "} (68,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -liD -ijy -ijy -ijy -mzr +nvv +mPk +mPk +mPk +mPk +fjv +qwQ +qwQ +pAX +qwQ +qwQ +qwQ +kap cmU wMw wMw @@ -40189,16 +50303,11 @@ wMw wMw wMw wMw -wMw -wMw -wMw -wMw pbp -irk +cYZ bZU bZU bZU -qOh bZU bZU bZU @@ -40207,6 +50316,7 @@ bZU bZU bZU bZU +qOh bZU bZU bZU @@ -40215,18 +50325,24 @@ bZU bZU bZU bZU -bwP +bZU +miF mrC wMw wMw wMw wMw wMw -joh -mxb -aiK -mGb -mGb +wMw +wMw +wMw +obN +aVs +lzX +sdy +sdy +sdy +sdy mGb mGb mGb @@ -40250,10 +50366,10 @@ fFs tZE iZH kGo -hHA -hHA +hMV qcN qqA +qqA aQc xgG tbQ @@ -40267,7 +50383,7 @@ qvo xUq bNC ugW -xgG +qvo aPU rQY dWE @@ -40278,20 +50394,19 @@ gCi sJZ tEJ cNu -wSx +sBX uNq uNq uNq uNq uNq -rFL -wSx +uNq +sBX etv cto +cto ksX ksX -ksX -cty cty cty cty @@ -40300,15 +50415,16 @@ cty cty cty cty -ksX +iFb +swV xxk etv xEG mCF mCF hoC -hoC -mSa +mCF +mCF mCF mCF jdm @@ -40322,14 +50438,14 @@ mCF mCF mCF mCF -hoC -pGs -pGs -pGs -pGs -pGs -pGs -pGs +mCF +mCF +mCF +qzZ +fjg +jQa +jQa +jQa pGs pGs pGs @@ -40345,21 +50461,19 @@ wUU "} (69,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -mzr +nvv +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +kap rgZ olD olD @@ -40371,12 +50485,8 @@ kSz kSz wMw wMw -wMw -wMw -wMw -wMw pbp -cYZ +fXH bZU bZU bZU @@ -40394,21 +50504,27 @@ bZU bZU bZU bZU -qOh bZU bZU -miF +bZU +bZU +evX mrC wMw wMw wMw +nFB +wMw +wMw wMw wMw pAp -bZU -vTq -hvO -ckI +aVs +bgh +fUn +jjS +fUn +jjS hvO ckI hvO @@ -40425,19 +50541,19 @@ rHv fzy qcN qcN +nxW qcN -qcN -qcN +nxW qcN qcN sgy peA -bzq -iKh +qVl qcN +yil qqA aQc -xgG +qvo xUq jMr rQY @@ -40445,7 +50561,7 @@ avy rzg rQY rzM -mXo +sSU rzM bNC ugW @@ -40460,19 +50576,18 @@ mVS iKa tvv pRP -wSx +sBX gmE bvS nfv aFh uNq -qkr -wSx +pPf +sBX etv cto -ksX -cty -cty +cto +iFb cty cty cty @@ -40482,21 +50597,22 @@ cty cty cty cty -ksX +iFb +wNz cto etv iDn iDn ksX ksX +cba ksX +xxk +xxk +xxk ksX ksX -ksX -ksX -ksX -ksX -ksX +xxk ksX ksX ksX @@ -40506,12 +50622,12 @@ xEG mCF mCF mCF -pGs -pGs -pGs -pGs -pGs -pGs +mCF +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -40527,38 +50643,32 @@ wUU "} (70,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -liD -ijy -ijy -ijy -ijy -xBb +nvv +mPk +mPk +mPk +mPk +rYC +lTR +pAX +qwQ +qwQ +lTR +lTR +eDY tpV asx cfq -ujo -sOe -sOe -sOe -sOe -lje -wMw +qAI +bJV +ohC +euS +vWn +fWE ezx -uhJ inj -fZB -wMw pbp -fXH +sHV bZU bZU bZU @@ -40566,7 +50676,6 @@ bZU bZU bZU bZU -qOh bZU bZU bZU @@ -40579,18 +50688,25 @@ bZU bZU bZU bZU -evX +bZU +bZU +xsH mrC wMw wMw +wMw +wMw +bnf cHY wMw rSA pAp -bZU -vTq -hvO -ckI +aVs +bgh +fUn +jjS +fUn +jjS hvO ckI hvO @@ -40605,18 +50721,18 @@ hvO bih rHv uiq -qcN +nxW sbX wMx -gnE +jqK sjR sbX -qcN +nxW tex gJs -sdS niF -qcN +nxW +yil qqA dYn vcd @@ -40631,18 +50747,18 @@ krL rRz eZc lFS -ybC +xqN lFS lFS lFS bQH qnf -dWY +sBF cug gia avl cug -aUj +xBv vLk ptw ptw @@ -40650,10 +50766,10 @@ qjd uNq mey wSx -etv +bez cto -ksX -cty +cto +iFb cty cty cty @@ -40662,9 +50778,9 @@ cty cty cty cty -hoC -hoC -ksX +iFb +owM +xxk cto etv cto @@ -40683,17 +50799,17 @@ cto cto xxk cto -cto +pOa iDn mCF mCF mCF -pGs -pGs -pGs -pGs -pGs -pGs +mCF +jQa +abL +jQa +jQa +jQa pGs pGs pGs @@ -40709,42 +50825,37 @@ wUU "} (71,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -xBb +nvv +mPk +mPk +mPk +mPk +wBp +lTR +qwQ +qwQ +qwQ +lTR +qwQ +eDY lZR -asx +aCo lZR -saj -ijy -liD -ijy -liD -mzr -wMw +caD +lTR +aTY +eGX +haR +kap wMw -jJT tZr -aRI -wMw pbp -sHV +irk bZU bZU bZU bZU +qOh bZU bZU bZU @@ -40761,24 +50872,29 @@ bZU bZU bZU bZU -xsH +hEs mrC -aHy wMw wMw +vpr wMw +pFF wMw +wMw +wMw +pAp +cFK kdV -bZU -vTq -lNX -yeH +gvM +gvM +gvM +gvM yeH yeH yeH yeH lNX -yeH +bUK yeH yeH yeH @@ -40787,20 +50903,20 @@ hrG mos rHv nnw -qcN -qUQ -gjw +nSP +tQz +xug gjw jZO -qUQ +djb nSP tyT peA -bzq -nzO -qcN +ubH +nxW +qqA qqA -iPb +bYT xgG xUq tkT @@ -40809,17 +50925,17 @@ rzg rQY jMr rzM -mXo +sSU rzM bNC rzM -hSN +rzM rzM rzM rzM qFO iWK -hSN +rzM rMN kyK epO @@ -40832,10 +50948,10 @@ ceo cic hmm wSx -etv +pQw cto -ksX -cty +cto +iFb cty cty cty @@ -40845,24 +50961,24 @@ cty cty cty mCF -mCF -xxk +wOR cto -etv cto +etv +xxk cto vTe cto cto +xxk cto cto -cto -cto -cto +vTe +sgl cto xxk cto -cto +fLu cto cto xxk @@ -40870,12 +50986,12 @@ ksX mCF mCF mCF -pGs -pGs -pGs -pGs -pGs -pGs +mCF +jQa +jQa +jQa +jQa +jQa pGs pGs pGs @@ -40891,70 +51007,70 @@ wUU "} (72,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -pHX -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -xBb +nvv +mPk +mPk +imk +mPk +xVw +dXg +dXg +qwQ +qwQ +qwQ +qwQ +xLB gnC mYR asx -saj -ijy -ijy -liD -ijy -mzr -wMw -wMw +caD +lTR +dXg +lTR +lTR +kap wMw ygY -fft -wMw pbp -irk +cYZ bZU bZU -rtm bZU bZU bZU bZU -egj bZU bZU bZU bZU bZU -qOh bZU bZU bZU -rtm bZU bZU -bwP +bZU +bZU +qOh +bZU +bZU +miF mrC wMw wMw wMw +vpr wMw -sDc -amu -amu -amu -pGJ -sXm +wMw +wMw +vLV +mcr +aMC +bgE +qzb +erK +qzb +qzb pGJ pGJ pGJ @@ -40969,19 +51085,19 @@ hvO bih rHv nnw -qcN -tQz +jCE +qUQ gjw -qMC +eOh tGr -vXu +jnA jKz prh wVa -wpr esz qcN qqA +qqA aQc xgG xJx @@ -41006,7 +51122,7 @@ mVS sJZ tEJ cNu -wSx +sBX pIz lpv wxu @@ -41016,36 +51132,36 @@ lpv nTj etv cto -ksX -cty -hoC -jdm -mCF +cto +nNe +dNZ +eCu +eov mCF hoC cty cty hoC mCF -mCF -xxk +wOR +cto cto etv -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX +cto +cto +cto +cto +cto +cto +cto +feM +cto +cto +cto +cto +cto +cto +cto cto cto ksX @@ -41053,10 +51169,10 @@ mCF aOg hiE hoC -pGs -pGs -pGs -pGs +jQa +jQa +gxQ +jQa pGs pGs pGs @@ -41073,38 +51189,33 @@ wUU "} (73,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -fvR -sOe -sOe -sOe -tql -ijy -ijy -ijy -liD -mzr -wMw -wMw -wMw -vUQ +nvv +mPk +mPk +mPk +mPk +wBp +qwQ +dXg +dXg +qwQ +lTR +qwQ +fHf +wPl +xOX +lId +jLS +lTR +dXg +dXg +aTY +kap oLa -wMw +vUQ pbp -cYZ +fXH +bZU bZU bZU bZU @@ -41112,10 +51223,10 @@ bZU bZU bZU bZU +qOh bZU bZU bZU -rtm bZU bZU bZU @@ -41125,18 +51236,23 @@ bZU bZU bZU bZU -miF -mrC +kMy +lEm wMw wMw +xXr +wMw +plm +wMw rSA wMw -aZt +wMw +kdf hyr htP hyr hyr -hyr +leU pGJ iaO uRU @@ -41144,28 +51260,28 @@ uRU uRU reG pGJ -mFY +neU oMs xWY hrG mos rHv nnw -qcN +nxW lYA gjw wdh -spd +lEM rNo qcN maN rsM -maN -fCE +gwW qcN +yil qqA aQc -xgG +qvo smO rQY rzM @@ -41188,56 +51304,56 @@ iMp sJZ tEJ cNu -wSx +sBX kNe -lpv +ptM lpv lpv lpv uuv wSx rjH -cto -ksX -hoC -mCF -mCF -mCF +wOC +gMm +iFb +kxe +awJ mCF mCF +eov mCF mCF jdm mCF -mCF -ksX +wOR +cto cto etv +xxk +ksX +ksX ksX -cty -cty -cty -cty -cty -cty -cty -cty -cty -cty -cty -cty -cty ksX +ksX +ksX +ksX +ksX +ksX +ksX +ksX +ksX +ksX +azw cto cto -ksX +xxk mCF xGV aOg mCF -hoC -pGs -pGs +jQa +jQa +jQa pGs pGs pGs @@ -41255,78 +51371,78 @@ wUU "} (74,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -kcj -nvF -nvF -nvF -nvF -nvF -xdy -wMw -fZB -wMw -wMw +nvv +mPk +mPk +mPk +mPk +wBp +uYJ +dXg +dXg +qwQ +qwQ +qwQ +qwQ +xLB +xOX +bCM +rlI +rlI +rlI +rlI +rlI +cEm fZB wMw pbp -wCc -uaV -nXR -fUF -jyq -uaV -nXR -fUF -jyq -uaV -nXR -kvQ -jyq -uaV -nXR -fUF -jyq -uaV -nXR -fUF -jyq -wCc +sHV +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +xsH mrC wMw wMw wMw +rSA +wMw +rSA wMw -aZt -cZZ +rSA +wMw +sid +hyr +hyr hyr -rfn hyr hyr pGJ nio -hpQ +bte mxv qHJ afg pGJ -nSY +bOO lnG rKf erE @@ -41339,16 +51455,16 @@ qUQ bVq woI xVA -qcN +nxW mVN doa -tjF srX qcN -oxs +dmR +yil aQc xgG -tkH +lMq jOR wIH gkL @@ -41365,12 +51481,12 @@ mbt jBp ilQ rzM -xgG +qvo vUM fPn jjg cNu -wSx +sBX uNh sNa ffe @@ -41380,21 +51496,22 @@ kSd wSx etv cto -ksX -hoC -mCF -mCF -mCF -mCF +cto +iFb +kmW mCF +eov +nqf mCF mCF mCF mCF mCF -ksX +wOR +noj cto etv +cto ksX cty cty @@ -41407,17 +51524,16 @@ cty cty cty cty -cty -cty ksX cto cto -ksX +cto +xxk mCF mCF aOg mCF -pGs +jQa pGs pGs pGs @@ -41437,73 +51553,73 @@ wUU "} (75,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -xBb +nvv +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +dXg +dXg +dXg +qwQ +qwQ +eDY +xOX +tkV asx asx asx cDm asx asx -pbp +paq wMw +pbp +irk +bZU +bZU +bZU +rtm +bZU +bZU +bZU +bZU +egj +bZU +bZU +bZU +bZU +bZU +qOh +bZU +bZU +bZU +rtm +bZU +bZU +bwP +mrC wMw wMw wMw wMw -qoE -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -olD -jgL wMw -vil wMw euH -amu -bgE -bgE -bgE -htP +pLp +wMw +kdf hyr -pGJ -nio -mxv +hyr +giN +htP +bmV +afz +xyO +eDQ eDQ eDQ xyO @@ -41517,36 +51633,36 @@ rHv shG qcN qcN -qcN +nxW nSP -jGk -qcN +hli +nxW qcN nSP jGk -qcN -qcN +nxW qcN pco +qqA aQc xgG xgG +qvo xgG +qvo xgG +qvo xgG xgG xgG xgG -xgG -xgG -xgG -xgG +qvo xgG xgG xgG qvo -gCC -kjA +mjA +wQi xgG vUM sJZ @@ -41563,7 +51679,7 @@ wSx etv cto xxk -mCF +eov mCF aOg aOg @@ -41573,10 +51689,11 @@ mCF mCF mCF mCF -mCF -ksX +wOR +xxk mxB -etv +eJS +cto ksX cty cty @@ -41589,12 +51706,11 @@ cty cty cty cty -cty -cty ksX cto cto -ksX +cto +xxk aOg aOg mCF @@ -41619,75 +51735,75 @@ wUU "} (76,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -xBb +nvv +mPk +mPk +mPk +mPk +xVw +qwQ +qwQ +qwQ +dXg +dXg +dXg +dXg +eDY +asx +asx kzo izB fZx asx +hOp asx -asx -pbp -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw -wMw wMw wMw +pbp +cYZ +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +rtm +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +bZU +miF +mrC wMw wMw wMw wMw -mcr -srL -qzq -ahg -pCj -nhc -uhW -bgE -hyr +xVQ +kyz +kqA +fOO +aMC +aMC +aqw +giN +cTV hyr -pGJ -bHL +bmV +qxu +eDQ svD oNy -eDQ +teT eDQ lzu gqX @@ -41696,9 +51812,9 @@ ckI tam lss rHv -gtr -gkF -lUe +oMs +kiE +xNY qqA qqA aQc @@ -41707,8 +51823,8 @@ kWZ rVZ aQc qqA -sWs -xNY +nfk +qqA qqA aQc kWZ @@ -41724,12 +51840,12 @@ sah haq eRE iPw -pxK +pbf xgG wwd mjA rzM -xgG +qvo eea sJZ tEJ @@ -41746,7 +51862,7 @@ etv xxk xxk mCF -mCF +eov aOg aOg aOg @@ -41754,11 +51870,12 @@ mCF mCF mCF mCF -cty -hoC -ksX +mCF +mnL +cto cto etv +cto ksX cty cty @@ -41766,15 +51883,14 @@ cty cty cty cty -cty mCF cty cty cty cty -cty ksX cto +fLu cto ksX aOg @@ -41801,73 +51917,73 @@ wUU "} (77,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -xBb +nvv +mPk +mPk +mPk +mPk +rYC +qwQ +lTR +pAX +qwQ +qwQ +qwQ +dXg +xFS +vZR +eha dKy qVD fXu asx asx asx -pbp -wMw -wMw -wMw -wMw -wMw -wMw -olD -olD -olD -wMw -wMw -wMw -wMw -wMw -wMw -wMw -olD -olD -olD -wMw -wMw -wMw -wMw wMw wMw +pbp +wCc +uaV +uaV +nXR +fUF +jyq +uaV +nXR +fUF +jyq +uaV +nXR +kvQ +jyq +uaV +nXR +fUF +jyq +uaV +nXR +fUF +jyq +wCc +mrC wMw olD olD olD -olD -ntL -auU -qaE -qaE -uQC -rLb -bgE -dLb +teH +oaO +wns +vru +wfS +kqA +giN +giN +giN hyr -pGJ -icZ -teT +bmV +qxu +eDQ +eDQ oNy eDQ eDQ @@ -41885,16 +52001,16 @@ kIK kIK bfq kIK +jAx kIK -tRu bfq akf -gPA +snE kIK kIK -bfq +pLF +jAx kIK -tRu kIK kIK kIK @@ -41902,28 +52018,28 @@ kIK kIK fAQ qqA -xgG -rCI +qvo +vOW rKB jHJ tXE -xgG +qvo mqt qhN kXZ -xgG +qvo ueg sJZ tEJ cNu -aFt -bsH -bIj -cto -cto -cto -cto -cto +lNb +apY +vzt +ezt +ezt +ezt +ezt +ezt toU cto xxk @@ -41937,32 +52053,32 @@ mCF mCF mCF hoC -cty -ksX +owM +qEG cto etv -ksX -cty +xxk +xxk mCF cty cty hoC hoC mCF -mCF +wBc hoC cty cty cty -cty ksX cto cto +cto ksX hoC mCF aOg -mCF +wBc mCF pGs pGs @@ -41983,75 +52099,75 @@ wUU "} (78,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -fvR -sOe -sOe -alE +nvv +mPk +mPk +mPk +mPk +xVw +qwQ +daS +qwQ +gVO +jaF +qgm +lTR +dXg +dXg +xFS +eqg +bJV +bJV +bJV +qTs asx asx xOI -bDM -mHo -ufn -fPG -fPG -fLV -lgi -asx -asx -asx -bDM -wTQ -ufn -fPG -fPG -fLV -lgi -asx -asx -asx -mvo -wTQ -ufn -fPG -fPG -fLV -lgi -asx +qoE +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +olD +jgL +mrC asx asx asx -ntL -qaE -hqL -hjj -hqL -hGm -bgE -leU +kqA +aSe +rFv +hQP +iFm +kqA +lGD +giN hyr -pGJ -nio -mlN +hyr +qOV +qxu eDQ +mlN eDQ +mxv eDQ lzu vfg @@ -42060,52 +52176,52 @@ lzu hrG mos rHv -eXT -xRF -srY -hFE -xRF -xRF -jcT -jcT -jcT -jcT +oMs +kiE +qqA +qqA +qqA +qqA +yil +qqA +gxi +qqA +qqA +sKN +qqA +qqA +qJF +qqA +gjs +qqA +qqA +qqA +qqA qqA -aQc -clX -bft -qJF -clX -clX -clX -clX -clX -clX -clX aQc qqA -xgG +qvo slB tNT bur vRI -sfB +oxi qnf ayo wbB -xgG +qvo ueg fPn aBB ozz -mzt -mUP -mUP -mUP -mUP -mUP -mUP -mUP +lmd +hys +hys +hys +hys +hys +hys +hys pGP cto xxk @@ -42119,12 +52235,12 @@ mCF mCF mCF hoC -cty -ksX +owM +ghs cto etv -ksX -cty +xxk +xxk mCF aOg aOg @@ -42136,10 +52252,10 @@ mCF mCF cty cty -cty ksX cto cto +cto ksX hoC mCF @@ -42165,97 +52281,97 @@ wUU "} (79,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -xBb -asx -viY -asx -dDo -sJr -oGv -oGv -pZq -vao -ctL -asx -fZB -asx -dDo -kvC -oGv -oGv -oGv -mcX -ctL +nvv +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +lTR +scL +vLo +lnO +qwQ +qwQ +qwQ +dXg +qwQ +qwQ +qwQ +pAX +rMl asx fZB asx -dDo -bgi -jSX -hKK -hKK -hKK -fOW +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +mrC asx fZB -fZB asx -ntL -tRN -wjM -uZp -hqL -tFf +kqA +kEB +sSp +hlw +vhJ bgE +kpN +giN +hyr hyr hyr pGJ nio lkH -fyo +eaN lYF srW pGJ -ffi +mFY oMs xWY hvO bih rHv -oMs -snl -kTD -lLZ -qsk +qMl +xRF +srY +hFE +egp xRF yil +qio yil -aai jcT ojG aQc -clX -clX +qqA +vMU clX clX qio @@ -42263,31 +52379,31 @@ qio qio qio qio -clX +qqA aQc qqA xgG duw aDQ -vzX +mcN aAg xgG sLU qOn wbB -xgG +qvo ueg sJZ tEJ ouV -aFt -aFt -aFt -aFt -aFt -xxk -xxk -xxk +lNb +ezt +ezt +ezt +ezt +ixr +ixr +ixr etv xxk xxk @@ -42296,32 +52412,32 @@ mCF aOg aOg aOg +vOo mCF -mCF -mCF +bls mCF cty -cty -ksX +owM +cto cto etv -ksX -hoC +xxk +xxk mCF aOg aOg -mCF -aOg +dda +gCh hiE mCF aOg aOg cty cty -cty ksX cto cto +cto ksX cty mCF @@ -42347,70 +52463,70 @@ wUU "} (80,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -xBb -asx -asx -wCR -uEx -vLS -iGW -oGv -tgE -jSX -ykD -asx -asx -asx -uEx -hKK -sRs -oRj -rfV -jSX -ykD -asx -asx -asx -uEx +nvv +mPk +mPk +mPk +mPk +xVw +qwQ +qwQ +qwQ +eGX hKK fLY -ijy -ijy -ijy -wAj +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +btU asx asx +wCR +gsQ +icb +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +wMw +mrC asx +dlr asx -ahg -ieh -hqL -wga -hqL -cNi bgE -iSW -hyr +pTg +ycY +jfA +cdS +bgE +giN +giN +giN +giN +rfn pGJ dXd tGV @@ -42426,31 +52542,31 @@ mos rHv oMs snl -fQU -jPW -kiU -xRF +kTD +lLZ +dKc +snl yil yil +tiF yil -gkF ojG aQc +qqA +qqA clX qio qio +aUA +vpQ qio qio -vzy -rey -qio -qio -clX +hLY aXz lhp xgG xgG -xgG +qvo xgG xgG xgG @@ -42458,22 +52574,22 @@ rgy mRZ wDN xgG -vUM +rGl sJZ fnq cNu bkM -cty -gsm -aOg -aOg -mCF -mCF -xxk +ngg +bkM +ixr +ezt +dad +ixr +ixr toU cto -ksX -hoC +cto +iFb mCF mCF mCF @@ -42483,27 +52599,27 @@ mCF mCF cty cty -cty -ksX +owM +diu cto etv +cto ksX -cty mCF aOg xGV -aOg -aOg +gCh +gCh mCF mCF aOg aOg cty cty -cty ksX bxx bxx +bxx ksX cty mCF @@ -42529,70 +52645,70 @@ wUU "} (81,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -fvR -alE -uxQ -bDr -tql -biA -scL -dOS -rfV -lnO -fvR -alE -uxQ -bDr -tql -ijy -awf -oGv -oGv -lnO -fvR -alE -uxQ -bDr -tql -ijy -ijy -ijy -ijy -ijy -fvR -alE -uxQ -bDr -juT -ahg -pWI -dzV -uLa -uOQ -mrF -bgE -iSW -iSW +nvv +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +ebN +eha +tNy +gXf +unH +kKX +oJb +wfK +wfK +ebm +bJI +asx +asx +asx +bJI +bJI +oJb +wfK +wfK +ebm +bJI +asx +asx +asx +bJI +bJI +oJb +wfK +wfK +fWR +bJI +bJI +bJI +aMC +hLt +egV +bTf +cKK +duN +hyr +nRH +nRH +feW +giN pGJ pGJ pGJ @@ -42610,23 +52726,23 @@ ciH tIV hKe fWU -vwl +mXO xRF ira -aai -aai -aTc +yil +yil +qqA qqA aQc -clX -qio +yil +qqA qio qio -vzy -rey -rey -rey -eUR +pGj +iIc +aAC +wSL +axv lDh jQe mHa @@ -42635,7 +52751,7 @@ jxe orH uIl odw -xgG +qvo feV qOn wbB @@ -42646,16 +52762,16 @@ tEJ cNu bkM bkM -cty -aOg -mCF -jdm -mCF -ksX +ngg +ipl +ixr +exj +ixr +gxX etv cto -ksX -hoC +cto +iFb mCF jdm mCF @@ -42665,12 +52781,12 @@ mCF mCF cty cty -cty -xxk +owM +rXS cto toU +xxk ksX -hoC mCF mCF aOg @@ -42683,7 +52799,7 @@ aOg aOg ksX ksX -ksX +qYd fLu cto ksX @@ -42711,105 +52827,105 @@ wUU "} (82,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -xBb -uxQ -ubn -ijy -ijy -scL -gDI -jSX -fLY -ijy -xBb -uxQ -ubn -ijy -ijy -scL -kvC -jSX -fLY -ijy -xBb -uxQ -ubn -ijy -ijy -ijy -ijy -ijy -ijy -ijy -xBb -uxQ -ubn -xBb -ahg -pWI -qaE -nHb -qaE -bgE -bgE -iSW -iSW +nvv +mPk +mPk +mPk +mPk +wBp +uYJ +lTR +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +eDY +tNy +gPL +hKK +srU +sUp +lYr +pdn +cRx +bJI +asx +fZB +asx +pUi +rIG +lYr +awr +lYr +aHu +tEc +asx +viY +asx +gfc +sFN +lYr +lYr +lYr +kRH +bJI +rgf +asx +aMC +hLt +kUj +ixw +rmV +kqA +giN +hyr +giN iSW +giN +qUW hyr pJf -hyr +giN kIV hyr -iiV -oMs +thS oMs +vAF xWY hrG mos rHv oMs snl -dsw -jPW +qgR +dvw qWt -xRF +snl yil -aai -aai -jcT +yil +yil +gkF iwc aQc -clX -qio +yil +qqA qio qio -rey -rey -rey -vzy -eUR -edu +vDf +gvJ +sLO +lum +lxR +rpN jQe xvj xgG @@ -42821,41 +52937,41 @@ xgG pJZ qOn wbB -xgG +qvo fkE sJZ tEJ cNu xBO bkM -cty -aOg -aOg -mCF -mCF -ksX +ngg +tsz +chs +ixr +ixr +gxX etv cto -ksX -hoC -mCF +xxk +iFb mCF mCF mCF mCF mCF +jdm mCF hoC cty -cty +owM xxk cto etv +tcX ksX -hoC -mCF -aOg +vOo aOg +qZR aOg aOg aOg @@ -42865,7 +52981,7 @@ aOg aOg ksX kgC -qvK +wtU cto cto jps @@ -42893,113 +53009,113 @@ wUU "} (83,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -liD -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -xBb -uxQ -ubn -ijy -oML -idF -hKK -fLY -ijy -ijy -xBb -uxQ -ubn -ijy -ijy +nvv +mPk +mPk +mPk +mPk +wBp +qwQ +aTY +dXg +aTY +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +eDY +tNy +oLZ +sUK eGX -hKK -fLY -ijy -ijy -xBb -uxQ -ubn -ijy -ijy -ijy -ijy -ijy -ijy -ijy -xBb -uxQ -ubn -xBb -ahg -pWI -jhb -wqK -tKx -bgE -iSW -iSW -ovD -ovD +wXc +sJm +bVS +kRH +eOa +asx +dlr +asx +itQ +qKZ +qyJ +vAZ +vmw +kRH +eOa +svG +dlr +asx +itQ +qKZ +qyJ +fwo +lYr +hZE +bVX +eOa +asx +aMC +hLt +rmo +qfC +xbm +kqA +giN +hyr +giN +hyr ovD +hxO +hxO rbd hyr oZA -hyr -xRF -evV -uiq -lzu +htP +jrq +oMs +oMs +hmp oMs hca lzu oMs yjp lDk -dkt +oKN sJB xRF -aai yil -aai -jcT -pZD -aQc -clX +yil +yil qio +sMJ +sKN +qqA +qqA qio qio -vzy -rey -rey -rey -eUR -lDh +oRD +wSL +vVz +wSL +hlF +hLQ boV dkl -xgG +qvo opW nOz djH vRI -sfB +oxi rVI hQb lEw @@ -43010,12 +53126,12 @@ tEJ cNu qnm bkM -cty -aOg -aOg -mCF -mCF -ksX +ngg +qLq +chs +ixr +ixr +nTG etv cto xxk @@ -43027,14 +53143,14 @@ mCF mCF mCF mCF -hoC -cty +mCF cty -ksX +vVJ +cto cto etv -ksX -mCF +cto +wFx mCF aOg aOg @@ -43047,11 +53163,11 @@ aOg aOg ksX kgC -sMT +lun cto cto drK -bIz +cto ksX mCF mCF @@ -43075,108 +53191,108 @@ wUU "} (84,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy +nvv +mPk +mPk +mPk +mPk +wBp +wBp +rYC +dXg +qwQ +lTR gVO jaF jaF jaF qgm -ijy -ijy -ijy -ijy -ijy -fvR -sOe -tql -ijy -ijy -ijy -ijy -ijy -ijy -ijy -fvR -sOe -tql -ijy -ijy -ijy -ijy -ijy -ijy -ijy -fvR -sOe -tql -ijy -ijy -ijy -ijy -ijy -ijy -ijy -fvR -sOe -tql -xBb -ahg -ntL -ntL -amu -amu +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +oLZ +qwQ +lTR +scL +dOS +rfV +lnO +fHf +eha +tNy +eXg +jLS +lTR +scL +oGv +lsN +lnO +fHf +eha +tNy +eXg +jLS +lTR +scL +oGv +rKM +lnO +lTR +fHf +wPl +aMC +kqA +kqA bgE +bgE +bgE +aMC +ldr +hyr iSW -iSW -iSW -iSW -bbS +giN +giN +mMJ cZZ -hyr +htP ooe ukX -xRF -xRF +wHk +evV aVQ lsU -eiC -xKz +oMs +pCf lsU fkR fkR +pVN fkR +pVN fkR +pVN +pVN +pVN fkR fkR -fkR -fkR -fkR -fkR -fkR -aQc -clX -qio +gSn +qqA +tDF qio qio qio -rey -rey -nNw -eUR -edu +qfL +wSL +wyE +axv +hLY boV nLI -xgG +qvo tgk bLp dWN @@ -43192,12 +53308,12 @@ tEJ ciu bkM bkM -aOg -aOg -aOg -mCF -hoC -ksX +chs +chs +chs +ixr +poz +nTG etv xxk xxk @@ -43211,16 +53327,16 @@ mCF mCF mCF mCF -hoC -ksX +wOR +cto cto etv xxk -mCF +xxk mCF aOg hoC -cty +mCF cty mCF mCF @@ -43228,7 +53344,7 @@ ksX ksX ksX loP -fLu +lYQ cto cto wgv @@ -43239,7 +53355,7 @@ aOg mCF mCF mCF -hoC +mCF pGs pGs pGs @@ -43257,129 +53373,129 @@ wUU "} (85,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -liD +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +daS +dXg +aTY scL lsN +gcF +wnA +lnO +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +oLZ +qwQ +lTR +scL +gDI +jSX +fLY +lTR +eDY +tNy +oLZ +lTR +lTR +scL +kvC +jSX +fLY +lTR +eDY +tNy +oLZ +lTR +lTR +scL oGv oGv lnO -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -nSv -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -ijy -liD -fvR -sOe -sOe -sOe -suv -bgE -bgE -yeJ -iSW -sXb -sXb +lTR +dXg +fHf +jEG +hET +hET +koZ +hET +wft +aMC +sNT +giN +vFl sXb sXb +mRq sXb +mRq qaY +mRq sXb -sXb -sXb +mRq xzj -sCo +oxA oMs hca wRB fkR qps -gan -pqG bVI +pqG bVI +gan bVI bVI bVI gKn nDC -drn -clX -qio -qio +aQc +tDF +tDF +tDF qio qio -rey -iUA -rey -eUR +rja +gvJ +szS +axv lDh boV dkl xgG xgG +qvo xgG xgG xgG xgG -xgG -xgG +qvo xgG xgG vUM sJZ tEJ -rsw -bkM -gsm -aOg -xGV -mCF -mCF -mCF -xxk +fMP +pKs +chs +chs +kGq +wvI +ixr +ixr +ixr toU cto xxk @@ -43393,27 +53509,27 @@ mCF mCF mCF mCF -cty -ksX +wOR +cto cto etv +swV xxk mCF -mCF aOg hoC cty cty mCF mCF -ksX +iDn wTE -bIz -bIz -qYd -qYd -xtD -qYd +cto +cto +cto +cto +xxk +cto xxk xxk xEG @@ -43439,77 +53555,77 @@ wUU "} (86,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -ijy -ijy -ijy +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +uYJ +lTR +scL +vom +hJq +hXe +lnO +qwQ +pAX +qwQ +qwQ +uYJ +eDY +tNy +oLZ +qwQ +qwQ +eGX +hKK +fLY +lTR +qwQ +eDY +tNy +oLZ +lTR +lTR +eGX +hKK +fLY +lTR +lTR +eDY +jzL +oLZ +lTR +lTR scL -oGv oGv oGv lnO -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -oIN -gMf +dXg +lTR +lTR +qTZ +hKK +bbG +hKK +hKK +gdJ +vKv bZA -iSW -iSW +giN +giN sXb -oyb -iet -oyb -iet -nih -iet -oyb +egH +pJQ +aVt +tzw +dSA +cGc +aVt iet sXb xWY @@ -43526,48 +53642,48 @@ wrg jfn hPD ugi -fkR +pVN aQc +tDF +bzf +gyz clX -clX -nnD -bjz -nxF -rey -rey -rey -eUR +azr +aAC +wSL +wSL +axv edu boV nLI jfP bak -ezc +cmf ezc ezc bak +uOF bak -kjJ -clX +tQy fEm vUM sJZ tEJ cNu -bkM -cty -aOg -aOg -mCF -mCF -mCF -mxB +pKs +chs +chs +ibV +ixr +ixr +ixr +exj etv xxk xxk aOg mCF -hoC +mCF hoC cty aOg @@ -43575,21 +53691,21 @@ aOg aOg mCF mCF -cty -ksX +wOR xxk -etv xxk -hoC +gAK +xxk +mrY mCF mCF -cty -cty mCF +cty +eoV mCF mCF -ksX -cDc +iDn +fLu cto cto kDJ @@ -43621,70 +53737,70 @@ wUU "} (87,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -liD -ijy +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +aTY +lTR eGX hKK -sRs -nyj +vDw +aag lnO -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -liD -ijy -liD -ijy -oIN -gMf -xVK +qwQ +lTR +qwQ +qwQ +lTR +eDY +tNy +oLZ +qwQ +qwQ +lTR +qwQ +qwQ +qwQ +lTR +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +lTR +lTR +lTR +eDY +iAP +sgn +dXg +dXg +scL +oGv +hXR +lnO +lTR +lTR +lTR +lTR +lTR +lTR +lTR +aTY +qsb +vKv +hsl iSW -fIT -sXb +giN +mRq oyb jzZ mCY @@ -43692,7 +53808,7 @@ pjn mCY jzZ mCY -jzZ +wjd mRq xWY hvO @@ -43708,18 +53824,18 @@ wrC eTP hPD uQH -fkR +pVN aQc -qXO -pNn -rvd -lDh -vGj -rey -noG -rey -eUR -lDh +dkl +dkl +mOx +iZT +roT +gdO +wSL +gvJ +hlF +suE dkV sff sff @@ -43737,13 +53853,13 @@ lQA ptY uzg bkM -cty -aOg -aOg -aOg -mCF -mCF -xxk +chs +chs +chs +rCs +ixr +ixr +ixr toU xxk xxk @@ -43757,16 +53873,16 @@ aOg aOg mCF mCF -cty -ksX +owM +mxB cto etv +cto ksX cty mCF mCF -cty -cty +mCF mCF mCF mCF @@ -43774,12 +53890,12 @@ xEG xxk cto cto -qYd -qYd +cto +cto wgv -qYd +cto fLu -bIz +cto ksX aBK aOg @@ -43803,152 +53919,152 @@ wUU "} (88,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -liD -ijy -liD -eGX +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +qwQ +qwQ +aTY +qwQ +aTY +dFt hKK fLY -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -oIN -gMf +lTR +qwQ +lTR +qwQ +qwQ +eDY +tNy +oLZ +qwQ +qwQ +qwQ +aqh +qwQ +lTR +qwQ +eDY +tNy +oLZ +lTR +lTR +lTR +aTY +lTR +lTR +lTR +eDY +cpF +cpF +dXg +lTR +scL +oGv +oGv +lnO +lTR +lTR +lTR +lTR +lTR +aTY +lTR +lTR +vEe +vKv hsl -iSW +giN hyr -sXb -peE +mRq +nih jzZ lZa gyw mCY jzZ -qYR +mCY jzZ mRq xWY hvO bih rHv -keo +mXx tpL khb -urd +dnA lQg ara xHt nZk hPD -uQH -fkR +mZi +mXx aQc qXO -sHr -tDF +tso +bbW qQk -oEl -fbq -fbq -fbq -bHo -edu +per +mVY +opP +lMl +pRR +rpN aXz oXm -xNR -xNR -xNR -xNR -xNR -xNR -xNR -xNR -xNR -xNR -xAD -huz +oXm +xne +xne +xne +xne +mtx +cWs +xne +tQy +rMN +lMD +oRK tEJ bZI bkM -cty -gsm -aOg -aOg -mCF -mCF -xxk -etv +ngg +dtH +chs +chs +ixr +ixr +ixr +mMZ xxk xxk mCF -hoC +mCF cty cty cty aOg aOg -aOg -mCF +gCh +dda mCF -hoC -ksX +owM +xxk cto etv +cto ksX cty mCF mCF mCF -hoC mCF mCF mCF @@ -43956,18 +54072,18 @@ ksX ksX ksX ksX -fLu +aMN xxk cto cto esw -bIz +cto ksX aOg mCF mCF -mCF -mCF +wBc +aOg mCF hoC pGs @@ -43985,76 +54101,76 @@ wUU "} (89,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -liD -ijy -oIN -juW -juW -oDg -opA +nvv +mPk +mPk +mPk +mPk +mPk +mPk +rYC +qwQ +lTR +qwQ +qwQ +qwQ +qHl +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +oLZ +qwQ +pAX +lTR +lTR +qwQ +dXg +qwQ +eDY +tNy +oLZ +lTR +lTR +aTY +lTR +lTR +lTR +lTR +fHf +cpF +lTR +lTR +gVO +uTu +oGv +oGv +lnO +lTR +lTR +lTR +lTR +lTR +lTR +lTR +gVO +bEY +aMC +hyr +giN +mpL sXb nih jzZ mCY gyw nPI -jzZ +pKg mCY jzZ mRq @@ -44062,7 +54178,7 @@ xWY hvO bih rHv -cYT +hPD tpL khb urd @@ -44071,30 +54187,30 @@ lVW lZh nZk hPD -uQH -fkR +mZi +hPD aQc -bum -nLI -dkl +qXO +tso +qBO eUh izP -rLq +khB nTH -kua +pNT izP eUh aXz nYy xNR -iLd -iTP -jZG -tNE -uIj -rAy -fEI -wfy +ydx +xNR +ydx +xNR +ydx +xNR +ydx +xNR xNR rMN mzv @@ -44104,27 +54220,28 @@ bkM bkM bkM bkM -bkM -bkM +pKs +pKs bkM cNC etv cto xxk mCF -hoC +mCF mCF aOg aOg aOg xGV -aOg -mCF +gCh +dda mCF -hoC -ksX +owM +cto cto etv +cto ksX mCF mCF @@ -44134,22 +54251,21 @@ mCF mCF mCF mCF -mCF hoC cty ksX kgC -bIz +qYd +cto cto cto cto -bIz ksX aOg mCF -hoC mCF mCF +vOo mCF mCF pGs @@ -44167,71 +54283,71 @@ wUU "} (90,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -pHX -rGe -rGe -ijy -ijy -liD -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -liD -ijy -pGs -pGs -tdq -cUq -fal +nvv +mPk +mPk +mPk +mPk +mPk +mPk +msj +daS +pAX +qwQ +qwQ +qwQ +qwQ +qwQ +pAX +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +oLZ +qwQ +dXg +qwQ +qwQ +dXg +qwQ +qwQ +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +lTR +daS +lTR +lTR +lTR +lTR +lTR +scL +hXR +oGv +oGv +lnO +dXg +dXg +daS +lTR +lTR +gVO +jaF +aqq +cwE +cwE +ngC +hyr +iSW sXb -tzw +djh jzZ jzZ gyw @@ -44247,37 +54363,37 @@ rHv pVN cMf khb -urd -ara +qLs +iwg ara hAh nZk hPD uQH -fkR -ljs -tDF -gbU -oXm +pVN +aQc +bum +azh +fEb nLI nLI ovp -dtq +mIQ fnX -oXm +ujR dkl boV dkl xNR -dNb -vNu -pRs -vNu -qFZ -hPd -hPd -irc -nwO +iLd +iTP +jZG +tNE +uIj +lgb +fEI +wfy +xNR gFx aFg umT @@ -44303,12 +54419,12 @@ aOg mCF mCF aOg -mCF -ksX +wOR +cto cto toU -ksX -mCF +cto +cba mCF mCF jdm @@ -44321,7 +54437,7 @@ aOg cty ksX kgC -bIz +qYd cto xxk cto @@ -44329,8 +54445,8 @@ ksX ksX mCF mCF -cty -hoC +mCF +mCF mCF mCF mCF @@ -44349,70 +54465,70 @@ wUU "} (91,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -rGe -rGe -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -ijy -liD -ijy -pGs -pGs -hXN -bAT -cUq -iOE -sXb +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +lTR +aTY +qwQ +qwQ +qwQ +aTY +lTR +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +eDY +tNy +oLZ +qwQ +dXg +dXg +qwQ +dXg +qwQ +aqh +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +lTR +lTR +lTR +eDY +cpF +lTR +lTR +scL +oGv +tmC +hXR +lnO +dXg +daS +lTR +lTR +lTR +scL +oGv +cwE +cwE +qqM +hsl +hyr +giN +dVq tzw jzZ jzZ @@ -44421,7 +54537,7 @@ pol pol pol pol -mka +dVq lbr urA lss @@ -44430,13 +54546,13 @@ pVN daA khb urd -ara +mwd ara ara nZk hPD uQH -fkR +pVN dYn rmB rmB @@ -44450,16 +54566,16 @@ rmB tcq jyw xya -xNR +ydx fDn -wdA +wpX qQt jNT qeu thY mPI bTm -rby +snP qhF ffx umT @@ -44467,9 +54583,9 @@ eDF gFx fvw tEJ -qDk +ozC qIi -tEJ +vZz ezt xxk toU @@ -44485,12 +54601,12 @@ mCF mCF aOg xGV -mCF +wOR xxk cto etv +xxk ksX -mCF aOg mCF mCF @@ -44503,7 +54619,7 @@ aOg cty ksX ksX -ksX +qYd cto fLu ksX @@ -44512,7 +54628,7 @@ mCF mCF mCF cty -cty +mCF mCF mCF mCF @@ -44531,72 +54647,72 @@ wUU "} (92,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -rGe -pGs -aFr -pGs -bAT -cbU -cUq -cUq +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +lTR +qwQ +pAX +lTR +lTR +lTR +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +oLZ +qwQ +lTR +lTR +qwQ +qwQ +qwQ +qwQ +eDY +tNy +oLZ +nFD +lTR +lTR +lTR +lTR +lTR +lTR +lTR +stl +caD +lTR +scL +oGv +hXR +oGv +pfd +qgm +dXg +lTR +lTR +lTR +scL +oGv +cwE +cwE +hsl +hsl +hyr +hyr sXb esO -jzZ +dYp wZF fjH wZF @@ -44604,44 +54720,44 @@ wZF jzZ dYX sXb -hYf +ePB hvO mrd ogq riJ spP fdw -eUe -qRy +xtZ +ifZ eMi qRy moK hPD hXg -fkR +riJ aQc qqA +qqA pbt -pbt -pbt +iLD pbt pbt cLY +iLD +iLD pbt pbt -pbt -pbt -pbt +iLD xNR rSI vNu -cSI -rJK -vzH -lEB +cdL +oWs +qFZ syL +lsR clD -xNR +ydx xGp aFg aPe @@ -44667,14 +54783,14 @@ mCF mCF aOg aOg -aOg +iHE xxk cto etv +cto xxk mCF mCF -mCF aOg xGV aOg @@ -44684,8 +54800,8 @@ mCF aOg aOg cty -cty -ksX +cqZ +bxx bxx bxx ksX @@ -44713,75 +54829,75 @@ wUU "} (93,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -qhd -pGs -pGs -bAT -bAT -fal -cUq +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +pAX +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +oLZ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +eDY +tNy +oLZ +aTY +lTR +lTR +lTR +lTR +uoh +lTR +lTR +lTR +cpF +lTR +scL +rMb +oGv +oGv +oGv +lnO +lTR +lTR +lTR +dXg +scL +hXR +cwE +cwE +hsl +hsl +giN +hyr sXb tzw aJP svH kBo -uxO +wBD ybm lWf jzZ @@ -44796,19 +54912,19 @@ khb urd ara ara -ara +iGm nZk hPD uQH -fkR +pVN aQc qqA -pbt +pZD +iLD lQO -kwa cvW pYV -aVE +iJk foz juL iBz @@ -44834,11 +54950,11 @@ wpm vDC tEJ tEJ -bkM +pKs xxk toU xxk -xxk +noj mCF mCF hoC @@ -44849,35 +54965,35 @@ mCF aOg hoC hoC -cty +owM xxk cto etv +cto xxk -mCF meS aOg phA aOg aOg -mCF +wBc mCF mCF aOg aOg cty -cty -ksX +cqZ +cto cto cto ksX mCF mCF -mCF +wBc hoC cty cty -hoC +mCF mCF aOg mCF @@ -44895,75 +55011,75 @@ wUU "} (94,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -pGs -pGs -pGs -juW -juW -srq -fal -sXb +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +lTR +uYJ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +dXg +qwQ +qwQ +eDY +tNy +oLZ +qwQ +aqh +lTR +qwQ +qwQ +lTR +qwQ +eDY +tNy +oLZ +lTR +lTR +aTY +lTR +lTR +dXg +lTR +lTR +lTR +lTR +lTR +scL +oGv +oGv +hXR +oGv +pfd +qgm +lTR +lTR +lTR +scL +oGv +cwE +bgE +yeJ +giN +hyr +iSW +mRq tzw aJP ogj akk -gzW +xUu gdN lWf jzZ @@ -44982,16 +55098,16 @@ ara nZk hPD uQH -fkR +pVN aQc qqA -pbt +qqA +iLD wno jCr -jCr iNE -hLA -jCr +xbA +akO jCr iNE jCr @@ -44999,11 +55115,11 @@ bLy xNR xNR xNR +ydx xNR +ydx xNR -xNR -xNR -xNR +ydx xNR xNR uul @@ -45017,26 +55133,26 @@ xdz yeG frQ bkM -xxk +rXS etv xxk xxk mCF mCF cty -hoC -cty +mCF cty cty -hoC cty +mCF cty cty +owM ksX cto etv -ksX -mCF +cto +xxk mCF aOg aOg @@ -45048,8 +55164,8 @@ mCF mCF aOg hoC -cty -ksX +cqZ +cto mxB cto ksX @@ -45063,7 +55179,7 @@ mCF mCF aOg mCF -hoC +mCF pGs pGs pGs @@ -45077,70 +55193,70 @@ wUU "} (95,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +lTR +lTR +lTR +lTR +dXg +qwQ +qwQ +eDY +tNy +oLZ +pAX +qwQ +qwQ +qwQ +uoh +lTR +qwQ +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +lTR +lTR +lTR +lTR +cpF +gVO +jaF +uTu +tmC +oGv +dOS +hXR +oGv +lnO +lTR +lTR +lTR +scL +oGv +cwE +bgE +orK iks +giN iSW -iSW -sXb +mRq tzw jzZ oos @@ -45154,37 +55270,37 @@ xWY tam lss rHv -keo +mXx tpL khb -urd +hIo hOv wYa god nZk hPD -uQH -fkR +mZi +mXx aQc qqA -pbt -wno -hen +qqA +iLD +nRy qlW oXE uYF hen sJx -uvG +kZn qvQ bLy -xNR -fFN +ydx +bAE kIg nmC ben uIj -iwy +hDk aZb rAy xNR @@ -45198,7 +55314,7 @@ eDF fXG gFx gFx -aFt +bkM aFt etv cto @@ -45206,38 +55322,38 @@ cto xxk ksX ksX +tdN ksX ksX ksX +tdN ksX ksX -ksX -ksX -ksX -ksX -cto -etv -ksX +eEd +eEd +iaM +hbi +iaM +eEd mCF mCF mCF mCF mCF hoC -hoC mCF mCF mCF mCF -hoC -cty -ksX +mCF +cqZ +cto cto xxk xEG jdm mCF -cty +mCF cty cty hoC @@ -45259,68 +55375,68 @@ wUU "} (96,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -pGs -pGs -pGs -bgE +nvv +mPk +mPk +mPk +mPk +mPk +mPk +rYC +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +dXg +dXg +lTR +qwQ +pAX +eDY +tNy +wJl +rlI +rlI +rlI +rlI +rlI +rlI +rlI +mEy +tNy +oLZ +lTR +lTR +lTR +dXg +dXg +dXg +lTR +lTR +lTR +scL +hXR +oGv +oGv +hXR +oGv +oGv +oGv +lnO +lTR +lTR +gVO +lzD +upH +cwE bgE fuh -lzU +kWR +iSW iSW sXb ibo @@ -45332,55 +55448,55 @@ tzw tzw tzw sXb -xWY +ntw hvO bih rHv -cYT +hPD tpL khb urd pku -ara +xUH xHt nZk hPD -uQH -fkR +mZi +hPD aQc qqA -pbt -wno -hen +qqA +iLD +nRy vPj -hJQ +cHR uYF hen -cgp +hWA nBD qvQ -bLy +uXX xNR -duh +gZI vNu vNu -faG +iAc qFZ hPd wLv dSs -nwO +lvG gFx aFg qlx veZ gFx -gFx +veZ gFx sgz qhF qhF -lbD +qnN mUP nDl mUP @@ -45389,37 +55505,37 @@ qMW mUP mUP mUP +qMW mUP mUP +qMW mUP mUP mUP mUP mUP -mUP -mUP -ewO -ksX -cty -hoC +pGP +xxk +eEd hoC mCF mCF +mCF cty cty -hoC -aOg mCF +aOg mCF mCF mCF ksX cto cto +cto iDn mCF mCF -cty +mCF cty cty mCF @@ -45441,79 +55557,79 @@ wUU "} (97,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs -cBu -cBu -cBu -cBu -pGs -pGs -pGs -bgE +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +uYJ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +dXg +dXg +qwQ +qwQ +lTR +eDY +vss +vss +vss +vss +vss +vss +vss +vss +vss +vss +tNy +oLZ +lTR +lTR +lTR +dXg +dXg +lTR +lTR +lTR +lTR +scL +oGv +oGv +oGv +oGv +oGv +oGv +hXR +lnO +lTR +lTR +scL +oGv +hXR +cwE lat +hyr xYC dPR -nRH -sXb -sXb +giN sXb +mRq +mRq sXb vhw sXb sXb -sXb -sXb -sXb +mRq +mRq +xzj xWY hvO bih @@ -45528,12 +55644,12 @@ gfA eTP hPD uQH -fkR +pVN aQc qqA -pbt -btl -hen +hwa +iLD +wno pbt pbt uYF @@ -45541,17 +55657,17 @@ hen pbt pbt qvQ -uXX -xNR +bLy +ydx kxW pbd mnm -vNu +kWj wkM thY mPI tQI -rby +snP wrB ffx ddc @@ -45562,8 +55678,8 @@ aZv vZm xGp vZs -aFt -cDc +cTw +cto cto mxB cto @@ -45572,19 +55688,19 @@ xxk cto cto cto -eBT -bnc -fhV -lYi -oeO +cto +kul +cto +xxk +cto cto cto cto etv +mxB ksX cty cty -cty mCF mCF mCF @@ -45594,14 +55710,14 @@ aOg mCF mCF mCF -mCF ksX cto cto +cto ksX mCF mCF -hoC +mCF mCF mCF aOg @@ -45623,79 +55739,79 @@ wUU "} (98,1,1) = {" wUU -vGb -jYB -oWA -oWA -oWA -rxp -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -aFr -pGs -cBu -cBu -cBu -pHX -pGs -pGs -pGs -bgE +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +lTR +dXg +qwQ +qwQ +lTR +eDY +tNy +qLf +bJV +bJV +bJV +bJV +bJV +bJV +bJV +eha +tNy +oLZ +daS +lTR +lTR +lTR +dXg +lTR +aTY +lTR +lTR +scL +oGv +hXR +oGv +tgE +hXR +gJy +oGv +lnO +lTR +lTR +scL +vcz +hXR +cwE leU hyr -lzU -iSW +hyr nRH nRH -iSW -iSW -hyN -hyr +nRH +nRH +nRH +nRH +vqZ hyr +aXm rPT -iwQ -srY +rPT +qAp xWY xuW bih @@ -45710,63 +55826,63 @@ qBy fbQ hPD uQH -fkR +pVN aQc +qqA bft pbt -nnr -hen -jCr -jCr +kPj +xFO +stU uYF hen jCr jCr -qvQ +aAj cGd xNR gLZ vNu -vNu -vNu +pRs +ssZ vzH bNt syL -hXj -xNR +syL +ydx hwP vuE umT pNI tvI laa -gFx +veZ bpT hoK lWJ -aFt -ghs +bkM +dIK vTe vTe cto cto cto -vTe -aFt -aFt -aFt -aFt -aFt -aFt -aFt -aFt -aFt cto -etv +cto +cto +eBT +bnc +fhV +lYi +oeO +cto +ubJ +cto +eJS +owk ksX cty cty -cty mCF mCF mCF @@ -45775,15 +55891,15 @@ aOg aOg aOg aOg -mCF -mCF -xEG +wBc +glp +xxk cto cto -ksX +cba +vOo mCF mCF -hoC mCF mCF aOg @@ -45805,79 +55921,79 @@ wUU "} (99,1,1) = {" wUU -vGb -bOZ -jRC -jRC -aii -hGZ -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -cBu -cBu -pHX -cBu -cBu -pGs -qhd -pGs -bgE +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +uYJ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +lTR +vEg +qwQ +qwQ +eDY +tNy +nhY +rlI +rlI +rlI +rlI +bvF +rlI +hAI +qDr +tNy +oLZ +lTR +lTR +lTR +gVO +jaF +qgm +lTR +lTR +lTR +eGX +hKK +sRs +hXR +oGv +oGv +jSX +hKK +fLY +lTR +lTR +scL +hXR +oGv +cwE cTV +hyr sZe hyr iSW -mFF -iSW -iSW -iSW -oZA +giN iSW iSW +giN +vAz +giN +giN rbd hyr -iiV +jrq xWY hvO bih @@ -45893,63 +56009,63 @@ ufV ufV lTb fkR -aQc -nyO +pvs +qqA +gYg pbt qXn -oFq hiD hiD fQE oFq hiD -hiD +vqU oFq nzr xNR pYx -dXJ +sQs rSX alh owY klP -kPl +ryG cIP xNR -uYL +nWS aFg jHb -gFx +iwf xKq laa scD oKo laa gkx -aFt +pKs ghs cto cto gLo -ghs +oEX ghs vTe -aFt -gIB -uLY -oFd -cLD -oFd -tVA -kus +bkM +bkM +pKs +pKs +bkM +pKs +pKs +bkM aFt cto etv +cto ksX cty cty cty -cty mCF mCF mCF @@ -45958,22 +56074,22 @@ aOg aOg aOg mCF -mCF iDn +xxk cto cto -ksX +cba mCF mCF mCF mCF aOg mCF -hoC +mCF mCF aOg aOg -hoC +mCF pGs pGs pGs @@ -45987,79 +56103,79 @@ wUU "} (100,1,1) = {" wUU -vGb -bOZ -jRC -oAS -jRC -hGZ -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +ctE +gYh +gYh +tSK +eQm +gYh +rHE +uKY +eDY +tNy +oLZ +lTR +aTY +lTR +scL +vGn +lnO +lTR +lTR +lTR +lTR +lTR +scL +hXR +oGv +oGv +lnO +lTR +lTR +lTR +lTR +eGX +sRs +oGv +cwE bgE rAj bGe hyr -bgE -bgE -pGs -gte -pth -bIQ -iSW iSW -wjG -bgE -pGJ +cZZ +iJa +nKy +pth +uBV +jjN +giN +hyr +hyr +qAp xWY hvO bih @@ -46072,30 +56188,30 @@ pVN xDy pVN pVN -fkR +pVN fkR fkR ojJ -jcT +kEV +iRZ pbt iLD -iLD -faC -jiF +jCr +fiv uWA iLD -faC -jiF +jCr +pbM iLD iLD xNR +ydx xNR +ydx xNR +ydx xNR -xNR -xNR -xNR -xNR +ydx xNR xNR ldJ @@ -46108,42 +56224,42 @@ scD qEf aZv pNI +bkM +bkM +pKs +pKs +bkM +bkM +pKs +bkM +bkM +gIB +uLY +oFd +cLD +oFd +mcs +kus aFt -aFt -aFt -aFt -aFt -aFt -aFt -aFt -aFt -iTF -tEJ -tEJ -tEJ -tEJ -tEJ -gbG -aFt -cto +wOC etv +cto ksX cty cty cty cty cty -cty hoC mCF aOg phA aOg mCF -hoC ksX cto cto +bng ksX mCF mCF @@ -46169,82 +56285,82 @@ wUU "} (101,1,1) = {" wUU -vGb -bOZ -jRC -pom -nSZ -hGZ -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -rGe -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +lTR +qwQ +dXg +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +lTR +eDY +tNy +ctE +gYh +oKi +opd +iEe +diK +rHE +oLZ +eDY +tNy +oLZ +lTR +lTR +lTR +eGX +hKK +fLY +lTR +lTR +lTR +lTR +lTR +scL +oGv +hXR +oGv +lnO +lTR +lTR +lTR +nFD +aTY +scL +oGv +cwE bgE jEZ cjf pyk -bgE +vEM bgE pGs pGs pGs moH +onj iSW -iSW -pGs +uXR pGs -nTG -fkj -tEJ -pEE +pGJ +gnx +hvO +bih mux pot kmb @@ -46254,7 +56370,7 @@ mvI wVE mvI mvI -hHt +pot fJb mvI wVE @@ -46266,7 +56382,7 @@ pGS pGS ihn uLY -pGS +mJh pGS uLY mvI @@ -46278,8 +56394,8 @@ wmC aED pie guE -rgr -epm +qus +scD gFx aFg umT @@ -46299,16 +56415,17 @@ wmC mvI uLY pKs -uLY +iTF tEJ tEJ tEJ tEJ tEJ gbG -aFt +upL cto etv +xxk ksX cty cty @@ -46316,14 +56433,13 @@ cty cty cty cty -cty -hoC +mCF aOg aOg aOg mCF -cty -ksX +cqZ +cto cto cto xEG @@ -46334,11 +56450,11 @@ mCF mCF mCF cty -hoC mCF mCF mCF -hoC +mCF +mCF pGs pGs hoC @@ -46351,83 +56467,83 @@ wUU "} (102,1,1) = {" wUU -vGb -npB -hjD -hjD -hjD -gOJ -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +daS +qwQ +dXg +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +eDY +tNy +ctE +gYh +dlh +ncn +lXv +sFc +rHE +oLZ +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +lTR +lTR +lTR +lTR +cpF +lTR +lTR scL -xhb -wTQ -asJ -sOe -sOe -pGs -bgE +oGv +xzc +oGv +lnO +daS +lTR +lTR +lTR +lTR +scL +oGv +foQ +hET +vzB +ufn +vZN +nHy +hET pGs pGs bgE grT -ihG +gVq pGs pGs pGs -nTG -fkj -tEJ -pEE -tEJ +pGJ +xWY +hvO +bih +hvO tEJ rtV tEJ @@ -46448,7 +56564,7 @@ aLn tEJ uXw tEJ -rmN +azv tEJ tEJ qDt @@ -46458,10 +56574,10 @@ tEJ tEJ tEJ oMl -rwV -unm -jmB -woF +oKx +bGy +tak +pJs umT aJF uVu @@ -46473,14 +56589,14 @@ kTs lRz umT lIT -lCh +qeK bGy aLn tEJ tEJ tEJ rMN -yev +etf rMN tEJ tEJ @@ -46488,9 +56604,10 @@ tEJ hgB tEJ gbG -aFt -cto +upL +fky etv +cto ksX cty cty @@ -46498,14 +56615,13 @@ cty cty cty cty -cty hoC mCF aOg mCF hoC -cty -ksX +cqZ +cto cto cto iDn @@ -46519,12 +56635,12 @@ cty cty mCF mCF -hoC -pGs +mCF +mCF pGs mCF mCF -hoC +mCF pGs pGs pGs @@ -46533,70 +56649,70 @@ wUU "} (103,1,1) = {" wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -eGX -hKK -hKK -fLY -ijy -ijy -aFr -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +rYC +qwQ +qwQ +qwQ +dXg +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +ctE +rHE +psk +gyE +anA +uqU +ipi +oLZ +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +lTR +lTR +uoh +lTR +stl +cpF +gVO +uTu +rKM +oGv +oGv +lnO +aTY +lTR +lTR +lTR +lTR +scL +oGv +rMb +oGv +oGv +vss +vss +gJy +dOS pGs pGs pGs @@ -46605,11 +56721,11 @@ pGs pGs pGs pGs -nTG +pGJ fQr -tEJ +hvO pXp -oGc +oZw oGc ngm oGc @@ -46626,7 +56742,7 @@ oGc oGc eAJ oGc -oGc +buB oGc eAJ oGc @@ -46662,7 +56778,7 @@ oGc oGc oGc cug -veW +cug cug oGc oGc @@ -46670,10 +56786,10 @@ oGc ezW tEJ gbG -aFt +upL cto etv -ksX +cto ksX ksX ksX @@ -46686,8 +56802,8 @@ mCF mCF mCF mCF -cty -ksX +cqZ +cto cto cto iDn @@ -46715,70 +56831,70 @@ wUU "} (104,1,1) = {" wUU -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -ijy -ijy -liD -ijy -ijy -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +eDY +tNy +bLl +rHE +rjM +gLw +hso +ijO +rHE +wJl +mEy +tNy +oLZ +lTR +uoh +lTR +lTR +lTR +lTR +lTR +lTR +lTR +lTR +scL +oGv +oGv +hXR +oGv +pfd +jaF +oAC +lTR +lTR +lTR +eGX +hKK +sRs +oGv +kin +vss +vss +oGv +hXR pGs pGs pGs @@ -46787,11 +56903,11 @@ pGs pGs pGs pGs -nTG -lBS -rMN +pGJ +arg +oMs qPs -uLY +lzu rBP afx rBP @@ -46810,7 +56926,7 @@ gvE uLY rBP rBP -rBP +pqC rBP rBP dYy @@ -46826,19 +56942,19 @@ oBQ frQ gFx vZm -uzP -cJX -gFx +skY +mTD gFx gFx gFx gFx +lFA wba nNz gFx mXV lMv -qxL +oDz gFt rBP gvE @@ -46852,24 +56968,24 @@ uLY iKa xAO gmT -aFt +upL cto etv -ksX +xxk ksX cFe cFe cFe ksX +iFb +iFb cty -cty -cty -mCF mCF mCF mCF mCF -ksX +cba +cto cto cto ksX @@ -46883,13 +56999,13 @@ cty cty mCF mCF -mCF +vOo mCF aOg phA aOg mCF -hoC +mCF pGs pGs pGs @@ -46897,70 +57013,70 @@ wUU "} (105,1,1) = {" wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -rGe -rGe -ijy -ijy -ijy -ijy -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +lTR +eDY +vss +vss +gLw +sKF +aSt +gLw +pNk +aSt +vss +vss +tNy +oLZ +lTR +lTR +lTR +lTR +daS +lTR +lTR +lTR +lTR +lTR +scL +oGv +hXR +oGv +tmC +oGv +oGv +lnO +lTR +lTR +daS +lTR +lTR +scL +hXR +oGv +vss +gMi +oGv +oGv pGs pGs pGs @@ -46969,66 +57085,66 @@ pGs pGs pGs pGs -wOO -wOO -lcP -bwd -wOO -wOO -nTG -nTG -nTG -nTG -nTG +juW +wUj +bLN +viP +wUj +juW nTG nTG nTG +lNb +vqd +lNb nTG -rKe nTG nTG +pNf +vqd +lNb nTG nTG nTG wVf wVf wVf +sPs wVf wVf -wVf -ezB +qUf uIH -iTO -wVf +jQg wVf +qhZ wVf +qhZ wVf +qhZ wVf -wVf -wVf -wqb +wjV abE -wqb -wqb -wqb +wjV +cdb +cdb slG fUJ kAm -wqb -wqb -wqb -wqb +cdb +wjV +cdb +wjV abE pYn pYn +kgw pYn pYn +kgw pYn pYn -pYn -pYn -pYn -pYn +kgw +kgw pYn uLY pEE @@ -47036,22 +57152,22 @@ tEJ buH aFt cto -etv -ksX -ksX +toU +cto +cto qYE cto cto -ksX -ksX -cty +cto +ghs +iFb cty cty -hoC -jdm mCF +jdm mCF -ksX +cba +xxk xxk cto ksX @@ -47078,72 +57194,72 @@ pGs wUU "} (106,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -rGe -rGe -rGe -rGe -rGe -pGs -aFr -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +daS +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +dXg +dXg +qwQ +eDY +vss +czA +gLw +dXr +qyW +idr +gLw +gLw +czA +vss +tNy +wJl +rlI +rlI +rlI +rlI +lTR +rlI +lTR +lTR +lTR +lTR +scL +oGv +oGv +ibs +lQW +gux +kGD +kgm +mQG +lTR +lTR +aTY +lTR +scL +oGv +nee +vss +gMi +oGv +qFe +oGv pGs pGs pGs @@ -47151,27 +57267,27 @@ pGs pGs pGs pGs -wOO -obR -iVt -pZl -rZS -wOO -eyt -eyt -eyt -eyt -eyt -eyt -eyt -eyt -wqb +juW +faP +ftF +bEX +pnL +juW +gDh +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +gDh +uEc viK -jKg +gAV +xJZ wqb -eyt -eyt -eyt +kBZ +hPj wVf wdb qyk @@ -47190,20 +57306,20 @@ qDw wVf pBS viK -wqb +xJZ yeF -wqb -wqb -wqb -wqb -wqb +cdb +cdb +wjV +cdb +cdb kqE -wqb +cdb rRq usB pYn qTz -cDk +bjP bjP sre bjP @@ -47212,7 +57328,7 @@ iIt xFE cBq pYn -uLY +tVl fPn aBB tuL @@ -47225,18 +57341,18 @@ mUP uVy mUP qWw -ksX -cty +cto +iFb cty cty hoC mCF jdm -mCF ksX cto cto -ksX +cto +xxk mCF aOg rWN @@ -47245,7 +57361,7 @@ hoC cty cty cty -hoC +mCF mCF mCF aOg @@ -47260,127 +57376,127 @@ pGs wUU "} (107,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +dXg +lTR +dXg +qwQ +eDY +tNy +aJD +eQm +jFt +qCE +abu +tnD +hFM +qLf +eha +vss +vss +vss +vss +vss +vss +stl +lTR +lTR +lTR +lTR +cpF +eGX +sRs +lsN +hXR +ibs +eFB +kGD +mnz +lTR +lTR +lTR +gVO +jaF +uTu +oGv +oGv +vss +vss +oGv +oGv +oGv pGs pGs -wOO -wOO -wOO -wOO -wOO -wOO -rsB -tlT -ljx -bgl -wOO -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb +juW +juW +juW +juW +juW +juW +xzr +eFJ +trh +qdk +wUj +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ viK gAV +xJZ wqb -eyt -eyt -eyt +kBZ +hPj wVf xLE ioc vqY oaR -wVf +sPs gwG pJn krP -wVf +qhZ gwG xOo xOo xOo nHA -wVf +qhZ uqw viK xJZ xJZ xJZ ccU -dbm +sCA aKk xJZ xJZ -wqb +cdb wMn viK lhJ @@ -47406,24 +57522,24 @@ cto cto cto cto -etv -ksX +toU +cto cty cty cty cty mCF mCF -mCF -xEG +glp +xxk cto cto -ksX +rgg mCF mCF aOg mCF -hoC +mCF cty cty cty @@ -47442,106 +57558,106 @@ pGs wUU "} (108,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pHX -cBu -cBu -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +daS +lTR +qwQ +qwQ +qwQ +lTR +qwQ +lTR +qwQ +lTR +dXg +lTR +qwQ +eDY +tNy +ctE +hFM +fQh +gLw +oMg +mhf +eQm +oLZ +eDY +tNy +qLf +bJV +bJV +bJV +lTR +bJV +lTR +lTR +lTR +cpF +lTR +lTR +scL +oGv +vss +oGv +hwL +pun +oTE +coQ +lTR +lTR +scL +lsN +oGv +dOS +nee +vss +gMi +oGv +hXR +oGv +hXR pGs -wOO -hSU -cIR -lAJ -wvi -wOO -rsB -hNC -rEY -hVM -pJy -lVc +juW +wGs +oVm +fLZ +esB +juW +xzr +hus +wuR +rVS +kSN lVc lVc lVc lVc lVc +uTq lVc lVc lVc qRP xJZ +xJZ wqb -eyt -eyt -ouy +kBZ +wVf wVf idw jQB psb idw -wVf +sPs gwG pJn krP @@ -47563,14 +57679,14 @@ iXR xJZ xJZ cYB -xJZ +gDh viK -pYn +kgw nXB jvh mPf qdd -wot +dhp pYn wic pqj @@ -47581,25 +57697,25 @@ pEE tEJ uLY bkM +pKs bkM bkM bkM -bkM -bkM +pKs bkM cto etv -ksX +xxk cty cty cty cty mCF mCF -mCF iDn cto cto +cto ksX hoC mCF @@ -47624,85 +57740,85 @@ pGs wUU "} (109,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs -pGs -pGs -pGs -pGs -wOO -sSm -tlT -tlT -rsB -oSX -rsB -tlT -ljx -bgl -wOO +nvv +mPk +mPk +mPk +mPk +mPk +mPk +rYC +qwQ +lTR +qwQ +qwQ +qwQ +lTR +dXg +lTR +lTR +qwQ +lTR +lTR +qwQ +eDY +tNy +ctE +gYh +xuJ +fgW +npF +trB +gYh +eBm +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +lTR +lTR +lTR +lTR +lTR +lTR +lTR +scL +oGv +vss +vss +oGv +oGv +ecX +lTR +lTR +lTR +scL +oGv +oGv +oGv +hXR +vss +gMi +oGv +oGv +oGv +eCg +ltB +szp +qdk +eFJ +cgj +iPH +szp +xzr +eFJ +trh +qdk +wUj gtz sKu xJZ @@ -47712,26 +57828,26 @@ xJZ xJZ xJZ xJZ -viK +mvA +xJZ xJZ wqb -eyt -eyt -ouy +kBZ +wVf swj idw idw eRD gyX -anO +eTb mnc xMq krP wVf wVf -wVf -ann -wVf +xvF +aiR +qhZ wVf wVf okI @@ -47739,21 +57855,21 @@ lab lVc lVc lVc -gjz +jfw okJ gjz lVc iFZ -cYB +xJZ xJZ viK pYn -wkF -jvh -gdw -bXI -xxc -efu +diQ +hhW +tKI +doO +bBo +bMf rPD bTA iOQ @@ -47765,23 +57881,23 @@ uLY pKs hrI pXG -pKs +bkM vAR iDS bkM cto etv -ksX +cto cty cty cty cty cty mCF -mCF -ksX +iDn cto cto +qEG ksX cty hoC @@ -47806,100 +57922,100 @@ pGs wUU "} (110,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs -pGs -pGs -pGs -pGs -wOO -hQH -cMy -gkS -oDN -pJS -oDN -gkS -jTe -bgl -wOO -wqb -wqb -wqb +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +uYJ +lTR +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +dXg +qwQ +eDY +tNy +ctE +hFM +aSt +xQJ +uVR +saQ +hFM +oLZ +eDY +tNy +oLZ +dXg +dXg +lTR +uoh +lTR +lTR +lTR +lTR +lTR +lTR +lTR +scL +oGv +vss +vss +jSX +hKK +wDi +coQ +lTR +daS +scL +oGv +rKM +hXR +oGv +vss +vss +hmR +oGv +oGv +oGv +oDU +szp +ekg +noC +ktN +qSj +nGE +qSj +ktN +che +qdk +juW wqb -tWA -gey -tWA +crC +xJZ +ryD +xJZ +ryD +joV wqb wqb viK -wXu +xJZ +tBm wqb -eyt -eyt -ouy +kBZ +wVf unw idw idw @@ -47911,32 +58027,32 @@ xMq fqY wVf qPk -rHQ +uFJ xOo uFJ eMD wVf wVf wVf +qhZ wVf -wVf -wVf +qhZ wVf vOr -wVf +qhZ wVf viK xJZ xJZ viK pYn -uGZ -aad -sau -pjz -jcZ +pYn +kgw +pYn +pYn +kgw vHs -eph +htU pqj ydI pYn @@ -47944,31 +58060,31 @@ jDW uVY sIU uLY -vGD +vke iad fkj pKs tXF uhD bkM -cto +rmr etv -ksX -cty +cto +iFb cty cty cty cty cty -hoC -ksX +cqZ +ghs xxk cto ksX cty cty cty -hoC +mCF mCF mCF mCF @@ -47988,100 +58104,100 @@ pGs wUU "} (111,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO -eWC -tlT -tlT -rsB -oSX -rsB -tlT -ljx -bgl -wOO -eyt -eyt -jqw -kbQ -kbQ -kbQ -kbQ -kbQ -tWA -wXs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +lTR +qwQ +lTR +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +eDY +tNy +ctE +gYh +hFM +gYh +gYh +hFM +gYh +uKY +eDY +tNy +oLZ +dXg +lTR +nFD +lTR +lTR +lTR +dXg +eDY +vss +caD +lTR +scL +oGv +dOS +oGv +pfd +qgm +lTR +lTR +lTR +lTR +scL +hXR +oGv +vss +inN +abK +abK +inN +inN +inN +inN +inN +tmm +qdk +eFJ +eFJ +xzr +szp +xzr +eFJ +trh +qdk +juW +kBZ +kBZ +joV +keY +xJZ +ryD +ryD +ryD +ryD +viK +xJZ wXu wqb -eyt -eyt -ouy +kBZ +wVf wVf tiw vPi @@ -48091,7 +58207,7 @@ wVf hXv pJn krP -xvF +qhZ gwG xOo cvX @@ -48106,17 +58222,17 @@ liE jZw xMq vnU -wVf +qhZ viK xJZ mdj -viK -pYn -pYn -pYn -pYn -pYn -pYn +icJ +cYB +eoq +xJZ +uEc +xJZ +iGM pYn jjl nkF @@ -48135,9 +58251,8 @@ hNc bkM cto etv -ksX -cty -cty +cto +iFb cty cty cty @@ -48145,14 +58260,15 @@ cty cty ksX cto +bdc cto ksX cty cty cty -hoC mCF mCF +aOg mCF mCF mCF @@ -48170,100 +58286,100 @@ pGs wUU "} (112,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -cBu -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO -hMf -tlT -tlT -rsB -oSX -rsB -tlT -ljx -bgl -wOO -eyt -eyt -eyt -mED -sgk -kbQ -dNO -kbQ -gey -wXs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +lTR +lTR +qwQ +lTR +lTR +dXg +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +lmS +bJV +bJV +bJV +qmF +bJV +bJV +nHH +eDY +tNy +oLZ +lTR +lTR +lTR +lTR +dXg +lTR +dXg +lTR +tNy +caD +gVO +uTu +rfV +vss +oGv +oGv +pfd +jaF +jaF +jaF +jaF +uTu +oGv +nee +vss +oGv +rMb +oGv +oGv +rKM +oGv +oGv +rkH +szp +ekg +eFJ +eFJ +xzr +szp +xzr +eFJ +trh +qdk +juW +kBZ +kBZ +kBZ +xJZ +quP ryD -tWA -eyt -eyt -eyt +fbr +ryD +ryD +viK +sHO +ryD +wqb +kBZ +hPj wVf wVf wVf @@ -48273,9 +58389,9 @@ wVf hJl pJn krP -xvF +qhZ gwG -epU +wOS wrv cNh eOu @@ -48283,26 +58399,26 @@ kMf apI uoO mnc -icX +jJX mnc mnc xMq -vVC -wVf -gMs +agJ +qhZ +lab +lVc lVc -rPe pfr pbw -emX lVc -fvH -elO -kTx +lVc +qjg +lVc +iFZ +pIj +pYn +pYn pYn -aoU -aoU -aoU pYn kus gHH @@ -48313,139 +58429,139 @@ prY fkj pKs tXF -mNj -bkM +rBi +pKs cto etv -ksX -cty -cty -cty -cty -cty -cty -cty +xxk +owM +iFb +iFb +iFb +iFb +iFb ksX cto +cto xxk ksX -cty -cty -cty -cty -hoC -mCF -mCF -mCF +ksX +ksX +xxk +xxk +xxk +ksX +iDn +iDn mCF mCF mCF cty -hoC +mCF hoC mCF mCF mCF -mAz +hoC pGs pGs wUU "} (113,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO -lHE -jtU -jtU -qId -wOO -obR -iVt -pZl -rZS -wOO -eyt -eyt -eyt -jqw -jqw -lkK -kbQ -lkK -tWA -wXs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +qwQ +lTR +qwQ +qwQ +dXg +dXg +lTR +lTR +qwQ +lTR +lTR +lTR +qwQ +eDY +tNy +wJl +rlI +rlI +rlI +rlI +rlI +rlI +rlI +mEy +tNy +dyo +jaF +jaF +jaF +jaF +qgm +dXg +dXg +lTR +stl +cpF +scL +oGv +oGv +oGv +vlB +oGv +oGv +oGv +oGv +oGv +tmC +oGv +oGv +fxK +vss +vss +dXg +eCg +iZP +tXv +tXv +tXv +oGv +szp +sYi +gXO +aZX +dCE +juW +sic +ftF +bEX +pnL +juW +kBZ +kBZ +kBZ +xJZ +xJZ ryD -tWA -jqw -eyt -eyt +ryD +ryD +ryD +viK +xJZ +ryD +ryD +kBZ +hPj hHR idw vco @@ -48455,7 +58571,7 @@ wVf jhe pJn krP -xvF +qhZ gwG xOo eqB @@ -48466,22 +58582,22 @@ eOZ hzm uiy wVf +qhZ wVf -wVf -qIT -wVf -wVf -wVf -wVf -wVf -wVf -wVf -wVf +bdJ wVf wVf -wVf -xhj -pYn +gfj +fEA +xJZ +xJZ +xJZ +xJZ +xJZ +xJZ +vlw +viK +wXu vHs vHs vHs @@ -48497,33 +58613,33 @@ bkM ncX bkM bkM -cto +xag etv -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -ksX -xxk cto -ksX -ksX -ksX -ksX -ksX -ksX -ksX -iDn +iaM +cto +cto +cto +cto +cto +cto +cto +cto +cto +cto +cto +cto +wXC +cto +cto +cto +xxk xEG mCF mCF mCF mCF -hoC +mCF mCF mCF mCF @@ -48534,106 +58650,106 @@ pGs wUU "} (114,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -wUU wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -wUU -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +daS +qwQ +qwQ +lTR +lTR +qwQ +qwQ +lTR +qwQ +lTR +dXg +qwQ +eDY +vss +vss +vss +vss +vss +vss +vss +vss +vss +vss +tNy +hNq +oGv +oGv +oGv +oGv +lnO +lTR +lTR +lTR +lTR +lTR +pgg +oGv +oGv +rMb +vss +oGv +hXR +oGv +oGv +oGv +nwq +iaH +kAN +nRU +nRU +nRU +rQU +ihY +cCk +nwq +cFw +voJ pGs wOO wOO wOO wOO -pAu -wOO -wOO -lcP -wPN +wkt wOO +nUf +cbq +hHE +nUf wOO wOO wOO wOO -eyt -eyt -lkK -lkK -jqw -wqb +kBZ +kBZ +ryD +ryD +ryD +ryD lDm +xJZ +joV ryD -gey -kbQ -eyt -eyt +kBZ +hPj wVf dtu rTu hkZ xRx -wVf +sPs xsi pJn krP @@ -48646,24 +58762,24 @@ vEa wVf wVf wVf -wVf +qhZ wVf ezZ -uFJ +lyp pJn pBb wVf -grm -mpt -czl +qhZ +wVf +qhZ wVf -ixh -xKL -knW -baH wVf +wVf +wVf +wVf +xJZ viK -vpF +xJZ vHs eBs xcf @@ -48678,16 +58794,16 @@ aWP rBP rBP lZb -bkM +wMj cto etv vTe -cto +iaM mxB cto cto xxk -xxk +wNz xxk cto cto @@ -48716,71 +58832,71 @@ pGs wUU "} (115,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +lTR +qwQ +qwQ +lTR +qwQ +qwQ +lTR +qwQ +dXg +dXg +lTR +qwQ +eDY +tNy +qLf +bJV +bJV +bJV +bJV +bJV +bJV +bJV +eha +tNy +hNq +hXR +oGv +oGv +oGv +lnO +lTR +lTR +lTR +lTR +lTR +scL +oGv +tmC +vss +oGv +oGv +oGv +rKM +oGv +hXR +ihY +oDB +cFw +dwN +jks +jks +epN +cFw +cFw +ykS pGs pGs pGs @@ -48795,25 +58911,25 @@ iVt pZl qId cud -hnS +kOS dWl wOO -eyt -eyt -eyt -jqw -eyt +kBZ +kBZ +kBZ +ryD +kBZ wqb smE xJZ -tWA -mED -jqw -eyt +ryD +jeW +joV +hPj wVf aHM iYE -idw +dos idw wVf ivX @@ -48821,9 +58937,9 @@ pJn krP wVf wVf -wVf -iMq -wVf +qhZ +qto +qhZ wVf wVf xdJ @@ -48834,23 +58950,23 @@ unh ydQ eKw mnc -dSM +ilZ mnc bCA -kGT +fVt wVf -kEg -xOo -xOo -nHA +ixh +xKL +baH wVf +xJZ viK -wXu +xJZ vHs imz -sHa -kWB -sHa +mwD +ezb +wWd ggk vHs xlb @@ -48860,13 +58976,13 @@ tEJ tEJ tEJ twm -bkM -gLo +lNb +cto etv vTe dfP cto -cto +wXC cto cto xxk @@ -48877,7 +58993,7 @@ gLo xxk cto cto -cto +fLu cto cto cto @@ -48898,78 +59014,78 @@ pGs wUU "} (116,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +qwQ +lTR +lTR +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +lTR +qwQ +qwQ +qwQ +eDY +tNy +oLZ +lTR +qwQ +dXg +qwQ +qwQ +lTR +dXg +eDY +tNy +hNq +oGv +oGv +hXR +lsN +lnO +lTR +daS +lTR +lTR +lTR +scL +oGv +oGv +vss +gJy +hXR +oGv +oGv +pox +oGv +ihY +cFw +cel +fSa +jks +coX +mUz +cFw +cFw +qtv pGs pGs pGs pGs pGs wOO -eFA +faX kCA kCA cbq @@ -48980,24 +59096,24 @@ vmc wYF rsB wOO -eyt -eyt -eyt -eyt -eyt +kBZ +kBZ +kBZ +kBZ +kBZ wqb viK xJZ -tWA -kbQ -jqw +ryD +ryD +ryD wVf wVf rpT iHh eRD jSN -tUI +ylX mnc xMq oVr @@ -49006,36 +59122,36 @@ uFJ uFJ xOo uFJ -wOk +rsL uFJ kMN ppw irj -wOk +rsL diW pJn xOo rwh wVf -gwG +vLU pJn xOo -uHt -xOo -cSb +wku +cKC xOo -ndl +jcC wVf -viK xJZ -vHs -imz -kWB +viK +oef +fEz +fpY +eQC kWB kWB fpY gOe -nkP +rQk tEJ uXw tEJ @@ -49043,10 +59159,10 @@ tEJ tEJ lHH bkM -ksX +mdN bnB -ksX -ksX +mdN +eEd ksX ksX ksX @@ -49059,9 +59175,9 @@ ksX ksX ksX ksX -ksX iDn -xEG +iDn +xxk xxk cto ksX @@ -49080,71 +59196,71 @@ pGs wUU "} (117,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +rYC +qwQ +lTR +lTR +qwQ +qwQ +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +eDY +tNy +oLZ +qwQ +lTR +dXg +dXg +qwQ +qwQ +dXg +eDY +tNy +hNq +oGv +upH +oGv +oGv +lnO +lTR +lTR +lTR +lTR +lTR +scL +upH +oGv +hXR +vss +oGv +oGv +jju +ihY +ihY +hQl +vyp +cFw +jks +jks +jks +cFw +cFw +cFw +sVH pGs pGs pGs @@ -49159,27 +59275,27 @@ tlT ljx cbq tlT -kCA +loh rsB poE tlT hlp -eyt -eyt -eyt +kBZ +kBZ +kBZ wqb viK xJZ -tWA -kbQ -kbQ -xvF +ryD +ryD +ryD +sPs cYa lVB lZU vqY tiw -wVf +sPs oXp jVK uUS @@ -49188,36 +59304,36 @@ yeY fER yeY yeY -auf +haX yeY haX cdy jjE -auf +haX vvS -xMq +rKy xOo hoG -wVf -jMU +qhZ +vLU eye xOo -ifw -xOo -qAU +wku xOo +qEa iqW wVf -viK xJZ -vHs -iSc +viK +oef +jgY kWB -sHa kWB +mXi +rmf kWB ltA -tEJ +jpM tEJ mQC aBB @@ -49225,10 +59341,10 @@ jjg tEJ rtu bkM -iKy -etv -ksX -cty +iaM +hbi +iaM +eEd cty cty cty @@ -49242,10 +59358,10 @@ cty cty hoC mCF -mCF iDn xxk -cto +xxk +ghs ksX cty mCF @@ -49262,104 +59378,104 @@ pGs wUU "} (118,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +uYJ +qwQ +lTR +qwQ +qwQ +lTR +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +eDY +tNy +mIU +jaF +jaF +jaF +jaF +qgm +vEg +qwQ +eDY +tNy +jdu +hXR +oGv +oGv +hXR +lnO +lTR +lTR +lTR +stl +lTR +scL +oGv +oGv +jks +gkG +nRU +jjj +vuQ +ihY +ihY +ihY +iaT +cFw +rSl +utZ +coX +cFw +dvT +cFw +pkj +wUF pGs pGs pGs pGs wOO -wHW +mNm kCA tlT cbq dNU kDd cbq -tlT +aFK kCA -rsB +jaL poE tlT mQh -eyt -eyt -jqw -tWA -uPo -fNn -tWA -kbQ -kbQ -xvF +kBZ +kBZ +ryD +hcI +wXs +xJZ +ryD +ryD +ryD +sPs etE swi idw -idw +izy hJw wVf hek @@ -49380,54 +59496,54 @@ mLt pJn xOo oCN -wVf -jMU +qhZ +vLU nmQ ghb wVf gwG xOo -xOo -nHA +mAP wVf -viK xJZ -vHs -oDF -kWB -sHa +tYw +oef +jgY kWB +wmt +sgp +eQC kWB ltA -tEJ +jpM tEJ uXw tEJ tEJ tEJ twm -bkM +lNb +iaM +gAK cto -etv ksX cty cty cty cty cty -cty mCF mCF -hoC +mCF cty cty cty mCF mCF -mCF ksX +mxB cto -cto +bng ksX cty mCF @@ -49444,73 +59560,73 @@ pGs wUU "} (119,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +lTR +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +lTR +eDY +tNy +igB +oGv +oGv +oGv +oGv +lnO +lTR +lTR +eDY +tNy +igB +oGv +oGv +tmC +oGv +pfd +jaF +jaF +jaF +stl +gbE +uTu +oGv +hXR +ihY +cFw +kmo +cFw +epN +qkq +xfz +ihY +nwq +cFw +cFw +fWW +jks +jks +cFw +tkh +cFw +nwq +cFw pGs pGs pGs @@ -49519,24 +59635,24 @@ pNJ kCA tlT mYd -dQq +oSe ssg rKL tlT kCA -aIq -ewn +cil +cuc tlT -vbB -eyt -jqw -kbQ -tWA -uPo -fNn -gey -kbQ -kbQ +mrT +kBZ +ryD +ryD +ryD +wXs +xJZ +ryD +ryD +ryD wVf wVf pIC @@ -49544,9 +59660,9 @@ hty wVf wVf wVf -wVf -vOr -wVf +qhZ +jsf +qhZ wVf eyt eyt @@ -49560,7 +59676,7 @@ eHB wVf dQr pJn -xOo +bPL tUd wVf rmL @@ -49568,46 +59684,46 @@ qsh oCy wVf cur -bhp -crx +syb gEO wVf +rDD viK -xJZ -vHs -imz -kWB +oef +jgY kWB +cAx +aXA kWB kWB xyJ -tym +aFX tEJ uXw tEJ tEJ tEJ twm -bkM -cto +lNb +iaM etv +cto ksX ksX -ksX -cty +iFb cty cty hoC mCF jdm -hoC +mCF hoC cty mCF mCF mCF -jdm -ksX +cba +xxk cto cto ksX @@ -49626,107 +59742,107 @@ pGs wUU "} (120,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +uYJ +lTR +qwQ +qwQ +qwQ +qwQ +lTR +lTR +lTR +lTR +qwQ +qwQ +lTR +eDY +tNy +igB +oGv +lsN +tmC +hXR +pfd +jaF +jaF +tGw +tNy +igB +oGv +hXR +oGv +oGv +oGv +oGv +oGv +oGv +stl +mmO +oGv +oGv +gfk +ihY +xnS +vyp +jks +cFw +cFw +cFw +cFw +cFw +cFw +gJN +wop +jks +rUI +nwq +cFw +cFw +cFw +cFw +nwq +cFw pGs qnW bgl kCA tlT mYd -mdU +iht hTd rKL tlT kCA aIq tlT -tlT -vbB +eGL +mrT +kBZ +tkF +ryD +ryD +wXs +xJZ +ryD +ryD eyt -jqw -lkK -tuO -uPo -fNn -tWA -kbQ -mED eyt wVf wVf wVf wVf eyt -eyt wqb +wXu viK xJZ wqb @@ -49741,26 +59857,26 @@ uoO mnc kCT mnc -xMq -xOo +aQR +shP gBV wVf +xvF wVf +xvF wVf wVf wVf wVf wVf -wVf -wVf -wVf +sKu viK xJZ vHs imz -sHa -kWB -sHa +wDv +bSu +wdI szh vHs iad @@ -49771,13 +59887,12 @@ aBB wXD pdr bkM -cto +kRp mNO qWw cto -ksX -cty -hoC +xxk +iFb hoC mCF mCF @@ -49786,10 +59901,11 @@ mCF mCF mCF mCF -aOg mCF +aOg mCF -xEG +ksX +xxk cto cto cto @@ -49808,98 +59924,98 @@ pGs wUU "} (121,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -cqC -bgl +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +dXg +qwQ +qwQ +btU +tNy +igB +hXR +rMb +oGv +oGv +oGv +oGv +oGv +eoj +tNy +igB +oGv +oGv +oGv +rKM +fkd +oGv +hXR +svt +vss +mmO +dOS +oGv +dXg +ihY +xnS +fPq +jks +upb +upb +jks +jks +upb +upb +jks +jks +qTE +cFw +cFw +cFw +jsG +jks +cFw +cFw +nwq +nwq +oSX +mvO kCA tlT mYd -dQq +hbP iIC rKL tlT kCA -aIq +cil wae sdZ hwZ -eyt -eyt -kbQ -yeK -wXs +kBZ +kBZ +ryD +ryD +apj +xJZ +ryD ryD -tWA -kbQ kbQ kbQ eyt @@ -49907,8 +60023,8 @@ eyt eyt eyt eyt -eyt wqb +xJZ viK xJZ wqb @@ -49933,9 +60049,9 @@ eij wVf ieu qAr -ccK mIG wVf +eFW viK xJZ vHs @@ -49953,12 +60069,12 @@ ciR wVE fiA bkM -cto -cto -etv -cto -ksX -mCF +eQr +iaM +hbi +gMm +xxk +iFb mCF mCF aOg @@ -49970,9 +60086,9 @@ mCF aOg aOg mCF -mCF -ksX -cto +iDn +xxk +sgl cto cto cto @@ -49990,76 +60106,76 @@ pGs wUU "} (122,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +lTR +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +qwQ +dXg +dXg +qwQ +tqV +mEy +tNy +jKW +hej +dOS +oGv +oGv +rKM +oGv +fZX +nOM +tNy +jKW +hej +rMb +oGv +oGv +oGv +oGv +oGv +svt +tNy +mmO +oGv +oGv +oGv +cFw +ngY +jks +qVb +jks +kPZ +cFw +cFw +cFw +nwq +iaH +jjj +jJC +pFd +vuQ +cel +jks +jks +nwq +cFw +cFw +fsC wOO fFx kCA @@ -50068,7 +60184,7 @@ mYd imZ jPe rKL -tlT +tOd kCA rpH wOO @@ -50076,12 +60192,12 @@ wOO wOO wOO wOO +oSX wOO -wqb -wXs +jPM xJZ -wqb -kbQ +xJZ +ryD lFk kbQ kbQ @@ -50089,8 +60205,8 @@ eyt eyt jqw eyt -eyt wqb +xJZ viK xJZ wqb @@ -50100,24 +60216,24 @@ wqb wqb wVf wVf +xvF wVf -wVf -wVf +xvF wVf umA mve xOo hoG -wVf +qhZ xOo ppw xOo wVf wpM vpV -aOi -dlI +nmN wVf +xJZ viK xJZ vHs @@ -50127,20 +60243,20 @@ vHs vHs vHs vHs +eHl +ufB uXS -imF uXS uXS +uwN +eHl uXS -ykC uXS uXS -aFt -aFt -etv +hbi cto -iDn -mCF +xxk +vhI mCF mCF aOg @@ -50148,18 +60264,18 @@ aOg mCF mCF mCF -hoC +mCF lVQ xGV mCF -mCF -xEG -xxk -cto +iDn xxk +qAS +fYs +dDG wws poC -ksX +cba aOg aOg aOg @@ -50172,85 +60288,85 @@ pGs wUU "} (123,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +qwQ +pdK +pdK +pdK +pdK +kgp +pdK +pdK +gVP +aQN +jzB +aQN +geK +qNu +wlB +wlB +wlB +ghW +mnU +aQN +jzB +aQN +geK +wlB +wlB +lTg +ghW +wlB +mnU +suY +aQN +hMg +lTg +wlB +wlB +res +res +kZe +lrR +jks +qKM +mUz +cFw +cFw +ihY +cFw +ewv +jks +nwq +gwD +cFw +jks +jks +cFw +cFw +cFw +nwq +oSX vQL kCA tlT mYd wRi -iIC +leO rKL -tlT +mSf kCA rsB wOO @@ -50259,27 +60375,27 @@ ubK sLi pkT pAZ -wqb -viK +wOO +rWY xJZ -wqb +xJZ +ryD +kbQ +kbQ +kbQ kbQ -lkK -lkK -jqw -jqw jqw kbQ eyt -eyt wqb -hUK -lVc +rDD +wng lVc lVc lVc lVc lVc +elO lVc lVc lVc @@ -50297,32 +60413,32 @@ wVf wVf pRy vpV -qoS mIG -wVf -viK +obS xJZ -dfi -eyt +hfn +ryD +xJZ +kfG eyt eyt uXS vZv -mDW +kNa sGo eQZ -coh +xwY uXS xOz eQZ -aOZ -mDW +sGo +kNa oAm -aFt -etv +uXS +hbi cto -xEG -mCF +mMu +vhI mCF aOg aOg @@ -50330,18 +60446,18 @@ lVQ hoC cty cty -hoC mCF mCF mCF mCF -iDn +xEG +xxk cto cto cto eGq aTC -ksX +cba aOg aOg aOg @@ -50354,77 +60470,77 @@ pGs wUU "} (124,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO +nvv +mPk +mPk +mPk +mPk +mPk +mPk +rYC +qwQ +lTR +lTR +qwQ +qwQ +urD +urD +urD +kgp +pdK +pdK +fpq +kVq +aQN +hQV +aQN +geK +wlB +lTg +wlB +wlB +wlB +mnU +aQN +ocz +aQN +geK +wlB +wlB +wlB +wlB +wlB +mnU +wlB +aHw +aQN +vMo +qNu +wlB +wlB +iUH +cel +jks +jks +cFw +ihY +cFw +cFw +vYy +deE +nwq +aBz +xfz +ihY +cel +jks +jks +jks +jks +cFw +nwq +oSX uwQ kCA tlT @@ -50435,28 +60551,29 @@ cbq tlT kCA rsB -wOO +oSX fEu fEu fEu fEu pCO -wqb +oSX viK xJZ +xJZ wqb +tVj kbQ -lkK -lkK -jqw -jqw kbQ kbQ -dHE -eyt -wqb +kbQ +kbQ +lFk +bPk +xJZ viK xJZ +sxY xJZ xJZ xJZ @@ -50466,45 +60583,44 @@ xJZ xJZ xJZ xJZ -mHh -wVf +qhZ rqn -civ +kGF pJn tUd -wVf +qhZ hyp iNr vZl -wVf +qhZ tdy vpV -vpV dNY -wVf +obS +ryD viK xJZ -dfi -eyt +xJZ +kfG eyt eyt uXS uXS uXS tlG -hsx +eQZ rWx uXS sGo -eQZ +pmh iAa uXS uXS -aFt -etv +uXS +hbi cto -ksX -mCF +cto +vhI mCF aOg mCF @@ -50516,8 +60632,8 @@ cty hoC mCF mCF -mCF ksX +dzH xxk cto cto @@ -50528,7 +60644,7 @@ lVQ xGV aOg aOg -hoC +mCF pGs pGs pGs @@ -50536,157 +60652,157 @@ pGs wUU "} (125,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO +nvv +mPk +mPk +mPk +mPk +mPk +mPk +xVw +qwQ +daS +qwQ +qwQ +qwQ +pdK +pdK +pdK +urD +pdK +pdK +nsN +mnU +aQN +aQN +aQN +geK +vLh +hDw +qZV +qZV +oyl +mnU +aQN +aQN +aQN +geK +vLh +hDw +qZV +qZV +oyl +fmu +xVX +wlB +lTg +aQN +wlB +lTg +wlB +cFw +cel +jks +jks +cFw +cFw +jks +ebi +xmL +otH +iWX +jks +kDk +xWL +cFw +jks +uAM +cFw +cFw +cFw +tlq +oSX oUO kCA tlT -cbq +syt tlT -ljx +xdW cbq tlT kCA rsB -hst +oSX lur lur lur fEu ubK -wqb +oSX viK xJZ -tWA +ryD +ryD +tVj kbQ -lkK -lkK jqw kbQ kbQ kbQ -rWB -eyt -wqb +ofC +uvr +xJZ viK xJZ -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wVf +xJZ +sny +vlw +xJZ +xJZ +xxs +iXR +xJZ +xJZ +gDh +qhZ beE orb pJn xOo dpz xOo -pJn +kiG lxy -wVf +qhZ bUg vpV -qoS -pcQ -wVf -viK +eKW +obS +ryD +wXs xJZ -dfi -eyt -kbQ +ryD +kfG +xAx eyt uXS vZv -mDW +kNa sGo wlq sGo uXS -vzY -eQZ +aud +vHY sGo -mDW +kNa oAm -aFt -etv +uXS +hbi cto -ksX -mCF +cto +iFb mCF aOg mCF @@ -50698,9 +60814,9 @@ cty cty mCF mCF -mCF +ksX +iDn iDn -xEG ksX ksX xEG @@ -50710,7 +60826,7 @@ aOg aOg aOg mCF -hoC +mCF pGs pGs pGs @@ -50718,81 +60834,81 @@ pGs wUU "} (126,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +qwQ +qwQ +qwQ +qwQ +urD +urD +pdK +pdK +pdK +urD +nsN +bys +kkt +hsa +ksu +njC +riM +aQN +aQN +aQN +hsa +xDd +rUc +hsa +ksu +bVe +yhZ +aQN +aQN +aQN +hsa +wlB +aQN +aQN +kYF +kgp +kgp +wlB +ghW +cFw +cFw +cFw +osE +cFw +cFw +eSo +dvT +cFw +tPK +jks +jks +upb +jks +qSR +wop +cFw +cFw +cFw pGs pGs wOO pCV kCA tlT -iwd +iGS tlT qqs adR @@ -50805,20 +60921,20 @@ aDZ rTv fEu ubK -wqb -viK +oSX +mZk +xJZ +xJZ +imu +tVj +tVj +tVj +tVj +tVj +tVj +tVj +uvr xJZ -gey -kbQ -kbQ -kbQ -lkK -kbQ -kbQ -poK -rWB -eyt -wqb viK xJZ wqb @@ -50827,31 +60943,31 @@ eyt eyt eyt wVf -sBN -xOo -xOo -xOo -lod +wVf +wVf +xvF +wVf +wVf xOo xOo jVK mnc -hih +mnc mnc xMq kYn wVf fHx vpV -qoS qVS wVf +rWY viK xJZ xJZ -kbQ -kbQ -kbQ +vph +qIF +sgk uXS uXS uXS @@ -50859,16 +60975,16 @@ jGz hsx rWx uXS -sGo +xzd eQZ -iHm +sGo uXS uXS -aFt -etv +uXS +wGQ +xxk cto -ksX -hoC +kmI mCF jdm mCF @@ -50876,7 +60992,7 @@ hoC cty cty cty -hoC +mCF hoC mCF mCF @@ -50893,89 +61009,89 @@ aOg mCF mCF mCF -pGs +mCF pGs pGs pGs wUU "} (127,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +uYJ +qqR +qwQ +qwQ +lTR +pdK +pdK +pdK +pdK +pdK +urD +nBc +gsC +lTg +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +lTg +wlB +kgp +kgp +kgp +vzq +kgp +ihY +nwq +ihY +ihY +ihY +iaH +jjj +jjj +ihY +ihY +teg +jks +jks +cFw +cFw +gDr +dvT +nwq +cFw +cFw pGs wOO -bkx +fCB kCA tlT cbq -tlT +mSf ljx cbq tlT @@ -50987,36 +61103,36 @@ lur cbg fEu xjp -wqb -qSK +wOO +viK +xJZ xJZ wqb -wqb -tWA -tWA -kbQ -lkK -mED +tVj +tVj +qIF kbQ +qIF +tTU kbQ -eyt -wqb -viK +uvr xJZ +viK +gDh wqb eyt eyt eyt eyt wVf -wVf -wVf -wVf -wVf -svP +sBN xOo -ufH -nmQ +xOo +xOo +aRL +xOo +xOo +vrO vAg wVf gwG @@ -51025,32 +61141,32 @@ iPI fLn jhv aQu -vpV ocr wVf +ybt viK xJZ -dfi -eyt +vlw +qIF kbQ kbQ uXS -crO -mDW -sGo +dGR +kNa +eqn eQZ sGo uXS vzY eQZ -sGo -mDW +eqn +kNa oAm -aFt -etv +uXS +hbi cto -ksX -hoC +cto +kmI mCF mCF mCF @@ -51075,85 +61191,85 @@ mCF mCF mCF mCF -pGs +mCF pGs pGs pGs wUU "} (128,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO -wHW +nvv +mPk +mPk +mPk +cUN +mPk +mPk +wBp +uYJ +qwQ +qwQ +qwQ +qwQ +pdK +pdK +pdK +pdK +pdK +pdK +urD +nsN +usQ +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +aQN +wlB +aQN +aQN +wlB +kgp +kgp +wlB +kgp +kgp +kgp +ihY +ihY +ihY +qis +mrR +mtJ +cFw +epN +cFw +ihY +hQl +jks +jks +fSa +jks +cFw +cFw +cFw +cFw +cFw +fsC +oSX +bgl mSD gkS adR @@ -51163,9 +61279,9 @@ yjK lsT kCA hUY -wOO -lur +oSX lur +rtR osr aDZ aDZ @@ -51174,15 +61290,15 @@ pfr lVc lVc iFZ -ryD -tuO kbQ kbQ kbQ kbQ -eyt +kbQ +sgk eyt wqb +xJZ viK xJZ wqb @@ -51190,10 +61306,10 @@ eyt eyt eyt eyt -eyt -eyt -eyt -jqw +wVf +wVf +wVf +xvF wVf wVf hay @@ -51205,17 +61321,17 @@ vap jVK eUv wVf -gLK +twh aqb -qoS ptP wVf +mNT viK xJZ -dfi -eyt +xJZ +kfG nMJ -kbQ +uqW uXS uXS uXS @@ -51224,15 +61340,15 @@ bHc rWx uXS sGo -gFv +qQe uXS uXS uXS -aFt -etv +uXS +hbi cto -ksX -cty +cto +iFb hoC mCF mCF @@ -51252,8 +61368,8 @@ cty mCF mCF mCF -hoC -hoC +mCF +mCF mCF mCF mCF @@ -51264,80 +61380,80 @@ pGs wUU "} (129,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO -bgl -kCA +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +qwQ +lTR +daS +uYJ +qwQ +pdK +pdK +pdK +pdK +pdK +fpq +cVq +mtT +lTg +nCl +nCl +nCl +aQN +aQN +kgp +kgp +kgp +kgp +kgp +kgp +kgp +kgp +nCl +nCl +nCl +aQN +dOm +aQN +nCl +nCl +nCl +nCl +nCl +aQN +wlB +gDr +ihY +ihY +mgT +bfX +uRa +uRa +uRa +eoB +kjp +uRa +lNd +jks +fbJ +lch +fbJ +lch +fbJ +lch +fbJ +lch +tZm +mvi kCA +sHs cbq kCA kCA @@ -51345,41 +61461,41 @@ pkX nsl kCA hUY -wOO -lur +oSX +eYM lur rpI rrr rrr -wqb -qvO -wXu +wOO +fga +uwJ xJZ viK -fNn -yeK kbQ kbQ +qIF kbQ -jqw -eyt +qIF +uet eyt wqb +rpd viK xJZ wqb eyt eyt eyt -jqw -jqw kbQ -kbQ -sgk -jqw -wVf -wVf +eyt +eyt +ldw +xAx +kjN wVf +xvF +nNv wVf wVf wVf @@ -51391,30 +61507,30 @@ wVf wVf wVf wVf -wVf -amK +rDD +viK xJZ -dfi -jqw +xJZ +kbQ kbQ eyt uXS -vzY +pjk qZr -mDW +kNa tKw nFf uXS vzY eQZ -mDW +kNa sGo rWx -aFt -etv +uXS +hbi cto -ksX -cty +wXC +iFb cty mCF mCF @@ -51446,82 +61562,82 @@ pGs wUU "} (130,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO +nvv +mPk +mPk +mPk +mPk +mPk +mPk +wBp +rYC +wLB +mPW +wBp +lze +pdK +urD +pdK +urD +urD +nsN +wlB +kAH +kgp +kgp +wsn +wlB +aQN +kgp +kgp +wlB +lTg +kgp +lTg +wlB +jsx +rVl +dJX +pNR +vll +bbK +bSQ +iQr +tCV +tCV +iQr +iQr +tCV +iQr +iQr +sIK +foE +nnb +pmW +keb +nnb +wtk +wDH +nLH +wDH +nnb +nnb +nnb +cFw +cFw +nwq +cFw +nwq +gDr +cFw +mcB +oSX oIC jtU jtU qId -bIq +jtU oBP kLA vnH @@ -51529,40 +61645,40 @@ jtU dID wOO gar -lur +dgF uZa mEB mEB -wqb -wqb -wqb -wqb +oSX +xJZ +xJZ +xJZ viK ryD -wqb -kbQ -kbQ -kbQ -jqw -eyt +ouy +ofC +qIF +jJf +cFz eyt wqb +xJZ viK xJZ wqb eyt eyt jqw -kJX kbQ -mED kbQ +rMP kbQ +qIF kbQ +qIF +kbQ +tVj kbQ -eyt -eyt -eyt eyt wVf oWO @@ -51573,42 +61689,42 @@ eyt eyt eyt wqb -wqb +xJZ viK xJZ -dfi -eyt +xJZ +kbQ +kbQ kbQ -eyt uXS vZv -cDY +vZO uXS -eQZ -qXM +jCN +rWx uXS tcS dnU uXS sGo oAm -aFt -etv +uXS +hbi cto -iDn -lVQ +mxB +eHZ aOg mCF mCF cty mCF mCF -hQq +mCF mCF mCF mCF lVQ -gsm +aOg gsm cty cty @@ -51618,7 +61734,7 @@ cty cty cty cty -cty +mCF mCF mCF mCF @@ -51628,86 +61744,86 @@ pGs wUU "} (131,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -wOO -wOO -dmg -dmg -dmg -wOO -wOO +nvv +cUN +mPk +cUN +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +rYC +fpq +mwI +cVq +cVq +pZT +nsN +mdg +lTg +kgp +nit +wlB +aQN +slw +kgp +eia +lTg +hVL +wlB +qAy +hmh +wlB +ebF +ggr +kgp +kyP +wlB +wlB +tCV +iQr +aCX +tCV +iQr +iQr +iQr +tCV +eJN +vuA +vuA +bcD +pmW +pmW +nnb +nnb +sIK +nnb +nnb +nnb +nnb +nwq +ebi +cFw +cFw +cFw +cFw +cFw +kuO +slE +cqC +sPh +qId +qxa wOO -jTn wOO +nUf +kIz +nUf wOO wOO wOO @@ -51717,18 +61833,18 @@ wOO wOO wOO wqb -wqb +xJZ xJZ viK xJZ -wqb +tCA kbQ kbQ -fZL -eyt +vcR eyt eyt wqb +xJZ viK xJZ wqb @@ -51738,14 +61854,14 @@ eyt sgk kbQ kbQ +qIF kbQ -kbQ -kbQ +qIF sgk kbQ +tVj kbQ eyt -eyt wVf jUM dnV @@ -51758,33 +61874,33 @@ wqb xJZ viK xJZ -dfi -dfi -dfi -dfi -dfi -dfi -dfi -dfi -abE -dfi -dfi -dfi -abE -aFt -aFt -aFt -aFt -etv +xJZ +kfG +ofC +kbQ +uXS +uXS +uXS +uXS +jKK +eHl +uXS +eHl +jKK +uXS +uXS +uXS +uXS +hbi cto -iDn -aOg +xxk +eHZ aOg mCF mCF mCF -hQq -hQq +mCF +mCF mCF mCF mCF @@ -51800,8 +61916,8 @@ cty cty cty cty -hoC mCF +aOg mCF mCF pGs @@ -51810,141 +61926,141 @@ pGs wUU "} (132,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -oET -oET -faV -faV -faV -oET -oET -wqb -viK -uEc -wqb -wqb -eyt -eyt -eyt -eyt -eyt -eyt +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cUN +mPk +cJL +mPk +xVw +nsN +xNA +xNA +xNA +gVd +oZJ +xNA +kgp +kgp +gCQ +wlB +bYO +lTg +wlB +nKf +wlB +wlB +wlB +wlB +wlB +tgK +wlB +aQN +wlB +wlB +bbK +wlB +iQr +iQr +bSQ +qNu +wlB +wlB +aQN +wlB +aKJ +mrR +cFw +cFw +dYW +jks +cFw +cFw +xmL +fMI +eHv +cFw +jks +cFw +cFw +cFw +mUz +nwq +cFw +cFw +uFO +slE +slE +oSX +oSX +oSX +slE +xAg +axh +enu +iQS +cRZ +vVH +kBZ +kBZ +kBZ +kBZ +kBZ +kBZ wqb gDh xJZ viK xJZ -wqb +tCA kbQ kbQ eyt eyt eyt -eyt wqb -viK xJZ +viK +wXu wqb eyt eyt eyt eyt sgk +tTU +qIF kbQ kbQ kbQ -kbQ -kbQ -mED -kbQ -jqw +wQh +tVj +tVj eyt wVf -nrd gqN +nrd gnZ wVf eyt eyt wqb +oJW xJZ -xJZ -wng -lVc +eQa lVc lVc lVc lVc lVc +mCe lVc lVc lVc @@ -51953,19 +62069,19 @@ lVc feR lVc pfr +vJp +lVc mUP -mUP -mUP -mUP +fnj baa -xxk -xEG -aOg +mMu +xhA +eHZ aOg aOg mCF -hQq -hQq +mCF +mCF mCF mCF mCF @@ -51982,9 +62098,9 @@ cty cty cty cty -hoC -mCF +aOg mCF +mSa mCF pGs pGs @@ -51992,121 +62108,121 @@ pGs wUU "} (133,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -gZP -hUq -gZP -xGf -gZP -taO -oET -rjS -viK -xJZ -ylf +nvv +mPk +mPk +mPk +cUN +mPk +mPk +mPk +mPk +mPk +cUN +mPk +wcb +wlH +tMZ +ghW +wlB +beK +mtT +kgp +kgp +wlB +wlB +hmh +wlB +jwX +aQN +aQN +sKz +wlB +tez +tmZ +rXk +wlB +aQN +hmh +wlB +bbK +mdg +dWV +tCV +jKs +wlB +wlB +kgp +doH +nCl +bbK +xmL +iUH +icm +cFw +nwq +cFw +cFw +cFw +cFw +pll +jNn +eNA +jks +cFw +jks +jks +jks +cFw +cFw +nwq +gaG +qEt +ihX +qEt +xSZ +qEt +biS +vVH +dsz +enu +iQS +wxD +vVH +kBZ +kBZ +kBZ +kBZ +kBZ +kBZ wqb -eyt -eyt -eyt -eyt +rDD +xJZ +viK +stw +ouy +kbQ +kbQ +kbQ eyt eyt wqb -xJZ -xJZ +rDD viK -xJZ -wqb -mED -eyt -eyt -eyt -eyt -eyt -wqb -viK -xJZ +gha wqb eyt eyt -lkK -lkK -kbQ kbQ kbQ kbQ kbQ kbQ kbQ +ofC +tTU +tVj sgk jqw eyt @@ -52118,36 +62234,36 @@ wVf eyt eyt wqb -xJZ +qQd xJZ viK xJZ +vlw xJZ xJZ +ryD xJZ xJZ xJZ xJZ xJZ +ryD xJZ xJZ xJZ xJZ xJZ -xJZ -cto -cto -cto -cto cto +tuZ +sgl +wNz xxk -iDn -aOg +eHZ aOg aOg mCF -hQq -hQq +mCF +mCF mCF jdm mCF @@ -52174,115 +62290,113 @@ pGs wUU "} (134,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -vrp -vrp -fLS -eSd -hmu -fLS -nrR -iLN -oET -iQN -viK -xJZ -ylf -wqb -eyt -eyt -eyt -eyt -eyt -eyt +nvv +cUN +mPk +cUN +mPk +mPk +mPk +mPk +mPk +cUN +cUN +cUN +pCa +tMZ +wlB +eia +wlB +ghW +lTg +wlB +wlB +lTg +wlB +wlB +wlB +wlB +jwX +wlB +wlB +qNX +ehY +urD +nsN +lTg +aQN +aQN +gjC +wlB +wlB +dWV +iQr +jKs +wlB +kgp +kgp +kgp +nCl +wlB +cFw +tPK +cFw +nwq +cFw +cFw +cel +jks +cFw +tPK +qkq +xpe +jks +jks +jks +mtp +coX +cFw +cFw +cFw +cFw +cFw +cFw +cFw +nwq +nwq +oep +vVH +won +vSu +iQS +wxD +vVH +kBZ +kBZ +kBZ +kBZ +kBZ +kBZ wqb bFD xJZ viK xJZ -wqb +lFE +kbQ +kbQ kbQ -eyt -eyt -eyt eyt eyt wqb +xJZ viK xJZ wqb eyt eyt -nkJ -lkK -lkK +jqw kbQ kbQ kbQ @@ -52290,8 +62404,10 @@ kbQ kbQ kbQ kbQ -eyt -eyt +tVj +kbQ +kbQ +kbQ wVf wVf wVf @@ -52303,29 +62419,29 @@ wqb wqb xJZ viK +ouP +vlw +pOg xJZ -wqb -wqb -wqb -gey -tWA -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -ksX -ksX -ksX -ksX -iDn -iDn -iDn -cty -hoC +xJZ +wXu +ryD +ryD +xJZ +xJZ +xJZ +gDh +vlw +ryD +vXx +xJZ +fLu +iaM +pyz +cto +xxk +hBA +mCF mCF mCF mCF @@ -52333,7 +62449,7 @@ mCF mCF hoC mCF -hQq +mCF mCF mCF cty @@ -52345,7 +62461,7 @@ cty cty cty cty -hoC +mCF mCF mCF mCF @@ -52356,166 +62472,166 @@ pGs wUU "} (135,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -vrp -fLS -fLS -eSd -iLL -xgH -hmu -fLS -iLN -oET -wqb -viK -xJZ -wqb -wqb -eyt -eyt -eyt -eyt -eyt -eyt +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wfR +dYd +wlB +kAH +lTg +wlB +wlB +wlB +wlB +wlB +gjC +wlB +lTg +wlB +wlB +mdg +wlB +beK +cVq +cVq +mtT +wlB +aQN +aQN +wlB +oyv +lTg +wlB +iQr +iQr +lTg +wlB +gjC +kgp +nCl +wlB +cFw +ihY +qkq +ihY +cSc +jrr +jrr +vUx +jrr +cSc +cCk +cFw +cFw +jks +jks +jks +coX +nwq +cFw +cFw +tkh +cFw +nwq +wUF +cFw +cFw +uFO +vVH +iQS +aQY +iQS +iQS +vVH +kBZ +kBZ +kBZ +kBZ +kBZ +kBZ wqb wqb xJZ viK sKu -wqb +ouy +kbQ +kbQ kbQ -eyt -eyt -eyt eyt eyt wqb +rWY viK xJZ -wqb +bPk jqw kbQ kbQ -lkK -lkK -lkK +kbQ +kbQ +kbQ kbQ mED kbQ sgk -eyt -jqw -eyt -eyt -cFQ +tVj +kbQ +kbQ +kbQ +sgk snq aUD snq -jqw +kbQ eyt eyt eyt wqb -wqb +xJZ viK xJZ -wqb -eyt -eyt -kbQ -kbQ -kbQ -kbQ -jqw -jqw -eyt -eyt -eyt -eyt -cty -cty +ouy +ouy +ouy +wVp +iwT +ouy +nZP +nZP +nZP +nZP +ouy +ouy +ouy +iFb +owM +owM +owM +hBA +hBA cty cty mCF mCF -cty -hoC mCF mCF mCF +cty mCF mCF -cty -hoC mCF -hQq mCF mCF cty @@ -52526,11 +62642,11 @@ gsm aOg aOg gsm -hoC mCF mCF mCF -pGs +mCF +mCF pGs pGs pGs @@ -52538,151 +62654,151 @@ pGs wUU "} (136,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -rBz -vrp -eSd -iLL -jrK -jrK -xgH -hmu -iLN -oET +nvv +mPk +cUN +mPk +mPk +mPk +mPk +cUN +mPk +mPk +rUa +cUN +xDE +wlB +wlB +lTg +lTg +wlB +wlB +wlB +mdg +wlB +wlB +wlB +ghW +wlB +lTg +wlB +ghW +wlB +wlB +lTg +wlB +wlB +mdg +wlB +qNu +wlB +wlB +wlB +iQr +iDE +doH +gXw +aQN +wlB +lTg +wlB +uAM +ihY +ihY +ihY +nwq +cFw +nwq +nwq +qTE +ihY +ihY +cFw +ykU +jks +nwq +cFw +fSa +cFw +jks +jks +jks +jks +cFw +cFw +cFw +dgY +kuO +vVH +iQS +fnl +iQS +iQS +vVH +kBZ +kBZ +kBZ +kBZ +kBZ +kBZ +kBZ wqb -aCm xJZ -wqb -eyt -eyt -eyt -eyt -eyt -eyt -eyt -eyt -wqb -wqb viK gDh -wqb +ouy sgk -jqw -eyt -eyt +kbQ +qIF eyt eyt wqb +oJW viK xJZ wqb kbQ sgk kbQ -lkK -lkK -lkK kbQ kbQ -jqw -jqw -eyt -eyt -eyt -cFQ kbQ +kbQ +tVj +tVj +ykx +tVj +kbQ +kbQ +sgk +tTU nMJ mxG kbQ bfg -cFQ +jqw eyt eyt eyt -wqb -amK +rDD +viK xJZ -wqb +ouy eyt eyt kbQ kbQ kbQ kbQ +mED kbQ -kbQ -kbQ -kbQ +qIF +qIF eyt eyt cty -hoC +tEF cty cty aOg @@ -52694,11 +62810,11 @@ mCF mCF mCF mCF -hoC -hoC mCF mCF -hQq +mCF +mCF +mCF mCF hoC cty @@ -52707,12 +62823,12 @@ aOg lVQ aOg aOg -gsm +aOg +mCF mCF mCF mCF mCF -hoC pGs pGs pGs @@ -52720,153 +62836,153 @@ pGs wUU "} (137,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -fLS -fLS -jVw -jrK -jrK -oOg -jrK -fOA -tBC -oET -wqb -aZZ -xJZ -wqb -eyt -eyt +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cUN +mPk +mPk +iWj +wlB +mdg +lTg +wlB +wlB +wlB +lTg +wlB +wlB +wlB +wlB +wlB +lTg +wlB +wlB +lTg +lTg +wlB +lTg +wlB +lTg +wlB +wlB +lTg +wlB +wlB +tfc +tCV +iQr +wlB +ghW +wlB +wlB +rBq +wlB +xmL +deE +cFw +cFw +jks +cFw +cFw +cFw +ivo +cFw +deq +cFw +cFw +jks +cFw +mEs +ihY +wop +cFw +cFw +cFw +jks +cFw +cFw +dvT +cFw +kuO +vVH +iQS +enu +apH +iQS +vVH +kBZ wqb wqb wqb wqb -eyt -eyt -eyt +kBZ +kBZ wqb +xJZ viK gDh -wqb -sgk +lFE sgk +kbQ jqw eyt eyt wqb -wqb +xJZ viK xJZ -ryD -sgk +tFQ +iyv +tTU +jqw kbQ jqw -nkJ -nkJ -lkK kbQ kbQ -jqw -eyt -eyt +tVj +tVj +tVj +tVj eyt eyt -jqw +kbQ sgk kbQ kbQ nMJ +sgk kbQ -jqw eyt eyt eyt -wqb -viK xJZ -wqb -eyt +wXs +xJZ +ouy eyt -jqw +wnE kbQ kbQ kbQ kbQ kbQ kbQ +tTU +kbQ kbQ kbQ -lkK -hQq mCF -hoC -gsm +wOR +mCF +aOg lVQ aOg aOg @@ -52882,7 +62998,7 @@ hoC mCF mCF mCF -hoC +mCF cty cty gsm @@ -52902,141 +63018,142 @@ pGs wUU "} (138,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -kDy -iLL -oOg -jrK -jrK -jrK -fOA -iLN -oET -wqb -kux -xJZ -wqb -eyt -wqb +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +cJL +iWj +hPq +wlB +wlB +wlB +wlB +wlB +lTg +wlB +wlB +lTg +lTg +lTg +tuT +lTg +lTg +wlB +chX +lTg +lTg +jtH +lTg +lTg +jtH +jtH +jtH +lTg +lTg +tCV +iQr +wlB +wlB +wlB +wlB +nCl +wlB +xmL +cFw +cFw +cFw +jks +cFw +cFw +cFw +cFw +cFw +tEM +hzx +cFw +jks +nwq +nwq +ihY +ihY +cFw +mDm +dvT +nwq +jks +cFw +cFw +cFw +kuO +vVH +nxl +enu +iQS +hza +aoC +vVH rql qcD -gDh -wqb +kAl +vVH wqb -eyt -eyt +kBZ wqb +xJZ viK klf -wqb -sgk +ouy +kbQ sgk -jqw +kbQ eyt wqb -xJZ +xxs xJZ viK xJZ -ryD -ryD -wqb -wqb -wqb -wqb -yeK -tuO tWA tWA +tLu +tLu wqb wqb +tWA +gey +uvr +tWA wqb wqb wqb wqb +tLu +tLu xJZ xJZ xJZ wqb +tLu wqb wqb wqb -wqb -wqb +xJZ viK xJZ -wqb -eyt +ouy eyt -jqw +qIF kbQ +qIF +ofC kbQ kbQ kbQ @@ -53044,9 +63161,8 @@ kbQ kbQ kbQ kbQ -lkK -hQq mCF +wOR mCF aOg aOg @@ -53084,103 +63200,103 @@ pGs wUU "} (139,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -jrK -jrK -jrK -jrK -jrK -jrK -fOA -iLN -faV -qLa -viK +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +rJv +rXk +lTg +wlB +wlB +wlB +wlB +lTg +lTg +lTg +lTg +lTg +pXT +lTg +lTg +pXT +lTg +tpa +lTg +lTg +pXT +lTg +xUp +lTg +lTg +jqd +lTg +lTg +lTg +kFn +wlB +iQr +wlB +lTg +nCl +wlB +iig +jks +cFw +cFw +jks +cFw +cFw +nwq +ihY +ihY +fxX +iaH +mio +nRU +jjj +hjn +ihY +cFw +cFw +cFw +cFw +cFw +jks +jks +cFw +cFw +kuO +uti +kxU +enu +iQS +iQS +iQS +iQS +jXn +iQS +iQS +tkr +imu xJZ -wqb -wqb -wqb -bFD xJZ xJZ -wXu -wqb -wqb -wqb -wqb viK xJZ -wqb -wqb -wqb -wqb +ouy +tCA +kbQ +tCA wqb wqb xJZ @@ -53191,14 +63307,14 @@ xJZ xJZ xJZ xJZ +wXu xJZ -xJZ -fNn -fNn ryD -keY +ryD xJZ +keY xJZ +vlw xJZ xJZ xJZ @@ -53212,11 +63328,8 @@ xJZ xJZ xJZ xJZ -viK +wXs xJZ -wqb -eyt -jqw kbQ kbQ kbQ @@ -53225,10 +63338,13 @@ kbQ kbQ kbQ kbQ -lkK -lkK -hQq +kbQ +kbQ +kbQ +kbQ +kbQ mCF +wOR mCF jdm mCF @@ -53245,7 +63361,7 @@ bUZ mCF mCF mCF -hQq +mCF mCF aOg aOg @@ -53256,7 +63372,7 @@ mCF jdm mCF mCF -hQq +mCF mCF hoC pGs @@ -53266,93 +63382,93 @@ pGs wUU "} (140,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -rxO -mcm -oOg -jrK -jrK -jrK -xgH -dki -faV -pCz -lab -lVc -lVc -lVc -lVc -lVc -lVc -lVc -lVc +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +vhB +nsN +ghW +wlB +lTg +wlB +lTg +lTg +lTg +lTg +pXT +lTg +lTg +wlB +wlB +wlB +lTg +lTg +lTg +emP +lTg +wlB +wlB +wlB +wlB +wlB +lTg +pXT +pXT +rhu +wlB +lTg +wlB +hPq +aQN +wlB +xmL +qTE +cFw +cFw +cFw +ebi +cFw +ihY +ihY +gFA +nwq +upb +jks +jks +cFw +epN +cFw +cFw +vbS +cFw +cFw +cFw +jks +jks +cFw +nwq +ezU +uti +sPD +hdV +pDW +pDW +pDW +eVH +pDW +pDW +pDW +pDW lVc lVc lVc @@ -53368,36 +63484,36 @@ pbw lVc lVc pfr +nch lVc lVc lVc lVc +xpk lVc +elO lVc lVc lVc lVc lVc lVc +xza lVc lVc lVc +elO lVc lVc lVc -lVc -lVc -lVc -lVc -lVc -lVc +tlM lVc lVc lVc cpC xJZ -wqb -eyt +kbQ +ofC kbQ kbQ kbQ @@ -53406,16 +63522,16 @@ kbQ pGs pGs jqw +kbQ jqw -nkJ -lkK -mCF +kbQ mCF +wOR mCF mCF cty cty -hoC +mCF mCF mCF mCF @@ -53436,9 +63552,9 @@ mCF mCF mCF mCF +aOg mCF mCF -hQq mCF pGs pGs @@ -53448,137 +63564,137 @@ pGs wUU "} (141,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -mcm -jrK -jrK -oOg -jrK -jrK -nfD -faV -nxf +nvv +mPk +mPk +mPk +cUN +mPk +mPk +mPk +mPk +mPk +pRa +cJL +rYC +nsN +wlB +wlB +vNy +wlB +wlB +eia +lTg +lTg +lTg +ade +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +nFX +ias +lTg +aAX +lTg +lTg +iQr +kgp +kgp +nCl +wlB +cFw +tPK +cFw +cFw +cFw +cFw +nwq +cFw +ihY +fvV +cFw +coX +cFw +cFw +dvT +nwq +cFw +cFw +cFw +nwq +cFw +jks +jks +cFw +cFw +nwq +kuO +uti +fmy +iQS +iQS +iQS +iQS +iQS +iQS +axs +iQS +iQS +xJZ +xJZ xJZ xJZ xJZ +ryD +ryD +oPV +xJZ xJZ +eKF +bPk xJZ xJZ xJZ xJZ xJZ xJZ +vlw +xJZ xJZ xJZ xJZ sny -ryD -ryD -oPV xJZ xJZ -mHh -wqb -rDD xJZ xJZ xJZ -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -tWA -gey -tWA -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -wqb -tWA -gey -tWA -wqb +xJt +xJZ +xJZ +sny +xJZ +xJZ +xJZ +xJZ +vlw +xJZ +xJZ +xJZ +vXx +ryD +kbQ kbQ kbQ kbQ @@ -53592,13 +63708,13 @@ pGs pGs jqw mCF -aOg +iHE aOg hoC cty cty +mCF hoC -xMH mCF mCF aOg @@ -53608,7 +63724,6 @@ mCF mCF mCF mCF -hQq mCF mCF mCF @@ -53620,7 +63735,8 @@ mCF mCF mCF mCF -hQq +mCF +mCF pGs pGs pGs @@ -53630,141 +63746,141 @@ pGs wUU "} (142,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -wUU -wUU -wUU wUU -wUU -wUU -vGb -ucx -jrK -oOg -mcm -jrK -jrK -nfD -oET -oET -gDh -gDh -xJZ -oET -oET -oET -oET -oET -oET +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +wBp +nsN +wlB +wlB +kqs +lTg +wlB +pXT +lTg +lTg +lTg +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +nFX +wlB +wlB +wlB +wlB +wlB +wlB +wlB +pXT +wlB +lTg +rhu +wlB +kgp +kgp +nCl +wlB +cFw +cFw +ihY +ihY +qTE +cFw +cFw +nwq +cFw +hQl +cFw +coX +cFw +nwq +cFw +cFw +cFw +cFw +cFw +ihY +wop +gkG +nRU +jjj +jjj +mcp +tdt +xAg +xAg +bSD +kAl +kAl +vVH +vVH +vVH +vVH +vVH +vVH gfu xJZ xJZ gfu +sny +sVr +ryD +ryD +xJZ +iLc +dUL +jcY +sny +xJZ +xJZ +mHh +wqb wqb +tLu +tLu +wqb +wqb +wqb +wqb +bPk +tLu +tWA gey tWA wqb wqb +bPk wqb +bPk wqb wqb -xJZ -xJZ -xJZ -xJZ +tLu +bPk +bPk wqb -lkK -lkK -lkK -lkK -lkK -kbQ -sgk -kbQ -kbQ -tVj -tVj -tVj -tVj -kbQ -kbQ -kbQ -lkK -lkK -lkK -lkK -lkK -kbQ -kbQ -kbQ -kbQ -kbQ -kbQ -kbQ +iwT +wVp +iwT +ouy kbQ kbQ kbQ +qIF kbQ pGs pGs @@ -53774,7 +63890,7 @@ pGs pGs pGs bUZ -aOg +iHE aOg mCF mCF @@ -53785,23 +63901,23 @@ mCF mCF mCF aOg -gsm +aOg +mCF +mCF +mCF +mCF +dda +dda +mCF mCF mCF mCF mCF -hQq -hQq -hQq -hQq mCF mCF -hQq mCF mCF mCF -hQq -hQq mCF pGs pGs @@ -53812,131 +63928,131 @@ pGs wUU "} (143,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -kTX -mcm -mcm -jrK -jrK -jrK -vaF -vrB -oET -faV -faV -faV -oET -xWD -txs -beU -gZP -oET +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +cJL +ovT +mtT +wlB +wlB +dqx +wlB +lTg +lTg +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +lTg +eqT +iQr +eia +kgp +nCl +wlB +cFw +nwq +ihY +kfc +cFw +cFw +cFw +cFw +cFw +cFw +cFw +jks +cFw +ihY +ihY +cFw +jks +cFw +ihY +ihY +xfz +cFw +jks +cFw +eHs +cFw +bSj +aoC +xAg +uti +uti +uti +vVH +gCZ +gfe +bzz +fNm +vVH oET slA gfG oET oET +iwT +iwT +iwT +lFE +tCA +ouy +ouy +ouy +tCA +lFE +ouy +ouy kbQ kbQ -sgk +qIF +eyt +eyt +qIF kbQ kbQ -lkK -wqb -xJZ -xJZ -sny -xJZ -wqb -lkK -lkK -lkK -lkK -lkK kbQ kbQ +tVj kbQ kbQ +liq kbQ -tVj +sgk kbQ +eyt kbQ kbQ kbQ -sgk -lkK -lkK -lkK -lkK -lkK kbQ kbQ kbQ @@ -53956,7 +64072,7 @@ pGs pGs pGs pGs -mCF +wOR aOg lVQ aOg @@ -53967,21 +64083,21 @@ mCF mCF mCF mCF -hoC -mCF mCF mCF mCF mCF mCF +dda +dda mCF mCF mCF mCF mCF +aOg mCF mCF -hQq mCF bUZ hoC @@ -53994,140 +64110,140 @@ pGs wUU "} (144,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -jrK -jrK -jrK -xgH -dEN -xGf -gZP -gZP -gtd -gZP -ppY -jVw -xgH -hmu -fLS +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +iWj +wlB +gjC +lTg +lTg +wlB +lTg +lTg +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +lTg +uHD +rhu +lTg +fIk +wlB +kgp +nCl +ghW +nwq +cFw +cFw +nwq +cFw +cFw +cFw +upb +cFw +cFw +cFw +jks +cFw +uAM +ihY +cFw +agn +cFw +ejk +nwq +nak +cFw +jks +nwq +cFw +cFw +bGU +pGs +pGs +tgC +oAJ +sxL +bzz +aer +rvD +rvD +wPH +ekE oET oET oET oET -nkJ +jqw kbQ +ofC kbQ +qIF +qIF kbQ kbQ -lkK -lkK -wqb -wqb -wqb -wqb -wqb -wqb kbQ +qIF kbQ +qIF kbQ kbQ -lkK +qfu kbQ kbQ +qIF kbQ kbQ kbQ +ofC kbQ kbQ kbQ kbQ kbQ kbQ -qAg kbQ +qAg kbQ +tTU kbQ kbQ sgk -jqw kbQ kbQ kbQ +qIF +kbQ kbQ kbQ kbQ -jqw pGs pGs pGs @@ -54160,8 +64276,8 @@ mCF mCF mCF mCF -mCF -mCF +aOg +aOg mCF mCF hoC @@ -54176,122 +64292,122 @@ pGs wUU "} (145,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -jrK -jrK -jrK -jrK -xgH -hmu -fLS -jtw -fLS -fLS -sqZ -jVw -jrK -fOA -fLS -pGs -pGs -pGs -pGs -pGs -nkJ -lkK +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +iWj +wlB +wlB +wlB +rBq +wlB +lTg +lTg +wlB +wlB +wlB +wlB +nFX +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +lTg +lTg +lTg +kFH +iQr +wlB +kgp +kgp +wlB +cFw +cFw +cFw +xfz +cel +jks +jks +jks +gtv +jks +jks +coX +cFw +cFw +cFw +cFw +cFw +jks +pll +cFw +cFw +cFw +cFw +cFw +bGU +bGU +bGU +bGU +pGs +bGU +xke +rvD +bGU +rvD +rvD +bGU +rvD +xeO +eyt +eyt +eyt +eyt +eyt +kbQ kbQ -lkK +tTU kbQ +sgk kbQ kbQ kbQ -lkK -lkK -lkK kbQ kbQ kbQ -lkK -sgk +rsf kbQ kbQ kbQ +sgk kbQ kbQ +qfu +qIF kbQ kbQ kbQ +qIF kbQ kbQ kbQ @@ -54302,13 +64418,13 @@ kbQ kbQ eyt jqw -eyt kbQ kbQ kbQ -jqw +nMJ kbQ kbQ +kqN jqw pGs pGs @@ -54321,13 +64437,13 @@ pGs pGs pGs pGs -hoC +mCF +mCF mCF mCF mCF hoC -hoC -hQq +mCF mCF mCF mCF @@ -54358,123 +64474,123 @@ pGs wUU "} (146,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -kTX -ucx -rxO -jrK -jrK -jrK -jrK -xgH -kDy -kDy -kDy -kDy -kDy -iLL -jrK -fOA -jtw -vrp -pGs -pGs -pGs -pGs -pGs -nkJ -nkJ -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +pRa +xDE +wlB +lTg +wlB +mdg +wlB +lTg +lTg +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +nFX +lTg +pXT +lTg +cxT +bDs +aQN +kgp +kgp +wlB +cFw +cFw +xmL +iXy +cFw +cFw +cFw +cFw +ihY +cFw +cFw +cFw +ebi +cFw +nwq +cFw +tsC +cFw +pll +eHs +cFw +nwq +bGU +pmM +bGU +bGU +rvD +bGU +bGU +rvD +bGU +rvD +rvD +elP +bGU +bGU +rvD +erQ +vNB +eyt +eyt +eyt +eyt +eyt +kbQ +kbQ +kbQ +kbQ +kbQ +kbQ +kbQ kbQ kbQ -lkK -lkK -lkK kbQ qAg kbQ +sfj kbQ kbQ -lkK -lkK kbQ +dDn kbQ eyt eyt -jqw +qIF eyt jqw -jqw +qIF eyt eyt kbQ @@ -54487,7 +64603,7 @@ eyt kbQ kbQ kbQ -jqw +kbQ kbQ kbQ kbQ @@ -54507,9 +64623,6 @@ mCF mCF mCF mCF -hoC -hoC -hQq mCF mCF mCF @@ -54525,7 +64638,10 @@ mCF mCF mCF mCF -hQq +mCF +mCF +wBc +mCF mCF bUZ pGs @@ -54540,117 +64656,117 @@ pGs wUU "} (147,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -fOA -fLS -vrp -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -nkJ -lkK -sgk -lkK -lkK -lkK +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +rUa +rJv +rXk +wlB +lTg +wlB +lTg +lTg +lTg +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +nFX +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +kLF +doH +wlB +dOl +kgp +kgp +lTg +cFw +cFw +xmL +jks +jks +cFw +cFw +ykA +cFw +cFw +cFw +cFw +cFw +nwq +nwq +cFw +cFw +agn +tPK +udp +cFw +bGU +bGU +pmM +cYw +bGU +bGU +trI +bGU +bGU +bGU +bGU +bGU +bGU +bGU +rvD +bGU +rvD +rvD +bGU +rvD +rvD +bGU +eyt +eyt +eyt +eyt +eyt +kbQ kbQ sgk +qIF kbQ -jqw kbQ kbQ +sgk +kbQ +pbT +kbQ +qfu jqw -jqw +tTU eyt eyt eyt @@ -54659,7 +64775,7 @@ eyt eyt eyt jqw -kbQ +qfu kbQ sgk kbQ @@ -54667,10 +64783,10 @@ kbQ kbQ kbQ kbQ -kbQ -kbQ +ofC +qIF sgk -kbQ +qIF kbQ kbQ kbQ @@ -54691,8 +64807,8 @@ mCF mCF hoC lDF -hQq -hQq +mCF +mCF mCF mCF mCF @@ -54703,8 +64819,8 @@ mCF aOg aOg mCF -hoC -lDF +mCF +mCF mCF mCF mCF @@ -54722,114 +64838,114 @@ pGs wUU "} (148,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -kmy -ucx -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -xgH -hmu -fLS -vrp -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -jqw -pGs -pGs -pGs -jqw -jqw -tVj -tVj -kbQ +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPW +nsN +wlB +lTg +wlB +wlB +lTg +uHD +lTg +lTg +lTg +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +wlB +uHD +wlB +lTg +dOl +iQr +wlB +kgp +kgp +wlB +cFw +iUH +wfh +jks +nwq +wop +gDr +cFw +cFw +jks +jks +udp +cFw +nwq +cFw +nwq +nwq +cFw +nwq +tkh +nwq +bGU +bGU +bGU +bGU +bGU +bGU +rvD +bGU +bGU +bGU +pYK +bGU +rvD +bLV +bGU +rvD +bGU +rvD +rvD +rvD +rvD +rvD +rvD +eyt +eyt +eyt +eyt +eyt +uqW +eyt +eyt +eyt +qIF +uqW +gaJ tVj +qfu +eQI tVj tVj tVj @@ -54841,10 +64957,10 @@ eyt eyt eyt eyt -jqw -kbQ +qIF kbQ kbQ +sfj kbQ kbQ kbQ @@ -54870,27 +64986,27 @@ aOg mCF jdm mCF -hoC +mCF lDF lDF -hQq -hQq -lVQ mCF mCF +lVQ +mCF mCF mCF +wBc mCF aOg aOg lVQ lDF lDF -lDF -lDF -ogX +rkC +rkC +rPB plT -ogX +rkC pGs pGs pGs @@ -54904,117 +65020,117 @@ pGs wUU "} (149,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -xgH -hmu -vrp -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -huF -huF -huF -huF +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +mPW +nsN +wlB +wlB +wlB +wlB +lTg +lTg +lTg +lTg +lTg +ade +wlB +wlB +wlB +wlB +hHn +wlB +wlB +wlB +wlB +wlB +nFX +wlB +wlB +wlB +xpL +lTg +wlB +lTg +wlB +iQr +kgp +kgp +kgp +wlB +cFw +cFw +xmL +cFw +cFw +cFw +cFw +cFw +cFw +jks +cFw +fSa +fSa +ihY +xBw +nwq +cFw +vbH +cFw +cFw +bGU +bGU +xke +bGU +trI +bGU +bLV +bGU +elP +bGU +rvD +bGU +bGU +bGU +bGU +bGU +rvD +pYK +bGU +bGU +bGU +bGU +bGU +elP +rvD +bGU +bGU +eyt +eyt +eyt +eyt tXu tXu -vqG -tVj -tVj tXu tXu +ouy +ouy +uon +kvz +fUC +ouy +ouy tXu tXu tXu @@ -55026,10 +65142,10 @@ tXu vqG tVj kbQ +qIF +qfu kbQ -kbQ -kbQ -kbQ +qIF sgk kbQ kbQ @@ -55048,7 +65164,7 @@ pGs pGs lVQ xGV -aOg +qZR mCF mCF mCF @@ -55056,7 +65172,7 @@ hoC lDF lDF lDF -xDl +hoC aOg aOg mCF @@ -55068,10 +65184,10 @@ lDF lDF lDF lDF -kkv -lDF bsf bsf +pDX +bsf bsf pGs pGs @@ -55086,137 +65202,137 @@ pGs wUU "} (150,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -kmy -kmy -jrK -jrK -jrK -jrK -jrK -jrK -xgH -hmu -fLS -fLS -fLS -fLS -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -vrB -tXu -vxW -vxW -vxW -tXu -xWD -gkC -gZP -gZP -gZP -gZP -gZP -vrB -asi -eXv -fdf -rFd -rFd -rFd -rFd +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +wLB +nsN +hPq +wlB +wlB +lTg +lTg +wlB +lTg +lTg +uHD +lTg +lTg +wlB +wlB +wlB +lTg +lTg +lTg +emP +lTg +wlB +wlB +wlB +wlB +wlB +lTg +uHD +uHD +lTg +lTg +iQr +aQN +kgp +nCl +lTg +cFw +nwq +lxi +kgA +cFw +cFw +luC +jEv +joe +jjj +jjj +jjj +jjj +vuQ +ihY +ihY +cFw +cFw +bGU +rvD +bGU +bGU +qoI +jTR +bGU +eKL +bGU +bGU +rvD +bGU +lzT +bGU +rvD +uFq +bGU +bGU +bGU +bGU +bGU +rvD +lzT +bGU +bGU +bGU +bGU +rvD +rvD +rvD +rvD +eyt +eyt +eyt +eyt +eyt +eyt +qTh +ouy +qaX +rTi +rTi +ouy +nhI +vjO +rsO +bzz +gfe +oAJ +liz +vDP +ouy +cwk +sCp +kkc +vqK +kbQ +kbQ pGs pGs jqw kbQ +qIF kbQ -jqw pGs pGs pGs @@ -55233,25 +65349,25 @@ aOg aOg mCF mCF +mCF lDF lDF lDF lDF lDF lDF -lDF -ogX +rkC plT -ogX -ogX +rkC +rkC plT -ogX +rkC lDF lDF lDF kkv -kkv -kkv +bsf +bsf bsf bsf bsf @@ -55268,136 +65384,136 @@ pGs wUU "} (151,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -kmy -kmy -jrK -jrK -jrK -jrK -jrK -jrK -jrK -xgH -hmu -fLS -fLS -fLS -fLS -fLS -fLS -fLS -fLS -pGs -pGs -fLS -fLS -fLS -fLS -uRL -gZP -xGf -gZP -gZP -gZP -ppY -fLS -fLS -jtw -vrp -vrp -fLS -iLN -nap -ofu +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +wBp +nsN +wlB +qNu +lTg +wlB +lTg +mdg +lTg +lTg +lTg +lTg +uHD +lTg +lTg +uHD +lTg +lTg +lTg +lTg +uHD +lTg +lTg +lTg +lTg +uHD +lTg +lTg +lTg +lTg +iQr +iQr +aQN +wlB +nCl +wlB +cFw +ykU +hMI +prC +cFw +nwq +cFw +cFw +cFw +cFw +nwq +cFw +cFw +pgn +kgA +nwq +kyp +oWf +kyp +kyp +kyp +elI +fWd +pjD +dTG +cFh +kyp +bGU +lzT +lzT +lzT +rvD +bGU +bGU +bGU +rvD +bGU +bGU +bGU +lzT +rvD +bGU +bGU +bGU +bGU +rvD +bGU +rvD +rvD +rvD +rvD +rvD +bGU +rvD +rvD +xeO +bzz +uSF +dFC +mVn +hti +qEc +bGU +rvD +aSj +fPJ +bGU +oBq +kjr +kVE +ibi dRI -tVj -tVj -tVj -eyt +jrv +fZP +vqG pGs pGs pGs -jqw -jqw +pGs +qIF +uqW pGs pGs pGs @@ -55411,11 +65527,11 @@ pGs pGs pGs pGs -ogX +rkC plT -ogX -lDF -lDF +rkC +rkC +rkC lDF lDF lDF @@ -55437,7 +65553,7 @@ bsf bsf bsf bsf -pGs +bsf pGs pGs pGs @@ -55450,131 +65566,131 @@ pGs wUU "} (152,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -kmy -jrK -jrK -jrK -jrK -jrK -jrK -oOg -jrK -xgH -kDy -kDy -hmu -fLS -fLS -jtw -fLS -fLS -fLS -fLS -fLS -fLS -jtw -eSd -kDy -kDy -kDy -hmu -sgo -eSd -kDy -kDy -kDy -kDy -kDy -hmu -nrR -iLN -dxy -tVj +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +wHt +mtT +wlB +wlB +lTg +wlB +wlB +wlB +wlB +wlB +wlB +lTg +lTg +lTg +lTg +lTg +wlB +gjC +mdg +lTg +lTg +lTg +lTg +ghW +wlB +lTg +wlB +wlB +lTg +wlB +wlB +iQr +aQN +wlB +nCl +wlB +cFw +cFw +wfh +agn +nwq +cFw +cFw +qTE +nNB +cFw +cFw +cFw +nwq +hds +qvS +kyp +cFh +kyp +cFh +kyp +elI +fWd +dRs +dRs +pjD +dTG +cFh +bGU +rvD +lzT +lzT +rvD +bGU +bGU +rvD +bGU +bGU +bGU +bGU +lzT +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bLV +bGU +erQ +bGU +rvD +rvD +bGU +kyD +prl +noR +etV +huE +eXN +bGU +kyD +kyD +cVd +huE +lzT +bGU +rKS +vEi +dir +xHz tVj -tVj -tVj -eyt -eyt +xcz +pGs +pGs pGs pGs pGs @@ -55596,17 +65712,18 @@ pGs bsf bsf bsf -lDF -lDF -kkv -kkv -kkv +bsf +bsf +bsf +bsf +bsf kkv lDF lDF bsf bsf bsf +pDX bsf bsf bsf @@ -55628,135 +65745,134 @@ pGs pGs pGs pGs -pGs wUU "} (153,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -jrK -jrK -jrK -jrK -jrK -jrK -jrK -oOg -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -fLS -fLS -fLS -fLS -eSd -kDy -iLL -jrK -jrK -jrK -xgH -kDy -iLL -jrK -jrK -jrK -jrK -jrK -fOA -fLS -iLN -nap -mje -fdf -asi -asi -tXu -tXu +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +iWj +wlB +lTg +wlB +wlB +wlB +wlB +lTg +wlB +ghW +wlB +wlB +wlB +lTg +wlB +wlB +lTg +wlB +wlB +wlB +wlB +lTg +wlB +wlB +lTg +wlB +lTg +wlB +wlB +lTg +wlB +wlB +aQN +aQN +nCl +wlB +cFw +nwq +ihY +vlL +gcB +jNE +cFw +cFw +cFw +cFw +nwq +kyp +kyp +hds +pjD +jek +jek +dTG +kyp +kyp +hds +exX +xFb +ulb +dRs +qvS +hWv +bGU +bGU +rvD +lzT +bGU +vNB +elP +bGU +bGU +bGU +bGU +bGU +bGU +rvD +bGU +uFq +bGU +rvD +bGU +bGU +bGU +trI +bGU +bGU +bGU +bGU +kyD +uFq +qZJ +bGU +kyD +vNB +exs +huE +fFw +bGU +bGU +sDH +huE +lzT +lzT +gzm +rTi +sCp +inV +ouy +ouy +huF +huF huF pGs pGs @@ -55776,12 +65892,10 @@ pGs pGs pGs bsf +pDX bsf bsf -lDF -lDF bsf -kkv bsf bsf bsf @@ -55796,13 +65910,15 @@ bsf bsf bsf bsf +pDX bsf bsf bsf +pDX +bsf +bsf bsf bsf -pGs -pGs pGs pGs pGs @@ -55814,130 +65930,129 @@ pGs wUU "} (154,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -mcm -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -xgH -kDy -kDy -kDy -kDy -kDy -kDy -kDy -kDy -iLL -jrK -jrK -jrK -jrK -jrK -oOg -jrK -jrK -jrK -jrK -jrK -jrK -jrK -xgH -hmu -uRL -gZP -gZP -gZP -gZP -gZP -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +rJv +rXk +wlB +wlB +wlB +wlB +ghW +wlB +wlB +wlB +wlB +wlB +lTg +tLS +wlB +wlB +wlB +wlB +lTg +wlB +wlB +phk +wlB +wlB +bnH +mdg +wlB +wlB +lTg +wlB +wlB +lTg +hPq +kgp +nCl +wlB +nwq +cFw +ihY +ihY +ihY +ihY +nwq +nwq +wUF +oWf +lci +kyp +kyp +nCF +kGJ +plq +dRs +qvS +kyp +hEv +hds +ulb +dRs +dRs +dRs +qvS +kyp +bGU +bGU +bGU +bGU +vNB +bGU +bGU +bGU +rvD +lzT +rvD +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +eKL +bGU +bGU +bGU +bGU +bGU +huE +bGU +kyD +bGU +bGU +kyD +pYK +fFw +pYI +huE +xeO +uoU +bzz +fXA +mVj +cql pGs pGs pGs @@ -55961,7 +66076,6 @@ bsf bsf bsf bsf -kkv bsf bsf bsf @@ -55983,8 +66097,10 @@ bsf bsf bsf bsf -pGs -pGs +bsf +bsf +bsf +bsf pGs pGs pGs @@ -55996,140 +66112,139 @@ pGs wUU "} (155,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -jrK -mcm -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -fOA -fLS -rav -fLS -huD -rav -fLS -fLS -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +wBp +nsN +tLS +wlB +lTg +eia +wlB +wlB +wlB +wlB +lTg +wlB +wlB +wlB +lTg +mdg +wlB +xCZ +wlB +wlB +wlB +wlB +lTg +wlB +nFX +nFX +wlB +gjC +lTg +wlB +wlB +lTg +kgp +kgp +aQN +wlB +kyp +kyp +efy +efy +kyp +kyp +cFh +kyp +kyp +kyp +cFh +kyp +kyp +kyp +cFh +hds +dRs +qvS +kyp +kyp +hds +dRs +xFb +xFb +xFb +qvS +uWo +bGU +rvD +bGU +bGU +bGU +bGU +bGU +bGU +lzT +lzT +bGU +pYK +bLV +bGU +bGU +eKL +bjC +rvD +bGU +bGU +bGU +lzT +lzT +bGU +bGU +prl +bGU +qFI +bGU +kyD +bGU +cGD +bGU +bGU +kyD +bGU +huE +pYI +bGU +bGU +bGU +huE +trI +gCe +etV +trI +rvD +aSj +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs pGs pGs pGs @@ -56144,10 +66259,11 @@ bsf bsf bsf bsf -fBB bsf +gRU bsf bsf +pDX bsf bsf bsf @@ -56162,12 +66278,12 @@ bsf bsf bsf bsf -fBB +gRU +bsf +bsf bsf bsf bsf -pGs -pGs pGs pGs pGs @@ -56178,133 +66294,131 @@ pGs wUU "} (156,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -kmy -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -xgH -kDy -hmu -fLS -jtw -fLS -fLS -fLS -fLS -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +nsN +wlB +wlB +lTg +wlB +lTg +wlB +lTg +lTg +wlB +qNu +wlB +wlB +wlB +wlB +wlB +pDl +dyl +lTg +aCW +wlB +wlB +qNu +mJH +wlB +lTg +wlB +lTg +aQN +ayx +kgp +kgp +kyP +aQN +lTg +iHN +kyp +kyp +kyp +kyp +kyp +kyp +kyp +cFh +kyp +kyp +kyp +cFh +kyp +kyp +hds +dRs +qvS +cFh +kyp +hds +ulb +dRs +xFb +xFb +pjD +dTG +bGU +qoI +gPi +jTR +bGU +bGU +rvD +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +bGU +vNB +bGU +lzT +lzT +rvD +bGU +bGU +bGU +kyD +bGU +hDY +bGU +tZl +fFw +huE +lzT +bGU +pZS +bGU +bGU +vGQ +huE +kyD +huE +huE +bGU +bGU +kyD +bGU +orr +rvD pGs pGs pGs @@ -56331,6 +66445,8 @@ bsf bsf bsf bsf +bsf +bsf avD chU chU @@ -56348,8 +66464,8 @@ bsf bsf bsf bsf -pGs -pGs +pDX +bsf pGs pGs pGs @@ -56360,131 +66476,131 @@ pGs wUU "} (157,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -oOg -jrK -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -fLS -fLS +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +rUa +wBp +nsN +eNk +wlB +wlB +wlB +wlB +wlB +hPq +wlB +wlB +wlB +wlB +lTg +lTg +wlB +cFZ +nti +ola +ayF +ueB +lTg +wlB +lTg +wlB +wlB +wlB +wlB +wlB +aQN +aQN +tMZ +pvQ +lTg +aQN +wlB +kyp +cFh +cFh +kyp +elI +jek +jek +jek +dTG +kyp +cFh +kyp +elI +jek +jek +fWd +xFb +qvS +cFh +kyp +hds +dRs +xFb +tHc +xFb +dRs +pjD +gPi +xfQ +bUP +veV +jTR +bGU +bGU +bGU +rvD +bGU +bGU +bGU +bGU +lzT +lzT +rvD +bGU +bGU +bGU +bGU +bGU +rvD +lzT +bGU +elP +bLV +pYK +bGU +bGU +bGU +tZl +lzT +feH +bGU +pZS +pYI +bGU +kyD +bGU +huE +uFq +bGU +huE +bGU +bLV +bGU +prl +bGU +aSj pGs pGs pGs @@ -56500,12 +66616,12 @@ pGs pGs pGs pGs -pGs -pGs -kkv bsf bsf +kkv +bsf bsf +pDX bsf bsf bsf @@ -56529,10 +66645,10 @@ bsf bsf bsf bsf -kkv -pGs -pGs -pGs +bsf +bsf +bsf +bsf pGs pGs pGs @@ -56542,141 +66658,141 @@ pGs wUU "} (158,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -jrK -mcm -mcm -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -jrK -xgH -kDy -kDy -hmu -fLS -fLS -nrR -fLS -pGs -pGs -pGs -pGs -pGs -pGs -hre -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +rYC +nsN +iFc +qAy +lTg +lTg +wlB +wlB +wlB +wlB +ghW +lTg +wlB +gjC +wlB +lTg +yjH +mUv +hgc +sZd +wlB +gOp +wlB +qNX +rXk +wlB +ghW +kAH +wlB +aQN +tMZ +lTg +tmZ +tmZ +tmZ +dTG +kyp +kyp +jTj +elI +fWd +xFb +xFb +dRs +qvS +kyp +kyp +kyp +hds +exX +dRs +xFb +dRs +qvS +cFh +cFh +hds +dRs +xFb +xFb +xFb +dRs +dRs +dRs +bUP +bUP +bUP +ghN +rvD +bGU +qoI +gPi +gPi +jTR +elP +bGU +lzT +lzT +bGU +bGU +bGU +bGU +bGU +rvD +bGU +bGU +bGU +bGU +bGU +vNB +prl +kyD +pYI +pZS +bGU +pYI +bGU +huE +prl +kyD +bGU +uTY +bGU +huE +kyD +pYI +bGU +bGU +bGU +kyD +bGU +orr +rvD +pGs +pGs +pGs +pGs +pGs +pGs +iFQ bsf +hre bsf hre bsf @@ -56712,9 +66828,9 @@ bsf bsf bsf kkv -pGs -pGs -pGs +bsf +bsf +bsf pGs pGs pGs @@ -56724,139 +66840,139 @@ pGs wUU "} (159,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -kmy -kmy -ucx -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -kmy -jrK -jrK -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -fLS -pGs -pGs -pGs -pGs -hre -hre +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +xVw +nBc +tmZ +rXk +wlB +kAH +wlB +wlB +qNX +rXk +wlB +wlB +qNX +tmZ +tmZ +tmZ +rXk +wlB +wlB +aQN +lTg +kAH +wlB +uIW +nsN +wlB +lTg +wlB +wlB +aQN +aQN +tMZ +pTI +rnL +pdK +pjD +jek +jek +jek +fWd +xFb +xFb +xFb +xFb +pjD +jek +jek +jek +fWd +xFb +xFb +dRs +xFb +qvS +kyp +kyp +hds +dRs +dRs +dRs +xFb +dRs +dRs +xFb +xFb +xFb +bUP +ghN +bGU +bGU +ejM +bUP +bUP +veV +jTR +bGU +rvD +lzT +bGU +rvD +bGU +rvD +trI +bGU +bGU +bGU +bGU +bGU +bGU +bjC +kyD +huE +huE +huE +kyD +huE +bGU +rqg +gPi +gPi +bko +gPi +jTR +bGU +huE +bGU +pYI +lzT +lzT +bGU +pYK +pYI +qZJ +kyD +bGU +bGU +iOi +rvD +bGU +iFQ bsf puq hre @@ -56871,9 +66987,9 @@ bsf bsf kkv bsf +puq bsf -bsf -bsf +pDX bsf avD avD @@ -56890,14 +67006,14 @@ uvd avD avD bsf +pDX +bsf +bsf +bsf +bsf bsf bsf bsf -pGs -pGs -pGs -pGs -pGs pGs pGs pGs @@ -56906,151 +67022,151 @@ pGs wUU "} (160,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -ucx -ucx -kmy -ucx -ucx -kmy -lEP -kmy -kmy -ucx -ucx -kmy -kmy -ucx -kmy -kmy -ucx -kmy -ucx -kmy -ucx -ucx -kmy -ucx -kmy -lEP -kmy -jrK -jrK -jrK -jrK -jrK -xgH -hmu -fLS -vrp -fLS -fLS -vrp -pGs -pGs -hre -bsf -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +pdK +pdK +jJn +wlB +wlB +wlB +lTg +uIW +nBc +tmZ +tmZ +sXc +pdK +pdK +pdK +nsN +wlB +tLS +wlB +wlB +wlB +wlB +uIW +nsN +wlB +wlB +lTg +wlB +lTg +tMZ +fbw +pdK +pdK +pdK +xFb +xFb +xFb +xFb +dRs +xFb +xFb +dRs +xFb +xFb +dRs +xFb +dRs +xFb +dRs +dRs +xFb +xFb +pjD +jek +jek +fWd +dRs +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +bUP +ghN +bGU +ylB +ejM +bUP +xFb +bUP +veV +jTR +bGU +bGU +bGU +lzT +bGU +bGU +pYK +bGU +bGU +bGU +prl +bGU +kyD +bGU +bGU +huE +huE +ipC +bGU +rqg +gPi +xeU +xFb +sfo +sfo +pNZ +kyj +gPi +bko +jTR +pZS +fFw +lzT +fcp +huE +bLV +bGU +bGU +bLV +rvD +bGU +bGU +rvD +fBV hre hre hre hre bsf bsf +oWx +oWx +pDX bsf bsf -hre -bsf -bsf -fBB +gRU bsf bsf bsf @@ -57058,7 +67174,7 @@ bsf bsf bsf avD -ilr +fFK uvd smx aCl @@ -57076,10 +67192,10 @@ bsf bsf bsf bsf -pGs -pGs -pGs -pGs +bsf +bsf +bsf +lDF pGs pGs pGs @@ -57088,150 +67204,150 @@ pGs wUU "} (161,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -kmy -ucx -ucx -kmy -ucx -kmy -kmy -ucx -ucx -ucx -kmy -ucx -kmy -kmy -ucx -kmy -kmy -ucx -kmy -kmy -jrK -jrK -jrK -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -fLS -fLS -pGs -hre -hre -hre -hre -pGs -pGs -pGs -gKH +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +wBp +rnL +pdK +nBc +tmZ +tmZ +tmZ +tmZ +sXc +rnL +pdK +pdK +pdK +urD +rnL +pdK +nBc +tmZ +tmZ +tmZ +tmZ +tmZ +tmZ +xJH +nsN +wlB +wlB +wlB +wlB +wlB +pvQ +tMZ +pdK +pdK +pdK +dRs +xFb +xFb +xFb +xFb +xFb +xFb +xFb +dRs +byC +xFb +xFb +xFb +xFb +xFb +xFb +byC +xFb +dRs +dRs +dRs +dRs +dRs +byC +xFb +dRs +xFb +xFb +xFb +exX +xFb +bUP +veV +gPi +gPi +xfQ +bUP +xFb +bUP +bUP +veV +jTR +bGU +bGU +bGU +bGU +bGU +erQ +rvD +lzT +eXO +bGU +kyD +bGU +erQ +qoI +bko +gPi +bko +gPi +qNr +xFb +sfo +xFb +sfo +sfo +sfo +xFb +xFb +sfo +ghN +pZS +kyD +bGU +bGU +pZS +vXG +bGU +bGU +uFq +rvD +bGU +rvD +bGU +iFQ +bsf hre -pGs bsf bsf bsf -kkv +bsf +oXo +oWx +bsf +bsf +bsf bsf bsf kkv @@ -57240,8 +67356,8 @@ bsf bsf bsf avD -buN -ilr +pBf +fFK bye avD fJI @@ -57259,9 +67375,9 @@ bsf bsf bsf bsf -kkv -kkv -pGs +bsf +bsf +bsf pGs pGs pGs @@ -57270,147 +67386,143 @@ pGs wUU "} (162,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -jrK -jrK -jrK -jrK -jrK -jrK -fOA -fLS -fLS -fLS -vrp -fLS -fLS -fLS +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +lze +wBp +xVw +mPW +bBV +mPW +xVw +wBp +wBp +wBp +bBV +mPW +mPW +wLB +wBp +mPW +wBp +xVw +rYC +xVw +wBp +mPW +wBp +bBV +rJv +tWT +uxM +grG +tWT +uxM +loO +ifO +wBp +xVw +rYC +xVw +wBp +wBp +xVw +wBp +wBp +rYC +xVw +wBp +wBp +wBp +wBp +rYC +xVw +wBp +wBp +wBp +wBp +xVw +rYC +wBp +mPW +wLB +wBp +mPW +wLB +bBV +wLB +mPW +wBp +xFb +xFb +bUP +bUP +bUP +bUP +hwE +xFb +xFb +nKR +bUP +veV +gPi +gPi +jTR +bGU +bGU +bGU +lzT +lzT +lzT +bGU +bGU +qoI +gPi +xfQ +spv +xFb +uDr +xFb +uDr +xFb +sfo +xFb +xFb +sfo +sfo +xFb +sfo +sfo +ghN +gRj +bGU +kyD +bGU +pZS +kyD +qhO +kyD +cYw +bGU +bGU +rvD +rvD +iFQ hre bsf +bsf hre -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs bsf bsf bsf @@ -57421,6 +67533,10 @@ bsf bsf bsf bsf +bsf +pDX +bsf +bsf avD avD avD @@ -57452,152 +67568,152 @@ pGs wUU "} (163,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -ucx -kmy -mcm -mcm -jrK -jrK -jrK -jrK -xgH -hmu -fLS -fLS -fLS -fLS -fLS -fLS -puq -hre +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +mPk +cJL +mPk +mPk +mPk +pRa +mPk +rUa +mPk +mPk +mPk +mPk +cJL +mPk +mPk +mPk +mPk +pRa +rUa +pRa +pRa +mPk +pRa +pRa +rUa +pRa +pRa +uhi +kkF +mPk +mPk +mPk +mPk +cJL +mPk +mPk +cJL +mPk +cJL +mPk +mPk +mPk +mPk +cJL +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +mPk +mPk +pRa +mPk +mPk +mPk +rUa +pRa +wLB +dRs +xFb +xFb +bUP +xFb +bUP +xFb +xFb +xFb +xFb +bUP +bUP +bUP +bUP +veV +gPi +gPi +gPi +gPi +gPi +gPi +gPi +gPi +xfQ +bUP +jFL +sfo +xFb +sfo +tHc +sfo +xFb +xFb +uDr +sfo +sfo +xFb +xFb +sfo +xFb +veV +bko +gPi +jTR +pYI +huE +eKL +bGU +bGU +bGU +rvD +rvD +rvD +bGU +fBV +bsf +bsf bsf -kkv -pGs -pGs -pGs -pGs -pGs pGs pGs -kkv bsf bsf bsf bsf +puq +bsf +bsf +bsf bsf bsf bsf @@ -57634,155 +67750,155 @@ pGs wUU "} (164,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kTX -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -jrK -jrK -jrK -jrK -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -fLS -fLS -hre -hre -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +pRa +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +mPk +mPk +mPk +mPk +rUa +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPW +exX +xFb +xFb +xFb +xFb +xFb +xFb +xFb +ulb +dRs +xFb +dRs +xFb +bUP +bUP +bUP +bUP +bUP +bUP +bUP +bUP +bUP +bUP +xFb +xFb +sfo +xFb +xFb +sfo +xFb +xFb +sfo +xFb +xFb +xFb +xFb +xFb +xFb +sfo +xFb +xFb +sfo +hwE +ghN +pZS +lYD +fTh +kyD +bGU +bGU +rvD +bGU +bGU +bGU pGs +kkv +hre pGs pGs pGs pGs pGs -kkv bsf bsf bsf bsf bsf +puq +bsf bsf +mMz bsf bsf avD @@ -57808,7 +67924,7 @@ bsf bsf bsf bsf -pGs +bsf pGs pGs pGs @@ -57816,136 +67932,134 @@ pGs wUU "} (165,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -kmy -jrK -jrK -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +xVw +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +dRs +dRs +xFb +xFb +xFb +xFb +dRs +dRs +xFb +xFb +xFb +uDr +xFb +xFb +sfo +xFb +xFb +sfo +xFb +xFb +xFb +xFb +xFb +sfo +sfo +xFb +sfo +xFb +xFb +aaG +dkS +qlw +tjn +pmM +bGU +qZJ pGs pGs pGs @@ -57962,9 +68076,11 @@ pGs bsf bsf bsf -avD -avD -avD +bsf +bsf +crq +ulv +uvd avD bsf avD @@ -57982,15 +68098,15 @@ snS qxb avD bsf -avD -avD -avD +gFH +crq +ulv avD bsf bsf bsf bsf -kkv +bsf pGs pGs pGs @@ -57998,136 +68114,135 @@ pGs wUU "} (166,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -kmy -kmy -jrK -jrK -jrK -jrK -jrK -xgH -hmu -fLS -fLS -fLS -fLS -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +rYC +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +tHc +dRs +xFb +xFb +dRs +xFb +xFb +sfo +uDr +xFb +xFb +sfo +xFb +xFb +xFb +sfo +sfo +xFb +xFb +mRk +sfo +xFb +sfo +xFb +xFb +uDr +ihC +ghN +pmM +hTX +evW +pYK +elP +rvD pGs pGs pGs @@ -58141,13 +68256,14 @@ pGs pGs pGs pGs +gNE +gNE bsf -bsf -avD -avD -lMY -lMY avD +ulv +uvd +uvd +aEQ avD avD brT @@ -58164,15 +68280,15 @@ brT brT avD avD -avD -lMY -lMY -avD -avD +ofJ +uvd +uvd +crq +gFH +mMz bsf bsf bsf -kkv pGs pGs pGs @@ -58180,155 +68296,155 @@ pGs wUU "} (167,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -jrK -jrK -jrK -jrK -jrK -jrK -fOA -fLS -vrp -fLS -vrp -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +xVw +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +dRs +xFb +xFb +xFb +dRs +xFb +xFb +xFb +dRs +xFb +uDr +sfo +xFb +xFb +sfo +sfo +xFb +xFb +xFb +sfo +uDr +sfo +sfo +xFb +xFb +uDr +xFb +uDr +xFb +bUP +ghN +bGU +trI +bGU +vNB +rvD +vNB +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +bsf +pDX bsf -avD -qsc -qsc -qsc +ulv +mol +mol +fof avD vNT vNT @@ -58346,11 +68462,11 @@ rmS xka fbW rnj -avD -qsc -qsc -qsc -avD +oJX +pqf +uvd +ulv +gFH bsf bsf bsf @@ -58362,152 +68478,152 @@ pGs wUU "} (168,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -jrK -jrK -jrK -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv -bsf -bsf -bsf -brT +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +byC +xFb +xFb +xFb +xFb +xFb +xFb +byC +xFb +xFb +xFb +byC +xFb +xFb +xFb +byC +xFb +xFb +xFb +xFb +byC +xFb +byC +xFb +uDr +xFb +gIE +xFb +xFb +uDr +sfo +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +sfo +sfo +xFb +dRs +bUP +veV +jTR +bGU +bGU +bGU +rvD +bGU +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +bsf +bsf +bsf +mMz +crq uvd uvd uvd @@ -58531,8 +68647,8 @@ ojF brT uvd uvd -uvd -brT +crq +ulv bsf bsf bsf @@ -58544,136 +68660,136 @@ pGs wUU "} (169,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -kmy -kmy -kmy -kmy -jrK -xgH -hmu -fLS -fLS -fLS -fLS +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +wBp +wLB +mPW +wLB +bBV +xVw +wBp +wBp +wBp +xVw +wBp +rYC +wBp +xVw +wBp +wBp +wBp +rYC +xVw +wBp +wBp +wBp +rYC +wBp +xBH +xFb +xFb +xFb +xFb +xFb +xFb +uDr +sfo +xFb +xFb +xFb +xFb +sfo +uDr +uDr +xFb +xFb +dRs +bUP +bUP +ghN +bGU +bGU +bGU +rvD +bGU +bGU pGs pGs pGs @@ -58685,13 +68801,13 @@ pGs pGs pGs pGs -kkv bsf bsf bsf -brT -uvd +bsf +ulv uvd +crq uvd brT bPx @@ -58701,8 +68817,8 @@ snS cRn brT czG -kjI -kjI +izi +izi snS brT kjI @@ -58712,335 +68828,152 @@ ndp kjI brT uvd +kEK uvd -uvd -brT -bsf -bsf -bsf -bsf -pGs -pGs -pGs -pGs -wUU -"} -(170,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -kmy -jrK -jrK -fOA -fLS -fLS -fLS -vrp -fLS -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv -bsf -bsf -bsf -bsf -brT -uvd -uvd -uvd -brT -kjI -snS -xka -snS -kjI -mRs -snS -kjI -kjI -snS -mRs -kjI -snS -xka -eBS -kjI -brT -uvd -uvd -uvd -brT -bsf -fBB -bsf -bsf -pGs -pGs -pGs -pGs -wUU -"} -(171,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -ucx -kmy -jrK -jrK -fOA -fLS -fLS -fLS -fLS -fLS +gFH +bsf +bsf +bsf +bsf +bsf +pGs pGs pGs +wUU +"} +(170,1,1) = {" +wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +mPk +mPk +mPk +mPk +mPk +cJL +mPk +wkJ +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +sfo +sfo +sfo +sfo +sfo +sfo +xFb +xFb +dRs +xFb +bUP +ucL +ghN +bGU +bGU +bGU +bGU +rvD +vNB +bGU +pGs pGs pGs pGs @@ -59049,14 +68982,197 @@ pGs pGs pGs pGs +kkv bsf bsf -fBB bsf +bsf +ulv +ulv +uvd +uvd +brT +kjI +snS +xka +snS +kjI +mRs +snS +kjI +kjI +snS +mRs +kjI +snS +xka +eBS +kjI brT uvd uvd uvd +uvd +bsf +gRU +bsf +bsf +bsf +pGs +pGs +pGs +wUU +"} +(171,1,1) = {" +wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +rYC +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +bUP +ghN +bGU +bGU +bGU +bGU +rvD +rvD +rvD +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +pGs +bsf +bsf +gRU +bsf +brT +kEK +uvd +uvd brT kjI kjI @@ -59083,144 +69199,144 @@ bsf bsf bsf bsf -pGs +bsf pGs pGs pGs wUU "} (172,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -jrK -jrK -xgH -hmu -fLS -fLS -fLS -fLS +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +wBp +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +tHc +bUP +veV +jTR +bGU +akg +bGU +rvD +rvD +bGU pGs pGs pGs @@ -59235,7 +69351,7 @@ bsf bsf bsf bsf -brT +ulv uvd uvd uvd @@ -59265,145 +69381,144 @@ bsf bsf bsf bsf -pGs +bsf pGs pGs pGs wUU "} (173,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -kmy -jrK -jrK -jrK -fOA -fLS -fLS -fLS -fLS -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +xVw +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +bUP +ghN +bGU +bGU +bGU +bGU +bGU +rvD pGs pGs pGs @@ -59417,6 +69532,7 @@ bsf bsf bsf bsf +bsf brT uvd uvd @@ -59429,7 +69545,7 @@ snS snS brT snS -kjI +ujg kjI snS brT @@ -59446,146 +69562,145 @@ brT bsf bsf bsf -kkv -pGs +bsf +bsf pGs pGs pGs wUU "} (174,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -kmy -jrK -jrK -jrK -xgH -hmu -fLS -fLS -fLS -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +dRs +xFb +bUP +veV +jTR +bGU +bGU +bGU +vNB +rvD pGs pGs pGs @@ -59599,7 +69714,8 @@ bsf bsf bsf bsf -brT +bsf +ulv uvd uvd uvd @@ -59628,145 +69744,144 @@ brT bsf bsf bsf -pGs -pGs +bsf +bsf pGs pGs pGs wUU "} (175,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -jrK -jrK -jrK -jrK -fOA -fLS -fLS -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +byC +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +dRs +bUP +bUP +ghN +bGU +vNB +bGU +rvD pGs pGs pGs @@ -59781,7 +69896,8 @@ bsf bsf bsf bsf -brT +bsf +ulv uvd uvd uvd @@ -59809,149 +69925,145 @@ uvd brT bsf bsf -kkv -pGs -pGs +bsf +bsf +bsf pGs pGs pGs wUU "} (176,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -ucx -jrK -jrK -jrK -jrK -fOA -fLS -fLS -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +rYC +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +tHc +bUP +ghN +bGU +bGU +rvD +rvD pGs pGs pGs @@ -59963,6 +70075,10 @@ bsf bsf bsf bsf +bsf +bsf +bsf +bsf brT uvd uvd @@ -59981,159 +70097,155 @@ snS snS cNJ cNJ -brT -avD -cFu -brT -uvd -uvd -uvd -brT -bsf -bsf -kkv -pGs -pGs -pGs -pGs -pGs -wUU -"} -(177,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -mcm -jrK -jrK -jrK -fOA -fLS -fLS +brT +avD +cFu +brT +uvd +uvd +uvd +brT +bsf +bsf +bsf +bsf pGs pGs pGs pGs +wUU +"} +(177,1,1) = {" +wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pkl +kkF +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +byC +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +xFb +bUP +ghN +vNB +rvD +frR +bGU pGs pGs pGs @@ -60144,6 +70256,10 @@ pGs bsf bsf bsf +hre +bsf +bsf +bsf bsf brT uvd @@ -60156,10 +70272,10 @@ snS snS snS snS -kjI +izi kjI cTb -kjI +izi snS snS snS @@ -60173,8 +70289,8 @@ uvd brT bsf bsf -pGs -pGs +bsf +bsf pGs pGs pGs @@ -60182,143 +70298,136 @@ pGs wUU "} (178,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -ucx -kmy -mcm -mcm -jrK -jrK -fOA -fLS -fLS -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +kkF +pkl +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +xFb +xFb +xFb +xFb +byC +xFb +xFb +xFb +byC +xFb +xFb +xFb +byC +xFb +xFb +byC +xFb +xFb +xFb +byC +xFb +exX +kyj +jTR +dlD +bGU +rvD pGs pGs pGs @@ -60327,12 +70436,19 @@ bsf bsf bsf bsf +hre +hre +bsf +bsf +bsf +bsf +bsf brT uvd uvd uvd wNI -aEn +xqS rco kjI kjI @@ -60347,16 +70463,16 @@ kjI kjI atM pTc -vRt +lvt lFr uvd uvd uvd -brT +uvd +bsf bsf bsf bsf -pGs pGs pGs pGs @@ -60364,159 +70480,159 @@ pGs wUU "} (179,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU -vGb -hht -hht -hht -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -vGb -hht -xJn -pGs -pGs -pGs -pGs +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +hJB +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +wBp +xVw +rYC +xVw +wBp +wBp +wBp +xVw +wBp +rYC +wBp +wBp +xVw +wBp +wBp +rYC +wBp +xVw +wBp +rYC +xVw +wBp +xVw +rYC +enZ +iAE pGs pGs pGs pGs pGs -pGs -pGs -pGs -kkv bsf +bsf +bsf +bsf +bsf +hre +hre kkv bsf bsf +bsf +bsf brT uvd uvd +iwV uvd -eIr -ioM +smx rco -kjI +izi kjI kjI kjI @@ -60527,14 +70643,14 @@ kjI kjI kjI kjI -kjI +izi pTc -fpV -nau +nzb uvd +iwV uvd uvd -brT +ulv bsf bsf bsf @@ -60546,73 +70662,6 @@ pGs wUU "} (180,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP wUU wUU wUU @@ -60675,48 +70724,115 @@ wUU wUU wUU wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +cJL +mPk +mPk +mPk +cJL +mPk +mPk +mPk +mPk +rUa +imk +rJv +iAE pGs pGs pGs kkv -kkv +bsf +tRN +hre +hre +hre +hre +bsf +bsf +bsf +bsf bsf bsf brT uvd uvd uvd -avD -avD -avD -avD -snS +eIr +uxi +rco kjI snS kjI +snS +izi kjI kjI -kjI +izi snS kjI snS -avD -avD -avD -avD -uvd +snS +hTQ +vPh +nau uvd uvd -brT +ulv +crq bsf bsf bsf @@ -60817,69 +70933,69 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk +mPk +pRa +imk +rJv pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +aXb +hre +hre +hre +hre +tRN +hre +hre +hre +hre bsf bsf -brT +bsf +ulv uvd uvd uvd brT -bsf -bsf +avD +avD avD brT mvv @@ -60892,13 +71008,13 @@ czG pjm brT avD -bsf -bsf +avD +avD brT uvd uvd +ulv uvd -brT bsf bsf bsf @@ -60999,70 +71115,70 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk +xTA +pRa +wBp +fjv +mPW +mZH +kdq +tWT +uxM +tWT +grG +tWT +iAE +bsf +hre +hre +bsf bsf bsf -brT uvd uvd uvd -brT +uvd +ulv bsf bsf -avD +kjI bPF kjI jUY @@ -61079,7 +71195,7 @@ bsf brT uvd uvd -uvd +ulv brT bsf bsf @@ -61150,39 +71266,13 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP +gsP +gsP +gsP +gsP +gsP +gsP +gsP cLP cLP cLP @@ -61207,37 +71297,63 @@ cLP cLP cLP cLP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk +mPk +xTA +pRa +imk +cJL +xTA +pRa +pRa +pRa +mPk +rUa +pRa +iWj +hre bsf +hre +hre bsf bsf -brT +crq uvd uvd uvd @@ -61363,70 +71479,70 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +mPk +pRa +pRa +mPk +pRa +pRa +pRa +pRa +xDE +kkv +dsi +dsi bsf bsf bsf -brT +uvd eiK uvd uvd -brT -bsf +ulv bsf -avD +mMz +kjI ydZ kjI jUY @@ -61437,18 +71553,18 @@ oKy asf qLH jYs -avD -bsf +kjI bsf -brT +mMz uvd uvd uvd -brT +kEK +uvd +bsf bsf bsf bsf -pGs pGs pGs pGs @@ -61545,70 +71661,70 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf -fBB +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk +mPk +mPk +imk +mPk +mPk +pRa +mPk +pRa +pRa +mPk +pRa +mPk +rUa +iWj +tOV +dsi +dsi +hre +gRU bsf -brT +ulv dHD +kEK uvd -uvd -brT +ulv bsf bsf -avD +qEn iSC kjI jUY @@ -61617,21 +71733,21 @@ kjI kjI pfL asf -bSO +vmY mke -avD +kjI bsf bsf brT uvd uvd -uvd -brT +ulv +ulv +bsf +gRU +bsf bsf -fBB bsf -kkv -pGs pGs pGs pGs @@ -61727,93 +71843,93 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +imk +mPk +pRa +pRa +pRa +pRa +mPk +pRa +pRa +pRa +mPk +pRa +iWj +tRN +dsi +ami +hre bsf bsf brT uvd uvd uvd -brT +kEK kTu bsf avD brT -mvv +gsu snS snS -kjI -kjI +izi +izi snS snS pjm brT -avD -bsf +kjI +mMz bsf brT uvd uvd -uvd +ulv brT bsf bsf bsf -kkv -pGs +bsf +bsf pGs pGs pGs @@ -61909,74 +72025,74 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +pRa +pRa +mPk +pRa +pRa +mPk +pRa +pRa +pRa +rJv +iAE +hre +hre +hre bsf bsf -brT +ulv uvd uvd uvd brT -fBB +gRU mLJ avD brT brT brT -snS +uTA jbR kjI snS @@ -61984,18 +72100,18 @@ brT brT brT avD -eIK +bhU bsf -brT uvd uvd uvd -brT +uvd +uvd +mMz +bsf bsf bsf bsf -pGs -pGs pGs pGs pGs @@ -62091,61 +72207,61 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +hfZ +mPk +mPk +pRa +mPk +mPk +pRa +pRa +mPk +jhK +mPk +mPk +cJL +xDE +aOG +tRN bsf +tOV bsf lqa ulv @@ -62154,7 +72270,7 @@ uvd brT vdV tPE -lfQ +qza kjI rco kjI @@ -62163,12 +72279,12 @@ aJp kjI snS kjI -qAd +hTQ kjI -uJk +vus xfD -bsf -brT +mMz +ulv uvd uvd brT @@ -62176,8 +72292,8 @@ brT bsf bsf kkv -pGs -pGs +bsf +bsf pGs pGs pGs @@ -62273,93 +72389,93 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf -bsf -bsf -bsf -pTO -uvd +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL +xce +byF +xce +xce +xce +xce +xce +byF +xce +xce +xce +xce +xce +xce +gBP +hXq +hXq +hXq +hXq +hXq +qbX uvd +iwV uvd -brT -bsf +ulv bsf +jeT lbX -bNF -brT -kjI +izi +rco +izi dTe kjI kjI kjI -kjI -brT -nZZ -nTq -bsf +izi +qAd +izi +xuX +tfC bsf brT uvd uvd -brT +uvd +bsf +bsf +bsf bsf bsf bsf -pGs -pGs -pGs pGs pGs pGs @@ -62416,60 +72532,21 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP cLP cLP cLP @@ -62495,30 +72572,69 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +iWj bsf -bsf -bsf -gFY +vxi +dsi +hre +vxi +esK vBZ -uvd +kEK eiK -brT +ulv bsf jwf -nJq +ehM kjI rco eRQ @@ -62529,18 +72645,18 @@ kjI kjI qAd kjI -vlJ +cXa rYi bsf brT uvd -uvd -brT +rDK +ulv +bsf +bsf bsf bsf bsf -pGs -pGs pGs pGs pGs @@ -62637,67 +72753,67 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +rJv +sXn +hre bsf +hre bsf bsf bJH ulv ulv -brT +ulv bsf jXp avD @@ -62714,10 +72830,10 @@ avD avD xfD bsf -brT -brT -brT -brT +ulv +uvd +ulv +kEK bsf bsf bsf @@ -62819,65 +72935,65 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf -bsf -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +rJv +apG +vxi +dsi +dsi bsf pTO -bsf +vxi uvd brT bsf @@ -62896,9 +73012,9 @@ ueQ avD bsf bsf -brT -brT -brT +crq +uvd +uvd bsf bsf bsf @@ -63001,76 +73117,76 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +rJv +iAE bsf +hre bsf gFY lqM lTv -brT +ulv gNE gNE avD -bTN +gSE asf kjI izi -uTA -uTA +snS +snS izi kjI jUY @@ -63078,8 +73194,8 @@ bTN avD bsf bsf -brT -brT +ulv +ulv brT bsf bsf @@ -63183,70 +73299,70 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv -bsf -bsf -bsf +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +iWj bsf +dsi +hre +vxi +vxi fcf gFY lqM lqM -avD +ulv kEK kjI kjI @@ -63257,7 +73373,7 @@ ijo kjI kjI ueQ -avD +ulv bsf bsf bsf @@ -63366,25 +73482,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -63405,41 +73506,56 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +rJv +iAE +hre +hre bsf bFo fcf bsf bsf -bsf -avD -avD +vxi +ulv +uvd uvd kjI izi -uTA -uTA +snS +snS izi kjI kEK avD -avD +sOw bsf bsf bsf @@ -63548,145 +73664,112 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -kkv -fBB -bsf -bsf -bsf -bsf -bsf -bsf -nEY -avD -uvd -kjI -qEn -avD -avD -kjI -eiK -hte -avD -bsf -bsf -bsf -bsf -bsf -bsf -bsf -bsf -bsf -bsf -bsf -bsf -bsf -pGs -pGs -pGs -wUU -"} -(197,1,1) = {" -dGr -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +cLP +wUU +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +rUa +iWj +bsf +hre +bsf +vxi +bsf +vxi +bsf +bsf +nEY +avD +cdc +kjI +qEn +avD +avD +dUS +eiK +uvd +ulv +bsf +bsf +bsf +bsf +bsf +bsf +bsf +bsf +bsf +bsf +bsf +bsf +bsf +pGs +pGs +pGs +wUU +"} +(197,1,1) = {" +dGr +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP gsP gsP gsP @@ -63749,6 +73832,24 @@ gsP gsP gsP gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -63769,28 +73870,43 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +pRa +pRa +eXw +pRa +pRa +pRa +ovT +uNz +vxi bsf +vxi bsf bsf bsf +pDX bsf lVf iyk @@ -63802,10 +73918,10 @@ fxR kjI kjI fcF -avD +ulv bsf bsf -eMf +bmI bsf bsf bsf @@ -63912,25 +74028,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -63951,24 +74052,39 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +itL +lwm +tjs +lwm +lwm +lwm +lwm +lwm +tjs +lwm +lwm +lwm +lwm +lwm +tjs +lwm +lwm +hjK +stK +hXq +hXq +hXq +hXq qCT qCT qCT @@ -63983,8 +74099,8 @@ kjI kjI kjI ulv -avD -hte +uvd +ulv uaU bsf bsf @@ -64094,25 +74210,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -64133,32 +74234,47 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -bsf +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +jhK +mPk +pRa +mPk +mPk +pRa +pRa +mPk +vjZ +aAr +fGN +wFJ +xrl +pRa +hfZ +iWj +tRN +hre +hre +gRU qCT byw oXC sxR qCT -fBB +gRU bsf luu -hte +uvd crq kjI hoU @@ -64170,7 +74286,7 @@ nmH hmg bsf bsf -fBB +gRU bsf bsf lDF @@ -64276,25 +74392,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -64315,22 +74416,37 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +mPk +mPk +pRa +pRa +pRa +pRa +itL +kif +fGN +fGN +xrl +pRa +mPk +xDE +hre +gOj +hre qCT qUK rCB @@ -64341,7 +74457,7 @@ qCT bsf bsf hte -avD +sOw kZl ulv hoU @@ -64458,25 +74574,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -64497,22 +74598,37 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +mPk +pRa +kWf +cKB +mdM +mdM +hjf +pRa +fDH +ymb +hre +hre +hre qCT mzK kKS @@ -64528,7 +74644,7 @@ gRN crq uli kEK -hte +ulv lqM vRW bsf @@ -64640,25 +74756,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -64679,22 +74780,37 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +pRa +pRa +mPk +pRa +pRa +pRa +pRa +pRa +ovT +ymb +hre +tRN +hre +bsf qCT kzp kKS @@ -64706,10 +74822,10 @@ oUh yfV bsf hte -hte -ojK -uvd -avD +sOw +akn +iwV +ulv hte bsf bsf @@ -64822,25 +74938,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -64861,22 +74962,37 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +mPk +pRa +pRa +pRa +pRa +pRa +pRa +ovT +dTu +gOj +hre +bsf +bsf +bsf qCT gWL kKS @@ -64891,7 +75007,7 @@ bsf npW hTO toN -hte +ulv bsf bsf bsf @@ -65004,25 +75120,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -65043,23 +75144,38 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +mPk +pRa +pRa +mPk +pRa +pRa +pRa +pRa +rUa +xDE +hre +tRN +hre +bsf +hre +bsf +bsf qCT gMp eyL @@ -65186,25 +75302,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -65225,28 +75326,43 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +nvv +oTs +vgH pGs pGs pGs pGs bsf +hre +bsf +bsf qCT qCT qCT -bsf +pDX bsf bsf ncv @@ -65258,7 +75374,7 @@ bsf bsf bsf bsf -bsf +pDX bsf bsf kkv @@ -65368,25 +75484,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -65407,22 +75508,37 @@ cLP cLP cLP wUU +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +iax pGs pGs pGs pGs pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +bsf +bsf kkv bsf bsf @@ -65550,25 +75666,10 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP +cLP +cLP +cLP +cLP cLP cLP cLP @@ -65589,15 +75690,30 @@ cLP cLP cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +iax pGs pGs pGs @@ -65619,7 +75735,7 @@ ftm tXT bsf bsf -fBB +gRU bsf bsf bsf @@ -65755,31 +75871,31 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +iax pGs pGs pGs @@ -65937,31 +76053,31 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +iax pGs pGs pGs @@ -66119,30 +76235,30 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -66301,30 +76417,30 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -66483,30 +76599,30 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -66665,30 +76781,30 @@ cLP cLP cLP cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP -cLP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -66847,30 +76963,30 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -67029,30 +77145,30 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -67211,30 +77327,30 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU -pGs -pGs -pGs -pGs -pGs -pGs -pGs -pGs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -67393,22 +77509,22 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -67575,22 +77691,22 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -67757,22 +77873,22 @@ gsP gsP gsP gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP -gsP wUU +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs +gKs pGs pGs pGs @@ -67939,21 +78055,21 @@ dGr dGr dGr dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr -dGr +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU +wUU wUU wUU wUU diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 2da1f3f4295d..17f2e577a120 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -9733,7 +9733,7 @@ }, /area/strata/ag/interior/outpost/canteen) "aDr" = ( -/obj/structure/machinery/chem_dispenser/beer, +/obj/structure/machinery/chem_dispenser/soda/beer, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outpost/canteen) "aDs" = ( @@ -10184,7 +10184,7 @@ }, /area/strata/ag/interior/dorms) "aEK" = ( -/obj/structure/machinery/chem_dispenser/beer, +/obj/structure/machinery/chem_dispenser/soda/beer, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/strata{ icon_state = "orange_tile" @@ -12088,7 +12088,7 @@ }, /area/strata/ag/interior/outpost/admin) "aKQ" = ( -/obj/structure/machinery/chem_dispenser/beer, +/obj/structure/machinery/chem_dispenser/soda/beer, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/strata{ dir = 4; diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index b15ee29dd20a..8ccc43dbc64d 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -837,8 +837,8 @@ /area/almayer/living/basketball) "acJ" = ( /mob/living/silicon/decoy/ship_ai{ - pixel_y = -16; - layer = 2.98 + layer = 2.98; + pixel_y = -16 }, /obj/structure/blocker/invisible_wall, /obj/effect/decal/warning_stripes{ @@ -2464,22 +2464,22 @@ /obj/structure/machinery/door_control{ id = "ARES StairsLock"; name = "ARES Exterior Lockdown Override"; - req_one_access_txt = "90;91;92"; + pixel_x = 8; pixel_y = -24; - pixel_x = 8 + req_one_access_txt = "90;91;92" }, /obj/structure/machinery/door_control{ id = "ARES Emergency"; name = "ARES Emergency Lockdown Override"; - req_one_access_txt = "91;92"; - pixel_y = -24 + pixel_y = -24; + req_one_access_txt = "91;92" }, /obj/structure/machinery/door_control{ id = "Brig Lockdown Shutters"; name = "Brig Lockdown Override"; - req_access_txt = "1;3"; pixel_x = -8; - pixel_y = -24 + pixel_y = -24; + req_access_txt = "1;3" }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) @@ -2839,6 +2839,10 @@ pixel_y = 7 }, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "silver" @@ -5322,7 +5326,13 @@ "are" = ( /obj/structure/machinery/computer/demo_sim{ dir = 4; - pixel_x = -16 + pixel_x = -17; + pixel_y = 8 + }, +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17; + pixel_y = -8 }, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) @@ -5816,9 +5826,9 @@ /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; name = "ARES Core Access"; - req_one_access_txt = "1;200;90;91;92"; + pixel_x = -24; pixel_y = 24; - pixel_x = -24 + req_one_access_txt = "1;200;90;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -5840,9 +5850,9 @@ "asG" = ( /obj/structure/surface/table/reinforced/almayer_B{ climbable = 0; + indestructible = 1; unacidable = 1; - unslashable = 1; - indestructible = 1 + unslashable = 1 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -7084,34 +7094,34 @@ /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; name = "ARES Core Access"; - req_one_access_txt = "91;92"; + pixel_x = -10; pixel_y = -24; - pixel_x = -10 + req_one_access_txt = "91;92" }, /obj/structure/machinery/door_control{ id = "ARES StairsLock"; name = "ARES Exterior Lockdown"; - req_one_access_txt = "91;92"; - pixel_y = -24 + pixel_y = -24; + req_one_access_txt = "91;92" }, /obj/structure/surface/table/reinforced/almayer_B{ climbable = 0; + indestructible = 1; unacidable = 1; - unslashable = 1; - indestructible = 1 + unslashable = 1 }, /obj/structure/transmitter/rotary{ - phone_color = "blue"; - phone_id = "AI Reception"; + name = "AI Reception Telephone"; phone_category = "ARES"; - name = "AI Reception Telephone" + phone_color = "blue"; + phone_id = "AI Reception" }, /obj/structure/machinery/door_control{ id = "ARES Emergency"; name = "ARES Emergency Lockdown"; - req_one_access_txt = "91;92"; + pixel_x = 10; pixel_y = -24; - pixel_x = 10 + req_one_access_txt = "91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -7125,9 +7135,9 @@ }, /obj/structure/surface/table/reinforced/almayer_B{ climbable = 0; + indestructible = 1; unacidable = 1; - unslashable = 1; - indestructible = 1 + unslashable = 1 }, /obj/item/paper_bin/uscm{ pixel_y = 6 @@ -9677,6 +9687,9 @@ /area/almayer/shipboard/brig/main_office) "aEm" = ( /obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/working_joe{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -10322,6 +10335,10 @@ }, /area/almayer/living/numbertwobunks) "aHo" = ( +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_x = -17 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "orange" @@ -10992,31 +11009,31 @@ }, /obj/structure/machinery/door_control{ id = "ARES Interior"; + indestructible = 1; name = "ARES Chamber Lockdown"; - req_one_access_txt = "1;200;90;91;92"; pixel_x = 24; pixel_y = -8; - indestructible = 1 + req_one_access_txt = "1;200;90;91;92" }, /obj/structure/machinery/door_control{ id = "ARES Railing"; + indestructible = 1; name = "ARES Chamber Railings"; - req_one_access_txt = "91;92"; - pixel_x = 24; needs_power = 0; - indestructible = 1 + pixel_x = 24; + req_one_access_txt = "91;92" }, /obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4.1; + density = 0; dir = 2; id = "ARES Railing"; - unslashable = 0; - unacidable = 0; - pixel_y = -1; - pixel_x = -1; + layer = 2.1; open_layer = 2.1; - closed_layer = 4.1; - density = 0; - layer = 2.1 + pixel_x = -1; + pixel_y = -1; + unacidable = 0; + unslashable = 0 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -11990,7 +12007,9 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + icon_state = "red" + }, /area/almayer/squads/alpha) "aPk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -12002,10 +12021,14 @@ }, /area/almayer/command/lifeboat) "aPl" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + layer = 4.1; + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/almayer, /area/almayer/squads/alpha) "aPm" = ( /obj/structure/closet/firecloset, @@ -12014,13 +12037,14 @@ }, /area/almayer/hallways/aft_hallway) "aPn" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_y = 16 }, /turf/open/floor/almayer{ - icon_state = "redcorner" + icon_state = "plate" }, -/area/almayer/squads/alpha) +/area/almayer/squads/bravo) "aPo" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -12110,19 +12134,6 @@ /obj/structure/sign/nosmoking_1, /turf/closed/wall/almayer, /area/almayer/squads/alpha) -"aPM" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) -"aPN" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/cm_vending/clothing/marine/alpha, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha) "aPX" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -12292,69 +12303,16 @@ /obj/structure/sign/nosmoking_1, /turf/closed/wall/almayer, /area/almayer/squads/bravo) -"aQP" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"aQQ" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/obj/structure/machinery/cm_vending/clothing/marine/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"aQR" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/machinery/cm_vending/clothing/marine/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"aQS" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/clothing/marine/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "aQT" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + layer = 4.1; + pixel_y = -29 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo_arrow" }, /area/almayer/squads/alpha) -"aQU" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/clothing/marine/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) -"aQV" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/machinery/cm_vending/clothing/marine/bravo, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/bravo) "aQW" = ( /obj/structure/machinery/vending/cola{ pixel_x = -6; @@ -12596,7 +12554,10 @@ /area/almayer/squads/bravo) "aRU" = ( /obj/structure/pipes/vents/pump/on, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, /area/almayer/squads/bravo) "aRV" = ( /obj/structure/platform{ @@ -12610,7 +12571,10 @@ /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "orange" + }, /area/almayer/squads/bravo) "aRZ" = ( /turf/open/floor/almayer{ @@ -12716,7 +12680,7 @@ /area/almayer/hallways/starboard_hallway) "aSt" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/chem_dispenser/beer, +/obj/structure/machinery/chem_dispenser/soda/beer, /turf/open/floor/prison{ icon_state = "kitchen" }, @@ -12927,12 +12891,13 @@ }, /area/almayer/living/offices) "aTv" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_y = 16 }, -/obj/structure/machinery/cm_vending/clothing/marine/bravo, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "cargo_arrow" }, /area/almayer/squads/bravo) "aTw" = ( @@ -12942,12 +12907,7 @@ }, /area/almayer/squads/bravo) "aTx" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer, /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, /turf/open/floor/almayer{ @@ -14290,9 +14250,9 @@ /obj/structure/machinery/door_control{ id = "ARES Mainframe Right"; name = "ARES Mainframe Lockdown"; - req_one_access_txt = "200;91;92"; pixel_x = -24; - pixel_y = -24 + pixel_y = -24; + req_one_access_txt = "200;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -15367,14 +15327,14 @@ }, /area/almayer/squads/alpha) "bfw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/item/device/radio/intercom{ freerange = 1; name = "General Listening Channel"; pixel_y = 28 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -15431,12 +15391,12 @@ }, /area/almayer/squads/alpha) "bfD" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -15713,19 +15673,16 @@ icon_state = "red" }, /area/almayer/squads/alpha) -"bgV" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/alpha) "bgW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/machinery/cm_vending/clothing/marine/charlie{ + density = 0; + layer = 4.1; + pixel_y = -29 }, /turf/open/floor/almayer{ - icon_state = "cargo_arrow" + icon_state = "plate" }, -/area/almayer/squads/alpha) +/area/almayer/squads/charlie) "bgY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15845,13 +15802,12 @@ "bhM" = ( /obj/structure/safe, /obj/item/coin/platinum, -/obj/item/attachable/suppressor, /obj/item/spacecash/c1000/counterfeit, /obj/item/spacecash/c1000/counterfeit, /obj/item/clothing/accessory/storage/holster, -/obj/item/weapon/gun/pistol/mod88, -/obj/item/ammo_magazine/pistol/mod88/rubber, -/obj/item/ammo_magazine/pistol/mod88/rubber, +/obj/item/weapon/gun/pistol/es4, +/obj/item/ammo_magazine/pistol/es4, +/obj/item/ammo_magazine/pistol/es4, /obj/item/clothing/suit/armor/bulletproof, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) @@ -16418,7 +16374,7 @@ "blB" = ( /turf/open/floor/almayer{ dir = 1; - icon_state = "cargo_arrow" + icon_state = "orange" }, /area/almayer/squads/bravo) "blZ" = ( @@ -17216,6 +17172,9 @@ /obj/structure/sign/poster{ pixel_y = 32 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "red" @@ -18183,7 +18142,7 @@ /area/almayer/squads/bravo) "buQ" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/station_alert{ +/obj/structure/machinery/computer/working_joe{ dir = 8 }, /turf/open/floor/almayer{ @@ -20411,19 +20370,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower_engineering) -"bFh" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) -"bFi" = ( -/obj/structure/machinery/light, -/obj/structure/machinery/cm_vending/clothing/marine/charlie, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/charlie) "bFj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -21071,12 +21017,12 @@ plane = -7 }, /obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - open_layer = 1.9; + closed_layer = 3.2; id = "ARES Emergency"; - needs_power = 0; - name = "ARES Emergency Lockdown"; layer = 3.2; - closed_layer = 3.2; + name = "ARES Emergency Lockdown"; + needs_power = 0; + open_layer = 1.9; plane = -7 }, /turf/open/floor/almayer/no_build{ @@ -21103,11 +21049,11 @@ }, /area/almayer/squads/req) "bIw" = ( -/obj/structure/machinery/prop/almayer/computer, /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/machinery/computer/working_joe, /turf/open/floor/almayer{ dir = 1; icon_state = "red" @@ -21185,6 +21131,9 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/upper_hull/u_m_p) +"bIO" = ( +/turf/closed/wall/almayer/outer, +/area) "bIR" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, @@ -21868,17 +21817,17 @@ /obj/structure/machinery/door_control{ id = "ARES StairsLower"; name = "ARES Core Lockdown"; - req_one_access_txt = "19;200;90;91;92"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "19;200;90;91;92" }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 8; pixel_y = 2 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "bLw" = ( @@ -23072,20 +23021,8 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"bQB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/squads/charlie) -"bQC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/almayer{ - icon_state = "emeraldcorner" + icon_state = "emerald" }, /area/almayer/squads/charlie) "bQD" = ( @@ -23265,22 +23202,22 @@ plane = -7 }, /obj/effect/step_trigger/ares_alert/public{ + alert_id = "AresStairs"; alert_message = "Caution: Movement detected in ARES Core."; - cooldown_duration = 1200; - alert_id = "AresStairs" + cooldown_duration = 1200 }, /obj/effect/step_trigger/ares_alert/public{ + alert_id = "AresStairs"; alert_message = "Caution: Movement detected in ARES Core."; - cooldown_duration = 1200; - alert_id = "AresStairs" + cooldown_duration = 1200 }, /obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - open_layer = 1.9; + closed_layer = 3.2; id = "ARES Emergency"; - needs_power = 0; - name = "ARES Emergency Lockdown"; layer = 3.2; - closed_layer = 3.2; + name = "ARES Emergency Lockdown"; + needs_power = 0; + open_layer = 1.9; plane = -7 }, /turf/open/floor/almayer/no_build{ @@ -23736,7 +23673,10 @@ /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/turf/open/floor/almayer, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, /area/almayer/squads/delta) "bTE" = ( /turf/open/floor/almayer{ @@ -26151,13 +26091,13 @@ /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) "cdP" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" +/obj/structure/machinery/cm_vending/clothing/marine/charlie{ + density = 0; + layer = 4.1; + pixel_y = -29 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo_arrow" }, /area/almayer/squads/charlie) "cdT" = ( @@ -26664,6 +26604,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/camera/autoname/almayer, /turf/open/floor/almayer{ dir = 1; icon_state = "emerald" @@ -26896,17 +26837,12 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"cje" = ( -/turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/squads/charlie) "cjf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer{ - icon_state = "cargo_arrow" + icon_state = "emerald" }, /area/almayer/squads/charlie) "cjg" = ( @@ -27017,15 +26953,6 @@ icon_state = "emerald" }, /area/almayer/squads/charlie) -"cjF" = ( -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, -/obj/structure/machinery/cm_vending/clothing/marine/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "cjK" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -27137,50 +27064,6 @@ icon_state = "plate" }, /area/almayer/squads/delta) -"cks" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"cku" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/machinery/cm_vending/clothing/marine/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"ckv" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/clothing/marine/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"ckx" = ( -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/clothing/marine/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) -"cky" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/machinery/cm_vending/clothing/marine/delta, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/delta) "ckB" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -27234,9 +27117,12 @@ }, /area/almayer/squads/delta) "ckR" = ( +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_y = 16 + }, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "plate" }, /area/almayer/squads/delta) "ckS" = ( @@ -27323,6 +27209,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -29 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "bluecorner" @@ -27355,6 +27246,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/alarm/almayer{ + dir = 1; + pixel_y = -29 + }, /turf/open/floor/almayer{ icon_state = "blue" }, @@ -27404,9 +27299,9 @@ "clw" = ( /obj/structure/machinery/light{ dir = 8; + invisibility = 101; unacidable = 1; - unslashable = 1; - invisibility = 101 + unslashable = 1 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -28012,9 +27907,7 @@ }, /area/almayer/squads/charlie) "coj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 - }, +/obj/structure/machinery/power/apc/almayer, /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, /turf/open/floor/almayer{ @@ -28152,8 +28045,8 @@ pixel_y = 6 }, /obj/item/folder/white{ - pixel_y = 6; - pixel_x = 5 + pixel_x = 5; + pixel_y = 6 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -28644,8 +28537,8 @@ icon_state = "ramptop" }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "cBs" = ( @@ -30460,12 +30353,13 @@ }, /area/almayer/hull/lower_hull/l_f_s) "dpO" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta, -/obj/structure/sign/banners/maximumeffort{ - pixel_y = 30 +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_y = 16 }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 1; + icon_state = "cargo_arrow" }, /area/almayer/squads/delta) "dpV" = ( @@ -31267,8 +31161,8 @@ dir = 1 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "dGr" = ( @@ -31619,8 +31513,8 @@ dir = 1 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "dQv" = ( @@ -31966,6 +31860,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/pilotbunks) +"dYh" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hull/upper_hull/u_f_p) "dYu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -32356,6 +32256,14 @@ icon_state = "plate" }, /area/almayer/squads/alpha) +"efU" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/lower_hull/l_m_s) "egc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33167,9 +33075,9 @@ /obj/structure/machinery/door_control{ id = "ARES Mainframe Left"; name = "ARES Mainframe Lockdown"; - req_one_access_txt = "200;91;92"; pixel_x = 24; - pixel_y = 24 + pixel_y = 24; + req_one_access_txt = "200;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "tcomms" @@ -33866,9 +33774,9 @@ }, /obj/structure/machinery/light{ dir = 4; + invisibility = 101; unacidable = 1; - unslashable = 1; - invisibility = 101 + unslashable = 1 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -34697,8 +34605,8 @@ dir = 1 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "fdj" = ( @@ -35097,6 +35005,18 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) +"foL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "emeraldcorner" + }, +/area/almayer/squads/charlie) "fpd" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -35786,6 +35706,12 @@ icon_state = "test_floor4" }, /area/almayer/living/grunt_rnr) +"fEC" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/medical/morgue) "fEN" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 4 @@ -36195,13 +36121,13 @@ /obj/structure/machinery/door_control{ id = "ARES Operations Right"; name = "ARES Operations Shutter"; - req_one_access_txt = "1;200;91;92"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "1;200;91;92" }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "fMt" = ( @@ -36212,12 +36138,12 @@ }, /obj/effect/step_trigger/ares_alert/core, /obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - open_layer = 1.9; + closed_layer = 3.2; id = "ARES Emergency"; - needs_power = 0; - name = "ARES Emergency Lockdown"; layer = 3.2; - closed_layer = 3.2; + name = "ARES Emergency Lockdown"; + needs_power = 0; + open_layer = 1.9; plane = -7 }, /obj/structure/sign/safety/laser{ @@ -36225,8 +36151,8 @@ pixel_y = -8 }, /obj/structure/sign/safety/rewire{ - pixel_y = 6; - pixel_x = 32 + pixel_x = 32; + pixel_y = 6 }, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" @@ -36749,12 +36675,12 @@ pixel_y = 8 }, /obj/structure/transmitter/rotary{ - pixel_x = 8; - pixel_y = -8; + name = "AI Core Telephone"; + phone_category = "ARES"; phone_color = "blue"; phone_id = "AI Core"; - phone_category = "ARES"; - name = "AI Core Telephone" + pixel_x = 8; + pixel_y = -8 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -36762,8 +36688,8 @@ /area/almayer/command/airoom) "gbg" = ( /obj/structure/sign/safety/terminal{ - pixel_y = 24; - pixel_x = 14 + pixel_x = 14; + pixel_y = 24 }, /obj/structure/sign/safety/laser{ pixel_y = 24 @@ -36778,9 +36704,9 @@ /obj/structure/machinery/door_control{ id = "ARES Operations Right"; name = "ARES Operations Shutter"; - req_one_access_txt = "1;200;91;92"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "1;200;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -37167,13 +37093,13 @@ /area/almayer/hull/lower_hull/l_f_s) "gjw" = ( /obj/structure/machinery/faxmachine/uscm/command{ + density = 0; department = "AI Core"; - pixel_y = 32; - density = 0 + pixel_y = 32 }, /obj/structure/surface/rack{ - pixel_y = 16; - density = 0 + density = 0; + pixel_y = 16 }, /obj/structure/machinery/computer/working_joe{ dir = 8; @@ -37520,7 +37446,7 @@ name = "Medical Telephone"; phone_category = "Almayer"; phone_id = "Medical Lower"; - pixel_x = 23 + pixel_x = 16 }, /turf/open/floor/almayer{ icon_state = "sterile_green" @@ -37830,9 +37756,9 @@ /area/almayer/hallways/starboard_hallway) "gyN" = ( /obj/structure/machinery/prop{ + desc = "It's a server box..."; icon_state = "comm_server"; - name = "server box"; - desc = "It's a server box..." + name = "server box" }, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" @@ -38475,23 +38401,23 @@ }, /obj/structure/machinery/door_control{ id = "ARES Interior"; + indestructible = 1; name = "ARES Chamber Lockdown"; - req_one_access_txt = "1;200;90;91;92"; pixel_x = -24; pixel_y = -8; - indestructible = 1 + req_one_access_txt = "1;200;90;91;92" }, /obj/structure/machinery/door/poddoor/railing{ + closed_layer = 4.1; + density = 0; dir = 2; id = "ARES Railing"; - unslashable = 0; - unacidable = 0; - pixel_y = -1; - pixel_x = -1; + layer = 2.1; open_layer = 2.1; - density = 0; - closed_layer = 4.1; - layer = 2.1 + pixel_x = -1; + pixel_y = -1; + unacidable = 0; + unslashable = 0 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -38538,24 +38464,24 @@ }, /obj/structure/machinery/door_control{ id = "ARES Interior"; + indestructible = 1; name = "ARES Chamber Lockdown"; - req_one_access_txt = "1;200;90;91;92"; pixel_x = 24; pixel_y = 8; - indestructible = 1 + req_one_access_txt = "1;200;90;91;92" }, /obj/structure/machinery/door/poddoor/railing{ - id = "ARES Railing"; - unslashable = 0; - unacidable = 0; - open_layer = 2.1; + closed_layer = 4; density = 0; + id = "ARES Railing"; layer = 2.1; - closed_layer = 4 + open_layer = 2.1; + unacidable = 0; + unslashable = 0 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "gPc" = ( @@ -38858,9 +38784,9 @@ "gXs" = ( /obj/effect/step_trigger/ares_alert/terminals, /obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; id = "ARES Operations Right"; - name = "\improper ARES Operations Shutters"; - dir = 4 + name = "\improper ARES Operations Shutters" }, /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -39046,12 +38972,12 @@ /area/almayer/medical/upper_medical) "hbZ" = ( /obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/station_alert{ - dir = 4 - }, /obj/structure/sign/safety/terminal{ pixel_x = -17 }, +/obj/structure/machinery/computer/working_joe{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "orange" @@ -39406,6 +39332,9 @@ /obj/item/storage/bag/trash{ pixel_x = -3 }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, /turf/open/floor/plating, /area/almayer/hull/lower_hull/l_f_p) "hiB" = ( @@ -39833,13 +39762,27 @@ /area/almayer/hallways/port_hallway) "hvv" = ( /obj/structure/disposalpipe/segment, -/obj/item/clipboard, -/obj/item/paper, -/obj/item/tool/pen/blue, /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, +/obj/item/clipboard{ + base_pixel_x = 20; + pixel_x = 5 + }, +/obj/item/paper{ + pixel_x = 5 + }, +/obj/item/tool/pen/blue{ + pixel_x = 5 + }, /obj/structure/surface/table/reinforced/black, +/obj/structure/transmitter/rotary{ + name = "CIC Reception Telephone"; + phone_category = "Command"; + phone_id = "CIC Reception"; + pixel_x = -7; + pixel_y = 4 + }, /turf/open/floor/almayer, /area/almayer/command/cic) "hvw" = ( @@ -40094,6 +40037,12 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"hzV" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_a_p) "hAc" = ( /obj/structure/surface/rack, /obj/item/mortar_shell/flare, @@ -40132,6 +40081,18 @@ icon_state = "sterile_green_side" }, /area/almayer/medical/lower_medical_medbay) +"hAZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "blue" + }, +/area/almayer/squads/delta) "hBc" = ( /obj/structure/pipes/vents/scrubber{ dir = 4 @@ -40790,12 +40751,12 @@ pixel_y = 24 }, /obj/structure/machinery/computer/crew/alt{ - pixel_x = -17; - dir = 4 + dir = 4; + pixel_x = -17 }, /obj/structure/sign/safety/terminal{ - pixel_y = 24; - pixel_x = 14 + pixel_x = 14; + pixel_y = 24 }, /obj/structure/sign/safety/fibre_optics{ pixel_x = 14; @@ -40868,10 +40829,10 @@ /area/almayer/hull/lower_hull/l_a_p) "hTl" = ( /obj/structure/prop/server_equipment/yutani_server{ - pixel_y = 16; - name = "server tower"; + density = 0; desc = "A powerful server tower housing various AI functions."; - density = 0 + name = "server tower"; + pixel_y = 16 }, /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/no_build{ @@ -41454,7 +41415,10 @@ }, /area/almayer/medical/lower_medical_medbay) "ihM" = ( -/obj/structure/machinery/cm_vending/clothing/marine/delta, +/obj/structure/machinery/cm_vending/clothing/marine/delta{ + density = 0; + pixel_y = 16 + }, /obj/structure/sign/safety/cryo{ pixel_x = 32 }, @@ -41958,24 +41922,24 @@ }, /obj/structure/machinery/door_control{ id = "ARES Interior"; + indestructible = 1; name = "ARES Chamber Lockdown"; - req_one_access_txt = "1;200;90;91;92"; pixel_x = -24; pixel_y = 8; - indestructible = 1 + req_one_access_txt = "1;200;90;91;92" }, /obj/structure/machinery/door/poddoor/railing{ - id = "ARES Railing"; - unslashable = 0; - unacidable = 0; - open_layer = 2.1; + closed_layer = 4; density = 0; + id = "ARES Railing"; layer = 2.1; - closed_layer = 4 + open_layer = 2.1; + unacidable = 0; + unslashable = 0 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "itR" = ( @@ -42210,10 +42174,10 @@ "iyH" = ( /obj/structure/surface/table/reinforced/almayer_B{ climbable = 0; - unacidable = 1; - unslashable = 1; + desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you."; indestructible = 1; - desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs. This one has a metal rail running above it, preventing something large passing over. Like you." + unacidable = 1; + unslashable = 1 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -43288,8 +43252,8 @@ dir = 1 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "iZG" = ( @@ -44152,12 +44116,12 @@ }, /obj/effect/step_trigger/ares_alert/core, /obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - open_layer = 1.9; + closed_layer = 3.2; id = "ARES Emergency"; - needs_power = 0; - name = "ARES Emergency Lockdown"; layer = 3.2; - closed_layer = 3.2; + name = "ARES Emergency Lockdown"; + needs_power = 0; + open_layer = 1.9; plane = -7 }, /turf/open/floor/almayer/no_build{ @@ -44521,8 +44485,8 @@ /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; name = "ARES Core Access"; - req_one_access_txt = "19;200;90;91;92"; - pixel_x = 24 + pixel_x = 24; + req_one_access_txt = "19;200;90;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -45231,7 +45195,11 @@ /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) "jVr" = ( -/obj/structure/machinery/cm_vending/clothing/marine/alpha, +/obj/structure/machinery/cm_vending/clothing/marine/alpha{ + density = 0; + layer = 4.1; + pixel_y = -29 + }, /obj/structure/sign/safety/cryo{ pixel_x = 32 }, @@ -45815,6 +45783,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "orange" }, @@ -46574,13 +46543,13 @@ /obj/structure/machinery/door_control{ id = "ARES StairsLower"; name = "ARES Core Lockdown"; - req_one_access_txt = "19;200;90;91;92"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "19;200;90;91;92" }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "kAh" = ( @@ -46983,8 +46952,8 @@ icon_state = "ramptop" }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "kKG" = ( @@ -47339,9 +47308,9 @@ /obj/structure/machinery/door_control{ id = "ARES Mainframe Right"; name = "ARES Mainframe Lockdown"; - req_one_access_txt = "200;91;92"; pixel_x = -24; - pixel_y = 24 + pixel_y = 24; + req_one_access_txt = "200;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "tcomms" @@ -47537,7 +47506,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) "kXa" = ( -/obj/structure/machinery/cm_vending/clothing/marine/bravo, +/obj/structure/machinery/cm_vending/clothing/marine/bravo{ + density = 0; + pixel_y = 16 + }, /obj/structure/sign/safety/cryo{ pixel_x = 32 }, @@ -47557,8 +47529,8 @@ /area/almayer/command/computerlab) "kXj" = ( /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "kXu" = ( @@ -48229,22 +48201,26 @@ pixel_y = 24 }, /obj/structure/sign/safety/terminal{ - pixel_y = 24; - pixel_x = 14 + pixel_x = 14; + pixel_y = 24 }, /obj/structure/machinery/door_control{ id = "ARES Operations Left"; name = "ARES Operations Shutter"; - req_one_access_txt = "1;200;91;92"; pixel_x = 24; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "1;200;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" }, /area/almayer/command/airoom) "lok" = ( -/obj/structure/machinery/cm_vending/clothing/marine/charlie, +/obj/structure/machinery/cm_vending/clothing/marine/charlie{ + density = 0; + layer = 4.1; + pixel_y = -29 + }, /obj/structure/sign/safety/cryo{ pixel_x = 32 }, @@ -48266,6 +48242,23 @@ "loP" = ( /turf/closed/wall/almayer, /area/almayer/engineering/laundry) +"loS" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -29 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "loV" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -49790,6 +49783,9 @@ "lXg" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, +/obj/structure/machinery/computer/working_joe{ + pixel_y = 16 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -50606,6 +50602,20 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"mtr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/squads/bravo) "mtD" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -50678,6 +50688,10 @@ dir = 4 }, /obj/structure/pipes/standard/manifold/hidden/supply, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, /turf/open/floor/almayer{ icon_state = "bluecorner" }, @@ -50756,6 +50770,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_f_p) +"myn" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_f_s) "myo" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/head/soft/purple, @@ -50807,9 +50828,6 @@ }, /area/almayer/hull/lower_hull/l_f_s) "mzg" = ( -/obj/structure/sign/poster{ - pixel_y = -32 - }, /turf/open/floor/almayer{ icon_state = "emerald" }, @@ -51042,12 +51060,12 @@ plane = -7 }, /obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - open_layer = 1.9; + closed_layer = 3.2; id = "ARES Emergency"; - needs_power = 0; - name = "ARES Emergency Lockdown"; layer = 3.2; - closed_layer = 3.2; + name = "ARES Emergency Lockdown"; + needs_power = 0; + open_layer = 1.9; plane = -7 }, /turf/open/floor/almayer/no_build{ @@ -51131,8 +51149,8 @@ /area/almayer/medical/medical_science) "mHE" = ( /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "mHO" = ( @@ -51631,17 +51649,17 @@ }, /obj/effect/step_trigger/ares_alert/core, /obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - open_layer = 1.9; + closed_layer = 3.2; id = "ARES Emergency"; - needs_power = 0; - name = "ARES Emergency Lockdown"; layer = 3.2; - closed_layer = 3.2; + name = "ARES Emergency Lockdown"; + needs_power = 0; + open_layer = 1.9; plane = -7 }, /obj/structure/sign/safety/terminal{ - pixel_y = -8; - pixel_x = -18 + pixel_x = -18; + pixel_y = -8 }, /obj/structure/sign/safety/fibre_optics{ pixel_x = -18; @@ -51791,9 +51809,9 @@ "mUC" = ( /obj/structure/machinery/light{ dir = 4; + invisibility = 101; unacidable = 1; - unslashable = 1; - invisibility = 101 + unslashable = 1 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -51887,6 +51905,9 @@ name = "synthetic potted plant"; pixel_y = 8 }, +/obj/structure/sign/banners/maximumeffort{ + pixel_y = 30 + }, /turf/open/floor/almayer{ dir = 9; icon_state = "blue" @@ -52424,7 +52445,7 @@ "njd" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - icon_state = "cargo_arrow" + icon_state = "red" }, /area/almayer/squads/alpha) "njD" = ( @@ -53161,6 +53182,12 @@ icon_state = "plate" }, /area/almayer/hull/upper_hull/u_f_s) +"nBl" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/lower_hull/l_m_p) "nBo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53222,6 +53249,22 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"nCp" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_y = -29 + }, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/squads/bravo) "nDd" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/ammo_magazine/smg/m39, @@ -54286,8 +54329,8 @@ layer = 3.3 }, /obj/structure/sign/safety/terminal{ - pixel_y = 24; - pixel_x = 14 + pixel_x = 14; + pixel_y = 24 }, /obj/structure/sign/safety/fibre_optics{ pixel_x = 14; @@ -54570,6 +54613,9 @@ /area/almayer/squads/charlie) "okd" = ( /obj/structure/platform_decoration, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -55013,8 +55059,8 @@ }, /obj/structure/platform_decoration, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "osz" = ( @@ -55709,8 +55755,8 @@ /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; name = "ARES Core Access"; - req_one_access_txt = "19;200;90;91;92"; - pixel_x = -24 + pixel_x = -24; + req_one_access_txt = "19;200;90;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -55767,9 +55813,9 @@ /obj/structure/machinery/door_control{ id = "ARES StairsLower"; name = "ARES Core Lockdown"; - req_one_access_txt = "19;200;90;91;92"; pixel_x = -24; - pixel_y = 8 + pixel_y = 8; + req_one_access_txt = "19;200;90;91;92" }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ dir = 4; @@ -55777,8 +55823,8 @@ }, /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "oLv" = ( @@ -56167,6 +56213,10 @@ }, /obj/effect/decal/cleanable/cobweb2/dynamic, /obj/item/packageWrap, +/obj/structure/machinery/computer/working_joe{ + dir = 8; + pixel_x = 17 + }, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -56807,10 +56857,10 @@ /area/almayer/living/briefing) "pmV" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ - pixel_y = 16; - name = "server tower"; + density = 0; desc = "A powerful server tower housing various AI functions."; - density = 0 + name = "server tower"; + pixel_y = 16 }, /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/no_build{ @@ -58434,8 +58484,8 @@ dir = 8 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "pYo" = ( @@ -59432,13 +59482,13 @@ /obj/structure/machinery/door_control{ id = "ARES Operations Left"; name = "ARES Operations Shutter"; - req_one_access_txt = "1;200;91;92"; pixel_x = -24; - pixel_y = -8 + pixel_y = -8; + req_one_access_txt = "1;200;91;92" }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "qxA" = ( @@ -60700,9 +60750,9 @@ /obj/structure/machinery/door_control{ id = "ARES Mainframe Left"; name = "ARES Mainframe Lockdown"; - req_one_access_txt = "200;91;92"; pixel_x = 24; - pixel_y = -24 + pixel_y = -24; + req_one_access_txt = "200;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -61227,8 +61277,8 @@ pixel_y = 1 }, /obj/structure/machinery/computer/crew/alt{ - pixel_x = 17; - dir = 8 + dir = 8; + pixel_x = 17 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -61254,6 +61304,15 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) +"rod" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hull/lower_hull/l_f_s) "rou" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -61276,9 +61335,9 @@ "roH" = ( /obj/effect/step_trigger/ares_alert/terminals, /obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; id = "ARES Operations Left"; - name = "\improper ARES Operations Shutters"; - dir = 4 + name = "\improper ARES Operations Shutters" }, /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -61393,11 +61452,17 @@ /turf/open/floor/plating, /area/almayer/living/offices/flight) "rrq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, /turf/open/floor/almayer{ - dir = 8; - icon_state = "blue" + dir = 1; + icon_state = "red" }, -/area/almayer/squads/delta) +/area/almayer/squads/alpha) "rrB" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/reinforced{ name = "\improper Cryogenics Bay" @@ -61486,6 +61551,14 @@ icon_state = "kitchen" }, /area/almayer/engineering/upper_engineering/port) +"rsY" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_a_s) "rtd" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -61594,7 +61667,7 @@ "rvT" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - icon_state = "cargo_arrow" + icon_state = "emerald" }, /area/almayer/squads/charlie) "rwv" = ( @@ -62989,9 +63062,9 @@ }, /obj/structure/machinery/light{ dir = 8; + invisibility = 101; unacidable = 1; - unslashable = 1; - invisibility = 101 + unslashable = 1 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -62999,8 +63072,8 @@ /area/almayer/command/airoom) "sdl" = ( /obj/structure/surface/rack{ - pixel_y = 16; - density = 0 + density = 0; + pixel_y = 16 }, /obj/item/tool/wet_sign, /obj/item/tool/wet_sign, @@ -63991,6 +64064,14 @@ icon_state = "bluefull" }, /area/almayer/living/briefing) +"sCC" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hull/upper_hull/u_m_p) "sCD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -64440,8 +64521,14 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) "sNb" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, /turf/open/floor/almayer{ - dir = 8; icon_state = "orange" }, /area/almayer/squads/bravo) @@ -65555,8 +65642,8 @@ "tmK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; - req_one_access_txt = "91;92"; - req_one_access = null + req_one_access = null; + req_one_access_txt = "91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "test_floor4" @@ -66861,6 +66948,12 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"tQE" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hull/upper_hull/u_m_s) "tQL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light, @@ -69487,6 +69580,12 @@ icon_state = "redcorner" }, /area/almayer/shipboard/brig/perma) +"uVR" = ( +/obj/structure/machinery/power/apc/almayer, +/turf/open/floor/almayer{ + icon_state = "orange" + }, +/area/almayer/engineering/lower_engineering) "uVX" = ( /obj/structure/machinery/light{ dir = 1 @@ -69661,6 +69760,9 @@ name = "synthetic potted plant"; pixel_y = 8 }, +/obj/structure/machinery/alarm/almayer{ + dir = 1 + }, /turf/open/floor/almayer{ dir = 9; icon_state = "orange" @@ -69869,6 +69971,9 @@ /obj/structure/pipes/vents/pump{ dir = 1 }, +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "redcorner" @@ -70002,10 +70107,10 @@ /area/almayer/hull/lower_hull/l_m_p) "vhe" = ( /obj/structure/prop/server_equipment/yutani_server{ - pixel_y = 16; - name = "server tower"; + density = 0; desc = "A powerful server tower housing various AI functions."; - density = 0 + name = "server tower"; + pixel_y = 16 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -70902,8 +71007,8 @@ dir = 4 }, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 8 + dir = 8; + icon_state = "silver" }, /area/almayer/command/airoom) "vBm" = ( @@ -71238,6 +71343,9 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/machinery/firealarm{ + pixel_y = -29 + }, /turf/open/floor/almayer{ icon_state = "orange" }, @@ -72549,17 +72657,17 @@ plane = -7 }, /obj/effect/step_trigger/ares_alert/public{ + alert_id = "AresStairs"; alert_message = "Caution: Movement detected in ARES Core."; - cooldown_duration = 1200; - alert_id = "AresStairs" + cooldown_duration = 1200 }, /obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - open_layer = 1.9; + closed_layer = 3.2; id = "ARES Emergency"; - needs_power = 0; - name = "ARES Emergency Lockdown"; layer = 3.2; - closed_layer = 3.2; + name = "ARES Emergency Lockdown"; + needs_power = 0; + open_layer = 1.9; plane = -7 }, /turf/open/floor/almayer/no_build{ @@ -73204,9 +73312,9 @@ /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door_control{ id = "ARES Emergency"; + indestructible = 1; name = "ARES Emergency Lockdown"; - req_one_access_txt = "91;92"; - indestructible = 1 + req_one_access_txt = "91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "plating" @@ -74530,8 +74638,8 @@ /area/almayer/living/gym) "xbN" = ( /obj/structure/surface/rack{ - pixel_y = 16; - density = 0 + density = 0; + pixel_y = 16 }, /obj/structure/janitorialcart, /obj/item/tool/mop, @@ -75016,6 +75124,21 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, /area/almayer/hull/lower_hull/l_m_s) +"xoe" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/status_display{ + pixel_y = -29 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "bluecorner" + }, +/area/almayer/squads/delta) "xoh" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -75340,14 +75463,14 @@ /obj/structure/machinery/door_control{ id = "ARES StairsLower"; name = "ARES Core Lockdown"; - req_one_access_txt = "19;200;90;91;92"; pixel_x = 24; - pixel_y = 8 + pixel_y = 8; + req_one_access_txt = "19;200;90;91;92" }, /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/no_build{ - icon_state = "silver"; - dir = 4 + dir = 4; + icon_state = "silver" }, /area/almayer/command/airoom) "xvX" = ( @@ -76583,9 +76706,9 @@ /obj/structure/machinery/door_control{ id = "ARES StairsUpper"; name = "ARES Core Access"; - req_one_access_txt = "1;200;90;91;92"; + pixel_x = 24; pixel_y = 24; - pixel_x = 24 + req_one_access_txt = "1;200;90;91;92" }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors" @@ -76719,6 +76842,11 @@ }, /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, +/obj/structure/machinery/computer/working_joe{ + dir = 4; + pixel_y = 14; + pixel_x = -17 + }, /turf/open/floor/almayer{ dir = 10; icon_state = "orange" @@ -94085,7 +94213,7 @@ soS sgy nsu iyQ -iyQ +rod psy xyw bHB @@ -95341,7 +95469,7 @@ kCT iRS mzo oFG -vRz +bIO aaa aaa aaa @@ -98486,7 +98614,7 @@ aES aES aES aES -gpe +dYh uEv xEF xEF @@ -98647,7 +98775,7 @@ aag aag pCi avl -lFb +myn agj mXj tZB @@ -104554,7 +104682,7 @@ asU asU asU arb -aoq +fEC aoe aoe aCw @@ -110717,7 +110845,7 @@ bdH bdH aad aKW -aSm +efU aLf hhw aQF @@ -110876,7 +111004,7 @@ xCX vGk hoX qVM -csz +sCC qVM czu aaa @@ -111634,7 +111762,7 @@ lYA aiZ aap aar -aap +tQE aNi aZs aNm @@ -112804,7 +112932,7 @@ wRO iMm gUf bJt -oDf +nBl ndQ yhQ yhQ @@ -117827,10 +117955,10 @@ aMC aLT avv bfu -bgV -aPM +rGj +aQT aLT -aQP +aTv blB bnp aTx @@ -117871,11 +117999,11 @@ bMy bJC cog chN -cje -bFh +mzg +cdP bJC dpO -ckR +ckX cli coj bSJ @@ -118029,11 +118157,11 @@ aLT aLT aLT aLT -bfw -bgV -aPM +bfx +rGj +aQT aLT -aQQ +aTv blB kiU aQL @@ -118074,11 +118202,11 @@ bJC bJC bJC chO -cje -bFh +mzg +cdP bJC -cks -ckR +dpO +ckX clj bSJ bSJ @@ -118233,10 +118361,10 @@ aMB bdA aLT ial -aMz -aPM +rGj +aPl aLT -aQP +aPn aRU bnr aQL @@ -118277,11 +118405,11 @@ bMx cgr bJC raK -cje -bFh +mzg +bgW bJC -cks ckR +ckX iyS bSJ clJ @@ -118435,11 +118563,11 @@ bco bdr bdA aLT -bfx -bgV -aPM +bfw +rGj +aQT aLT -aQP +aTv blB vJV aQL @@ -118480,11 +118608,11 @@ cfo cgr bJC chQ -cje -bFh +mzg +cdP bJC -cks -ckR +dpO +ckX clk bSJ clJ @@ -118639,10 +118767,10 @@ bdr bdC beR bfy -bgV -aPM +rGj +aQT aLT -aQR +aTv blB bnt bpG @@ -118683,11 +118811,11 @@ cfo cgs chk chR -cje -bFh +mzg +cdP bJC -cku -ckR +dpO +ckX cll clE clK @@ -118841,13 +118969,13 @@ bco bdr bdA aLT -bfx +bfD aPj -aPN +aPl aLT -aQS -aRT -bnu +aPn +blB +sNb aQL brr aRT @@ -118885,13 +119013,13 @@ cdV cfo cgr bJC -chN -bJD -bFi +foL +mzg +bgW bJC -ckv -bTA -clm +ckR +ckX +loS bSJ clJ clg @@ -119045,12 +119173,12 @@ aMC bdA aLT bfx -bgW -aPM +bgY +aQT aLT -aQP +aTv blB -bnu +nCp aQL brr aUY @@ -119089,11 +119217,11 @@ bMy cgr bJC chP -cje -bFh +mzg +cdP bJC -cks -ckR +dpO +ckX cln bSJ clJ @@ -119248,10 +119376,10 @@ aLT aLT aLT hQW -bgW -aPM +bgY +aQT aLT -aQP +aTv blB qhU aQL @@ -119292,11 +119420,11 @@ bJC bJC bJC uUo -cje +mzg cdP bJC -cjF -ckR +dpO +ckX sUO bSJ bSJ @@ -119451,11 +119579,11 @@ aMB bdD aLT bfz +bgY aPl -aQT aLT -aTv -aRT +aPn +blB bnu aQL brt @@ -119496,10 +119624,10 @@ cgt bJC chS bQA -bFh +bgW bJC -cks -bTA +ckR +ckX meu bSJ clL @@ -119653,13 +119781,13 @@ bcE bdr bdD aLT -bfx -bgW -aPM +rrq +bgY +aQT aLT -aQP +aTv blB -bnu +mtr aQL brt bpC @@ -119699,11 +119827,11 @@ cgt bJC chQ cjf -bFh +cdP bJC -cks -ckR -clo +dpO +ckX +xoe bSJ clL clg @@ -119857,10 +119985,10 @@ bdr bdC beS bfy -bgW -aPM +bgY +aQT aLT -aQP +aTv blB bnt bpH @@ -119902,10 +120030,10 @@ cgs chl chR cjf -bFh +cdP bJC -cks -ckR +dpO +ckX cll clF clK @@ -120060,10 +120188,10 @@ aMC bdD aLT bfC +bgY aPl -aPM aLT -aQU +aPn aRX cSQ aQL @@ -120104,10 +120232,10 @@ bMy cgt bJC chV -bQB -bFh +cjf +bgW bJC -ckx +ckR bTC mvl bSJ @@ -120262,13 +120390,13 @@ aLT aLT aLT aLT -bfD -bgW -aPM +bfx +bgY +aQT aLT -aQV +aTv blB -bnu +sNb aQL aQL aQL @@ -120308,11 +120436,11 @@ bJC bJC chW rvT -bFh +cdP bJC -cky -ckR -cln +dpO +ckX +hAZ bSJ bSJ bSJ @@ -120467,12 +120595,12 @@ aLT bpL bfE njd -aPN +aQT aLT -aQS +aTv blB uvu -sNb +aUZ aQL bsS mqK @@ -120508,15 +120636,15 @@ bJC cfp cgu bJC -fcB +bMx chQ cjf -bFh +cdP bJC -cks -ckR +dpO +ckX clo -rrq +bVn bSJ clM clS @@ -120669,11 +120797,11 @@ bdr bkg aMz bfy +bgY aPl -aPM aLT -aQP -aRT +aPn +blB bnt aRT ihY @@ -120713,11 +120841,11 @@ cfo chm bJD chR -bQB -bFi +cjf +bgW bJC -ckv -bTA +ckR +ckX cll bTA clG @@ -120872,10 +121000,10 @@ aLT aLT brv nuA -bgW -aPM +bgY +aQT aLT -aQP +aTv blB oiQ lml @@ -120917,10 +121045,10 @@ bJC cdf jxx cjf -bFh +cdP bJC -cks -ckR +dpO +ckX rXj gfo bSJ @@ -121075,10 +121203,10 @@ bdr bpK aMz bfy -bgW -aPM +bgY +aQT aLT -aQP +aTv blB bnt aRT @@ -121120,10 +121248,10 @@ chn bJD chR cjf -bFh +cdP bJC -cks -ckR +dpO +ckX cll bTA clH @@ -121278,11 +121406,11 @@ bdv aLT bry bfu -aPn +bgY jVr aLT kXa -aRZ +blB chL lAl aQL @@ -121322,11 +121450,11 @@ cgv bJC wqc chN -bQC +cjf lok bJC ihM -bTE +ckX clm hXY bSJ @@ -121590,7 +121718,7 @@ xlX dmQ gyt psm -dmQ +rsY xlX dmQ psm @@ -126794,7 +126922,7 @@ bCI ccW haq pFM -vuR +hzV vuR vuR vuR @@ -127197,7 +127325,7 @@ bvL bKO bEU bCI -ccW +uVR haq mHR aVl diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index 727ae18b926a..8dd8e17e6507 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -1040,7 +1040,7 @@ }, /area/adminlevel/ert_station) "zk" = ( -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ density = 0; pixel_y = 10 }, diff --git a/maps/new_varadero.json b/maps/new_varadero.json index d9d6a0d231cc..d695652d0ceb 100644 --- a/maps/new_varadero.json +++ b/maps/new_varadero.json @@ -3,15 +3,22 @@ "map_path": "map_files/New_Varadero", "map_file": "New_Varadero.dmm", "webmap_url": "NewVaradero", + "weather_holder": "/datum/weather_ss_map_holder/new_varadero", "survivor_types": [ - "/datum/equipment_preset/survivor/scientist/lv", - "/datum/equipment_preset/survivor/doctor/lv", - "/datum/equipment_preset/survivor/chaplain/lv", - "/datum/equipment_preset/survivor/engineer/lv", - "/datum/equipment_preset/survivor/trucker/lv", - "/datum/equipment_preset/survivor/security/lv", - "/datum/equipment_preset/survivor/colonial_marshal/lv" + "/datum/equipment_preset/survivor/scientist/nv", + "/datum/equipment_preset/survivor/doctor/nv", + "/datum/equipment_preset/survivor/chaplain/nv", + "/datum/equipment_preset/survivor/engineer/nv", + "/datum/equipment_preset/survivor/trucker/nv", + "/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv", + "/datum/equipment_preset/survivor/security/nv", + "/datum/equipment_preset/survivor/beachbum", + "/datum/equipment_preset/survivor/miner", + "/datum/equipment_preset/survivor/clf" + ], + "CO_survivor_types": [ + "/datum/equipment_preset/survivor/new_varadero/commander" ], "defcon_triggers": [ @@ -21,12 +28,13 @@ 580, 0.0 ], - "survivor_message": "You are an UA employee on the island outpost of New Varadero, it is vital that you do all that you can to contain the outbreak, or at least survive.", + "survivor_message": "You are an employee for the United Americas on the island outpost of New Varadero. A newfound discovery has unleashed unspeakable horrors. Do everything you can to survive.", "map_item_type": "/obj/item/map/new_varadero", - "announce_text": "A manual distress signal has been received from United American outpost New Varadero. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.\nDesgination: Radio survey station\n\nPop: 98\nTemp: 95F : 35C ext\nRanking officer: Maj. Afric Zimmerman\nTelecommunications array: Repair required\n\nNo further information available at this time.", + "announce_text": "An automated distress signal has been received from UA Outpost New Varadero. A response team from the ###SHIPNAME### will be dispatched shortly to investigate.\nDesignation: Island research station and mining facility\n\nPopulation: 47\nCurrent Temperature: 68F Interior, 97F Exterior\nOutpost Commander: UA Rep. Steve Haifisch\nTelecommunications Array: Repairs required\n\nNo further information available at this time.", "monkey_types": [ - "farwa" + "monkey" ], + "environment_traits": { "Fog": true }, "traits": [{ "Ground": true }], "xvx_hives": { "xeno_hive_alpha": 0, diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 467df24a94f4..6a129b6f8cfe 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -2002,37 +2002,17 @@ }, /area/yautja) "ov" = ( -/obj/item/storage/belt/utility/full{ - color = "#6b675e"; - desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools."; - name = "\improper Yautja toolbelt" - }, -/obj/item/storage/belt/utility/full{ - color = "#6b675e"; - desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools."; - name = "\improper Yautja toolbelt" - }, -/obj/item/storage/belt/utility/full{ - color = "#6b675e"; - desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools."; - name = "\improper Yautja toolbelt" - }, -/obj/item/storage/belt/utility/full{ - color = "#6b675e"; - desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools."; - name = "\improper Yautja toolbelt" - }, -/obj/item/storage/belt/utility/full{ - color = "#6b675e"; - desc = "A modular belt with various clips. This version lacks any hunting functionality, and is commonly used by engineers to transport important tools."; - name = "\improper Yautja toolbelt" - }, -/obj/item/stack/yautja_rope, -/obj/item/stack/yautja_rope, /obj/structure/surface/rack{ color = "#6b675e"; layer = 2.79 }, +/obj/item/storage/belt/utility/full/pred, +/obj/item/storage/belt/utility/full/pred, +/obj/item/storage/belt/utility/full/pred, +/obj/item/storage/belt/utility/full/pred, +/obj/item/storage/belt/utility/full/pred, +/obj/item/stack/yautja_rope, +/obj/item/stack/yautja_rope, /turf/open/floor/corsat{ dir = 1; icon_state = "squareswood" diff --git a/maps/templates/Chinook.dmm b/maps/templates/Chinook.dmm index 0d9e64628b24..f2acbe320aeb 100644 --- a/maps/templates/Chinook.dmm +++ b/maps/templates/Chinook.dmm @@ -1875,7 +1875,7 @@ /area/adminlevel/chinook/engineering) "gv" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/chem_dispenser/beer, +/obj/structure/machinery/chem_dispenser/soda/beer, /turf/open/floor/almayer{ icon_state = "plate" }, diff --git a/maps/templates/clf_ert_station.dmm b/maps/templates/clf_ert_station.dmm index ec2a81bf6218..cf8bc8d46bf6 100644 --- a/maps/templates/clf_ert_station.dmm +++ b/maps/templates/clf_ert_station.dmm @@ -1828,7 +1828,7 @@ /turf/open/gm/river, /area/adminlevel/ert_station/clf_station) "RR" = ( -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ density = 0; pixel_y = 10 }, diff --git a/maps/templates/weyland_ert_station.dmm b/maps/templates/weyland_ert_station.dmm index 171bd8d9ac6e..854299a4efda 100644 --- a/maps/templates/weyland_ert_station.dmm +++ b/maps/templates/weyland_ert_station.dmm @@ -2509,7 +2509,7 @@ /area/adminlevel/ert_station/weyland_station) "EW" = ( /obj/structure/surface/table/reinforced, -/obj/structure/machinery/chem_dispenser/beer{ +/obj/structure/machinery/chem_dispenser/soda/beer{ density = 0; pixel_y = 23 }, diff --git a/sound/ambience/ambienceNV.ogg b/sound/ambience/ambienceNV.ogg new file mode 100644 index 000000000000..0fcbe8f76505 Binary files /dev/null and b/sound/ambience/ambienceNV.ogg differ diff --git a/sound/ambience/varadero_storm.ogg b/sound/ambience/varadero_storm.ogg new file mode 100644 index 000000000000..ec3234241443 Binary files /dev/null and b/sound/ambience/varadero_storm.ogg differ diff --git a/sound/effects/alien_dragsound_large.ogg b/sound/effects/alien_dragsound_large.ogg new file mode 100644 index 000000000000..bacd14b0eb07 Binary files /dev/null and b/sound/effects/alien_dragsound_large.ogg differ diff --git a/sound/effects/burrowing_b.ogg b/sound/effects/burrowing_b.ogg new file mode 100644 index 000000000000..cc44a8e19282 Binary files /dev/null and b/sound/effects/burrowing_b.ogg differ diff --git a/sound/effects/burrowoff.ogg b/sound/effects/burrowoff.ogg new file mode 100644 index 000000000000..66f10b253612 Binary files /dev/null and b/sound/effects/burrowoff.ogg differ diff --git a/sound/effects/comical_bonk.ogg b/sound/effects/comical_bonk.ogg new file mode 100644 index 000000000000..e0a2751d52c2 Binary files /dev/null and b/sound/effects/comical_bonk.ogg differ diff --git a/sound/effects/weather_warning_varadero.ogg b/sound/effects/weather_warning_varadero.ogg new file mode 100644 index 000000000000..f381188659d2 Binary files /dev/null and b/sound/effects/weather_warning_varadero.ogg differ diff --git a/sound/voice/joe/death_dream.ogg b/sound/voice/joe/death_dream.ogg new file mode 100644 index 000000000000..366890711fe4 Binary files /dev/null and b/sound/voice/joe/death_dream.ogg differ diff --git a/sound/voice/joe/death_normal.ogg b/sound/voice/joe/death_normal.ogg new file mode 100644 index 000000000000..b1afd713e094 Binary files /dev/null and b/sound/voice/joe/death_normal.ogg differ diff --git a/sound/voice/joe/death_silence.ogg b/sound/voice/joe/death_silence.ogg new file mode 100644 index 000000000000..fea5080ccc99 Binary files /dev/null and b/sound/voice/joe/death_silence.ogg differ diff --git a/sound/voice/joe/death_tomorrow.ogg b/sound/voice/joe/death_tomorrow.ogg new file mode 100644 index 000000000000..dbb134005e5e Binary files /dev/null and b/sound/voice/joe/death_tomorrow.ogg differ diff --git a/sound/weapons/gun_es4.ogg b/sound/weapons/gun_es4.ogg new file mode 100644 index 000000000000..54210c02fa60 Binary files /dev/null and b/sound/weapons/gun_es4.ogg differ diff --git a/tgui/packages/tgui-panel/chat/constants.js b/tgui/packages/tgui-panel/chat/constants.js index a73003e13267..ac9346d8d5f0 100644 --- a/tgui/packages/tgui-panel/chat/constants.js +++ b/tgui/packages/tgui-panel/chat/constants.js @@ -125,14 +125,8 @@ export const MESSAGE_TYPES = [ type: MESSAGE_TYPE_ADMINCHAT, name: 'Admin Chat', description: 'ASAY messages', - selector: '.admin_channel, .adminsay, .headminsay', - admin: true, - }, - { - type: MESSAGE_TYPE_MODCHAT, - name: 'Mod Chat', - description: 'MSAY messages', - selector: '.mod_channel, .mod, .adminmod, .staffsay', + selector: + '.admin_channel, .adminsay, .headminsay, .mod_channel, .mod, .adminmod, .staffsay', admin: true, }, { diff --git a/tgui/packages/tgui-say/helpers/index.tsx b/tgui/packages/tgui-say/helpers/index.tsx index 44225cb876d3..c359c79a940f 100644 --- a/tgui/packages/tgui-say/helpers/index.tsx +++ b/tgui/packages/tgui-say/helpers/index.tsx @@ -166,13 +166,10 @@ export const getAvailableChannels = ( return availableChannels; } - if (roles.includes('Mod')) { - availableChannels.push('MSAY'); - } if (roles.includes('Mentor')) { availableChannels.push('Mentor'); } - if (roles.includes('Admin')) { + if (roles.includes('Mod')) { availableChannels.push('ASAY'); } diff --git a/tgui/packages/tgui-say/styles/colors.scss b/tgui/packages/tgui-say/styles/colors.scss index 509b3e17f5ef..e0abb717edf3 100644 --- a/tgui/packages/tgui-say/styles/colors.scss +++ b/tgui/packages/tgui-say/styles/colors.scss @@ -14,7 +14,6 @@ $comms: #b4b4b4; $me: #5975da; $ooc: #1c52f5; $looc: #e362b4; -$msay: #74471b; $mentor: #b5850d; $asay: #9611d4; @@ -49,7 +48,6 @@ $_channel_map: ( 'ooc': $ooc, 'looc': $looc, 'whisper': $say, - 'msay': $msay, 'mentor': $mentor, 'asay': $asay, 'department': $comms, diff --git a/tgui/packages/tgui/interfaces/JoeEmotes.tsx b/tgui/packages/tgui/interfaces/JoeEmotes.tsx new file mode 100644 index 000000000000..acd37de34978 --- /dev/null +++ b/tgui/packages/tgui/interfaces/JoeEmotes.tsx @@ -0,0 +1,110 @@ +import { useBackend, useLocalState } from '../backend'; +import { Box, Button, Divider, Section, Stack, Tabs } from '../components'; +import { Window } from '../layouts'; +import { BooleanLike } from '../../common/react'; + +type Emote = { + id: string; + text: string; + category: string; + path: string; +}; + +type BackendContext = { + categories: string[]; + emotes: Emote[]; + on_cooldown: BooleanLike; +}; + +const EmoteTab = (props, context) => { + const { data, act } = useBackend(context); + const { categories, emotes, on_cooldown } = data; + const [categoryIndex, setCategoryIndex] = useLocalState( + context, + 'category_index', + 'Farewell' + ); + const mapped_emote = emotes.filter( + (emote) => emote && emote.category === categoryIndex + ); + return ( + + + + + {categories.map((item, key) => ( + { + setCategoryIndex(item); + }}> + {item} + + ))} + + + + +
+ + + {mapped_emote.map((item) => ( + + + {' '} + + + + +
+ + + ); +}; + +export const JoeEmotes = (props, context) => { + return ( + + + + + + ); +}; diff --git a/tools/requirements.txt b/tools/requirements.txt index abd6a512a222..316d7d2fe18d 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -3,5 +3,5 @@ bidict==0.22.0 Pillow==9.3.0 # changelogs -PyYaml==5.4 +PyYaml==6.0.1 beautifulsoup4==4.9.3